From 50f24271eb0c3aea6dbb91ab28ebd5682ac59cae Mon Sep 17 00:00:00 2001 From: msquare Date: Sun, 19 Nov 2017 10:45:08 +0100 Subject: [PATCH] fix all redirects to home (because of new urls redirect to ? wont work anymore) --- includes/controller/angeltypes_controller.php | 4 ++-- includes/controller/event_config_controller.php | 2 +- includes/controller/shifts_controller.php | 6 +++--- includes/controller/users_controller.php | 2 +- includes/pages/guest_login.php | 2 +- includes/pages/user_shifts.php | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php index 8c1cbe5d..3e377fb0 100644 --- a/includes/controller/angeltypes_controller.php +++ b/includes/controller/angeltypes_controller.php @@ -171,7 +171,7 @@ function angeltype_controller() global $privileges, $user; if (!in_array('angeltypes', $privileges)) { - redirect('?'); + redirect(page_link_to('/')); } $angeltype = load_angeltype(); @@ -204,7 +204,7 @@ function angeltypes_list_controller() global $privileges, $user; if (!in_array('angeltypes', $privileges)) { - redirect('?'); + redirect(page_link_to('/')); } $angeltypes = AngelTypes_with_user($user); diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php index 73e79655..aa328802 100644 --- a/includes/controller/event_config_controller.php +++ b/includes/controller/event_config_controller.php @@ -16,7 +16,7 @@ function event_config_edit_controller() global $privileges; if (!in_array('admin_event_config', $privileges)) { - redirect('?'); + redirect(page_link_to('/')); } $request = request(); diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index 70011821..739ba009 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -249,7 +249,7 @@ function shift_controller() $request = request(); if (!in_array('user_shifts', $privileges)) { - redirect(page_link_to('?')); + redirect(page_link_to('/')); } if (!$request->has('shift_id')) { @@ -311,7 +311,7 @@ function shifts_controller() case 'next': return shift_next_controller(); default: - redirect(page_link_to('?')); + redirect(page_link_to('/')); } return false; @@ -325,7 +325,7 @@ function shift_next_controller() global $user, $privileges; if (!in_array('user_shifts', $privileges)) { - redirect(page_link_to('?')); + redirect(page_link_to('/')); } $upcoming_shifts = ShiftEntries_upcoming_for_user($user); diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index e8cb1b27..b1ef517e 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -192,7 +192,7 @@ function user_controller() $user_source = User($request->input('user_id')); if ($user_source == null) { error(_('User not found.')); - redirect('?'); + redirect(page_link_to('/')); } } diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 0577951f..3a0ed967 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -271,7 +271,7 @@ function guest_register() return User_registration_success_view($event_config['event_welcome_msg']); } - redirect('?'); + redirect(page_link_to('/')); } } diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 24b9251a..f8cf71cd 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -96,7 +96,7 @@ function load_rooms() ); if (empty($rooms)) { error(_('The administration has not configured any rooms yet.')); - redirect('?'); + redirect(page_link_to('/')); } return $rooms; } @@ -115,7 +115,7 @@ function load_days() if (empty($days)) { error(_('The administration has not configured any shifts yet.')); - redirect('?'); + redirect(page_link_to('/')); } return $days; } @@ -129,7 +129,7 @@ function load_types() if (!count(DB::select('SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0'))) { error(_('The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.')); - redirect('?'); + redirect(page_link_to('/')); } $types = DB::select(' SELECT