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/User_model.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

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-54-g00ecf