diff options
| -rw-r--r-- | db/anonymize.sql | 10 | ||||
| -rw-r--r-- | includes/controller/angeltypes_controller.php | 4 | ||||
| -rw-r--r-- | includes/controller/event_config_controller.php | 13 | ||||
| -rw-r--r-- | includes/controller/shifts_controller.php | 6 | ||||
| -rw-r--r-- | includes/controller/users_controller.php | 2 | ||||
| -rw-r--r-- | includes/pages/guest_login.php | 21 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 6 |
7 files changed, 42 insertions, 20 deletions
diff --git a/db/anonymize.sql b/db/anonymize.sql new file mode 100644 index 00000000..ba420d79 --- /dev/null +++ b/db/anonymize.sql @@ -0,0 +1,10 @@ +update User set Nick=concat('User',UID), Name=concat('Name',UID), Vorname=concat('Prename',UID), `Alter`=0, Telefon='', DECT='', Handy='', email=concat('engel', UID, '@engelsystem.de'), jabber='', Hometown=''; +update Messages set Text=concat('Message', id); +update News set Betreff=concat('Subject', ID), Text=concat('News', ID); +update NewsComments set Text=concat('Comment', ID); +update Questions set Question=concat('Question', QID), Answer=concat('Answer', QID); +update ShiftEntry set Comment='', freeload_comment=''; +update ShiftTypes set name=concat('Shifttype',id), description='Description'; +update AngelTypes set name=concat('Angeltype',id), description=concat('Description of angeltype',id); +TRUNCATE TABLE LogEntries; + 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 7d11ecb4..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(); @@ -101,9 +101,14 @@ function event_config_edit_controller() ); engelsystem_log( - 'Changed event config: $event_name, $event_welcome_msg, ' - . date('Y-m-d', $buildup_start_date) . ', ' . date('Y-m-d', $event_start_date) . ', ' - . date('Y-m-d', $event_end_date) . ', ' . date('Y-m-d', $teardown_end_date) + sprintf('Changed event config: %s, %s, %s, %s, %s, %s', + $event_name, + $event_welcome_msg, + date('Y-m-d', $buildup_start_date), + date('Y-m-d', $event_start_date), + date('Y-m-d', $event_end_date), + date('Y-m-d', $teardown_end_date) + ) ); success(_('Settings saved.')); redirect(page_link_to('admin_event_config')); 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..9e71e180 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -45,7 +45,7 @@ function guest_register() $nick = ''; $lastName = ''; $preName = ''; - $age = ''; + $age = 0; $tel = ''; $dect = ''; $mobile = ''; @@ -157,6 +157,9 @@ function guest_register() $valid = false; error(_('Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date.')); } + } else { + $valid = false; + error(_('Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date.')); } $selected_angel_types = []; @@ -214,9 +217,13 @@ function guest_register() `CreateDate`, `Sprache`, `arrival_date`, - `planned_arrival_date` + `planned_arrival_date`, + `force_active`, + `lastLogIn`, + `api_key`, + `got_voucher` ) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?, FALSE, 0, "", 0) ', [ config('theme'), @@ -228,8 +235,8 @@ function guest_register() $dect, $mobile, $mail, - (bool)$email_shiftinfo, - (bool)$email_by_human_allowed, + (int)$email_shiftinfo, + (int)$email_by_human_allowed, $jabber, $tshirt_size, $password_hash, @@ -249,7 +256,7 @@ function guest_register() $user_angel_types_info = []; foreach ($selected_angel_types as $selected_angel_type_id) { DB::insert( - 'INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES (?, ?)', + 'INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`, `supporter`) VALUES (?, ?, FALSE)', [$user_id, $selected_angel_type_id] ); $user_angel_types_info[] = $angel_types[$selected_angel_type_id]; @@ -271,7 +278,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 |