diff options
| author | msquare <msquare@notrademark.de> | 2019-12-08 11:48:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 11:48:58 +0100 |
| commit | a3a938a1210f1bfb2680c25b2bcf53e47444bdba (patch) | |
| tree | fd4c13fd9b714c0d8c60b6d3fe3e2fc88b82b717 /includes | |
| parent | b540ac93856065ce6e145930b6611e0a0946d646 (diff) | |
| parent | 064a1750279be244f86cf24f29749b391b11f1dd (diff) | |
Merge pull request #685 from MyIgel/schedule-import
Rebuild Schedule import
Diffstat (limited to 'includes')
34 files changed, 829 insertions, 775 deletions
diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php index 63bf53bd..b06a258c 100644 --- a/includes/controller/angeltypes_controller.php +++ b/includes/controller/angeltypes_controller.php @@ -79,7 +79,7 @@ function angeltypes_about_controller() function angeltype_delete_controller() { if (!auth()->can('admin_angel_types')) { - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = load_angeltype(); @@ -87,7 +87,7 @@ function angeltype_delete_controller() if (request()->hasPostData('delete')) { AngelType_delete($angeltype); success(sprintf(__('Angeltype %s deleted.'), AngelType_name_render($angeltype))); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } return [ @@ -112,13 +112,13 @@ function angeltype_edit_controller() $angeltype = load_angeltype(); if (!User_is_AngelType_supporter(auth()->user(), $angeltype)) { - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } } else { // New angeltype if ($supporter_mode) { // Supporters aren't allowed to create new angeltypes. - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType_new(); } @@ -157,7 +157,7 @@ function angeltype_edit_controller() } success('Angel type saved.'); - redirect(angeltype_link($angeltype['id'])); + throw_redirect(angeltype_link($angeltype['id'])); } } @@ -177,7 +177,7 @@ function angeltype_controller() $user = auth()->user(); if (!auth()->can('angeltypes')) { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } $angeltype = load_angeltype(); @@ -275,7 +275,7 @@ function angeltypes_list_controller() $user = auth()->user(); if (!auth()->can('angeltypes')) { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } $angeltypes = AngelTypes_with_user($user->id); @@ -346,13 +346,13 @@ function load_angeltype() { $request = request(); if (!$request->has('angeltype_id')) { - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($request->input('angeltype_id')); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist . ')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } return $angeltype; diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php index ff68c3ea..55071848 100644 --- a/includes/controller/event_config_controller.php +++ b/includes/controller/event_config_controller.php @@ -17,7 +17,7 @@ function event_config_title() function event_config_edit_controller() { if (!auth()->can('admin_event_config')) { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } $request = request(); @@ -118,7 +118,7 @@ function event_config_edit_controller() ) ); success(__('Settings saved.')); - redirect(page_link_to('admin_event_config')); + throw_redirect(page_link_to('admin_event_config')); } } diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php index 01d4fd37..f0449439 100644 --- a/includes/controller/rooms_controller.php +++ b/includes/controller/rooms_controller.php @@ -15,7 +15,7 @@ use Engelsystem\ShiftsFilterRenderer; function room_controller() { if (!auth()->can('view_rooms')) { - redirect(page_link_to()); + throw_redirect(page_link_to()); } $request = request(); @@ -74,7 +74,7 @@ function rooms_controller() return room_controller(); case 'list': default: - redirect(page_link_to('admin_rooms')); + throw_redirect(page_link_to('admin_rooms')); } } @@ -104,12 +104,12 @@ function room_edit_link($room) function load_room() { if (!test_request_int('room_id')) { - redirect(page_link_to()); + throw_redirect(page_link_to()); } $room = Room(request()->input('room_id')); if (empty($room)) { - redirect(page_link_to()); + throw_redirect(page_link_to()); } return $room; diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php index 5547c183..065f09cb 100644 --- a/includes/controller/shift_entries_controller.php +++ b/includes/controller/shift_entries_controller.php @@ -13,12 +13,12 @@ function shift_entries_controller() { $user = auth()->user(); if (!$user) { - redirect(page_link_to('login')); + throw_redirect(page_link_to('login')); } $action = strip_request_item('action'); if (empty($action)) { - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } switch ($action) { @@ -40,12 +40,12 @@ function shift_entry_create_controller() $request = request(); if (User_is_freeloader($user)) { - redirect(page_link_to('user_myshifts')); + throw_redirect(page_link_to('user_myshifts')); } $shift = Shift($request->input('shift_id')); if (empty($shift)) { - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } $angeltype = AngelType($request->input('angeltype_id')); @@ -55,7 +55,7 @@ function shift_entry_create_controller() } if (empty($angeltype)) { - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } if (User_is_AngelType_supporter($user, $angeltype)) { @@ -82,7 +82,7 @@ function shift_entry_create_controller_admin($shift, $angeltype) $signup_user = User::find($request->input('user_id')); } if (!$signup_user) { - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $angeltypes = AngelTypes(); @@ -91,7 +91,7 @@ function shift_entry_create_controller_admin($shift, $angeltype) } if (empty($angeltype)) { if (count($angeltypes) == 0) { - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $angeltype = $angeltypes[0]; } @@ -107,7 +107,7 @@ function shift_entry_create_controller_admin($shift, $angeltype) ]); success(sprintf(__('%s has been subscribed to the shift.'), User_Nick_render($signup_user))); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } /** @var User[]|Collection $users */ @@ -147,7 +147,7 @@ function shift_entry_create_controller_supporter($shift, $angeltype) } if (!UserAngelType_exists($signup_user->id, $angeltype)) { error(__('User is not in angeltype.')); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype); @@ -165,7 +165,7 @@ function shift_entry_create_controller_supporter($shift, $angeltype) if ($shift_signup_state->getState() == ShiftSignupState::OCCUPIED) { error(__('This shift is already occupied.')); } - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } if ($request->hasPostData('submit')) { @@ -179,7 +179,7 @@ function shift_entry_create_controller_supporter($shift, $angeltype) ]); success(sprintf(__('%s has been subscribed to the shift.'), User_Nick_render($signup_user))); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $users = Users_by_angeltype($angeltype); @@ -245,7 +245,7 @@ function shift_entry_create_controller_user($shift, $angeltype) ); if (!$shift_signup_state->isSignupAllowed()) { shift_entry_error_message($shift_signup_state); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $comment = ''; @@ -265,7 +265,7 @@ function shift_entry_create_controller_user($shift, $angeltype) } success(__('You are subscribed. Thank you!')); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } $room = Room($shift['RID']); @@ -319,12 +319,12 @@ function shift_entry_load() $request = request(); if (!$request->has('shift_entry_id') || !test_request_int('shift_entry_id')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } $shiftEntry = ShiftEntry($request->input('shift_entry_id')); if (empty($shiftEntry)) { error(__('Shift entry not found.')); - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } return $shiftEntry; @@ -346,13 +346,13 @@ function shift_entry_delete_controller() $signout_user = User::find($shiftEntry['UID']); if (!Shift_signout_allowed($shift, $angeltype, $signout_user->id)) { error(__('You are not allowed to remove this shift entry. If necessary, ask your supporter or heaven to do so.')); - redirect(user_link($signout_user->id)); + throw_redirect(user_link($signout_user->id)); } if ($request->hasPostData('delete')) { ShiftEntry_delete($shiftEntry); success(__('Shift entry removed.')); - redirect(shift_link($shift)); + throw_redirect(shift_link($shift)); } if ($user->id == $signout_user->id) { diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index 15f92a9d..1cfc1107 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -49,11 +49,11 @@ function shift_edit_controller() $request = request(); if (!auth()->can('admin_shifts')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } if (!$request->has('edit_shift') || !test_request_int('edit_shift')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } $shift_id = $request->input('edit_shift'); @@ -164,7 +164,7 @@ function shift_edit_controller() ); success(__('Shift updated.')); - redirect(shift_link([ + throw_redirect(shift_link([ 'SID' => $shift_id ])); } @@ -205,18 +205,18 @@ function shift_delete_controller() $request = request(); if (!auth()->can('user_shifts_admin')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) if (!$request->has('delete_shift') || !preg_match('/^\d+$/', $request->input('delete_shift'))) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } $shift_id = $request->input('delete_shift'); $shift = Shift($shift_id); if (empty($shift)) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } // Schicht löschen bestätigt @@ -230,7 +230,7 @@ function shift_delete_controller() . ' to ' . date('Y-m-d H:i', $shift['end']) ); success(__('Shift deleted.')); - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } return page_with_title(shifts_title(), [ @@ -256,17 +256,17 @@ function shift_controller() $request = request(); if (!auth()->can('user_shifts')) { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } if (!$request->has('shift_id')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } $shift = Shift($request->input('shift_id')); if (empty($shift)) { error(__('Shift could not be found.')); - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } $shifttype = ShiftType($shift['shifttype_id']); @@ -309,7 +309,7 @@ function shifts_controller() { $request = request(); if (!$request->has('action')) { - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } switch ($request->input('action')) { @@ -319,7 +319,7 @@ function shifts_controller() case 'next': shift_next_controller(); default: - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } return false; @@ -331,16 +331,16 @@ function shifts_controller() function shift_next_controller() { if (!auth()->can('user_shifts')) { - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } $upcoming_shifts = ShiftEntries_upcoming_for_user(auth()->user()->id); if (!empty($upcoming_shifts)) { - redirect(shift_link($upcoming_shifts[0])); + throw_redirect(shift_link($upcoming_shifts[0])); } - redirect(page_link_to('user_shifts')); + throw_redirect(page_link_to('user_shifts')); } /** diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php index 3c825d0c..ede360b8 100644 --- a/includes/controller/shifttypes_controller.php +++ b/includes/controller/shifttypes_controller.php @@ -18,12 +18,12 @@ function shifttype_delete_controller() { $request = request(); if (!$request->has('shifttype_id')) { - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } $shifttype = ShiftType($request->input('shifttype_id')); if (empty($shifttype)) { - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } if ($request->hasPostData('delete')) { @@ -31,7 +31,7 @@ function shifttype_delete_controller() engelsystem_log('Deleted shifttype ' . $shifttype['name']); success(sprintf(__('Shifttype %s deleted.'), $shifttype['name'])); - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } return [ @@ -59,7 +59,7 @@ function shifttype_edit_controller() $shifttype = ShiftType($request->input('shifttype_id')); if (empty($shifttype)) { error(__('Shifttype not found.')); - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } $shifttype_id = $shifttype['id']; $name = $shifttype['name']; @@ -99,7 +99,7 @@ function shifttype_edit_controller() engelsystem_log('Created shifttype ' . $name); success(__('Created shifttype.')); } - redirect(page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id])); + throw_redirect(page_link_to('shifttypes', ['action' => 'view', 'shifttype_id' => $shifttype_id])); } } @@ -116,11 +116,11 @@ function shifttype_controller() { $request = request(); if (!$request->has('shifttype_id')) { - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } $shifttype = ShiftType($request->input('shifttype_id')); if (empty($shifttype)) { - redirect(page_link_to('shifttypes')); + throw_redirect(page_link_to('shifttypes')); } $angeltype = []; diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index 6c64cb27..038d919e 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -45,18 +45,18 @@ function user_angeltypes_delete_all_controller() if (!$request->has('angeltype_id')) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($request->input('angeltype_id')); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if (!User_is_AngelType_supporter(auth()->user(), $angeltype)) { error(__('You are not allowed to delete all users for this angeltype.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->hasPostData('deny_all')) { @@ -64,7 +64,7 @@ function user_angeltypes_delete_all_controller() engelsystem_log(sprintf('Denied all users for angeltype %s', AngelType_name_render($angeltype, true))); success(sprintf(__('Denied all users for angeltype %s.'), AngelType_name_render($angeltype))); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -85,18 +85,18 @@ function user_angeltypes_confirm_all_controller() if (!$request->has('angeltype_id')) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($request->input('angeltype_id')); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if (!auth()->can('admin_user_angeltypes') && !User_is_AngelType_supporter($user, $angeltype)) { error(__('You are not allowed to confirm all users for this angeltype.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->hasPostData('confirm_all')) { @@ -104,7 +104,7 @@ function user_angeltypes_confirm_all_controller() engelsystem_log(sprintf('Confirmed all users for angeltype %s', AngelType_name_render($angeltype, true))); success(sprintf(__('Confirmed all users for angeltype %s.'), AngelType_name_render($angeltype))); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -125,30 +125,30 @@ function user_angeltype_confirm_controller() if (!$request->has('user_angeltype_id')) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_angeltype = UserAngelType($request->input('user_angeltype_id')); if (empty($user_angeltype)) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($user_angeltype['angeltype_id']); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if (!User_is_AngelType_supporter($user, $angeltype)) { error(__('You are not allowed to confirm this users angeltype.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_source = User::find($user_angeltype['user_id']); if (!$user_source) { error(__('User doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->hasPostData('confirm_user')) { @@ -164,7 +164,7 @@ function user_angeltype_confirm_controller() User_Nick_render($user_source), AngelType_name_render($angeltype) )); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -185,30 +185,30 @@ function user_angeltype_delete_controller() if (!$request->has('user_angeltype_id')) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_angeltype = UserAngelType($request->input('user_angeltype_id')); if (empty($user_angeltype)) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($user_angeltype['angeltype_id']); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_source = User::find($user_angeltype['user_id']); if (!$user_source) { error(__('User doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($user->id != $user_angeltype['user_id'] && !User_is_AngelType_supporter($user, $angeltype)) { error(__('You are not allowed to delete this users angeltype.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->hasPostData('delete')) { @@ -217,7 +217,7 @@ function user_angeltype_delete_controller() engelsystem_log(sprintf('User %s removed from %s.', User_Nick_render($user_source, true), $angeltype['name'])); success(sprintf(__('User %s removed from %s.'), User_Nick_render($user_source), $angeltype['name'])); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -238,37 +238,37 @@ function user_angeltype_update_controller() if (!auth()->can('admin_angel_types')) { error(__('You are not allowed to set supporter rights.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if (!$request->has('user_angeltype_id')) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->has('supporter') && preg_match('/^[01]$/', $request->input('supporter'))) { $supporter = $request->input('supporter') == '1'; } else { error(__('No supporter update given.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_angeltype = UserAngelType($request->input('user_angeltype_id')); if (empty($user_angeltype)) { error(__('User angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $angeltype = AngelType($user_angeltype['angeltype_id']); if (empty($angeltype)) { error(__('Angeltype doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } $user_source = User::find($user_angeltype['user_id']); if (!$user_source) { error(__('User doesn\'t exist.')); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if ($request->hasPostData('submit')) { @@ -288,7 +288,7 @@ function user_angeltype_update_controller() User_Nick_render($user_source) )); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -343,7 +343,7 @@ function user_angeltype_add_controller() AngelType_name_render($angeltype, true) )); - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } } @@ -366,7 +366,7 @@ function user_angeltype_join_controller($angeltype) $user_angeltype = UserAngelType_by_User_and_AngelType($user->id, $angeltype); if (!empty($user_angeltype)) { error(sprintf(__('You are already a %s.'), $angeltype['name'])); - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } if (request()->hasPostData('submit')) { @@ -389,7 +389,7 @@ function user_angeltype_join_controller($angeltype) )); } - redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); + throw_redirect(page_link_to('angeltypes', ['action' => 'view', 'angeltype_id' => $angeltype['id']])); } return [ @@ -407,7 +407,7 @@ function user_angeltypes_controller() { $request = request(); if (!$request->has('action')) { - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } switch ($request->input('action')) { @@ -424,6 +424,6 @@ function user_angeltypes_controller() case 'add': return user_angeltype_add_controller(); default: - redirect(page_link_to('angeltypes')); + throw_redirect(page_link_to('angeltypes')); } } diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php index 9dc15f15..e6924182 100644 --- a/includes/controller/user_driver_licenses_controller.php +++ b/includes/controller/user_driver_licenses_controller.php @@ -42,7 +42,7 @@ function user_driver_licenses_controller() $user = auth()->user(); if (!$user) { - redirect(page_link_to('')); + throw_redirect(page_link_to('')); } $action = strip_request_item('action', 'edit'); @@ -82,7 +82,7 @@ function user_driver_license_load_user() if ($request->has('user_id')) { $user_source = User::find($request->input('user_id')); if (empty($user_source)) { - redirect(user_driver_license_edit_link()); + throw_redirect(user_driver_license_edit_link()); } } @@ -102,7 +102,7 @@ function user_driver_license_edit_controller() // only privilege admin_user can edit other users driver license information if ($user->id != $user_source->id && !auth()->can('admin_user')) { - redirect(user_driver_license_edit_link()); + throw_redirect(user_driver_license_edit_link()); } $user_driver_license = UserDriverLicense($user_source->id); @@ -131,7 +131,7 @@ function user_driver_license_edit_controller() } engelsystem_log('Driver license information updated.'); success(__('Your driver license information has been saved.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } else { error(__('Please select at least one driving license.')); } @@ -139,7 +139,7 @@ function user_driver_license_edit_controller() UserDriverLicenses_delete($user_source->id); engelsystem_log('Driver license information removed.'); success(__('Your driver license information has been removed.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } } diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php index 7cedea92..6b100338 100644 --- a/includes/controller/user_worklog_controller.php +++ b/includes/controller/user_worklog_controller.php @@ -12,7 +12,7 @@ function user_worklog_delete_controller() $request = request(); $userWorkLog = UserWorkLog($request->input('user_worklog_id')); if (empty($userWorkLog)) { - redirect(user_link(auth()->user()->id)); + throw_redirect(user_link(auth()->user()->id)); } $user_source = User::find($userWorkLog['user_id']); @@ -20,7 +20,7 @@ function user_worklog_delete_controller() UserWorkLog_delete($userWorkLog); success(__('Work log entry deleted.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } return [ @@ -39,7 +39,7 @@ function user_worklog_edit_controller() $request = request(); $userWorkLog = UserWorkLog($request->input('user_worklog_id')); if (empty($userWorkLog)) { - redirect(user_link(auth()->user()->id)); + throw_redirect(user_link(auth()->user()->id)); } $user_source = User::find($userWorkLog['user_id']); @@ -50,7 +50,7 @@ function user_worklog_edit_controller() UserWorkLog_update($userWorkLog); success(__('Work log entry updated.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } } @@ -109,7 +109,7 @@ function user_worklog_add_controller() $request = request(); $user_source = User::find($request->input('user_id')); if (!$user_source) { - redirect(user_link(auth()->user()->id)); + throw_redirect(user_link(auth()->user()->id)); } $userWorkLog = UserWorkLog_new($user_source->id); @@ -121,7 +121,7 @@ function user_worklog_add_controller() UserWorkLog_create($userWorkLog); success(__('Work log entry created.')); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } } @@ -185,13 +185,13 @@ function user_worklog_controller() $user = auth()->user(); if (!auth()->can('admin_user_worklog')) { - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } $request = request(); $action = $request->input('action'); if (!$request->has('action')) { - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } switch ($action) { diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index 3ad2ffd9..da8a9339 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -17,7 +17,7 @@ function users_controller() $request = request(); if (!$user) { - redirect(page_link_to('')); + throw_redirect(page_link_to('')); } $action = 'list'; @@ -56,13 +56,13 @@ function user_delete_controller() } if (!auth()->can('admin_user')) { - redirect(page_link_to('')); + throw_redirect(page_link_to('')); } // You cannot delete yourself if ($user->id == $user_source->id) { error(__('You cannot delete yourself.')); - redirect(user_link($user->id)); + throw_redirect(user_link($user->id)); } if ($request->hasPostData('submit')) { @@ -85,7 +85,7 @@ function user_delete_controller() success(__('User deleted.')); engelsystem_log(sprintf('Deleted %s', User_Nick_render($user_source, true))); - redirect(users_link()); + throw_redirect(users_link()); } } @@ -145,7 +145,7 @@ function user_edit_vouchers_controller() } if (!auth()->can('admin_user')) { - redirect(page_link_to('')); + throw_redirect(page_link_to('')); } if ($request->hasPostData('submit')) { @@ -171,7 +171,7 @@ function user_edit_vouchers_controller() engelsystem_log(User_Nick_render($user_source, true) . ': ' . sprintf('Got %s vouchers', $user_source->state->got_voucher)); - redirect(user_link($user_source->id)); + throw_redirect(user_link($user_source->id)); } } @@ -194,7 +194,7 @@ function user_controller() $user_source = User::find($request->input('user_id')); if (!$user_source) { error(__('User not found.')); - redirect(page_link_to('/')); + throw_redirect(page_link_to('/')); } } @@ -261,7 +261,7 @@ function users_list_controller() $request = request(); if (!auth()->can('admin_user')) { - redirect(page_link_to('')); + throw_redirect(page_link_to('')); } $order_by = 'name'; @@ -319,13 +319,13 @@ function load_user() { $request = request(); if (!$request->has('user_id')) { - redirect(page_link_to()); + throw_redirect(page_link_to()); } $user = User::find($request->input('user_id')); if (!$user) { error(__('User doesn\'t exist.')); - redirect(page_link_to()); + throw_redirect(page_link_to()); } return $user; diff --git a/includes/includes.php b/includes/includes.php index 601a6ca2..50e98fe5 100644 --- a/includes/includes.php +++ b/includes/includes.php @@ -69,7 +69,6 @@ $includeFiles = [ __DIR__ . '/../includes/pages/admin_arrive.php', __DIR__ . '/../includes/pages/admin_free.php', __DIR__ . '/../includes/pages/admin_groups.php', - __DIR__ . '/../includes/pages/admin_import.php', __DIR__ . '/../includes/pages/admin_log.php', __DIR__ . '/../includes/pages/admin_questions.php', __DIR__ . '/../includes/pages/admin_rooms.php', @@ -82,6 +81,8 @@ $includeFiles = [ __DIR__ . '/../includes/pages/user_questions.php', __DIR__ . '/../includes/pages/user_settings.php', __DIR__ . '/../includes/pages/user_shifts.php', + + __DIR__ . '/../includes/pages/schedule/ImportSchedule.php', ]; foreach ($includeFiles as $file) { diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php index b29f68fe..f9eaf31d 100644 --- a/includes/model/Room_model.php +++ b/includes/model/Room_model.php @@ -62,35 +62,20 @@ function Room_delete($room_id) } /** - * Delete a room by its name - * - * @param string $name - */ -function Room_delete_by_name($name) -{ - DB::delete('DELETE FROM `Room` WHERE `Name` = ?', [ - $name - ]); - engelsystem_log('Room deleted: ' . $name); -} - -/** * Create a new room * * @param string $name Name of the room - * @param boolean $from_frab Is this a frab imported room? * @param string $map_url URL to a map tha can be displayed in an iframe * @param string description Markdown description * @return false|int */ -function Room_create($name, $from_frab, $map_url, $description) +function Room_create($name, $map_url, $description) { DB::insert(' - INSERT INTO `Room` (`Name`, `from_frab`, `map_url`, `description`) - VALUES (?, ?, ?, ?) + INSERT INTO `Room` (`Name`, `map_url`, `description`) + VALUES (?, ?, ?) ', [ $name, - (int)$from_frab, $map_url, $description ]); @@ -98,7 +83,6 @@ function Room_create($name, $from_frab, $map_url, $description) engelsystem_log( 'Room created: ' . $name - . ', frab import: ' . ($from_frab ? 'Yes' : '') . ', map_url: ' . $map_url . ', description: ' . $description ); @@ -107,28 +91,25 @@ function Room_create($name, $from_frab, $map_url, $description) } /** - * update a room + * Update a room * * @param int $room_id The rooms id * @param string $name Name of the room - * @param boolean $from_frab Is this a frab imported room? * @param string $map_url URL to a map tha can be displayed in an iframe * @param string $description Markdown description * @return int */ -function Room_update($room_id, $name, $from_frab, $map_url, $description) +function Room_update($room_id, $name, $map_url, $description) { $result = DB::update(' UPDATE `Room` SET `Name`=?, - `from_frab`=?, `map_url`=?, `description`=? WHERE `RID`=? LIMIT 1', [ $name, - (int)$from_frab, $map_url, $description, $room_id @@ -136,7 +117,6 @@ function Room_update($room_id, $name, $from_frab, $map_url, $description) engelsystem_log( 'Room updated: ' . $name . - ', frab import: ' . ($from_frab ? 'Yes' : '') . ', map_url: ' . $map_url . ', description: ' . $description ); diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 1f957c84..756d9284 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -14,17 +14,19 @@ function Shifts_by_angeltype($angeltype) return DB::select(' SELECT DISTINCT `Shifts`.* FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id` = `Shifts`.`SID` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `NeededAngelTypes`.`angel_type_id` = ? AND `NeededAngelTypes`.`count` > 0 - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION SELECT DISTINCT `Shifts`.* FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id` = `Shifts`.`RID` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `NeededAngelTypes`.`angel_type_id` = ? AND `NeededAngelTypes`.`count` > 0 - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ', [$angeltype['id'], $angeltype['id']]); } @@ -41,19 +43,21 @@ function Shifts_free($start, $end) SELECT * FROM ( SELECT * FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE (`end` > ? AND `start` < ?) AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0) - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION SELECT * FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE (`end` > ? AND `start` < ?) AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`) > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0) - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ) AS `tmp` ORDER BY `tmp`.`start` ", [ @@ -70,16 +74,6 @@ function Shifts_free($start, $end) } /** - * Returns all shifts with a PSID (from frab import) - * - * @return array[] - */ -function Shifts_from_frab() -{ - return DB::select('SELECT * FROM `Shifts` WHERE `PSID` IS NOT NULL ORDER BY `start`'); -} - -/** * @param array|int $room * @return array[] */ @@ -103,11 +97,12 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter) JOIN `Room` USING (`RID`) JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id` = `Shifts`.`SID` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`RID` IN (' . implode(',', $shiftsFilter->getRooms()) . ') AND `start` BETWEEN ? AND ? AND `NeededAngelTypes`.`angel_type_id` IN (' . implode(',', $shiftsFilter->getTypes()) . ') AND `NeededAngelTypes`.`count` > 0 - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION @@ -116,11 +111,12 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter) JOIN `Room` USING (`RID`) JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id`=`Shifts`.`RID` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`RID` IN (' . implode(',', $shiftsFilter->getRooms()) . ') AND `start` BETWEEN ? AND ? AND `NeededAngelTypes`.`angel_type_id` IN (' . implode(',', $shiftsFilter->getTypes()) . ') AND `NeededAngelTypes`.`count` > 0 - AND NOT `Shifts`.`PSID` IS NULL) AS tmp_shifts + AND NOT s.shift_id IS NULL) AS tmp_shifts ORDER BY `room_name`, `start`'; @@ -152,9 +148,10 @@ function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`Shifts`.`SID` JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`RID` IN (' . implode(',', $shiftsFilter->getRooms()) . ') AND `start` BETWEEN ? AND ? - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION @@ -168,9 +165,10 @@ function NeededAngeltypes_by_ShiftsFilter(ShiftsFilter $shiftsFilter) FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id`=`Shifts`.`RID` JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`RID` IN (' . implode(',', $shiftsFilter->getRooms()) . ') AND `start` BETWEEN ? AND ? - AND NOT `Shifts`.`PSID` IS NULL'; + AND NOT s.shift_id IS NULL'; return DB::select( $sql, @@ -201,9 +199,10 @@ function NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype) FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`Shifts`.`SID` JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`SID`=? AND `AngelTypes`.`id`=? - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION @@ -217,9 +216,10 @@ function NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype) FROM `Shifts` JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id`=`Shifts`.`RID` JOIN `AngelTypes` ON `AngelTypes`.`id`= `NeededAngelTypes`.`angel_type_id` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `Shifts`.`SID`=? AND `AngelTypes`.`id`=? - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ', [ $shift['SID'], @@ -495,16 +495,6 @@ function Shift_signup_allowed( } /** - * Delete a shift by its external id. - * - * @param int $shift_psid - */ -function Shift_delete_by_psid($shift_psid) -{ - DB::delete('DELETE FROM `Shifts` WHERE `PSID`=?', [$shift_psid]); -} - -/** * Delete a shift. * * @param int $shift_id @@ -535,7 +525,6 @@ function Shift_update($shift) `RID` = ?, `title` = ?, `URL` = ?, - `PSID` = ?, `edited_by_user_id` = ?, `edited_at_timestamp` = ? WHERE `SID` = ? @@ -547,7 +536,6 @@ function Shift_update($shift) $shift['RID'], $shift['title'], $shift['URL'], - $shift['PSID'], $user->id, time(), $shift['SID'] @@ -556,25 +544,6 @@ function Shift_update($shift) } /** - * Update a shift by its external id. - * - * @param array $shift - * @return int - * @throws Exception - */ -function Shift_update_by_psid($shift) -{ - $shift_source = DB::selectOne('SELECT `SID` FROM `Shifts` WHERE `PSID`=?', [$shift['PSID']]); - - if (empty($shift_source)) { - throw new Exception('Shift not found.'); - } - - $shift['SID'] = $shift_source['SID']; - return Shift_update($shift); -} - -/** * Create a new shift. * * @param array $shift @@ -590,12 +559,11 @@ function Shift_create($shift) `RID`, `title`, `URL`, - `PSID`, `created_by_user_id`, `edited_at_timestamp`, `created_at_timestamp` ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ', [ $shift['shifttype_id'], @@ -604,7 +572,6 @@ function Shift_create($shift) $shift['RID'], $shift['title'], $shift['URL'], - $shift['PSID'], auth()->user()->id, time(), time(), diff --git a/includes/model/Stats.php b/includes/model/Stats.php index c8342d82..e355b064 100644 --- a/includes/model/Stats.php +++ b/includes/model/Stats.php @@ -39,8 +39,9 @@ function stats_hours_to_work() (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) * (`Shifts`.`end` - `Shifts`.`start`)/3600 AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` >= ? - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION ALL @@ -48,8 +49,9 @@ function stats_hours_to_work() (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`) * (`Shifts`.`end` - `Shifts`.`start`)/3600 AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` >= ? - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ) AS `tmp` ", [ time(), @@ -90,8 +92,9 @@ function stats_angels_needed_three_hours() ) AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` > ? AND `start` < ? - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION ALL @@ -113,8 +116,9 @@ function stats_angels_needed_three_hours() ) AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` > ? AND `start` < ? - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ) AS `tmp`", [ $now, $in3hours, @@ -163,8 +167,9 @@ function stats_angels_needed_for_nightshifts() ) AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` > ? AND `start` < ? - AND `Shifts`.`PSID` IS NULL + AND s.shift_id IS NULL UNION ALL @@ -186,8 +191,9 @@ function stats_angels_needed_for_nightshifts() ) AS `count` FROM `Shifts` + LEFT JOIN schedule_shift AS s on Shifts.SID = s.shift_id WHERE `end` > ? AND `start` < ? - AND NOT `Shifts`.`PSID` IS NULL + AND NOT s.shift_id IS NULL ) AS `tmp`", [ $night_start, $night_end, 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 diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 3bb061ce..01a4b6d2 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -108,30 +108,38 @@ function make_navigation() $admin_menu = []; $admin_pages = [ - 'admin_arrive' => __('Arrived angels'), - 'admin_active' => __('Active angels'), - 'admin_user' => __('All Angels'), - 'admin_free' => __('Free angels'), - 'admin_questions' => __('Answer questions'), - 'shifttypes' => __('Shifttypes'), - 'admin_shifts' => __('Create shifts'), - 'admin_rooms' => __('Rooms'), - 'admin_groups' => __('Grouprights'), - 'admin_import' => __('Frab import'), - 'admin_log' => __('Log'), - 'admin_event_config' => __('Event config'), + 'admin_arrive' => 'Arrived angels', + 'admin_active' => 'Active angels', + 'admin_user' => 'All Angels', + 'admin_free' => 'Free angels', + 'admin_questions' => 'Answer questions', + 'shifttypes' => 'Shifttypes', + 'admin_shifts' => 'Create shifts', + 'admin_rooms' => 'Rooms', + 'admin_groups' => 'Grouprights', + 'admin/schedule' => ['schedule.import', 'schedule.import'], + 'admin_log' => 'Log', + 'admin_event_config' => 'Event config', ]; if (config('autoarrive')) { unset($admin_pages['admin_arrive']); } - foreach ($admin_pages as $menu_page => $title) { - if (auth()->can($menu_page)) { + foreach ($admin_pages as $menu_page => $options) { + $options = (array)$options; + $permissions = $menu_page; + $title = $options[0]; + + if (isset($options[1])) { + $permissions = $options[1]; + } + + if (auth()->can($permissions)) { $admin_menu[] = toolbar_item_link( page_link_to($menu_page), '', - $title, + __($title), $menu_page == $page ); } diff --git a/includes/sys_page.php b/includes/sys_page.php index c7b3ec74..d00a9b70 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -1,6 +1,7 @@ <?php use Carbon\Carbon; +use Engelsystem\Http\Exceptions\HttpTemporaryRedirect; use Engelsystem\ValidationResult; /** @@ -55,10 +56,9 @@ function parse_date($pattern, $value) * * @param string $url */ -function redirect($url) +function throw_redirect($url) { - header('Location: ' . $url, true, 302); - raw_output(''); + throw new HttpTemporaryRedirect($url); } /** diff --git a/includes/sys_template.php b/includes/sys_template.php index fad207a9..cf4c64aa 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -410,42 +410,6 @@ function table_buttons($buttons = []) } /** - * @param string $str - * @param int $length - * @return string - */ -function shorten($str, $length = 50) -{ - if (strlen($str) < $length) { - return $str; - } - return '<span title="' . htmlentities($str, ENT_COMPAT, 'UTF-8') . '">' - . substr($str, 0, $length - 3) - . '...</span>'; -} - -/** - * @param array[] $array - * @return string - */ -function table_body($array) -{ - $html = ''; - foreach ($array as $line) { - $html .= '<tr>'; - if (is_array($line)) { - foreach ($line as $td) { - $html .= '<td>' . $td . '</td>'; - } - } else { - $html .= '<td>' . $line . '</td>'; - } - $html .= '</tr>'; - } - return $html; -} - -/** * @param string $msg * @return mixed */ |