From 89e62c95a7ffd71a8e860f59378ecd13d6cbb196 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Tue, 9 Oct 2018 21:47:31 +0200 Subject: Changed more functions :tada: --- includes/view/Shifts_view.php | 9 ++++---- includes/view/UserAngelTypes_view.php | 8 ++++--- includes/view/UserWorkLog_view.php | 6 +++-- includes/view/User_view.php | 42 +++++++++++++++++++++-------------- 4 files changed, 39 insertions(+), 26 deletions(-) (limited to 'includes/view') diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 92447efd..bd13a390 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -75,10 +75,10 @@ function Shift_editor_info_render($shift) */ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null) { - global $user; + $user = auth()->user(); if (empty($user_angeltype)) { - $user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype); + $user_angeltype = UserAngelType_by_User_and_AngelType($user->id, $angeltype); } if ($angeltype['shift_signup_state']->isSignupAllowed()) { @@ -103,7 +103,8 @@ function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null) */ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupState $shift_signup_state) { - global $user, $privileges; + global $privileges; + $user = auth()->user(); $shift_admin = in_array('admin_shifts', $privileges); $user_shift_admin = in_array('user_shifts_admin', $privileges); @@ -141,7 +142,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt $admin_rooms ? button(room_link($room), glyph('map-marker') . $room['Name']) : '', ]; } - $buttons[] = button(user_link($user['UID']), ' ' . __('My shifts')); + $buttons[] = button(user_link($user->id), ' ' . __('My shifts')); $content[] = buttons($buttons); $content[] = Shift_view_header($shift, $room); diff --git a/includes/view/UserAngelTypes_view.php b/includes/view/UserAngelTypes_view.php index 965a353a..0702a2b3 100644 --- a/includes/view/UserAngelTypes_view.php +++ b/includes/view/UserAngelTypes_view.php @@ -1,8 +1,10 @@ id), glyph('remove') . __('cancel')), button(user_worklog_delete_link($userWorkLog, [ 'confirmed' => 1 ]), glyph('ok') . __('delete'), 'btn-danger') diff --git a/includes/view/User_view.php b/includes/view/User_view.php index ccd5e5d2..6243d26e 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -145,7 +145,7 @@ function User_registration_success_view($event_welcome_message) /** * Gui for deleting user with password field. * - * @param array $user + * @param User $user * @return string */ function User_delete_view($user) @@ -153,7 +153,7 @@ function User_delete_view($user) return page_with_title(sprintf(__('Delete %s'), User_Nick_render($user)), [ msg(), buttons([ - button(user_edit_link($user['UID']), glyph('chevron-left') . __('back')) + button(user_edit_link($user->id), glyph('chevron-left') . __('back')) ]), error( __('Do you really want to delete the user including all his shifts and every other piece of his data?'), @@ -292,7 +292,7 @@ function User_shift_state_render($user) return ''; } - $upcoming_shifts = ShiftEntries_upcoming_for_user($user); + $upcoming_shifts = ShiftEntries_upcoming_for_user($user['UID']); if (empty($upcoming_shifts)) { return '' . __('Free') . ''; @@ -823,15 +823,25 @@ function User_groups_render($user_groups) /** * Render a user nickname. * - * @param array $user_source + * @param array|User $user * @return string */ -function User_Nick_render($user_source) +function User_Nick_render($user) { + if ($user instanceof User) { + $id = $user->id; + $name = $user->name; + $arrived = $user->state->arrived; + } else { + $id = $user['UID']; + $name = $user['Nick']; + $arrived = $user['Gekommen']; + } + return render_profile_link( - ' ' . htmlspecialchars($user_source['Nick']) . '', - $user_source['UID'], - ($user_source['Gekommen'] ? '' : 'text-muted') + ' ' . htmlspecialchars($name) . '', + $id, + ($arrived ? '' : 'text-muted') ); } @@ -861,9 +871,7 @@ function render_profile_link($text, $user_id = null, $class = '') */ function render_user_departure_date_hint() { - global $user; - - if (!isset($user['planned_departure_date']) || empty($user['planned_departure_date'])) { + if (!auth()->user()->personalData->planned_departure_date) { $text = __('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.'); return render_profile_link($text, null, 'alert-link'); } @@ -895,9 +903,9 @@ function render_user_freeloader_hint() */ function render_user_arrived_hint() { - global $user; + $user = auth()->user(); - if ($user['Gekommen'] == 0) { + if (!$user->state->arrived) { /** @var Carbon $buildup */ $buildup = config('buildup_start'); if (!empty($buildup) && $buildup->lessThan(new Carbon())) { @@ -913,9 +921,9 @@ function render_user_arrived_hint() */ function render_user_tshirt_hint() { - global $user; + $user = auth()->user(); - if (config('enable_tshirt_size') && $user['Size'] == '') { + if (config('enable_tshirt_size') && !$user->personalData->shirt_size) { $text = __('You need to specify a tshirt size in your settings!'); return render_profile_link($text, null, 'alert-link'); } @@ -928,9 +936,9 @@ function render_user_tshirt_hint() */ function render_user_dect_hint() { - global $user; + $user = auth()->user(); - if ($user['Gekommen'] == 1 && $user['DECT'] == '') { + if ($user->state->arrived && !$user->contact->dect) { $text = __('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.'); return render_profile_link($text, null, 'alert-link'); } -- cgit v1.2.3-54-g00ecf