From 89e62c95a7ffd71a8e860f59378ecd13d6cbb196 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 9 Oct 2018 21:47:31 +0200
Subject: Changed more functions :tada:

---
 includes/model/Shifts_model.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'includes/model/Shifts_model.php')

diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 30ce5a97..e03ca0bf 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -326,7 +326,7 @@ function Shift_signup_allowed_angel(
     }
 
     if (empty($user_shifts)) {
-        $user_shifts = Shifts_by_user($user);
+        $user_shifts = Shifts_by_user($user['UID']);
     }
 
     $signed_up = false;
@@ -352,7 +352,7 @@ function Shift_signup_allowed_angel(
     }
 
     if (empty($user_angeltype)) {
-        $user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
+        $user_angeltype = UserAngelType_by_User_and_AngelType($user['UID'], $angeltype);
     }
 
     if (
@@ -577,7 +577,7 @@ function Shift_update_by_psid($shift)
  */
 function Shift_create($shift)
 {
-    global $user;
+    $user = auth()->user();
     DB::insert('
           INSERT INTO `Shifts` (
               `shifttype_id`,
@@ -601,7 +601,7 @@ function Shift_create($shift)
             $shift['title'],
             $shift['URL'],
             $shift['PSID'],
-            $user['UID'],
+            $user->id,
             time(),
             time(),
         ]
@@ -613,11 +613,11 @@ function Shift_create($shift)
 /**
  * Return users shifts.
  *
- * @param array $user
+ * @param int $userId
  * @param bool  $include_freeload_comments
  * @return array[]
  */
-function Shifts_by_user($user, $include_freeload_comments = false)
+function Shifts_by_user($userId, $include_freeload_comments = false)
 {
     return DB::select('
           SELECT 
@@ -640,7 +640,7 @@ function Shifts_by_user($user, $include_freeload_comments = false)
           ORDER BY `start`
       ',
         [
-            $user['UID']
+            $userId
         ]
     );
 }
-- 
cgit v1.2.3-54-g00ecf