From 5227fe6a94bd8b510aa49b40bfb36fad73ae4afb Mon Sep 17 00:00:00 2001
From: Bot <bot@myigel.name>
Date: Sun, 14 Jan 2018 18:09:34 +0100
Subject: Formatting

---
 includes/model/UserWorkLog_model.php | 74 ++++++++++++++++++++++--------------
 includes/model/User_model.php        | 16 ++++----
 2 files changed, 54 insertions(+), 36 deletions(-)

(limited to 'includes/model')

diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
index 36442943..df0ec8f6 100644
--- a/includes/model/UserWorkLog_model.php
+++ b/includes/model/UserWorkLog_model.php
@@ -1,10 +1,12 @@
 <?php
+
 use Engelsystem\Database\Db;
 
 /**
  * Load a single work log entry.
- * 
- * @param int $user_worklog_id            
+ *
+ * @param int $user_worklog_id
+ * @return array
  */
 function UserWorkLog($user_worklog_id)
 {
@@ -15,8 +17,9 @@ function UserWorkLog($user_worklog_id)
 
 /**
  * Returns all work log entries for a user.
- * 
- * @param User $user            
+ *
+ * @param array $user
+ * @return array[]
  */
 function UserWorkLogsForUser($user)
 {
@@ -27,8 +30,9 @@ function UserWorkLogsForUser($user)
 
 /**
  * Delete a work log entry.
- * 
- * @param UserWorkLog $userWorkLog            
+ *
+ * @param $userWorkLog
+ * @return int
  */
 function UserWorkLog_delete($userWorkLog)
 {
@@ -36,21 +40,27 @@ function UserWorkLog_delete($userWorkLog)
     $result = Db::delete("DELETE FROM `UserWorkLog` WHERE `id`=?", [
         $userWorkLog['id']
     ]);
-    
-    engelsystem_log(sprintf('Delete work log for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
-    
+
+    engelsystem_log(sprintf(
+        'Delete work log for %s, %s hours, %s',
+        User_Nick_render($user_source),
+        $userWorkLog['work_hours'],
+        $userWorkLog['comment']
+    ));
+
     return $result;
 }
 
 /**
  * Update work log entry (only work hours and comment)
- * 
- * @param UserWorkLog $userWorkLog            
+ *
+ * @param $userWorkLog
+ * @return int
  */
 function UserWorkLog_update($userWorkLog)
 {
     $user_source = User($userWorkLog['user_id']);
-    
+
     $result = Db::update("UPDATE `UserWorkLog` SET
         `work_timestamp`=?,
         `work_hours`=?,
@@ -61,23 +71,29 @@ function UserWorkLog_update($userWorkLog)
         $userWorkLog['comment'],
         $userWorkLog['id']
     ]);
-    
-    engelsystem_log(sprintf('Updated work log for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
-    
+
+    engelsystem_log(sprintf(
+            'Updated work log for %s, %s hours, %s',
+            User_Nick_render($user_source),
+            $userWorkLog['work_hours'],
+            $userWorkLog['comment'])
+    );
+
     return $result;
 }
 
 /**
  * Create a new work log entry
- * 
- * @param UserWorkLog $userWorkLog            
+ *
+ * @param $userWorkLog
+ * @return bool
  */
 function UserWorkLog_create($userWorkLog)
 {
     global $user;
-    
+
     $user_source = User($userWorkLog['user_id']);
-    
+
     $result = Db::insert("INSERT INTO `UserWorkLog` (
             `user_id`,
             `work_timestamp`,
@@ -94,30 +110,30 @@ function UserWorkLog_create($userWorkLog)
         $user['UID'],
         time()
     ]);
-    
-    engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
-    
+
+    engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s', User_Nick_render($user_source),
+        $userWorkLog['work_hours'], $userWorkLog['comment']));
+
     return $result;
 }
 
 /**
  * New user work log entry
  *
- * @param array[] $user            
+ * @param array[] $user
+ * @return array
  */
 function UserWorkLog_new($user)
 {
     $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', time()));
     $event_config = EventConfig();
-    if (! empty($event_config['buildup_start_date'])) {
+    if (!empty($event_config['buildup_start_date'])) {
         $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', $event_config['buildup_start_date']));
     }
     return [
-        'user_id' => $user['UID'],
+        'user_id'        => $user['UID'],
         'work_timestamp' => $work_date,
-        'work_hours' => 0,
-        'comment' => ''
+        'work_hours'     => 0,
+        'comment'        => ''
     ];
 }
-
-?>
\ No newline at end of file
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index a439b199..70a03736 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -20,12 +20,14 @@ function User_delete($user_id)
 /**
  * Returns the tshirt score (number of hours counted for tshirt).
  * Accounts only ended shifts.
- * 
+ *
  * @param array[] $user
+ * @return int
  */
-function User_tshirt_score($user) {
+function User_tshirt_score($user)
+{
     $shift_sum_formula = config('shift_sum_formula');
-    
+
     $result_shifts = DB::selectOne('
         SELECT ROUND((' . $shift_sum_formula . ') / 3600, 2) AS `tshirt_score`
         FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
@@ -33,7 +35,7 @@ function User_tshirt_score($user) {
         WHERE `User`.`UID` = ?
         AND `Shifts`.`end` < ?
         GROUP BY `User`.`UID`
-    ',[
+    ', [
         $user['UID'],
         time()
     ]);
@@ -43,11 +45,11 @@ function User_tshirt_score($user) {
         LEFT JOIN `UserWorkLog` ON `User`.`UID` = `UserWorkLog`.`user_id`
         WHERE `User`.`UID` = ?
         AND `UserWorkLog`.`work_timestamp` < ?
-    ',[
+    ', [
         $user['UID'],
         time()
     ]);
-    
+
     return $result_shifts['tshirt_score'] + $result_worklog['tshirt_score'];
 }
 
@@ -385,7 +387,7 @@ function User_validate_planned_departure_date($planned_arrival_date, $planned_de
         return new ValidationResult(false, $planned_arrival_date);
     }
     $event_config = EventConfig();
-    if (empty($event_config )) {
+    if (empty($event_config)) {
         // Nothing to validate against
         return new ValidationResult(true, $planned_departure_date);
     }
-- 
cgit v1.2.3-70-g09d2