From 7c6afc2bfe3263b91ecabf5530da57fe1162ea0b Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 10 Oct 2018 03:10:28 +0200
Subject: Removed `User($id)` function :tada:

---
 includes/pages/user_shifts.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'includes/pages/user_shifts.php')

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 350394be..3e300e3c 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -22,10 +22,9 @@ function shifts_title()
  */
 function user_shifts()
 {
-    global $user;
     $request = request();
 
-    if (User_is_freeloader($user)) {
+    if (User_is_freeloader(auth()->user())) {
         redirect(page_link_to('user_myshifts'));
     }
 
@@ -169,7 +168,8 @@ function load_types()
  */
 function view_user_shifts()
 {
-    global $user, $privileges, $ical_shifts;
+    global $privileges, $ical_shifts;
+    $user = auth()->user();
 
     $session = session();
     $ical_shifts = [];
@@ -193,7 +193,7 @@ function view_user_shifts()
 
     $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);
 
-    if ($user['api_key'] == '') {
+    if (empty($user->api_key)) {
         User_reset_api_key($user, false);
     }
 
@@ -212,12 +212,12 @@ function view_user_shifts()
     $end_day = date('Y-m-d', $shiftsFilter->getEndTime());
     $end_time = date('H:i', $shiftsFilter->getEndTime());
 
-    if (config('signup_requires_arrival') && !$user['Gekommen']) {
+    if (config('signup_requires_arrival') && !$user->state->arrived) {
         info(render_user_arrived_hint());
     }
 
     $ownTypes = [];
-    foreach (UserAngelTypes_by_User($user['UID']) as $type) {
+    foreach (UserAngelTypes_by_User($user->id) as $type) {
         $ownTypes[] = (int)$type['angeltype_id'];
     }
 
-- 
cgit v1.2.3-54-g00ecf