admin import now without template files
This commit is contained in:
Philip Häusler
parent
cf20bc1c29
commit
3401c6f8b6
|
|
@ -32,11 +32,6 @@ $max_freeloadable_shifts = 2;
|
|||
// local timezone
|
||||
date_default_timezone_set("Europe/Berlin");
|
||||
|
||||
// Pentabarf ConferenzDI für UpdateDB
|
||||
$PentabarfXMLhost = "cccv.pentabarf.org";
|
||||
$PentabarfXMLpath = "Xcal/conference/";
|
||||
$PentabarfXMLEventID = "31";
|
||||
|
||||
// multiply "night shifts" and freeloaded shifts (start or end between 2 and 6 exclusive) by 2
|
||||
$shift_sum_formula = "SUM(
|
||||
(1+(
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ function admin_import_title() {
|
|||
}
|
||||
|
||||
function admin_import() {
|
||||
global $PentabarfXMLhost, $PentabarfXMLpath;
|
||||
global $rooms_import;
|
||||
global $user;
|
||||
$html = "";
|
||||
|
|
@ -35,61 +34,7 @@ function admin_import() {
|
|||
|
||||
if (isset($_REQUEST['submit'])) {
|
||||
$ok = true;
|
||||
if (isset ($_REQUEST['user']) && $_REQUEST['user'] != "" && isset ($_REQUEST['password']) && $_REQUEST['password'] != "") {
|
||||
$fp = fsockopen("ssl://$PentabarfXMLhost", 443, $errno, $errstr, 5);
|
||||
|
||||
if (!$fp) {
|
||||
$ok = false;
|
||||
error("File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_REQUEST["url"] . "' not readable!" . "[$errstr ($errno)]");
|
||||
} else {
|
||||
$fileOut = fopen($import_file, "w");
|
||||
$head = 'GET /' . $PentabarfXMLpath . $_REQUEST["url"] . ' HTTP/1.1' . "\r\n" .
|
||||
'Host: ' . $PentabarfXMLhost . "\r\n" .
|
||||
'User-Agent: Engelsystem' . "\r\n" .
|
||||
'Authorization: Basic ' .
|
||||
base64_encode($_REQUEST["user"] . ':' . $_REQUEST["password"]) . "\r\n" .
|
||||
"\r\n";
|
||||
fputs($fp, $head);
|
||||
$Zeilen = -1;
|
||||
echo "<pre>";
|
||||
while (!feof($fp)) {
|
||||
$Temp = fgets($fp, 1024);
|
||||
|
||||
// show header
|
||||
if ($Zeilen == -1) {
|
||||
echo $Temp;
|
||||
}
|
||||
|
||||
// ende des headers
|
||||
if ($Temp == "\r\n") {
|
||||
echo "</pre>\n";
|
||||
$Zeilen = 0;
|
||||
$Temp = "";
|
||||
}
|
||||
|
||||
//file ende?
|
||||
if ($Temp == "0\r\n")
|
||||
break;
|
||||
|
||||
if (($Zeilen > -1) && ($Temp != "ffb\r\n")) {
|
||||
//steuerzeichen ausfiltern
|
||||
if (strpos("#$Temp", "\r\n") > 0)
|
||||
$Temp = substr($Temp, 0, strlen($Temp) - 2);
|
||||
if (strpos("#$Temp", "1005") > 0)
|
||||
$Temp = "";
|
||||
if (strpos("#$Temp", "783") > 0)
|
||||
$Temp = "";
|
||||
//schreiben in file
|
||||
fputs($fileOut, $Temp);
|
||||
$Zeilen++;
|
||||
}
|
||||
}
|
||||
fclose($fileOut);
|
||||
fclose($fp);
|
||||
success("Es wurden $Zeilen Zeilen eingelesen.");
|
||||
}
|
||||
}
|
||||
elseif (isset ($_FILES['xcal_file']) && ($_FILES['xcal_file']['error'] == 0)) {
|
||||
if (isset($_FILES['xcal_file']) && ($_FILES['xcal_file']['error'] == 0)) {
|
||||
if (move_uploaded_file($_FILES['xcal_file']['tmp_name'], $import_file)) {
|
||||
libxml_use_internal_errors(true);
|
||||
if (simplexml_load_file($import_file) === false) {
|
||||
|
|
@ -109,12 +54,13 @@ function admin_import() {
|
|||
|
||||
if ($ok)
|
||||
redirect(page_link_to('admin_import') . "&step=check");
|
||||
else
|
||||
$html .= template_render('../templates/admin_import_input.html', array (
|
||||
'link' => page_link_to('admin_import'),
|
||||
'msg' => msg(),
|
||||
'url' => "https://$PentabarfXMLhost/$PentabarfXMLpath"
|
||||
else {
|
||||
$html .= form(array(
|
||||
form_info('', _("This import will create/update/delete rooms and shifts by given FRAB-export file. The needed file format is xcal.")),
|
||||
form_file('xcal_file', _("xcal-File (.xcal)")),
|
||||
form_submit('submit', _("Import"))
|
||||
));
|
||||
}
|
||||
break;
|
||||
|
||||
case "check":
|
||||
|
|
@ -124,14 +70,37 @@ function admin_import() {
|
|||
list($rooms_new, $rooms_deleted) = prepare_rooms($import_file);
|
||||
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file);
|
||||
|
||||
$html .= template_render('../templates/admin_import_check.html', array (
|
||||
'link' => page_link_to('admin_import'),
|
||||
'rooms_new' => count($rooms_new) == 0 ? "<tr><td>None</td></tr>" : table_body($rooms_new),
|
||||
'rooms_deleted' => count($rooms_deleted) == 0 ? "<tr><td>None</td></tr>" : table_body($rooms_deleted),
|
||||
'events_new' => count($events_new) == 0 ? "<tr><td>None</td><td></td><td></td><td></td><td></td></tr>" : table_body(shifts_printable($events_new)),
|
||||
'events_updated' => count($events_updated) == 0 ? "<tr><td>None</td><td></td><td></td><td></td><td></td></tr>" : table_body(shifts_printable($events_updated)),
|
||||
'events_deleted' => count($events_deleted) == 0 ? "<tr><td>None</td><td></td><td></td><td></td><td></td></tr>" : table_body(shifts_printable($events_deleted))
|
||||
));
|
||||
$html .= form(array(
|
||||
'<h3>' . _("Rooms to create") . '</h3>',
|
||||
table(_("Name"), $rooms_new),
|
||||
'<h3>' . _("Rooms to delete") . '</h3>',
|
||||
table(_("Name"), $rooms_deleted),
|
||||
'<h3>' . _("Shifts to create") . '</h3>',
|
||||
table(array(
|
||||
'day' => _("Day"),
|
||||
'start' => _("Start"),
|
||||
'end' => _("End"),
|
||||
'name' => _("Name"),
|
||||
'room' => _("Room")
|
||||
), shifts_printable($events_new)),
|
||||
'<h3>' . _("Shifts to update") . '</h3>',
|
||||
table(array(
|
||||
'day' => _("Day"),
|
||||
'start' => _("Start"),
|
||||
'end' => _("End"),
|
||||
'name' => _("Name"),
|
||||
'room' => _("Room")
|
||||
), shifts_printable($events_updated)),
|
||||
'<h3>' . _("Shifts to delete") . '</h3>',
|
||||
table(array(
|
||||
'day' => _("Day"),
|
||||
'start' => _("Start"),
|
||||
'end' => _("End"),
|
||||
'name' => _("Name"),
|
||||
'room' => _("Room")
|
||||
), shifts_printable($events_deleted)),
|
||||
form_submit('submit', _("Import"))
|
||||
), page_link_to('admin_import') . '&step=import');
|
||||
break;
|
||||
|
||||
case "import":
|
||||
|
|
@ -148,23 +117,22 @@ function admin_import() {
|
|||
|
||||
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file);
|
||||
foreach ($events_new as $event)
|
||||
sql_query("INSERT INTO `Shifts` SET `name`='" .
|
||||
sql_escape($event['name']) . "', `start`=" . sql_escape($event['start']) . ", `end`=" . sql_escape($event['end']) . ", `RID`=" . sql_escape($event['RID']) . ", `PSID`=" . sql_escape($event['PSID']) . ", `URL`='" . sql_escape($event['URL']) . "'");
|
||||
sql_query("INSERT INTO `Shifts` SET `name`='" . sql_escape($event['name']) . "', `start`=" . sql_escape($event['start']) . ", `end`=" . sql_escape($event['end']) . ", `RID`=" . sql_escape($event['RID']) . ", `PSID`=" . sql_escape($event['PSID']) . ", `URL`='" . sql_escape($event['URL']) . "'");
|
||||
|
||||
foreach ($events_updated as $event)
|
||||
sql_query("UPDATE `Shifts` SET `name`='" .
|
||||
sql_escape($event['name']) . "', `start`=" . sql_escape($event['start']) . ", `end`=" . sql_escape($event['end']) . ", `RID`=" . sql_escape($event['RID']) . ", `PSID`=" . sql_escape($event['PSID']) . ", `URL`='" . sql_escape($event['URL']) . "' WHERE `PSID`=" . sql_escape($event['PSID']) . " LIMIT 1");
|
||||
sql_query("UPDATE `Shifts` SET `name`='" . sql_escape($event['name']) . "', `start`=" . sql_escape($event['start']) . ", `end`=" . sql_escape($event['end']) . ", `RID`=" . sql_escape($event['RID']) . ", `PSID`=" . sql_escape($event['PSID']) . ", `URL`='" . sql_escape($event['URL']) . "' WHERE `PSID`=" . sql_escape($event['PSID']) . " LIMIT 1");
|
||||
|
||||
foreach ($events_deleted as $event)
|
||||
sql_query("DELETE FROM `Shifts` WHERE `PSID`=" .
|
||||
sql_escape($event['PSID']) . " LIMIT 1");
|
||||
sql_query("DELETE FROM `Shifts` WHERE `PSID`=" . sql_escape($event['PSID']) . " LIMIT 1");
|
||||
|
||||
engelsystem_log("Pentabarf import done");
|
||||
|
||||
unlink($import_file);
|
||||
|
||||
$html .= template_render('../templates/admin_import_import.html', array ());
|
||||
$html .= success(_("It's done!"), true);
|
||||
break;
|
||||
default:
|
||||
redirect(page_link_to('admin_import'));
|
||||
}
|
||||
|
||||
return $html;
|
||||
|
|
@ -179,14 +147,14 @@ function prepare_rooms($file) {
|
|||
$rooms_db = array();
|
||||
$rooms_import = array();
|
||||
foreach ($rooms as $room) {
|
||||
$rooms_db[] = $room['Name'];
|
||||
$rooms_db[] = (string) $room['Name'];
|
||||
$rooms_import[$room['Name']] = $room['RID'];
|
||||
}
|
||||
|
||||
$events = $data->vcalendar->vevent;
|
||||
$rooms_pb = array();
|
||||
foreach ($events as $event) {
|
||||
$rooms_pb[] = $event->location;
|
||||
$rooms_pb[] = (string) $event->location;
|
||||
if (! isset($rooms_import[trim($event->location)]))
|
||||
$rooms_import[trim($event->location)] = trim($event->location);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ function toolbar($items = array()) {
|
|||
|
||||
/**
|
||||
* Render a link for a toolbar.
|
||||
*
|
||||
* @param string $href
|
||||
* @param string $class
|
||||
* @param string $label
|
||||
|
|
@ -115,6 +116,13 @@ function form_text($name, $label, $value, $disabled = false) {
|
|||
return form_element($label, '<input id="form_' . $name . '" type="text" name="' . $name . '" value="' . htmlspecialchars($value) . '" ' . $disabled . '/>', 'form_' . $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rendert ein Formular-Dateifeld
|
||||
*/
|
||||
function form_file($name, $label) {
|
||||
return form_element($label, '<input id="form_' . $name . '" type="file" name="' . $name . '" />', 'form_' . $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rendert ein Formular-Passwortfeld
|
||||
*/
|
||||
|
|
@ -163,7 +171,21 @@ function page($elements) {
|
|||
/**
|
||||
* Rendert eine Datentabelle
|
||||
*/
|
||||
function table($columns, $rows, $data = true) {
|
||||
function table($columns, $rows_raw, $data = true) {
|
||||
// If only one column is given
|
||||
if (! is_array($columns)) {
|
||||
$columns = array(
|
||||
'col' => $columns
|
||||
);
|
||||
|
||||
$rows = array();
|
||||
foreach ($rows_raw as $row)
|
||||
$rows[] = array(
|
||||
'col' => $row
|
||||
);
|
||||
} else
|
||||
$rows = $rows_raw;
|
||||
|
||||
if (count($rows) == 0)
|
||||
return info(_("No data found."), true);
|
||||
$html = "";
|
||||
|
|
|
|||
|
|
@ -1,106 +0,0 @@
|
|||
<form action="%link%&step=import" method="post">
|
||||
<fieldset>
|
||||
<h3>Rooms to create</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Name
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%rooms_new%
|
||||
</tbody>
|
||||
</table>
|
||||
<h3>Rooms to delete</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Name
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%rooms_deleted%
|
||||
</tbody>
|
||||
</table>
|
||||
<h3>Shifts to create</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Day
|
||||
</th>
|
||||
<th>
|
||||
Start
|
||||
</th>
|
||||
<th>
|
||||
End
|
||||
</th>
|
||||
<th>
|
||||
Name
|
||||
</th>
|
||||
<th>
|
||||
Room
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%events_new%
|
||||
</tbody>
|
||||
</table>
|
||||
<h3>Shifts to update</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Day
|
||||
</th>
|
||||
<th>
|
||||
Start
|
||||
</th>
|
||||
<th>
|
||||
End
|
||||
</th>
|
||||
<th>
|
||||
Name
|
||||
</th>
|
||||
<th>
|
||||
Room
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%events_updated%
|
||||
</tbody>
|
||||
</table>
|
||||
<h3>Shifts to delete</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Day
|
||||
</th>
|
||||
<th>
|
||||
Start
|
||||
</th>
|
||||
<th>
|
||||
End
|
||||
</th>
|
||||
<th>
|
||||
Name
|
||||
</th>
|
||||
<th>
|
||||
Room
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%events_deleted%
|
||||
</tbody>
|
||||
</table>
|
||||
<input type="submit" name="submit" value="Submit" />
|
||||
</fieldset>
|
||||
</form>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<p class="success">
|
||||
It's done!
|
||||
</p>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<form action="%link%" method="post" enctype="multipart/form-data">
|
||||
<fieldset>
|
||||
%msg%
|
||||
<p>
|
||||
For Pentabarf import provide user/password and url-completion.
|
||||
</p>
|
||||
<p><label>Location:</label> %url%<input type="text" name="url" /></p>
|
||||
<p>
|
||||
<label>
|
||||
User:
|
||||
</label>
|
||||
<input type="text" name="user" value="" />
|
||||
</p>
|
||||
<p>
|
||||
<label>
|
||||
Password:
|
||||
</label>
|
||||
<input type="password" name="password" />
|
||||
</p>
|
||||
<p>
|
||||
Or provide a Xcal-file from pentabarf manually:
|
||||
</p>
|
||||
<p>
|
||||
<label>
|
||||
Xcal-file:
|
||||
</label>
|
||||
<input type="file" name="xcal_file" />
|
||||
</p>
|
||||
<p>
|
||||
<input type="submit" name="submit" value="Submit" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
Loading…
Reference in New Issue