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/AngelType_model.php          |  6 ++--
 includes/model/ShiftEntry_model.php         | 25 +++++++-------
 includes/model/Shifts_model.php             | 14 ++++----
 includes/model/UserAngelTypes_model.php     | 52 ++++++++++++++---------------
 includes/model/UserDriverLicenses_model.php |  6 ++--
 includes/model/UserGroups_model.php         |  6 ++--
 includes/model/UserWorkLog_model.php        | 12 +++----
 includes/model/User_model.php               | 14 ++++----
 8 files changed, 68 insertions(+), 67 deletions(-)

(limited to 'includes/model')

diff --git a/includes/model/AngelType_model.php b/includes/model/AngelType_model.php
index 2dff7019..9b35f2b8 100644
--- a/includes/model/AngelType_model.php
+++ b/includes/model/AngelType_model.php
@@ -181,10 +181,10 @@ function AngelType_validate_name($name, $angeltype)
 /**
  * Returns all angeltypes and subscription state to each of them for given user.
  *
- * @param array $user
+ * @param int $userId
  * @return array
  */
-function AngelTypes_with_user($user)
+function AngelTypes_with_user($userId)
 {
     return DB::select('
       SELECT `AngelTypes`.*,
@@ -194,7 +194,7 @@ function AngelTypes_with_user($user)
       FROM `AngelTypes`
       LEFT JOIN `UserAngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id`
       AND `UserAngelTypes`.`user_id` = ?
-      ORDER BY `name`', [$user['UID']]);
+      ORDER BY `name`', [$userId]);
 }
 
 /**
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index ebf600f3..c8ca5ef4 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -1,6 +1,7 @@
 <?php
 
 use Engelsystem\Database\DB;
+use Engelsystem\Models\User\User;
 
 /**
  * Returns an array with the attributes of shift entries.
@@ -74,7 +75,7 @@ function ShiftEntries_by_shift($shift_id)
  */
 function ShiftEntry_create($shift_entry)
 {
-    $user = User($shift_entry['UID']);
+    $user = User::find($shift_entry['UID']);
     $shift = Shift($shift_entry['SID']);
     mail_shift_assign($user, $shift);
     $result = DB::insert('
@@ -150,10 +151,10 @@ function ShiftEntry($shift_entry_id)
  */
 function ShiftEntry_delete($shiftEntry)
 {
-    mail_shift_removed(User($shiftEntry['UID']), Shift($shiftEntry['SID']));
+    mail_shift_removed(User::find($shiftEntry['UID']), Shift($shiftEntry['SID']));
     DB::delete('DELETE FROM `ShiftEntry` WHERE `id` = ?', [$shiftEntry['id']]);
 
-    $signout_user = User($shiftEntry['UID']);
+    $signout_user = User::find($shiftEntry['UID']);
     $shift = Shift($shiftEntry['SID']);
     $shifttype = ShiftType($shift['shifttype_id']);
     $room = Room($shift['RID']);
@@ -171,10 +172,10 @@ function ShiftEntry_delete($shiftEntry)
 /**
  * Returns next (or current) shifts of given user.
  *
- * @param array $user
+ * @param int $userId
  * @return array
  */
-function ShiftEntries_upcoming_for_user($user)
+function ShiftEntries_upcoming_for_user($userId)
 {
     return DB::select('
         SELECT *
@@ -186,7 +187,7 @@ function ShiftEntries_upcoming_for_user($user)
         ORDER BY `Shifts`.`end`
       ',
         [
-            $user['UID'],
+            $userId,
             time(),
         ]
     );
@@ -195,10 +196,10 @@ function ShiftEntries_upcoming_for_user($user)
 /**
  * Returns shifts completed by the given user.
  *
- * @param array $user
+ * @param int $userId
  * @return array
  */
-function ShiftEntries_finished_by_user($user)
+function ShiftEntries_finished_by_user($userId)
 {
     return DB::select('
           SELECT *
@@ -211,7 +212,7 @@ function ShiftEntries_finished_by_user($user)
           ORDER BY `Shifts`.`end`
       ',
         [
-            $user['UID'],
+            $userId,
             time(),
         ]
     );
@@ -242,10 +243,10 @@ function ShiftEntries_by_shift_and_angeltype($shift_id, $angeltype_id)
 /**
  * Returns all freeloaded shifts for given user.
  *
- * @param array $user
+ * @param int $userId
  * @return array
  */
-function ShiftEntries_freeloaded_by_user($user)
+function ShiftEntries_freeloaded_by_user($userId)
 {
     return DB::select('
           SELECT *
@@ -254,7 +255,7 @@ function ShiftEntries_freeloaded_by_user($user)
           AND `UID` = ?
           ',
         [
-            $user['UID']
+            $userId
         ]
     );
 }
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
         ]
     );
 }
diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php
index b1005095..943dbb5b 100644
--- a/includes/model/UserAngelTypes_model.php
+++ b/includes/model/UserAngelTypes_model.php
@@ -9,43 +9,43 @@ use Engelsystem\Database\DB;
 /**
  * Checks if a user joined an angeltype.
  *
- * @param array $user      The user to be checked
+ * @param int   $userId    The user to be checked
  * @param array $angeltype The angeltype to be checked
  * @return boolean
  */
-function UserAngelType_exists($user, $angeltype)
+function UserAngelType_exists($userId, $angeltype)
 {
     return count(DB::select('
       SELECT `id`
       FROM `UserAngelTypes`
       WHERE `UserAngelTypes`.`user_id`=?
       AND `angeltype_id`=?
-      ', [$user['UID'], $angeltype['id']])) > 0;
+      ', [$userId, $angeltype['id']])) > 0;
 }
 
 /**
  * List users angeltypes.
  *
- * @param array $user
+ * @param int $userId
  * @return array[]
  */
-function User_angeltypes($user)
+function User_angeltypes($userId)
 {
     return DB::select('
       SELECT `AngelTypes`.*, `UserAngelTypes`.`confirm_user_id`, `UserAngelTypes`.`supporter`
       FROM `UserAngelTypes`
       JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`
       WHERE `UserAngelTypes`.`user_id`=?
-      ', [$user['UID']]);
+      ', [$userId]);
 }
 
 /**
  * Gets unconfirmed user angeltypes for angeltypes of which the given user is a supporter.
  *
- * @param array $user
+ * @param int $userId
  * @return array[]
  */
-function User_unconfirmed_AngelTypes($user)
+function User_unconfirmed_AngelTypes($userId)
 {
     return DB::select('
         SELECT
@@ -61,7 +61,7 @@ function User_unconfirmed_AngelTypes($user)
           AND `UnconfirmedMembers`.`confirm_user_id` IS NULL
         GROUP BY `UserAngelTypes`.`angeltype_id`, `UserAngelTypes`.`id`
         ORDER BY `AngelTypes`.`name`
-    ', [$user['UID']]);
+    ', [$userId]);
 }
 
 /**
@@ -126,32 +126,32 @@ function UserAngelTypes_delete_all($angeltype_id)
 /**
  * Confirm all unconfirmed UserAngelTypes for given Angeltype.
  *
- * @param int   $angeltype_id
- * @param array $confirm_user
+ * @param int $angeltype_id
+ * @param int $confirm_user_id
  */
-function UserAngelTypes_confirm_all($angeltype_id, $confirm_user)
+function UserAngelTypes_confirm_all($angeltype_id, $confirm_user_id)
 {
     DB::update('
       UPDATE `UserAngelTypes`
       SET `confirm_user_id`=?
       WHERE `angeltype_id`=?
       AND `confirm_user_id` IS NULL
-    ', [$confirm_user['UID'], $angeltype_id]);
+    ', [$confirm_user_id, $angeltype_id]);
 }
 
 /**
  * Confirm an UserAngelType with confirming user.
  *
- * @param int   $user_angeltype_id
- * @param array $confirm_user
+ * @param int $user_angeltype_id
+ * @param int $confirm_user_id
  */
-function UserAngelType_confirm($user_angeltype_id, $confirm_user)
+function UserAngelType_confirm($user_angeltype_id, $confirm_user_id)
 {
     DB::update('
       UPDATE `UserAngelTypes`
       SET `confirm_user_id`=?
       WHERE `id`=?
-      LIMIT 1', [$confirm_user['UID'], $user_angeltype_id]);
+      LIMIT 1', [$confirm_user_id, $user_angeltype_id]);
 }
 
 /**
@@ -170,18 +170,18 @@ function UserAngelType_delete($user_angeltype)
 /**
  * Create an UserAngelType.
  *
- * @param array $user
+ * @param int   $userId
  * @param array $angeltype
  * @return int
  */
-function UserAngelType_create($user, $angeltype)
+function UserAngelType_create($userId, $angeltype)
 {
     DB::insert('
             INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`, `supporter`)
             VALUES (?, ?, FALSE)
         ',
         [
-            $user['UID'],
+            $userId,
             $angeltype['id']
         ]
     );
@@ -209,11 +209,11 @@ function UserAngelType($user_angeltype_id)
 /**
  * Get an UserAngelType by user and angeltype.
  *
- * @param array $user
+ * @param int   $userId
  * @param array $angeltype
  * @return array|null
  */
-function UserAngelType_by_User_and_AngelType($user, $angeltype)
+function UserAngelType_by_User_and_AngelType($userId, $angeltype)
 {
     $angelType = DB::selectOne('
           SELECT *
@@ -223,7 +223,7 @@ function UserAngelType_by_User_and_AngelType($user, $angeltype)
           LIMIT 1
         ',
         [
-            $user['UID'],
+            $userId,
             $angeltype['id']
         ]
     );
@@ -234,16 +234,16 @@ function UserAngelType_by_User_and_AngelType($user, $angeltype)
 /**
  * Get an UserAngelTypes by user
  *
- * @param array $user
+ * @param int $userId
  * @return array[]|null
  */
-function UserAngelTypes_by_User($user)
+function UserAngelTypes_by_User($userId)
 {
     return DB::select('
           SELECT *
           FROM `UserAngelTypes`
           WHERE `user_id`=?
         ',
-        [$user['UID']]
+        [$userId]
     );
 }
diff --git a/includes/model/UserDriverLicenses_model.php b/includes/model/UserDriverLicenses_model.php
index 2c251d66..1be6d4d2 100644
--- a/includes/model/UserDriverLicenses_model.php
+++ b/includes/model/UserDriverLicenses_model.php
@@ -57,12 +57,12 @@ function UserDriverLicense($user_id)
  * Create a user's driver license entry
  *
  * @param array $user_driver_license The UserDriverLicense to create
- * @param array $user
+ * @param int   $userId
  * @return array
  */
-function UserDriverLicenses_create($user_driver_license, $user)
+function UserDriverLicenses_create($user_driver_license, $userId)
 {
-    $user_driver_license['user_id'] = $user['UID'];
+    $user_driver_license['user_id'] = $userId;
     DB::insert('
           INSERT INTO `UserDriverLicenses` (
               `user_id`,
diff --git a/includes/model/UserGroups_model.php b/includes/model/UserGroups_model.php
index 9d67770c..769871e9 100644
--- a/includes/model/UserGroups_model.php
+++ b/includes/model/UserGroups_model.php
@@ -5,10 +5,10 @@ use Engelsystem\Database\DB;
 /**
  * Returns users groups
  *
- * @param array $user
+ * @param int $userId
  * @return array[]
  */
-function User_groups($user)
+function User_groups($userId)
 {
     return DB::select('
           SELECT `Groups`.*
@@ -17,6 +17,6 @@ function User_groups($user)
           WHERE `UserGroups`.`uid`=?
           ORDER BY `UserGroups`.`group_id`
        ',
-        [$user['UID']]
+        [$userId]
     );
 }
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
index 46ab891e..c7de3f9e 100644
--- a/includes/model/UserWorkLog_model.php
+++ b/includes/model/UserWorkLog_model.php
@@ -21,13 +21,13 @@ function UserWorkLog($user_worklog_id)
 /**
  * Returns all work log entries for a user.
  *
- * @param array $user
+ * @param int $userId
  * @return array[]
  */
-function UserWorkLogsForUser($user)
+function UserWorkLogsForUser($userId)
 {
     return Db::select("SELECT * FROM `UserWorkLog` WHERE `user_id`=? ORDER BY `created_timestamp`", [
-        $user['UID']
+        $userId
     ]);
 }
 
@@ -123,10 +123,10 @@ function UserWorkLog_create($userWorkLog)
 /**
  * New user work log entry
  *
- * @param array[] $user
+ * @param int $userId
  * @return array
  */
-function UserWorkLog_new($user)
+function UserWorkLog_new($userId)
 {
     $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', time()));
 
@@ -137,7 +137,7 @@ function UserWorkLog_new($user)
     }
 
     return [
-        'user_id'        => $user['UID'],
+        'user_id'        => $userId,
         'work_timestamp' => $work_date,
         'work_hours'     => 0,
         'comment'        => ''
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 051f8ff6..bed6bf47 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -22,10 +22,10 @@ function User_delete($user_id)
  * Returns the tshirt score (number of hours counted for tshirt).
  * Accounts only ended shifts.
  *
- * @param array[] $user
+ * @param int $userId
  * @return int
  */
-function User_tshirt_score($user)
+function User_tshirt_score($userId)
 {
     $shift_sum_formula = User_get_shifts_sum_query();
     $result_shifts = DB::selectOne('
@@ -36,7 +36,7 @@ function User_tshirt_score($user)
         AND `Shifts`.`end` < ?
         GROUP BY `User`.`UID`
     ', [
-        $user['UID'],
+        $userId,
         time()
     ]);
     if (!isset($result_shifts['tshirt_score'])) {
@@ -50,7 +50,7 @@ function User_tshirt_score($user)
         WHERE `User`.`UID` = ?
         AND `UserWorkLog`.`work_timestamp` < ?
     ', [
-        $user['UID'],
+        $userId,
         time()
     ]);
     if (!isset($result_worklog['tshirt_score'])) {
@@ -245,7 +245,7 @@ function User_is_freeloader($user)
 {
     global $user;
 
-    return count(ShiftEntries_freeloaded_by_user($user)) >= config('max_freeloadable_shifts');
+    return count(ShiftEntries_freeloaded_by_user($user['UID'])) >= config('max_freeloadable_shifts');
 }
 
 /**
@@ -526,10 +526,10 @@ function User_generate_password_recovery_token(&$user)
  * @param array $user
  * @return float
  */
-function User_get_eligable_voucher_count(&$user)
+function User_get_eligable_voucher_count($user)
 {
     $voucher_settings = config('voucher_settings');
-    $shifts_done = count(ShiftEntries_finished_by_user($user));
+    $shifts_done = count(ShiftEntries_finished_by_user($user['UID']));
 
     $earned_vouchers = $user['got_voucher'] - $voucher_settings['initial_vouchers'];
     $eligable_vouchers = $shifts_done / $voucher_settings['shifts_per_voucher'] - $earned_vouchers;
-- 
cgit v1.2.3-70-g09d2