diff options
Diffstat (limited to 'includes/pages')
| -rw-r--r-- | includes/pages/admin_active.php | 17 | ||||
| -rw-r--r-- | includes/pages/admin_free.php | 10 | ||||
| -rw-r--r-- | includes/pages/admin_import.php | 166 | ||||
| -rw-r--r-- | includes/pages/admin_log.php | 4 | ||||
| -rw-r--r-- | includes/pages/admin_shifts.php | 152 | ||||
| -rw-r--r-- | includes/pages/guest_login.php | 4 | ||||
| -rw-r--r-- | includes/pages/user_ical.php | 9 | ||||
| -rw-r--r-- | includes/pages/user_myshifts.php | 8 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 323 |
9 files changed, 422 insertions, 271 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 58c36f5d..08c436fc 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -32,7 +32,14 @@ function admin_active() { $limit = " LIMIT " . $count; if (isset($_REQUEST['ack'])) { sql_query("UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0"); - $users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); + $users = sql_select(" + SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` + FROM `User` + LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` + WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 + GROUP BY `User`.`UID` + ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); $user_nicks = array(); foreach ($users as $usr) { sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`=" . sql_escape($usr['UID'])); @@ -85,7 +92,13 @@ function admin_active() { $msg = error(_("Angel not found."), true); } - $users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); + $users = sql_select(" + SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` + FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` + WHERE `User`.`Gekommen` = 1 + GROUP BY `User`.`UID` + ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); $matched_users = array(); if ($search == "") diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index 13d4f795..b56da4d1 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -27,7 +27,15 @@ function admin_free() { foreach ($angel_types_source as $angel_type) $angel_types[$angel_type['id']] = $angel_type['name']; - $users = sql_select("SELECT `User`.* FROM `User` ${angeltypesearch} LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`"); + $users = sql_select(" + SELECT `User`.* + FROM `User` + ${angeltypesearch} + LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") + WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL + GROUP BY `User`.`UID` + ORDER BY `Nick`"); $free_users_table = array(); if ($search == "") diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php index 120ab91b..786ea08b 100644 --- a/includes/pages/admin_import.php +++ b/includes/pages/admin_import.php @@ -10,104 +10,156 @@ function admin_import() { $html = ""; $step = "input"; - if (isset($_REQUEST['step'])) + if (isset($_REQUEST['step']) && in_array($step, [ + 'input', + 'check', + 'import' + ])) $step = $_REQUEST['step']; - $html .= '<p>'; - $html .= $step == "input" ? '<b>1. Input</b>' : '1. Input'; - $html .= ' » '; - $html .= $step == "check" ? '<b>2. Validate</b>' : '2. Validate'; - $html .= ' » '; - $html .= $step == "import" ? '<b>3. Import</b>' : '3. Import'; - $html .= '</p>'; + if ($test_handle = fopen('../import/tmp', 'w')) { + fclose($test_handle); + unlink('../import/tmp'); + } else { + error(_('Webserver has no write-permission on import directory.')); + } $import_file = '../import/import_' . $user['UID'] . '.xml'; + $shifttype_id = null; + + $shifttypes_source = ShiftTypes(); + if ($shifttypes_source === false) + engelsystem_error('Unable to load shifttypes.'); + $shifttypes = []; + foreach ($shifttypes_source as $shifttype) + $shifttypes[$shifttype['id']] = $shifttype['name']; switch ($step) { - case "input": + case 'input': $ok = false; - if ($test_handle = fopen('../import/tmp', 'w')) { - fclose($test_handle); - unlink('../import/tmp'); - } else { - error("Webserver has no write-permission on import directory."); - } if (isset($_REQUEST['submit'])) { $ok = true; + + if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) + $shifttype_id = $_REQUEST['shifttype_id']; + else { + $ok = false; + error(_('Please select a shift type.')); + } + 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) { $ok = false; - error("No valid xml/xcal file provided."); + error(_('No valid xml/xcal file provided.')); unlink($import_file); } } else { $ok = false; - error("File upload went wrong."); + error(_('File upload went wrong.')); } } else { $ok = false; - error("Please provide some data."); + error(_('Please provide some data.')); } } - if ($ok) - redirect(page_link_to('admin_import') . "&step=check"); - 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")) - )); + if ($ok) { + redirect(page_link_to('admin_import') . "&step=check&shifttype_id=" . $shifttype_id); + } else { + $html .= div('well well-sm text-center', [ + _('File Upload') . mute(glyph('arrow-right')) . mute(_('Validation')) . mute(glyph('arrow-right')) . mute(_('Import')) + ]) . div('row', [ + div('col-md-offset-3 col-md-6', [ + 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_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id), + form_file('xcal_file', _("xcal-File (.xcal)")), + form_submit('submit', _("Import")) + )) + ]) + ]); } break; - case "check": - if (! file_exists($import_file)) + case 'check': + if (! file_exists($import_file)) { + error(_('Missing import file.')); redirect(page_link_to('admin_import')); + } + + if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) + $shifttype_id = $_REQUEST['shifttype_id']; + else { + error(_('Please select a shift type.')); + redirect(page_link_to('admin_import')); + } list($rooms_new, $rooms_deleted) = prepare_rooms($import_file); - list($events_new, $events_updated, $events_deleted) = prepare_events($import_file); + list($events_new, $events_updated, $events_deleted) = prepare_events($import_file, $shifttype_id); - $html .= form(array( - '<h3>' . _("Rooms to create") . '</h3>', - table(_("Name"), $rooms_new), - '<h3>' . _("Rooms to delete") . '</h3>', - table(_("Name"), $rooms_deleted), + $html .= div('well well-sm text-center', [ + '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . _('Validation') . mute(glyph('arrow-right')) . mute(_('Import')) + ]) . form([ + div('row', [ + div('col-sm-6', [ + '<h3>' . _("Rooms to create") . '</h3>', + table(_("Name"), $rooms_new) + ]), + div('col-sm-6', [ + '<h3>' . _("Rooms to delete") . '</h3>', + table(_("Name"), $rooms_deleted) + ]) + ]), '<h3>' . _("Shifts to create") . '</h3>', table(array( 'day' => _("Day"), 'start' => _("Start"), 'end' => _("End"), - 'name' => _("Name"), + 'shifttype' => _('Shift type'), + 'title' => _("Title"), 'room' => _("Room") - ), shifts_printable($events_new)), + ), shifts_printable($events_new, $shifttypes)), '<h3>' . _("Shifts to update") . '</h3>', table(array( 'day' => _("Day"), 'start' => _("Start"), 'end' => _("End"), - 'name' => _("Name"), + 'shifttype' => _('Shift type'), + 'title' => _("Title"), 'room' => _("Room") - ), shifts_printable($events_updated)), + ), shifts_printable($events_updated, $shifttypes)), '<h3>' . _("Shifts to delete") . '</h3>', table(array( 'day' => _("Day"), 'start' => _("Start"), 'end' => _("End"), - 'name' => _("Name"), + 'shifttype' => _('Shift type'), + 'title' => _("Title"), 'room' => _("Room") - ), shifts_printable($events_deleted)), + ), shifts_printable($events_deleted, $shifttypes)), form_submit('submit', _("Import")) - ), page_link_to('admin_import') . '&step=import'); + ], page_link_to('admin_import') . '&step=import&shifttype_id=' . $shifttype_id); break; - case "import": + case 'import': + if (! file_exists($import_file)) { + error(_('Missing import file.')); + redirect(page_link_to('admin_import')); + } + if (! file_exists($import_file)) redirect(page_link_to('admin_import')); + if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) + $shifttype_id = $_REQUEST['shifttype_id']; + else { + error(_('Please select a shift type.')); + redirect(page_link_to('admin_import')); + } + list($rooms_new, $rooms_deleted) = prepare_rooms($import_file); foreach ($rooms_new as $room) { sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($room) . "', `FromPentabarf`='Y', `Show`='Y'"); @@ -116,7 +168,7 @@ function admin_import() { foreach ($rooms_deleted as $room) sql_query("DELETE FROM `Room` WHERE `Name`='" . sql_escape($room) . "' LIMIT 1"); - list($events_new, $events_updated, $events_deleted) = prepare_events($import_file); + list($events_new, $events_updated, $events_deleted) = prepare_events($import_file, $shifttype_id); foreach ($events_new as $event) { $result = Shift_create($event); if ($result === false) @@ -139,13 +191,18 @@ function admin_import() { unlink($import_file); - $html .= success(_("It's done!"), true); + $html .= div('well well-sm text-center', [ + '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Validation') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Import') . glyph('ok-circle') . '</span>' + ]) . success(_("It's done!"), true); break; default: redirect(page_link_to('admin_import')); } - return $html; + return page_with_title(admin_import_title(), [ + msg(), + $html + ]); } function prepare_rooms($file) { @@ -179,7 +236,7 @@ function prepare_rooms($file) { ); } -function prepare_events($file) { +function prepare_events($file, $shifttype_id) { global $rooms_import; $data = read_xml($file); @@ -195,10 +252,11 @@ function prepare_events($file) { $event_id = trim($event_pb->{ 'event-id' }); $shifts_pb[$event_id] = array( + 'shifttype_id' => $shifttype_id, 'start' => DateTime::createFromFormat("Ymd\THis", $event->dtstart)->getTimestamp(), 'end' => DateTime::createFromFormat("Ymd\THis", $event->dtend)->getTimestamp(), 'RID' => $rooms_import[trim($event->location)], - 'name' => trim($event->summary), + 'title' => trim($event->summary), 'URL' => trim($event->url), 'PSID' => $event_id ); @@ -209,14 +267,14 @@ function prepare_events($file) { foreach ($shifts as $shift) $shifts_db[$shift['PSID']] = $shift; - $shifts_new = array(); - $shifts_updated = array(); + $shifts_new = []; + $shifts_updated = []; foreach ($shifts_pb as $shift) if (! isset($shifts_db[$shift['PSID']])) $shifts_new[] = $shift; else { $tmp = $shifts_db[$shift['PSID']]; - if ($shift['name'] != $tmp['name'] || $shift['start'] != $tmp['start'] || $shift['end'] != $tmp['end'] || $shift['RID'] != $tmp['RID'] || $shift['URL'] != $tmp['URL']) + if ($shift['shifttype_id'] != $tmp['shifttype_id'] || $shift['title'] != $tmp['title'] || $shift['start'] != $tmp['start'] || $shift['end'] != $tmp['end'] || $shift['RID'] != $tmp['RID'] || $shift['URL'] != $tmp['URL']) $shifts_updated[] = $shift; } @@ -239,7 +297,7 @@ function read_xml($file) { return $xml_import; } -function shifts_printable($shifts) { +function shifts_printable($shifts, $shifttypes) { global $rooms_import; $rooms = array_flip($rooms_import); @@ -250,7 +308,11 @@ function shifts_printable($shifts) { $shifts_printable[] = array( 'day' => date("l, Y-m-d", $shift['start']), 'start' => date("H:i", $shift['start']), - 'name' => shorten($shift['name']), + 'shifttype' => ShiftType_name_render([ + 'id' => $shift['shifttype_id'], + 'name' => $shifttypes[$shift['shifttype_id']] + ]), + 'title' => shorten($shift['title']), 'end' => date("H:i", $shift['end']), 'room' => $rooms[$shift['RID']] ); diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php index 70b74d17..70da62fd 100644 --- a/includes/pages/admin_log.php +++ b/includes/pages/admin_log.php @@ -22,8 +22,8 @@ function admin_log() { return page_with_title(admin_log_title(), array( msg(), form(array( - form_text('keyword', _("Suche"), $filter), - form_submit(_("Suche"), "Go") + form_text('keyword', _("Search"), $filter), + form_submit(_("Search"), "Go") )), table(array( 'date' => "Time", diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php index 69166380..733144b3 100644 --- a/includes/pages/admin_shifts.php +++ b/includes/pages/admin_shifts.php @@ -6,9 +6,8 @@ function admin_shifts_title() { // Assistent zum Anlegen mehrerer neuer Schichten function admin_shifts() { - $msg = ""; $ok = true; - + $rid = 0; $start = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d") . " 00:00")->getTimestamp(); $end = $start + 24 * 60 * 60; @@ -16,52 +15,75 @@ function admin_shifts() { $angelmode = 'manually'; $length = ''; $change_hours = array(); - $name = ""; - + $title = ""; + $shifttype_id = null; + // Locations laden (auch unsichtbare - fuer Erzengel ist das ok) $rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`"); $room_array = array(); foreach ($rooms as $room) $room_array[$room['RID']] = $room['Name']; - + // Engeltypen laden $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $needed_angel_types = array(); foreach ($types as $type) $needed_angel_types[$type['id']] = 0; - + + // Load shift types + $shifttypes_source = ShiftTypes(); + if ($shifttypes_source === false) + engelsystem_error('Unable to load shift types.'); + $shifttypes = []; + foreach ($shifttypes_source as $shifttype) + $shifttypes[$shifttype['id']] = $shifttype['name']; + if (isset($_REQUEST['preview']) || isset($_REQUEST['back'])) { + if (isset($_REQUEST['shifttype_id'])) { + $shifttype = ShiftType($_REQUEST['shifttype_id']); + if ($shifttype === false) + engelsystem_error('Unable to load shift type.'); + if ($shifttype == null) { + $ok = false; + error(_('Please select a shift type.')); + } else + $shifttype_id = $_REQUEST['shifttype_id']; + } else { + $ok = false; + error(_('Please select a shift type.')); + } + // Name/Bezeichnung der Schicht, darf leer sein - $name = strip_request_item('name'); - + $title = strip_request_item('title'); + // Auswahl der sichtbaren Locations für die Schichten if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) $rid = $_REQUEST['rid']; else { $ok = false; $rid = $rooms[0]['RID']; - $msg .= error("Wähle bitte einen Raum aus.", true); + error(_('Please select a location.')); } - + if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) $start = $tmp->getTimestamp(); else { $ok = false; - $msg .= error("Bitte gib einen Startzeitpunkt für die Schichten an.", true); + error(_('Please select a start time.')); } - + if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end']))) $end = $tmp->getTimestamp(); else { $ok = false; - $msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true); + error(_('Please select an end time.')); } - + if ($start >= $end) { $ok = false; - $msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true); + error(_('The shifts end has to be after its start.')); } - + if (isset($_REQUEST['mode'])) { if ($_REQUEST['mode'] == 'single') { $mode = 'single'; @@ -71,7 +93,7 @@ function admin_shifts() { $length = trim($_REQUEST['length']); } else { $ok = false; - $msg .= error("Bitte gib eine Schichtlänge in Minuten an.", true); + error(_('Please enter a shift duration in minutes.')); } } elseif ($_REQUEST['mode'] == 'variable') { if (isset($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) { @@ -79,14 +101,14 @@ function admin_shifts() { $change_hours = array_map('trim', explode(",", $_REQUEST['change_hours'])); } else { $ok = false; - $msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true); + error(_('Please split the shift-change hours by colons.')); } } } else { $ok = false; - $msg .= error("Bitte wähle einen Modus.", true); + error(_('Please select a mode.')); } - + if (isset($_REQUEST['angelmode'])) { if ($_REQUEST['angelmode'] == 'location') { $angelmode = 'location'; @@ -97,26 +119,26 @@ function admin_shifts() { $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]); } else { $ok = false; - $msg .= error("Bitte überprüfe die Eingaben für die benötigten Engel des Typs " . $type['name'] . ".", true); + error(sprintf(_('Please check the needed angels for team %s.'), $type['name'])); } } if (array_sum($needed_angel_types) == 0) { $ok = false; - $msg .= error("Es werden 0 Engel benötigt. Bitte wähle benötigte Engel.", true); + error(_('There are 0 angels needed. Please enter the amounts of needed angels.')); } } else { $ok = false; - $msg .= error("Bitte Wähle einen Modus für die benötigten Engel.", true); + error(_('Please select a mode for needed angels.')); } } else { $ok = false; - $msg .= error("Bitte wähle benötigte Engel.", true); + error(_('Please select needed angels.')); } - + // Beim Zurück-Knopf das Formular zeigen if (isset($_REQUEST['back'])) $ok = false; - + // Alle Eingaben in Ordnung if ($ok) { if ($angelmode == 'location') { @@ -131,25 +153,27 @@ function admin_shifts() { 'start' => $start, 'end' => $end, 'RID' => $rid, - 'name' => $name + 'title' => $title, + 'shifttype_id' => $shifttype_id ); } elseif ($mode == 'multi') { $shift_start = $start; do { $shift_end = $shift_start + $length * 60; - + if ($shift_end > $end) $shift_end = $end; if ($shift_start >= $shift_end) break; - + $shifts[] = array( 'start' => $shift_start, 'end' => $shift_end, 'RID' => $rid, - 'name' => $name + 'title' => $title, + 'shifttype_id' => $shifttype_id ); - + $shift_start = $shift_end; } while ($shift_end < $end); } elseif ($mode == 'variable') { @@ -167,53 +191,56 @@ function admin_shifts() { } else break; } - + $shift_start = $start; do { $day = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00")->getTimestamp(); $shift_end = $day + $change_hours[$change_index] * 60 * 60; - + if ($shift_end > $end) $shift_end = $end; if ($shift_start >= $shift_end) $shift_end += 24 * 60 * 60; - + $shifts[] = array( 'start' => $shift_start, 'end' => $shift_end, 'RID' => $rid, - 'name' => $name + 'name' => $title, + 'shifttype_id' => $shifttype_id ); - + $shift_start = $shift_end; $change_index = ($change_index + count($change_hours) - 1) % count($change_hours); } while ($shift_end < $end); } - + $shifts_table = array(); foreach ($shifts as $shift) { - $shifts_table_entry = array( - 'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br /><span class="glyphicon glyphicon-map-marker"></span> ' . $room_array[$shift['RID']], - 'entries' => $shift['name'] - ); - foreach ($types as $type) { + $shifts_table_entry = [ + 'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br />' . Room_name_render(Room($shift['RID'])), + 'title' => ShiftType_name_render(ShiftType($shifttype_id)) . ($shift['title'] ? '<br />' . $shift['title'] : ''), + 'needed_angels' => '' + ]; + foreach ($types as $type) if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0) - $shifts_table_entry['entries'] .= '<br /><span class="icon-icon_angel"></span> <b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing'; - } + $shifts_table_entry['needed_angels'] .= '<b>' . AngelType_name_render($type) . ':</b> ' . $needed_angel_types[$type['id']] . '<br />'; + $shifts_table[] = $shifts_table_entry; } - + // Fürs Anlegen zwischenspeichern: $_SESSION['admin_shifts_shifts'] = $shifts; $_SESSION['admin_shifts_types'] = $needed_angel_types; - + $hidden_types = ""; foreach ($needed_angel_types as $type_id => $count) $hidden_types .= form_hidden('type_' . $type_id, $count); return page_with_title(_("Preview"), array( form(array( $hidden_types, - form_hidden('name', $name), + form_hidden('shifttype_id', $shifttype_id), + form_hidden('title', $title), form_hidden('rid', $rid), form_hidden('start', date("Y-m-d H:i", $start)), form_hidden('end', date("Y-m-d H:i", $end)), @@ -223,24 +250,25 @@ function admin_shifts() { form_hidden('angelmode', $angelmode), form_submit('back', _("back")), table(array( - 'timeslot' => _("Timeslot"), - 'entries' => _("Entries") + 'timeslot' => _('Time and location'), + 'title' => _('Type and title'), + 'needed_angels' => _('Needed angels') ), $shifts_table), - form_submit('submit', _("Save")) - )) + form_submit('submit', _("Save")) + )) )); } } elseif (isset($_REQUEST['submit'])) { if (! is_array($_SESSION['admin_shifts_shifts']) || ! is_array($_SESSION['admin_shifts_types'])) redirect(page_link_to('admin_shifts')); - + foreach ($_SESSION['admin_shifts_shifts'] as $shift) { $shift['URL'] = null; $shift['PSID'] = null; $shift_id = Shift_create($shift); if ($shift_id === false) engelsystem_error('Unable to create shift.'); - + engelsystem_log("Shift created: " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end'])); $needed_angel_types_info = array(); foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) { @@ -251,27 +279,27 @@ function admin_shifts() { } } } - + engelsystem_log("Shift needs following angel types: " . join(", ", $needed_angel_types_info)); - $msg = success("Schichten angelegt.", true); + success("Schichten angelegt."); + redirect(page_link_to('admin_shifts')); } else { unset($_SESSION['admin_shifts_shifts']); unset($_SESSION['admin_shifts_types']); } - + if (! isset($_REQUEST['rid'])) $_REQUEST['rid'] = null; $room_select = html_select_key('rid', 'rid', $room_array, $_REQUEST['rid']); $angel_types = ""; foreach ($types as $type) $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]); - + return page_with_title(admin_shifts_title(), array( msg(), - $msg, form(array( - form_text('name', _("Name"), $name), - // TODO: form_textarea('description', _("Description"), ''), + form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id), + form_text('title', _("Title"), $title), form_select('rid', _("Room"), $room_array, $_REQUEST['rid']), '<div class="row">', '<div class="col-md-6">', @@ -291,8 +319,8 @@ function admin_shifts() { $angel_types, '</div>', '</div>', - form_submit('preview', _("Preview")) - )) + form_submit('preview', _("Preview")) + )) )); } ?> diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 3d8b5381..fc375092 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -293,9 +293,9 @@ function guest_login() { form_text('nick', _("Nick"), $nick), form_password('password', _("Password")), form_submit('submit', _("Login")), - form_info("", buttons(array( + buttons(array( button(page_link_to('user_password_recovery'), _("I forgot my password")) - ))), + )), info(_("Please note: You have to activate cookies!"), true) )), '</div>', diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php index 911f48aa..ba832842 100644 --- a/includes/pages/user_ical.php +++ b/includes/pages/user_ical.php @@ -22,7 +22,14 @@ function user_ical() { require_once realpath(__DIR__ . '/user_shifts.php'); view_user_shifts(); } else { - $ical_shifts = sql_select("SELECT `Shifts`.*, `Room`.`Name` as `room_name` FROM `ShiftEntry` INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID']) . " ORDER BY `start`"); + $ical_shifts = sql_select(" + SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name` as `room_name` + FROM `ShiftEntry` + INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) + JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) + INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) + WHERE `UID`=" . sql_escape($user['UID']) . " + ORDER BY `start`"); } header("Content-Type: text/calendar; charset=utf-8"); diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 6fe9afa2..e557054d 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -35,12 +35,14 @@ function user_myshifts() { `ShiftEntry`.`freeload_comment`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, + `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) + JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); @@ -76,7 +78,11 @@ function user_myshifts() { redirect(page_link_to('user_myshifts')); } elseif (isset($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) { $id = $_REQUEST['cancel']; - $shift = sql_select("SELECT `Shifts`.`start` FROM `Shifts` INNER JOIN `ShiftEntry` USING (`SID`) WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); + $shift = sql_select(" + SELECT `Shifts`.`start` + FROM `Shifts` + INNER JOIN `ShiftEntry` USING (`SID`) + WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID'])); if (count($shift) > 0) { $shift = $shift[0]; if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index bfcf6152..603ca993 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -6,25 +6,39 @@ function shifts_title() { function user_shifts() { global $user, $privileges, $max_freeloadable_shifts; - + if (User_is_freeloader($user)) redirect(page_link_to('user_myshifts')); - + + // Locations laden + $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); + $room_array = array(); + foreach ($rooms as $room) + $room_array[$room['RID']] = $room['Name']; + // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) { if (isset($_REQUEST['entry_id']) && test_request_int('entry_id')) $entry_id = $_REQUEST['entry_id']; else redirect(page_link_to('user_shifts')); - - $shift_entry_source = sql_select("SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `User` ON (`User`.`UID`=`ShiftEntry`.`UID`) JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id) . " LIMIT 1"); + + $shift_entry_source = sql_select(" + SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` + FROM `ShiftEntry` + JOIN `User` ON (`User`.`UID`=`ShiftEntry`.`UID`) + JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) + JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) + JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) + JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) + WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id)); if (count($shift_entry_source) > 0) { $shift_entry_source = $shift_entry_source[0]; - + $result = ShiftEntry_delete($entry_id); if ($result === false) engelsystem_error('Unable to delete shift entry.'); - + engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("y-m-d H:i", $shift_entry_source['start']) . " to " . date("y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']); success(_("Shift entry deleted.")); } else @@ -34,28 +48,22 @@ function user_shifts() { elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) { $msg = ""; $ok = true; - + if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift')) $shift_id = $_REQUEST['edit_shift']; else redirect(page_link_to('user_shifts')); - - /* - * if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1") > 0) { error("Du kannst nur Schichten bearbeiten, bei denen niemand eingetragen ist."); redirect(page_link_to('user_shift')); } - */ - - $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); + + $shift = sql_select(" + SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* FROM `Shifts` + JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) + JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) + WHERE `SID`=" . sql_escape($shift_id)); if (count($shift) == 0) redirect(page_link_to('user_shifts')); $shift = $shift[0]; - - // Locations laden - $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); - $room_array = array(); - foreach ($rooms as $room) - $room_array[$room['RID']] = $room['Name']; - - // Engeltypen laden + + // Engeltypen laden $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angel_types = array(); $needed_angel_types = array(); @@ -63,30 +71,30 @@ function user_shifts() { $angel_types[$type['id']] = $type; $needed_angel_types[$type['id']] = 0; } - + // Benötigte Engeltypen vom Raum $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } - + // Benötigte Engeltypen von der Schicht $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } - + $name = $shift['name']; $rid = $shift['RID']; $start = $shift['start']; $end = $shift['end']; - + if (isset($_REQUEST['submit'])) { // Name/Bezeichnung der Schicht, darf leer sein $name = strip_request_item('name'); - + // Auswahl der sichtbaren Locations für die Schichten if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) $rid = $_REQUEST['rid']; @@ -95,26 +103,26 @@ function user_shifts() { $rid = $rooms[0]['RID']; $msg .= error(_("Please select a room."), true); } - + if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) $start = $tmp->getTimestamp(); else { $ok = false; $msg .= error(_("Please enter a valid starting time for the shifts."), true); } - + if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end']))) $end = $tmp->getTimestamp(); else { $ok = false; $msg .= error(_("Please enter a valid ending time for the shifts."), true); } - + if ($start >= $end) { $ok = false; $msg .= error(_("The ending time has to be after the starting time."), true); } - + foreach ($needed_angel_types_source as $type) { if (isset($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) { $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]); @@ -123,7 +131,7 @@ function user_shifts() { $msg .= error(sprintf(_("Please check your input for needed angels of type %s."), $type['name']), true); } } - + if ($ok) { $shift['name'] = $name; $shift['RID'] = $rid; @@ -138,19 +146,19 @@ function user_shifts() { sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count)); $needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count; } - + engelsystem_log("Updated shift '" . $name . "' from " . date("y-m-d H:i", $start) . " to " . date("y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info)); success(_("Shift updated.")); - redirect(page_link_to('user_shifts')); + redirect(shift_link($shift_id)); } } - + $room_select = html_select_key('rid', 'rid', $room_array, $rid); - + $angel_types = ""; foreach ($types as $type) $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]); - + return page_with_title(shifts_title(), array( msg(), '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>', @@ -161,8 +169,8 @@ function user_shifts() { form_text('end', _("End:"), date("Y-m-d H:i", $end)), '<h2>' . _("Needed angels") . '</h2>', $angel_types, - form_submit('submit', _("Save")) - )) + form_submit('submit', _("Save")) + )) )); } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) { @@ -170,64 +178,72 @@ function user_shifts() { $shift_id = $_REQUEST['delete_shift']; else redirect(page_link_to('user_shifts')); - - $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); - if (count($shift) == 0) + + $shift = Shift($shift_id); + if ($shift === false) + engelsystem_error('Unable to load shift.'); + if ($shift == null) redirect(page_link_to('user_shifts')); - $shift = $shift[0]; - - // Schicht löschen bestätigt + + // Schicht löschen bestätigt if (isset($_REQUEST['delete'])) { $result = Shift_delete($shift_id); if ($result === false) engelsystem_error('Unable to delete shift.'); - + engelsystem_log("Deleted shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end'])); success(_("Shift deleted.")); redirect(page_link_to('user_shifts')); } - + return page_with_title(shifts_title(), array( error(sprintf(_("Do you want to delete the shift %s from %s to %s?"), $shift['name'], date("Y-m-d H:i", $shift['start']), date("H:i", $shift['end'])), true), - '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' + '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' )); } elseif (isset($_REQUEST['shift_id'])) { if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id'])) $shift_id = $_REQUEST['shift_id']; else redirect(page_link_to('user_shifts')); - - $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); - if (count($shift) == 0) + + $shift = Shift($shift_id); + $room; + $shift['Name'] = $room_array[$shift['RID']]; + if ($shift === false) + engelsystem_error('Unable to load shift.'); + if ($shift == null) redirect(page_link_to('user_shifts')); - $shift = $shift[0]; - + if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id'])) $type_id = $_REQUEST['type_id']; else redirect(page_link_to('user_shifts')); - + // Schicht läuft schon, Eintragen für Engel nicht mehr möglich if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) { error(_("This shift is running now or ended already. Please contact a dispatcher to join the shift.")); - redirect(page_link_to('user_shifts')); + redirect(shift_link($shift)); } - + // Another shift the user is signed up for collides with this one - if (! in_array('user_shifts_admin', $privileges) && sql_num_query("SELECT `Shifts`.`SID` FROM `Shifts` INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) { + if (! in_array('user_shifts_admin', $privileges) && sql_num_query(" + SELECT `Shifts`.`SID` + FROM `Shifts` + INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") + WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) { error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift.")); - redirect(page_link_to('user_shifts')); + redirect(shift_link($shift)); } - + if (in_array('user_shifts_admin', $privileges)) $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1"); else $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = " . sql_escape($type_id) . " AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1"); - + if (count($type) == 0) redirect(page_link_to('user_shifts')); $type = $type[0]; - + if (isset($_REQUEST['submit'])) { $selected_type_id = $type_id; if (in_array('user_shifts_admin', $privileges)) { @@ -235,25 +251,25 @@ function user_shifts() { $user_id = $_REQUEST['user_id']; else $user_id = $user['UID']; - + if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0) redirect(page_link_to('user_shifts')); - + if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0) $selected_type_id = $_REQUEST['angeltype_id']; } else $user_id = $user['UID']; - + if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'")) return error("This angel does already have an entry for this shift.", true); - + $freeloaded = $shift['freeloaded']; $freeload_comment = $shift['freeload_comment']; if (in_array("user_shifts_admin", $privileges)) { $freeloaded = isset($_REQUEST['freeloaded']); $freeload_comment = strip_request_item_nl('freeload_comment'); } - + $comment = strip_request_item_nl('comment'); $result = ShiftEntry_create(array( 'SID' => $shift_id, @@ -261,28 +277,28 @@ function user_shifts() { 'UID' => $user_id, 'Comment' => $comment, 'freeloaded' => $freeloaded, - 'freeload_comment' => $freeload_comment + 'freeload_comment' => $freeload_comment )); if ($result === false) engelsystem_error('Unable to create shift entry.'); - + if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0) sql_query("INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ('" . sql_escape($user_id) . "', '" . sql_escape($selected_type_id) . "')"); - + $user_source = User($user_id); engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end'])); success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' »</a>'); - redirect(page_link_to('user_shifts')); + redirect(shift_link($shift)); } - + if (in_array('user_shifts_admin', $privileges)) { $users = sql_select("SELECT *, (SELECT count(*) FROM `ShiftEntry` WHERE `freeloaded`=1 AND `ShiftEntry`.`UID`=`User`.`UID`) AS `freeloaded` FROM `User` ORDER BY `Nick`"); $users_select = array(); - + foreach ($users as $usr) $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? "" : " (" . _("Freeloader") . ")"); $user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']); - + $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angeltypes = array(); foreach ($angeltypes_source as $angeltype) @@ -292,7 +308,7 @@ function user_shifts() { $user_text = User_Nick_render($user); $angeltyppe_select = $type['name']; } - + return ShiftEntry_edit_view($user_text, date("Y-m-d H:i", $shift['start']) . ' – ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')', $shift['Name'], $shift['name'], $angeltyppe_select, "", false, null, in_array('user_shifts_admin', $privileges)); } else { return view_user_shifts(); @@ -302,22 +318,25 @@ function user_shifts() { function view_user_shifts() { global $user, $privileges; global $ical_shifts; - + $ical_shifts = array(); - $days = sql_select_single_col("SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` FROM `Shifts` ORDER BY `start`"); - + $days = sql_select_single_col(" + SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` + FROM `Shifts` + ORDER BY `start`"); + if (count($days) == 0) { error(_("The administration has not configured any shifts yet.")); redirect('?'); } - + $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); - + if (count($rooms) == 0) { error(_("The administration has not configured any rooms yet.")); redirect('?'); } - + if (in_array('user_shifts_admin', $privileges)) $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`"); else @@ -327,32 +346,32 @@ function view_user_shifts() { $filled = array( array( 'id' => '1', - 'name' => _('occupied') + 'name' => _('occupied') ), array( 'id' => '0', - 'name' => _('free') - ) + 'name' => _('free') + ) ); - + if (count($types) == 0) { error(_("The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.")); redirect('?'); } - + if (! isset($_SESSION['user_shifts'])) $_SESSION['user_shifts'] = array(); - + if (! isset($_SESSION['user_shifts']['filled'])) { $_SESSION['user_shifts']['filled'] = array( - 0 + 0 ); } - + foreach (array( 'rooms', 'types', - 'filled' + 'filled' ) as $key) { if (isset($_REQUEST[$key])) { $filtered = array_filter($_REQUEST[$key], 'is_numeric'); @@ -363,7 +382,7 @@ function view_user_shifts() { if (! isset($_SESSION['user_shifts'][$key])) $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key); } - + if (isset($_REQUEST['rooms'])) { if (isset($_REQUEST['new_style'])) $_SESSION['user_shifts']['new_style'] = true; @@ -374,7 +393,7 @@ function view_user_shifts() { $_SESSION['user_shifts']['new_style'] = true; foreach (array( 'start', - 'end' + 'end' ) as $key) { if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days)) $_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day']; @@ -391,52 +410,59 @@ function view_user_shifts() { $_SESSION['user_shifts']['end_day'] = $_SESSION['user_shifts']['start_day']; if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time']) $_SESSION['user_shifts']['end_time'] = '23:59'; - + if (isset($_SESSION['user_shifts']['start_day'])) { $starttime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']); $starttime = $starttime->getTimestamp(); } else $starttime = now(); - + if (isset($_SESSION['user_shifts']['end_day'])) { $endtime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']); $endtime = $endtime->getTimestamp(); } else $endtime = now() + 24 * 60 * 60; - + if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0) $_SESSION['user_shifts']['rooms'] = array( - 0 + 0 ); - - $SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs' + + $SQL = "SELECT DISTINCT `Shifts`.*, `ShiftTypes`.`name`, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs' FROM `Shifts` INNER JOIN `Room` USING (`RID`) + INNER JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) LEFT JOIN (SELECT COUNT(*) AS special_needs , nat3.`shift_id` FROM `NeededAngelTypes` AS nat3 WHERE `shift_id` IS NOT NULL GROUP BY nat3.`shift_id`) AS nat2 ON nat2.`shift_id` = `Shifts`.`SID` INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND nat.`angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`)) LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id` WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") AND `start` BETWEEN " . $starttime . " AND " . $endtime; - + if (count($_SESSION['user_shifts']['filled']) == 1) { if ($_SESSION['user_shifts']['filled'][0] == 0) $SQL .= " - AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " .sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; + AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; elseif ($_SESSION['user_shifts']['filled'][0] == 1) $SQL .= " - AND (nat.`count` <= entries.`count` OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " .sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; + AND (nat.`count` <= entries.`count` OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))"; } $SQL .= " ORDER BY `start`"; + $shifts = sql_select($SQL); - $ownshifts_source = sql_select("SELECT `Shifts`.* FROM `Shifts` INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "') + + $ownshifts_source = sql_select(" + SELECT `ShiftTypes`.`name`, `Shifts`.* + FROM `Shifts` + INNER JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) + INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "') WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") AND `start` BETWEEN " . $starttime . " AND " . $endtime); $ownshifts = array(); foreach ($ownshifts_source as $ownshift) $ownshifts[$ownshift['SID']] = $ownshift; unset($ownshifts_source); - + $shifts_table = ""; // qqqq /* @@ -448,7 +474,7 @@ function view_user_shifts() { $block = array(); $todo = array(); $myrooms = $rooms; - + // delete un-selected rooms from array foreach ($myrooms as $k => $v) { if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE) @@ -456,7 +482,7 @@ function view_user_shifts() { // initialize $block array $block[$v["id"]] = array_fill(0, $maxshow, 0); } - + // calculate number of parallel shifts in each timeslot for each room foreach ($shifts as $k => $shift) { $rid = $shift["RID"]; @@ -466,7 +492,7 @@ function view_user_shifts() { $block[$rid][$i] ++; $shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts)); } - + $shifts_table = '<div class="shifts-table"><table id="shifts" class="table scrollable"><thead><tr><th>-</th>'; foreach ($myrooms as $key => $room) { $rid = $room["id"]; @@ -483,15 +509,14 @@ function view_user_shifts() { $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n"; } unset($block, $blocks, $firstblock, $colspan, $key, $room); - + $shifts_table .= "</tr></thead><tbody>"; for ($i = 0; $i < $maxshow; $i ++) { $thistime = $first + ($i * 15 * 60); if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60) { $shifts_table .= "<tr class=\"row-day\"><th class=\"row-header\">"; $shifts_table .= date('y-m-d<b\r />H:i', $thistime); - } - elseif ($thistime % (60 * 60) == 0) { + } elseif ($thistime % (60 * 60) == 0) { $shifts_table .= "<tr class=\"row-hour\"><th>"; $shifts_table .= date("H:i", $thistime); } else { @@ -506,33 +531,32 @@ function view_user_shifts() { $blocks = ($shift["end"] - $shift["start"]) / (15 * 60); if ($blocks < 1) $blocks = 1; - + $collides = in_array($shift['SID'], array_keys($ownshifts)); if (! $collides) foreach ($ownshifts as $ownshift) { - if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] || - $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] || - $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end']) - { + if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] || $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] || $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end']) { $collides = true; break; } } - + // qqqqqq $is_free = false; - $shifts_row = date('d.m. H:i', $shift['start']); + $shifts_row = '<a href="' . shift_link($shift) . '">' . date('d.m. H:i', $shift['start']); $shifts_row .= " – "; $shifts_row .= date('H:i', $shift['end']); $shifts_row .= "<br /><b>"; - $shifts_row .= $shift['name']; + $shifts_row .= ShiftType($shift['shifttype_id'])['name']; $shifts_row .= "</b><br />"; - $shifts_row .= $room["name"]; - $shifts_row .= "<br />"; + if ($shift['title'] != '') { + $shifts_row .= $shift['title']; + $shifts_row .= "<br />"; + } if (in_array('admin_shifts', $privileges)) $shifts_row .= ' ' . table_buttons(array( button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), - button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') )); $shifts_row .= '<br />'; $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` @@ -550,7 +574,7 @@ function view_user_shifts() { $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= " ORDER BY `AngelTypes`.`name`"; $angeltypes = sql_select($query); - + if (count($angeltypes) > 0) { foreach ($angeltypes as $angeltype) { $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); @@ -567,7 +591,7 @@ function view_user_shifts() { } if (in_array('user_shifts_admin', $privileges)) $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . table_buttons(array( - button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') )) . '</span>'; else $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>"; @@ -576,20 +600,20 @@ function view_user_shifts() { $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries)); // is the shift still running or alternatively is the user shift admin? $user_may_join_shift = true; - + // you cannot join if user alread joined a parallel or this shift $user_may_join_shift &= ! $collides; - + // you cannot join if user is not of this angel type $user_may_join_shift &= isset($angeltype['user_id']); - + // you cannot join if you are not confirmed if ($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) $user_may_join_shift &= isset($angeltype['confirm_user_id']); - + // you can only join if the shift is in future or running $user_may_join_shift &= time() < $shift['start']; - + // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) @@ -604,11 +628,11 @@ function view_user_shifts() { else $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; } - + unset($inner_text); $is_free = true; } - + $shifts_row .= '<b>' . $angeltype['name'] . ':</b> '; $shifts_row .= join(", ", $entry_list); $shifts_row .= '<br />'; @@ -650,17 +674,20 @@ function view_user_shifts() { $info[] = date("Y-m-d", $shift['start']); $info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']); if (count($_SESSION['user_shifts']['rooms']) > 1) - $info[] = $shift['room_name']; - + $info[] = Room_name_render([ + 'Name' => $shift['room_name'], + 'RID' => $shift['RID'] + ]); + $shift_row = array( 'info' => join('<br />', $info), - 'entries' => $shift['name'] + 'entries' => '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>' . ($shift['title'] ? '<br />' . $shift['title'] : '') ); - + if (in_array('admin_shifts', $privileges)) $shift_row['info'] .= ' ' . table_buttons(array( button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), - button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') )); $shift_row['entries'] .= '<br />'; $is_free = false; @@ -681,7 +708,7 @@ function view_user_shifts() { $angeltypes = sql_select($query); if (count($angeltypes) > 0) { $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0; - + foreach ($angeltypes as &$angeltype) { $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); $entry_list = array(); @@ -689,7 +716,7 @@ function view_user_shifts() { foreach ($entries as $entry) { if (in_array('user_shifts_admin', $privileges)) $member = User_Nick_render($entry) . ' ' . table_buttons(array( - button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') )); else $member = User_Nick_render($entry); @@ -705,20 +732,20 @@ function view_user_shifts() { $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries) + $freeloader), $angeltype['count'] - count($entries) + $freeloader); // is the shift still running or alternatively is the user shift admin? $user_may_join_shift = true; - + /* you cannot join if user already joined this shift */ $user_may_join_shift &= ! $my_shift; - + // you cannot join if user is not of this angel type $user_may_join_shift &= isset($angeltype['user_id']); - + // you cannot join if you are not confirmed if ($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) $user_may_join_shift &= isset($angeltype['confirm_user_id']); - + // you can only join if the shift is in future or running $user_may_join_shift &= time() < $shift['start']; - + // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) @@ -732,11 +759,11 @@ function view_user_shifts() { $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; } } - + unset($inner_text); $is_free = true; } - + $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> '; $shift_row['entries'] .= join(", ", $entry_list); $shift_row['entries'] .= '<br />'; @@ -751,13 +778,13 @@ function view_user_shifts() { } $shifts_table = table(array( 'info' => _("Time") . "/" . _("Room"), - 'entries' => _("Entries") + 'entries' => _("Entries") ), $shifts_table); } - + if ($user['api_key'] == "") User_reset_api_key($user, false); - + return page(array( '<div class="col-md-12">', msg(), @@ -774,9 +801,9 @@ function view_user_shifts() { 'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>', 'shifts_table' => msg() . $shifts_table, 'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>', - 'filter' => _("Filter") + 'filter' => _("Filter") )), - '</div>' + '</div>' )); } @@ -802,14 +829,14 @@ function make_select($items, $selected, $name, $title = null) { $html_items = array(); if (isset($title)) $html_items[] = '<h4>' . $title . '</h4>' . "\n"; - + foreach ($items as $i) $html_items[] = '<div class="checkbox"><label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '"' . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . '> ' . $i['name'] . '</label>' . (! isset($i['enabled']) || $i['enabled'] ? '' : glyph("lock")) . '</div><br />'; $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= implode("\n", $html_items); $html .= buttons(array( button("javascript: check_all('selection_" . $name . "')", _("All"), ""), - button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") + button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") )); $html .= '</div>' . "\n"; return $html; |