diff options
Diffstat (limited to 'includes/pages')
| -rw-r--r-- | includes/pages/admin_active.php | 4 | ||||
| -rw-r--r-- | includes/pages/admin_arrive.php | 4 | ||||
| -rw-r--r-- | includes/pages/admin_groups.php | 2 | ||||
| -rw-r--r-- | includes/pages/admin_import.php | 478 | ||||
| -rw-r--r-- | includes/pages/admin_news.php | 8 | ||||
| -rw-r--r-- | includes/pages/admin_questions.php | 4 | ||||
| -rw-r--r-- | includes/pages/admin_rooms.php | 17 | ||||
| -rw-r--r-- | includes/pages/admin_shifts.php | 5 | ||||
| -rw-r--r-- | includes/pages/admin_user.php | 4 | ||||
| -rw-r--r-- | includes/pages/guest_login.php | 4 | ||||
| -rw-r--r-- | includes/pages/schedule/ImportSchedule.php | 614 | ||||
| -rw-r--r-- | includes/pages/user_messages.php | 6 | ||||
| -rw-r--r-- | includes/pages/user_myshifts.php | 8 | ||||
| -rw-r--r-- | includes/pages/user_news.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_questions.php | 4 | ||||
| -rw-r--r-- | includes/pages/user_settings.php | 8 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 8 |
17 files changed, 654 insertions, 526 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 508f3d81..71d6914a 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -42,11 +42,11 @@ function admin_active() __('At least %s angels are forced to be active. The number has to be greater.'), $forced_count )); - redirect(page_link_to('admin_active')); + throw_redirect(page_link_to('admin_active')); } } else { $msg .= error(__('Please enter a number of angels to be marked as active.')); - redirect(page_link_to('admin_active')); + throw_redirect(page_link_to('admin_active')); } if ($request->hasPostData('ack')) { diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index 7a11f3ab..312fd6dc 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -39,7 +39,7 @@ function admin_arrive() engelsystem_log('User set to not arrived: ' . User_Nick_render($user_source, true)); success(__('Reset done. Angel has not arrived.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } else { $msg = error(__('Angel not found.'), true); } @@ -57,7 +57,7 @@ function admin_arrive() engelsystem_log('User set has arrived: ' . User_Nick_render($user_source, true)); success(__('Angel has been marked as arrived.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } else { $msg = error(__('Angel not found.'), true); } diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php index 6ba2ceaf..1d4a9e03 100644 --- a/includes/pages/admin_groups.php +++ b/includes/pages/admin_groups.php @@ -148,7 +148,7 @@ function admin_groups() 'Group privileges of group ' . $group['Name'] . ' edited: ' . join(', ', $privilege_names) ); - redirect(page_link_to('admin_groups')); + throw_redirect(page_link_to('admin_groups')); } else { return error('No Group found.', true); } diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php deleted file mode 100644 index 11c9729a..00000000 --- a/includes/pages/admin_import.php +++ /dev/null @@ -1,478 +0,0 @@ -<?php - -/** - * @return string - */ -function admin_import_title() -{ - return __('Frab import'); -} - -/** - * @return string - */ -function admin_import() -{ - global $rooms_import; - $user = auth()->user(); - $html = ''; - $import_dir = __DIR__ . '/../../import'; - $request = request(); - - $step = 'input'; - if ( - $request->has('step') - && in_array($request->input('step'), [ - 'input', - 'check', - 'import' - ]) - ) { - $step = $request->input('step'); - } - - try { - $test_handle = @fopen($import_dir . '/tmp', 'w'); - fclose($test_handle); - @unlink($import_dir . '/tmp'); - } catch (Exception $e) { - error(__('Webserver has no write-permission on import directory.')); - } - - $import_file = $import_dir . '/import_' . $user->id . '.xml'; - $shifttype_id = null; - $add_minutes_start = 15; - $add_minutes_end = 15; - - $shifttypes_source = ShiftTypes(); - $shifttypes = []; - foreach ($shifttypes_source as $shifttype) { - $shifttypes[$shifttype['id']] = $shifttype['name']; - } - - switch ($step) { - case 'input': - $valid = false; - - if ($request->hasPostData('submit')) { - $valid = true; - - if ($request->has('shifttype_id') && isset($shifttypes[$request->input('shifttype_id')])) { - $shifttype_id = $request->input('shifttype_id'); - } else { - $valid = false; - error(__('Please select a shift type.')); - } - - $minutes_start = trim($request->input('add_minutes_start')); - if ($request->has('add_minutes_start') && is_numeric($minutes_start)) { - $add_minutes_start = $minutes_start; - } else { - $valid = false; - error(__('Please enter an amount of minutes to add to a talk\'s begin.')); - } - - if ($request->has('add_minutes_end') && is_numeric(trim($request->input('add_minutes_end')))) { - $add_minutes_end = trim($request->input('add_minutes_end')); - } else { - $valid = false; - error(__('Please enter an amount of minutes to add to a talk\'s end.')); - } - - 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) { - $valid = false; - error(__('No valid xml/xcal file provided.')); - unlink($import_file); - } - } else { - $valid = false; - error(__('File upload went wrong.')); - } - } else { - $valid = false; - error(__('Please provide some data.')); - } - } - - if ($valid) { - redirect( - page_link_to('admin_import', [ - 'step' => 'check', - 'shifttype_id' => $shifttype_id, - 'add_minutes_end' => $add_minutes_end, - 'add_minutes_start' => $add_minutes_start, - ]) - ); - } 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([ - 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_spinner('add_minutes_start', __('Add minutes to start'), $add_minutes_start), - form_spinner('add_minutes_end', __('Add minutes to end'), $add_minutes_end), - form_file('xcal_file', __('xcal-File (.xcal)')), - form_submit('submit', __('Import')) - ]) - ]) - ]); - } - break; - - case 'check': - if (!file_exists($import_file)) { - error(__('Missing import file.')); - redirect(page_link_to('admin_import')); - } - - if ($request->has('shifttype_id') && isset($shifttypes[$request->input('shifttype_id')])) { - $shifttype_id = $request->input('shifttype_id'); - } else { - error(__('Please select a shift type.')); - redirect(page_link_to('admin_import')); - } - - if ($request->has('add_minutes_start') && is_numeric(trim($request->input('add_minutes_start')))) { - $add_minutes_start = trim($request->input('add_minutes_start')); - } else { - error(__('Please enter an amount of minutes to add to a talk\'s begin.')); - redirect(page_link_to('admin_import')); - } - - if ($request->has('add_minutes_end') && is_numeric(trim($request->input(('add_minutes_end'))))) { - $add_minutes_end = trim($request->input('add_minutes_end')); - } else { - error(__('Please enter an amount of minutes to add to a talk\'s end.')); - 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, - $shifttype_id, - $add_minutes_start, - $add_minutes_end - ); - - $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([ - 'day' => __('Day'), - 'start' => __('Start'), - 'end' => __('End'), - 'shifttype' => __('Shift type'), - 'title' => __('Title'), - 'room' => __('Room') - ], shifts_printable($events_new, $shifttypes)), - '<h3>' . __('Shifts to update') . '</h3>', - table([ - 'day' => __('Day'), - 'start' => __('Start'), - 'end' => __('End'), - 'shifttype' => __('Shift type'), - 'title' => __('Title'), - 'room' => __('Room') - ], shifts_printable($events_updated, $shifttypes)), - '<h3>' . __('Shifts to delete') . '</h3>', - table([ - 'day' => __('Day'), - 'start' => __('Start'), - 'end' => __('End'), - 'shifttype' => __('Shift type'), - 'title' => __('Title'), - 'room' => __('Room') - ], shifts_printable($events_deleted, $shifttypes)), - form_submit('submit', __('Import')) - ], - page_link_to('admin_import', [ - 'step' => 'import', - 'shifttype_id' => $shifttype_id, - 'add_minutes_end' => $add_minutes_end, - 'add_minutes_start' => $add_minutes_start, - ]) - ); - break; - - 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 ($request->has('shifttype_id') && isset($shifttypes[$request->input('shifttype_id')])) { - $shifttype_id = $request->input('shifttype_id'); - } else { - error(__('Please select a shift type.')); - redirect(page_link_to('admin_import')); - } - - if ($request->has('add_minutes_start') && is_numeric(trim($request->input('add_minutes_start')))) { - $add_minutes_start = trim($request->input('add_minutes_start')); - } else { - error(__('Please enter an amount of minutes to add to a talk\'s begin.')); - redirect(page_link_to('admin_import')); - } - - if ($request->has('add_minutes_end') && is_numeric(trim($request->input('add_minutes_end')))) { - $add_minutes_end = trim($request->input('add_minutes_end')); - } else { - error(__('Please enter an amount of minutes to add to a talk\'s end.')); - redirect(page_link_to('admin_import')); - } - - list($rooms_new, $rooms_deleted) = prepare_rooms($import_file); - foreach ($rooms_new as $room) { - $result = Room_create($room, true, null, null); - $rooms_import[trim($room)] = $result; - } - foreach ($rooms_deleted as $room) { - Room_delete_by_name($room); - } - - list($events_new, $events_updated, $events_deleted) = prepare_events( - $import_file, - $shifttype_id, - $add_minutes_start, - $add_minutes_end - ); - foreach ($events_new as $event) { - Shift_create($event); - } - - foreach ($events_updated as $event) { - Shift_update_by_psid($event); - } - - foreach ($events_deleted as $event) { - Shift_delete_by_psid($event['PSID']); - } - - engelsystem_log('Frab import done'); - - unlink($import_file); - - $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 page_with_title(admin_import_title(), [ - msg(), - $html - ]); -} - -/** - * @param string $file - * @return array - */ -function prepare_rooms($file) -{ - global $rooms_import; - $data = read_xml($file); - - // Load rooms from db for compare with input - $rooms = Rooms(); - // Contains rooms from db with from_frab==true - $rooms_db = []; - // Contains all rooms from db - $rooms_db_all = []; - // Contains all rooms from db and frab - $rooms_import = []; - foreach ($rooms as $room) { - if ($room['from_frab']) { - $rooms_db[] = $room['Name']; - } - $rooms_db_all[] = $room['Name']; - $rooms_import[$room['Name']] = $room['RID']; - } - - $events = $data->vcalendar->vevent; - $rooms_frab = []; - foreach ($events as $event) { - $rooms_frab[] = (string)$event->location; - if (!isset($rooms_import[trim($event->location)])) { - $rooms_import[trim($event->location)] = trim($event->location); - } - } - $rooms_frab = array_unique($rooms_frab); - - $rooms_new = array_diff($rooms_frab, $rooms_db_all); - $rooms_deleted = array_diff($rooms_db, $rooms_frab); - - return [ - $rooms_new, - $rooms_deleted - ]; -} - -/** - * @param string $file - * @param int $shifttype_id - * @param int $add_minutes_start - * @param int $add_minutes_end - * @return array - */ -function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_end) -{ - global $rooms_import; - $data = read_xml($file); - - $rooms = Rooms(); - $rooms_db = []; - foreach ($rooms as $room) { - $rooms_db[$room['Name']] = $room['RID']; - } - - $events = $data->vcalendar->vevent; - $shifts_pb = []; - foreach ($events as $event) { - $event_pb = $event->children('http://pentabarf.org'); - $event_id = trim($event_pb->{'event-id'}); - $shifts_pb[$event_id] = [ - 'shifttype_id' => $shifttype_id, - 'start' => parse_date("Ymd\THis", $event->dtstart) - $add_minutes_start * 60, - 'end' => parse_date("Ymd\THis", $event->dtend) + $add_minutes_end * 60, - 'RID' => $rooms_import[trim($event->location)], - 'title' => trim($event->summary), - 'URL' => trim($event->url), - 'PSID' => $event_id - ]; - } - - $shifts = Shifts_from_frab(); - $shifts_db = []; - foreach ($shifts as $shift) { - $shifts_db[$shift['PSID']] = $shift; - } - - $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['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; - } - } - } - - $shifts_deleted = []; - foreach ($shifts_db as $shift) { - if (!isset($shifts_pb[$shift['PSID']])) { - $shifts_deleted[] = $shift; - } - } - - return [ - $shifts_new, - $shifts_updated, - $shifts_deleted - ]; -} - -/** - * @param string $file - * @return SimpleXMLElement - */ -function read_xml($file) -{ - global $xml_import; - if (!isset($xml_import)) { - libxml_use_internal_errors(true); - $xml_import = simplexml_load_file($file); - } - return $xml_import; -} - -/** - * @param array $shifts - * @param array $shifttypes - * @return array - */ -function shifts_printable($shifts, $shifttypes) -{ - global $rooms_import; - $rooms = array_flip($rooms_import); - - uasort($shifts, 'shift_sort'); - - $shifts_printable = []; - foreach ($shifts as $shift) { - $shifts_printable[] = [ - 'day' => date('l, Y-m-d', $shift['start']), - 'start' => date('H:i', $shift['start']), - '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']] - ]; - } - return $shifts_printable; -} - -/** - * @param array $shift_a - * @param array $shift_b - * @return int - */ -function shift_sort($shift_a, $shift_b) -{ - return ($shift_a['start'] < $shift_b['start']) ? -1 : 1; -} diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php index 1d49af80..19d3c7ed 100644 --- a/includes/pages/admin_news.php +++ b/includes/pages/admin_news.php @@ -10,7 +10,7 @@ function admin_news() $request = request(); if (!$request->has('action')) { - redirect(page_link_to('news')); + throw_redirect(page_link_to('news')); } $html = '<div class="col-md-12"><h1>' . __('Edit news entry') . '</h1>' . msg(); @@ -70,17 +70,17 @@ function admin_news() engelsystem_log('News updated: ' . $request->postData('eBetreff')); success(__('News entry updated.')); - redirect(page_link_to('news')); + throw_redirect(page_link_to('news')); break; case 'delete': $news->delete(); engelsystem_log('News deleted: ' . $news->title); success(__('News entry deleted.')); - redirect(page_link_to('news')); + throw_redirect(page_link_to('news')); break; default: - redirect(page_link_to('news')); + throw_redirect(page_link_to('news')); } return $html . '</div>'; } diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 54d5509b..8a63f8db 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -122,7 +122,7 @@ function admin_questions() . ' answered: ' . $answer ); - redirect(page_link_to('admin_questions')); + throw_redirect(page_link_to('admin_questions')); } else { return error('Enter an answer!', true); } @@ -145,7 +145,7 @@ function admin_questions() if (!empty($question)) { $question->delete(); engelsystem_log('Question deleted: ' . $question['Question']); - redirect(page_link_to('admin_questions')); + throw_redirect(page_link_to('admin_questions')); } else { return error('No question found.', true); } diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php index c55eb227..733e56af 100644 --- a/includes/pages/admin_rooms.php +++ b/includes/pages/admin_rooms.php @@ -19,7 +19,6 @@ function admin_rooms() foreach ($rooms_source as $room) { $rooms[] = [ 'name' => Room_name_render($room), - 'from_frab' => glyph_bool($room['from_frab']), 'map_url' => glyph_bool(!empty($room['map_url'])), 'actions' => table_buttons([ button( @@ -40,7 +39,6 @@ function admin_rooms() if ($request->has('show')) { $msg = ''; $name = ''; - $from_frab = false; $map_url = null; $description = null; $room_id = 0; @@ -56,12 +54,11 @@ function admin_rooms() if (test_request_int('id')) { $room = Room($request->input('id')); if (empty($room)) { - redirect(page_link_to('admin_rooms')); + throw_redirect(page_link_to('admin_rooms')); } $room_id = $request->input('id'); $name = $room['Name']; - $from_frab = $room['from_frab']; $map_url = $room['map_url']; $description = $room['description']; @@ -88,8 +85,6 @@ function admin_rooms() $msg .= error(__('Please enter a name.'), true); } - $from_frab = $request->has('from_frab'); - if ($request->has('map_url')) { $map_url = strip_request_item('map_url'); } @@ -118,9 +113,9 @@ function admin_rooms() if ($valid) { if (empty($room_id)) { - $room_id = Room_create($name, $from_frab, $map_url, $description); + $room_id = Room_create($name, $map_url, $description); } else { - Room_update($room_id, $name, $from_frab, $map_url, $description); + Room_update($room_id, $name, $map_url, $description); } NeededAngelTypes_delete_by_room($room_id); @@ -140,7 +135,7 @@ function admin_rooms() . ' to: ' . join(', ', $needed_angeltype_info) ); success(__('Room saved.')); - redirect(page_link_to('admin_rooms')); + throw_redirect(page_link_to('admin_rooms')); } } $angeltypes_count_form = []; @@ -159,7 +154,6 @@ function admin_rooms() div('row', [ div('col-md-6', [ form_text('name', __('Name'), $name, false, 35), - form_checkbox('from_frab', __('Frab import'), $from_frab), form_text('map_url', __('Map URL'), $map_url), form_info('', __('The map url is used to display an iframe on the room page.')), form_textarea('description', __('Description'), $description), @@ -190,7 +184,7 @@ function admin_rooms() Room_delete($room_id); success(sprintf(__('Room %s deleted.'), $name)); - redirect(page_link_to('admin_rooms')); + throw_redirect(page_link_to('admin_rooms')); } return page_with_title(admin_rooms_title(), [ @@ -212,7 +206,6 @@ function admin_rooms() msg(), table([ 'name' => __('Name'), - 'from_frab' => __('Frab import'), 'map_url' => __('Map'), 'actions' => '' ], $rooms) diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php index c62ff995..dbcce180 100644 --- a/includes/pages/admin_shifts.php +++ b/includes/pages/admin_shifts.php @@ -345,12 +345,11 @@ function admin_shifts() !is_array($session->get('admin_shifts_shifts')) || !is_array($session->get('admin_shifts_types')) ) { - redirect(page_link_to('admin_shifts')); + throw_redirect(page_link_to('admin_shifts')); } foreach ($session->get('admin_shifts_shifts', []) as $shift) { $shift['URL'] = null; - $shift['PSID'] = null; $shift_id = Shift_create($shift); engelsystem_log( @@ -389,7 +388,7 @@ function admin_shifts() } success('Schichten angelegt.'); - redirect(page_link_to('admin_shifts')); + throw_redirect(page_link_to('admin_shifts')); } else { $session->remove('admin_shifts_shifts'); $session->remove('admin_shifts_types'); diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 1c40586f..3fc4c694 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -22,7 +22,7 @@ function admin_user() $html = ''; if (!$request->has('id')) { - redirect(users_link()); + throw_redirect(users_link()); } $user_id = $request->input('id'); @@ -30,7 +30,7 @@ function admin_user() $user_source = User::find($user_id); if (!$user_source) { error(__('This user does not exist.')); - redirect(users_link()); + throw_redirect(users_link()); } $html .= 'Hallo,<br />' diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 170572e4..820c84ea 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -239,7 +239,7 @@ function guest_register() // User is already logged in - that means a supporter has registered an angel. Return to register page. if ($authUser) { - redirect(page_link_to('register')); + throw_redirect(page_link_to('register')); } // If a welcome message is present, display it on the next page @@ -247,7 +247,7 @@ function guest_register() info((new Parsedown())->text($message)); } - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } } diff --git a/includes/pages/schedule/ImportSchedule.php b/includes/pages/schedule/ImportSchedule.php new file mode 100644 index 00000000..136f1816 --- /dev/null +++ b/includes/pages/schedule/ImportSchedule.php @@ -0,0 +1,614 @@ +<?php + +declare(strict_types=1); + +namespace Engelsystem\Controllers\Admin\Schedule; + +use Carbon\Carbon; +use Engelsystem\Controllers\BaseController; +use Engelsystem\Helpers\Schedule\Event; +use Engelsystem\Helpers\Schedule\Room; +use Engelsystem\Helpers\Schedule\Schedule; +use Engelsystem\Helpers\Schedule\XmlParser; +use Engelsystem\Http\Request; +use Engelsystem\Http\Response; +use Engelsystem\Models\Shifts\Schedule as ScheduleUrl; +use Engelsystem\Models\Shifts\ScheduleShift; +use ErrorException; +use GuzzleHttp\Client as GuzzleClient; +use Illuminate\Database\Connection as DatabaseConnection; +use Illuminate\Database\Eloquent\Builder as QueryBuilder; +use Illuminate\Database\Eloquent\Collection as DatabaseCollection; +use Illuminate\Support\Arr; +use Illuminate\Support\Collection; +use Psr\Log\LoggerInterface; +use stdClass; +use Symfony\Component\HttpFoundation\Session\SessionInterface; + +class ImportSchedule extends BaseController +{ + /** @var DatabaseConnection */ + protected $db; + + /** @var LoggerInterface */ + protected $log; + + /** @var array */ + protected $permissions = [ + 'schedule.import', + ]; + + /** @var XmlParser */ + protected $parser; + + /** @var Response */ + protected $response; + + /** @var SessionInterface */ + protected $session; + + /** @var string */ + protected $url = '/admin/schedule'; + + /** @var GuzzleClient */ + protected $guzzle; + + /** + * @param Response $response + * @param SessionInterface $session + * @param GuzzleClient $guzzle + * @param XmlParser $parser + * @param DatabaseConnection $db + * @param LoggerInterface $log + */ + public function __construct( + Response $response, + SessionInterface $session, + GuzzleClient $guzzle, + XmlParser $parser, + DatabaseConnection $db, + LoggerInterface $log + ) { + $this->guzzle = $guzzle; + $this->parser = $parser; + $this->response = $response; + $this->session = $session; + $this->db = $db; + $this->log = $log; + } + + /** + * @return Response + */ + public function index(): Response + { + return $this->response->withView( + 'admin/schedule/index.twig', + [ + 'errors' => $this->getFromSession('errors'), + 'success' => $this->getFromSession('success'), + 'shift_types' => $this->getShiftTypes(), + ] + ); + } + + /** + * @param Request $request + * @return Response + */ + public function loadSchedule(Request $request): Response + { + try { + /** + * @var Event[] $newEvents + * @var Event[] $changeEvents + * @var Event[] $deleteEvents + * @var Room[] $newRooms + * @var int $shiftType + * @var ScheduleUrl $scheduleUrl + * @var Schedule $schedule + * @var int $minutesBefore + * @var int $minutesAfter + */ + list( + $newEvents, + $changeEvents, + $deleteEvents, + $newRooms, + $shiftType, + $scheduleUrl, + $schedule, + $minutesBefore, + $minutesAfter + ) = $this->getScheduleData($request); + } catch (ErrorException $e) { + return back()->with('errors', [$e->getMessage()]); + } + + return $this->response->withView( + 'admin/schedule/load.twig', + [ + 'errors' => $this->getFromSession('errors'), + 'schedule_url' => $scheduleUrl->url, + 'shift_type' => $shiftType, + 'minutes_before' => $minutesBefore, + 'minutes_after' => $minutesAfter, + 'schedule' => $schedule, + 'rooms' => [ + 'add' => $newRooms, + ], + 'shifts' => [ + 'add' => $newEvents, + 'update' => $changeEvents, + 'delete' => $deleteEvents, + ], + ] + ); + } + + /** + * @param Request $request + * + * @return Response + */ + public function importSchedule(Request $request): Response + { + try { + /** + * @var Event[] $newEvents + * @var Event[] $changeEvents + * @var Event[] $deleteEvents + * @var Room[] $newRooms + * @var int $shiftType + * @var ScheduleUrl $scheduleUrl + */ + list( + $newEvents, + $changeEvents, + $deleteEvents, + $newRooms, + $shiftType, + $scheduleUrl + ) = $this->getScheduleData($request); + } catch (ErrorException $e) { + return back()->with('errors', [$e->getMessage()]); + } + + $this->log('Started schedule "{schedule}" import', ['schedule' => $scheduleUrl->url]); + + foreach ($newRooms as $room) { + $this->createRoom($room); + } + + $rooms = $this->getAllRooms(); + foreach ($newEvents as $event) { + $this->createEvent( + $event, + (int)$shiftType, + $rooms + ->where('name', $event->getRoom()->getName()) + ->first(), + $scheduleUrl + ); + } + + foreach ($changeEvents as $event) { + $this->updateEvent( + $event, + (int)$shiftType, + $rooms + ->where('name', $event->getRoom()->getName()) + ->first() + ); + } + + foreach ($deleteEvents as $event) { + $this->deleteEvent($event); + } + + $this->log('Ended schedule "{schedule}" import', ['schedule' => $scheduleUrl->url]); + + return redirect($this->url, 303) + ->with('success', ['schedule.import.success']); + } + + /** + * @param Room $room + */ + protected function createRoom(Room $room): void + { + $this->db + ->table('Room') + ->insert( + [ + 'Name' => $room->getName(), + ] + ); + + $this->log('Created schedule room "{room}"', ['room' => $room->getName()]); + } + + /** + * @param Event $shift + * @param int $shiftTypeId + * @param stdClass $room + * @param ScheduleUrl $scheduleUrl + */ + protected function createEvent(Event $shift, int $shiftTypeId, stdClass $room, ScheduleUrl $scheduleUrl): void + { + $user = auth()->user(); + + $this->db + ->table('Shifts') + ->insert( + [ + 'title' => $shift->getTitle(), + 'shifttype_id' => $shiftTypeId, + 'start' => $shift->getDate()->unix(), + 'end' => $shift->getEndDate()->unix(), + 'RID' => $room->id, + 'URL' => $shift->getUrl(), + 'created_by_user_id' => $user->id, + 'created_at_timestamp' => time(), + 'edited_by_user_id' => null, + 'edited_at_timestamp' => 0, + ] + ); + + $shiftId = $this->db->getDoctrineConnection()->lastInsertId(); + + $scheduleShift = new ScheduleShift(['shift_id' => $shiftId, 'guid' => $shift->getGuid()]); + $scheduleShift->schedule()->associate($scheduleUrl); + $scheduleShift->save(); + + $this->log( + 'Created schedule shift "{shift}" in "{room}" ({from} {to}, {guid})', + [ + 'shift' => $shift->getTitle(), + 'room' => $room->name, + 'from' => $shift->getDate()->format(Carbon::RFC3339), + 'to' => $shift->getEndDate()->format(Carbon::RFC3339), + 'guid' => $shift->getGuid(), + ] + ); + } + + /** + * @param Event $shift + * @param int $shiftTypeId + * @param stdClass $room + */ + protected function updateEvent(Event $shift, int $shiftTypeId, stdClass $room): void + { + $user = auth()->user(); + + $this->db + ->table('Shifts') + ->join('schedule_shift', 'Shifts.SID', 'schedule_shift.shift_id') + ->where('schedule_shift.guid', $shift->getGuid()) + ->update( + [ + 'title' => $shift->getTitle(), + 'shifttype_id' => $shiftTypeId, + 'start' => $shift->getDate()->unix(), + 'end' => $shift->getEndDate()->unix(), + 'RID' => $room->id, + 'URL' => $shift->getUrl(), + 'edited_by_user_id' => $user->id, + 'edited_at_timestamp' => time(), + ] + ); + + $this->log( + 'Updated schedule shift "{shift}" in "{room}" ({from} {to}, {guid})', + [ + 'shift' => $shift->getTitle(), + 'room' => $room->name, + 'from' => $shift->getDate()->format(Carbon::RFC3339), + 'to' => $shift->getEndDate()->format(Carbon::RFC3339), + 'guid' => $shift->getGuid(), + ] + ); + } + + /** + * @param Event $shift + */ + protected function deleteEvent(Event $shift): void + { + $this->db + ->table('Shifts') + ->join('schedule_shift', 'Shifts.SID', 'schedule_shift.shift_id') + ->where('schedule_shift.guid', $shift->getGuid()) + ->delete(); + + $this->log( + 'Deleted schedule shift "{shift}" ({from} {to}, {guid})', + [ + 'shift' => $shift->getTitle(), + 'from' => $shift->getDate()->format(Carbon::RFC3339), + 'to' => $shift->getEndDate()->format(Carbon::RFC3339), + 'guid' => $shift->getGuid(), + ] + ); + } + + /** + * @param Request $request + * @return Event[]|Room[]|ScheduleUrl|Schedule|string + * @throws ErrorException + */ + protected function getScheduleData(Request $request) + { + $data = $this->validate( + $request, + [ + 'schedule-url' => 'required|url', + 'shift-type' => 'required|int', + 'minutes-before' => 'optional|int', + 'minutes-after' => 'optional|int', + ] + ); + + $scheduleResponse = $this->guzzle->get($data['schedule-url']); + if ($scheduleResponse->getStatusCode() != 200) { + throw new ErrorException('schedule.import.request-error'); + } + + $scheduleData = (string)$scheduleResponse->getBody(); + if (!$this->parser->load($scheduleData)) { + throw new ErrorException('schedule.import.read-error'); + } + + $shiftType = (int)$data['shift-type']; + if (!isset($this->getShiftTypes()[$shiftType])) { + throw new ErrorException('schedule.import.invalid-shift-type'); + } + + $scheduleUrl = $this->getScheduleUrl($data['schedule-url']); + $schedule = $this->parser->getSchedule(); + $minutesBefore = isset($data['minutes-before']) ? (int)$data['minutes-before'] : 15; + $minutesAfter = isset($data['minutes-after']) ? (int)$data['minutes-after'] : 15; + $newRooms = $this->newRooms($schedule->getRooms()); + return array_merge( + $this->shiftsDiff($schedule, $scheduleUrl, $shiftType, $minutesBefore, $minutesAfter), + [$newRooms, $shiftType, $scheduleUrl, $schedule, $minutesBefore, $minutesAfter] + ); + } + + /** + * @param string $name + * @return Collection + */ + protected function getFromSession(string $name): Collection + { + $data = Collection::make(Arr::flatten($this->session->get($name, []))); + $this->session->remove($name); + + return $data; + } + + /** + * @param Room[] $scheduleRooms + * @return Room[] + */ + protected function newRooms(array $scheduleRooms): array + { + $newRooms = []; + $allRooms = $this->getAllRooms(); + + foreach ($scheduleRooms as $room) { + if ($allRooms->where('name', $room->getName())->count()) { + continue; + } + + $newRooms[] = $room; + } + + return $newRooms; + } + + /** + * @param Schedule $schedule + * @param ScheduleUrl $scheduleUrl + * @param int $shiftType + * @param int $minutesBefore + * @param int $minutesAfter + * @return Event[] + */ + protected function shiftsDiff( + Schedule $schedule, + ScheduleUrl $scheduleUrl, + int $shiftType, + int $minutesBefore, + int $minutesAfter + ): array { + /** @var Event[] $newEvents */ + $newEvents = []; + /** @var Event[] $changeEvents */ + $changeEvents = []; + /** @var Event[] $scheduleEvents */ + $scheduleEvents = []; + /** @var Event[] $deleteEvents */ + $deleteEvents = []; + $rooms = $this->getAllRooms(); + + foreach ($schedule->getDay() as $day) { + foreach ($day->getRoom() as $room) { + foreach ($room->getEvent() as $event) { + $scheduleEvents[$event->getGuid()] = $event; + + $event->getDate()->subMinutes($minutesBefore); + $event->getEndDate()->addMinutes($minutesAfter); + $event->setTitle(sprintf('%s [%s]', $event->getTitle(), $event->getLanguage())); + } + } + } + + $scheduleEventsGuidList = array_keys($scheduleEvents); + $existingShifts = $this->getScheduleShiftsByGuid($scheduleUrl, $scheduleEventsGuidList); + foreach ($existingShifts as $shift) { + $guid = $shift->guid; + $shift = $this->loadShift($shift->shift_id); + $event = $scheduleEvents[$guid]; + $room = $rooms->where('name', $event->getRoom()->getName())->first(); + + if ( + $shift->title != $event->getTitle() + || $shift->shift_type_id != $shiftType + || Carbon::createFromTimestamp($shift->start) != $event->getDate() + || Carbon::createFromTimestamp($shift->end) != $event->getEndDate() + || $shift->room_id != ($room->id ?? '') + || $shift->url != $event->getUrl() + ) { + $changeEvents[$guid] = $event; + } + + unset($scheduleEvents[$guid]); + } + + foreach ($scheduleEvents as $scheduleEvent) { + $newEvents[$scheduleEvent->getGuid()] = $scheduleEvent; + } + + $scheduleShifts = $this->getScheduleShiftsWhereNotGuid($scheduleUrl, $scheduleEventsGuidList); + foreach ($scheduleShifts as $shift) { + $event = $this->eventFromScheduleShift($shift); + $deleteEvents[$event->getGuid()] = $event; + } + + return [$newEvents, $changeEvents, $deleteEvents]; + } + + /** + * @param ScheduleShift $scheduleShift + * @return Event + */ + protected function eventFromScheduleShift(ScheduleShift $scheduleShift): Event + { + $shift = $this->loadShift($scheduleShift->shift_id); + $start = Carbon::createFromTimestamp($shift->start); + $end = Carbon::createFromTimestamp($shift->end); + $duration = $start->diff($end); + + $event = new Event( + $scheduleShift->guid, + 0, + new Room($shift->room_name), + $shift->title, + '', + 'n/a', + Carbon::createFromTimestamp($shift->start), + $start->format('H:i'), + $duration->format('%H:%I'), + '', + '', + '' + ); + + return $event; + } + + /** + * @return Collection + */ + protected function getAllRooms(): Collection + { + return new Collection($this->db->select('SELECT RID as id, Name as name FROM Room')); + } + + /** + * @param ScheduleUrl $scheduleUrl + * @param string[] $events + * @return QueryBuilder[]|DatabaseCollection|ScheduleShift[] + */ + protected function getScheduleShiftsByGuid(ScheduleUrl $scheduleUrl, array $events) + { + return ScheduleShift::query() + ->whereIn('guid', $events) + ->where('schedule_id', $scheduleUrl->id) + ->get(); + } + + /** + * @param ScheduleUrl $scheduleUrl + * @param string[] $events + * @return QueryBuilder[]|DatabaseCollection|ScheduleShift[] + */ + protected function getScheduleShiftsWhereNotGuid(ScheduleUrl $scheduleUrl, array $events) + { + return ScheduleShift::query() + ->whereNotIn('guid', $events) + ->where('schedule_id', $scheduleUrl->id) + ->get(); + } + + /** + * @param $id + * @return stdClass|null + */ + protected function loadShift($id): ?stdClass + { + return $this->db->selectOne( + ' + SELECT + s.SID AS id, + s.title, + s.start, + s.end, + s.shifttype_id AS shift_type_id, + s.RID AS room_id, + r.Name AS room_name, + s.URL as url + FROM Shifts AS s + LEFT JOIN Room r on s.RID = r.RID + WHERE SID = ? + ', + [$id] + ); + } + + /** + * @return string[] + */ + protected function getShiftTypes() + { + $return = []; + /** @var stdClass[] $shiftTypes */ + $shiftTypes = $this->db->select('SELECT t.id, t.name FROM ShiftTypes AS t'); + + foreach ($shiftTypes as $shiftType) { + $return[$shiftType->id] = $shiftType->name; + } + + return $return; + } + + /** + * @param string $scheduleUrl + * @return ScheduleUrl + */ + protected function getScheduleUrl(string $scheduleUrl): ScheduleUrl + { + if (!$schedule = ScheduleUrl::whereUrl($scheduleUrl)->first()) { + $schedule = new ScheduleUrl(['url' => $scheduleUrl]); + $schedule->save(); + + $this->log('Created schedule "{schedule}"', ['schedule' => $schedule->url]); + } + + return $schedule; + } + + /** + * @param string $message + * @param array $context + */ + protected function log(string $message, array $context = []): void + { + $user = auth()->user(); + $message = sprintf('%s (%u): %s', $user->name, $user->id, $message); + + $this->log->info($message, $context); + } +} diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php index ce496132..72bb9ae2 100644 --- a/includes/pages/user_messages.php +++ b/includes/pages/user_messages.php @@ -141,7 +141,7 @@ function user_messages() 'UPDATE `Messages` SET `isRead`=\'Y\' WHERE `id`=? LIMIT 1', [$message_id] ); - redirect(page_link_to('user_messages')); + throw_redirect(page_link_to('user_messages')); } else { return error(__('No Message found.'), true); } @@ -160,7 +160,7 @@ function user_messages() ); if (!empty($message) && $message['SUID'] == $user->id) { DB::delete('DELETE FROM `Messages` WHERE `id`=? LIMIT 1', [$message_id]); - redirect(page_link_to('user_messages')); + throw_redirect(page_link_to('user_messages')); } else { return error(__('No Message found.'), true); } @@ -168,7 +168,7 @@ function user_messages() case 'send': if (Message_send($request->input('to'), $request->input('text'))) { - redirect(page_link_to('user_messages')); + throw_redirect(page_link_to('user_messages')); } else { return error(__('Transmitting was terminated with an Error.'), true); } diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index f962225e..ca6762f7 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -37,7 +37,7 @@ function user_myshifts() if ($request->input('reset') == 'ack') { User_reset_api_key($user); success(__('Key changed.')); - redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); + throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); } return page_with_title(__('Reset API key'), [ error( @@ -109,7 +109,7 @@ function user_myshifts() . '. Freeloaded: ' . ($freeloaded ? 'YES Comment: ' . $freeload_comment : 'NO') ); success(__('Shift saved.')); - redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); + throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); } } @@ -125,10 +125,10 @@ function user_myshifts() auth()->can('user_shifts_admin') ); } else { - redirect(page_link_to('user_myshifts')); + throw_redirect(page_link_to('user_myshifts')); } } - redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); + throw_redirect(page_link_to('users', ['action' => 'view', 'user_id' => $shifts_user->id])); return ''; } diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 4eb8f0ce..8b9c21ad 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -197,7 +197,7 @@ function user_news() engelsystem_log('Created news: ' . $news->title . ', is meeting: ' . ($news->is_meeting ? 'yes' : 'no')); success(__('Entry saved.')); - redirect(page_link_to('news')); + throw_redirect(page_link_to('news')); } if (preg_match('/^\d{1,}$/', $request->input('page', 0))) { diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php index 13f58b10..7654d540 100644 --- a/includes/pages/user_questions.php +++ b/includes/pages/user_questions.php @@ -38,7 +38,7 @@ function user_questions() ]); success(__('You question was saved.')); - redirect(page_link_to('user_questions')); + throw_redirect(page_link_to('user_questions')); } else { return page_with_title(questions_title(), [ error(__('Please enter a question!'), true) @@ -59,7 +59,7 @@ function user_questions() $question = Question::find($question_id); if (!empty($question) && $question->user_id == $user->id) { $question->delete(); - redirect(page_link_to('user_questions')); + throw_redirect(page_link_to('user_questions')); } else { return page_with_title(questions_title(), [ error(__('No question found.'), true) diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index e398e3a8..5646b27f 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -91,7 +91,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) $user_source->settings->save(); success(__('Settings saved.')); - redirect(page_link_to('user_settings')); + throw_redirect(page_link_to('user_settings')); } return $user_source; @@ -119,7 +119,7 @@ function user_settings_password($user_source) $auth->setPassword($user_source, $request->postData('new_password')); success(__('Password saved.')); } - redirect(page_link_to('user_settings')); + throw_redirect(page_link_to('user_settings')); } /** @@ -144,7 +144,7 @@ function user_settings_theme($user_source, $themes) $user_source->settings->save(); success(__('Theme changed.')); - redirect(page_link_to('user_settings')); + throw_redirect(page_link_to('user_settings')); } return $user_source; @@ -174,7 +174,7 @@ function user_settings_locale($user_source, $locales) $session->set('locale', $user_source->settings->language); success('Language changed.'); - redirect(page_link_to('user_settings')); + throw_redirect(page_link_to('user_settings')); } return $user_source; diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 8e3c8ded..20bcca86 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -25,7 +25,7 @@ function user_shifts() $request = request(); if (User_is_freeloader(auth()->user())) { - redirect(page_link_to('user_myshifts')); + throw_redirect(page_link_to('user_myshifts')); } if ($request->has('edit_shift')) { @@ -99,7 +99,7 @@ function load_rooms() ); if (empty($rooms)) { error(__('The administration has not configured any rooms yet.')); - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } return $rooms; } @@ -120,7 +120,7 @@ function load_days() error(__('The administration has not configured any shifts yet.')); // Do not try to redirect to the current page if (config('home_site') != 'user_shifts') { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } } return $days; @@ -135,7 +135,7 @@ function load_types() if (!count(DB::select('SELECT `id`, `name` FROM `AngelTypes`'))) { error(__('The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.')); - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } $types = DB::select(' SELECT |