From fe58e4f4220d6685b91bf516374e33936e1075e3 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 14 Jan 2018 17:47:26 +0100
Subject: database: updated checks for selectOne

---
 includes/controller/angeltypes_controller.php      |  6 +--
 includes/controller/event_config_controller.php    | 10 ++--
 includes/controller/rooms_controller.php           |  2 +-
 includes/controller/shift_entries_controller.php   | 12 ++---
 includes/controller/shifts_controller.php          |  8 +--
 includes/controller/shifttypes_controller.php      | 11 ++--
 includes/controller/user_angeltypes_controller.php | 24 ++++-----
 .../controller/user_driver_licenses_controller.php | 12 ++---
 includes/controller/user_worklog_controller.php    | 60 +++++++++++-----------
 includes/controller/users_controller.php           | 15 +++---
 10 files changed, 78 insertions(+), 82 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index 399930c2..210b6209 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -154,7 +154,7 @@ function angeltype_edit_controller()
         $angeltype['contact_email'] = strip_request_item('contact_email', $angeltype['contact_email']);
 
         if ($valid) {
-            if ($angeltype['id'] != null) {
+            if (!empty($angeltype['id'])) {
                 AngelType_update($angeltype);
             } else {
                 $angeltype = AngelType_create($angeltype);
@@ -308,7 +308,7 @@ function angeltypes_list_controller()
         }
 
         $angeltype['membership'] = AngelType_render_membership($angeltype);
-        if ($angeltype['user_angeltype_id'] != null) {
+        if (!empty($angeltype['user_angeltype_id'])) {
             $actions[] = button(
                 page_link_to('user_angeltypes',
                     ['action' => 'delete', 'user_angeltype_id' => $angeltype['user_angeltype_id']]
@@ -355,7 +355,7 @@ function load_angeltype()
     }
 
     $angeltype = AngelType($request->input('angeltype_id'));
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist . '));
         redirect(page_link_to('angeltypes'));
     }
diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php
index 4422f046..a18b6f42 100644
--- a/includes/controller/event_config_controller.php
+++ b/includes/controller/event_config_controller.php
@@ -28,7 +28,7 @@ function event_config_edit_controller()
     $teardown_end_date = null;
 
     $event_config = EventConfig();
-    if ($event_config != null) {
+    if (empty($event_config)) {
         $event_name = $event_config['event_name'];
         $buildup_start_date = $event_config['buildup_start_date'];
         $event_start_date = $event_config['event_start_date'];
@@ -70,22 +70,22 @@ function event_config_edit_controller()
         $teardown_end_date = $result->getValue();
         $valid &= $result->isValid();
 
-        if ($buildup_start_date != null && $event_start_date != null && $buildup_start_date > $event_start_date) {
+        if (!is_null($buildup_start_date) && !is_null($event_start_date) && $buildup_start_date > $event_start_date) {
             $valid = false;
             error(_('The buildup start date has to be before the event start date.'));
         }
 
-        if ($event_start_date != null && $event_end_date != null && $event_start_date > $event_end_date) {
+        if (!is_null($event_start_date) && !is_null($event_end_date) && $event_start_date > $event_end_date) {
             $valid = false;
             error(_('The event start date has to be before the event end date.'));
         }
 
-        if ($event_end_date != null && $teardown_end_date != null && $event_end_date > $teardown_end_date) {
+        if (!is_null($event_end_date) && !is_null($teardown_end_date) && $event_end_date > $teardown_end_date) {
             $valid = false;
             error(_('The event end date has to be before the teardown end date.'));
         }
 
-        if ($buildup_start_date != null && $teardown_end_date != null && $buildup_start_date > $teardown_end_date) {
+        if (!is_null($buildup_start_date) && !is_null($teardown_end_date) && $buildup_start_date > $teardown_end_date) {
             $valid = false;
             error(_('The buildup start date has to be before the teardown end date.'));
         }
diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php
index 596cb6d7..f95184f0 100644
--- a/includes/controller/rooms_controller.php
+++ b/includes/controller/rooms_controller.php
@@ -110,7 +110,7 @@ function load_room()
     }
 
     $room = Room(request()->input('room_id'));
-    if ($room == null) {
+    if (empty($room)) {
         redirect(page_link_to());
     }
 
diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index ea5e319e..dbed09af 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -16,7 +16,7 @@ function shift_entries_controller()
     }
 
     $action = strip_request_item('action');
-    if ($action == null) {
+    if (empty($action)) {
         redirect(user_link($user));
     }
 
@@ -43,7 +43,7 @@ function shift_entry_create_controller()
     }
 
     $shift = Shift($request->input('shift_id'));
-    if ($shift == null) {
+    if (empty($shift)) {
         redirect(user_link($user));
     }
 
@@ -53,7 +53,7 @@ function shift_entry_create_controller()
         return shift_entry_create_controller_admin($shift, $angeltype);
     }
 
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         redirect(user_link($user));
     }
 
@@ -81,7 +81,7 @@ function shift_entry_create_controller_admin($shift, $angeltype)
     if ($request->has('user_id')) {
         $signup_user = User($request->input('user_id'));
     }
-    if ($signup_user == null) {
+    if (empty($signup_user)) {
         redirect(shift_link($shift));
     }
 
@@ -89,7 +89,7 @@ function shift_entry_create_controller_admin($shift, $angeltype)
     if ($request->has('angeltype_id')) {
         $angeltype = AngelType($request->input('angeltype_id'));
     }
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         if (count($angeltypes) == 0) {
             redirect(shift_link($shift));
         }
@@ -321,7 +321,7 @@ function shift_entry_load()
         redirect(page_link_to('user_shifts'));
     }
     $shiftEntry = ShiftEntry($request->input('shift_entry_id'));
-    if ($shiftEntry == null) {
+    if (empty($shiftEntry)) {
         error(_('Shift entry not found.'));
         redirect(page_link_to('user_shifts'));
     }
diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 5930595e..326449cf 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -217,7 +217,7 @@ function shift_delete_controller()
     $shift_id = $request->input('delete_shift');
 
     $shift = Shift($shift_id);
-    if ($shift == null) {
+    if (empty($shift)) {
         redirect(page_link_to('user_shifts'));
     }
 
@@ -264,7 +264,7 @@ function shift_controller()
     }
 
     $shift = Shift($request->input('shift_id'));
-    if ($shift == null) {
+    if (empty($shift)) {
         error(_('Shift could not be found.'));
         redirect(page_link_to('user_shifts'));
     }
@@ -288,7 +288,7 @@ function shift_controller()
             $needed_angeltype,
             $shift_entries
         );
-        if ($shift_signup_state == null) {
+        if (empty($shift_signup_state)) {
             $shift_signup_state = $angeltype_signup_state;
         } else {
             $shift_signup_state->combineWith($angeltype_signup_state);
@@ -387,7 +387,7 @@ function shifts_json_export_controller()
     $key = $request->input('key');
 
     $user = User_by_api_key($key);
-    if ($user == null) {
+    if (empty($user)) {
         engelsystem_error('Key invalid.');
     }
     if (!in_array('shifts_json_export', privileges_for_user($user['UID']))) {
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index 4e7cd92c..bc9c5c52 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -22,8 +22,7 @@ function shifttype_delete_controller()
     }
 
     $shifttype = ShiftType($request->input('shifttype_id'));
-
-    if ($shifttype == null) {
+    if (empty($shifttype)) {
         redirect(page_link_to('shifttypes'));
     }
 
@@ -58,7 +57,7 @@ function shifttype_edit_controller()
 
     if ($request->has('shifttype_id')) {
         $shifttype = ShiftType($request->input('shifttype_id'));
-        if ($shifttype == null) {
+        if (empty($shifttype)) {
             error(_('Shifttype not found.'));
             redirect(page_link_to('shifttypes'));
         }
@@ -120,12 +119,12 @@ function shifttype_controller()
         redirect(page_link_to('shifttypes'));
     }
     $shifttype = ShiftType($request->input('shifttype_id'));
-    if ($shifttype == null) {
+    if (empty($shifttype)) {
         redirect(page_link_to('shifttypes'));
     }
 
-    $angeltype = null;
-    if ($shifttype['angeltype_id'] != null) {
+    $angeltype = [];
+    if (!empty($shifttype['angeltype_id'])) {
         $angeltype = AngelType($shifttype['angeltype_id']);
     }
 
diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index 340de2a4..5dae0595 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -45,7 +45,7 @@ function user_angeltypes_delete_all_controller()
     }
 
     $angeltype = AngelType($request->input('angeltype_id'));
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -85,7 +85,7 @@ function user_angeltypes_confirm_all_controller()
     }
 
     $angeltype = AngelType($request->input('angeltype_id'));
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -125,13 +125,13 @@ function user_angeltype_confirm_controller()
     }
 
     $user_angeltype = UserAngelType($request->input('user_angeltype_id'));
-    if ($user_angeltype == null) {
+    if (empty($user_angeltype)) {
         error(_('User angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
 
     $angeltype = AngelType($user_angeltype['angeltype_id']);
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -142,7 +142,7 @@ function user_angeltype_confirm_controller()
     }
 
     $user_source = User($user_angeltype['user_id']);
-    if ($user_source == null) {
+    if (empty($user_source)) {
         error(_('User doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -185,19 +185,19 @@ function user_angeltype_delete_controller()
     }
 
     $user_angeltype = UserAngelType($request->input('user_angeltype_id'));
-    if ($user_angeltype == null) {
+    if (empty($user_angeltype)) {
         error(_('User angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
 
     $angeltype = AngelType($user_angeltype['angeltype_id']);
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
 
     $user_source = User($user_angeltype['user_id']);
-    if ($user_source == null) {
+    if (empty($user_source)) {
         error(_('User doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -252,19 +252,19 @@ function user_angeltype_update_controller()
     }
 
     $user_angeltype = UserAngelType($request->input('user_angeltype_id'));
-    if ($user_angeltype == null) {
+    if (empty($user_angeltype)) {
         error(_('User angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
 
     $angeltype = AngelType($user_angeltype['angeltype_id']);
-    if ($angeltype == null) {
+    if (empty($angeltype)) {
         error(_('Angeltype doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
 
     $user_source = User($user_angeltype['user_id']);
-    if ($user_source == null) {
+    if (empty($user_source)) {
         error(_('User doesn\'t exist.'));
         redirect(page_link_to('angeltypes'));
     }
@@ -359,7 +359,7 @@ function user_angeltype_join_controller($angeltype)
     global $user, $privileges;
 
     $user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
-    if ($user_angeltype != null) {
+    if (!empty($user_angeltype)) {
         error(sprintf(_('You are already a %s.'), $angeltype['name']));
         redirect(page_link_to('angeltypes'));
     }
diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php
index 3db31eff..889b03e3 100644
--- a/includes/controller/user_driver_licenses_controller.php
+++ b/includes/controller/user_driver_licenses_controller.php
@@ -14,7 +14,7 @@ function user_driver_license_required_hint()
     $user_driver_license = UserDriverLicense($user['UID']);
 
     // User has already entered data, no hint needed.
-    if ($user_driver_license != null) {
+    if (!empty($user_driver_license)) {
         return null;
     }
 
@@ -60,7 +60,7 @@ function user_driver_licenses_controller()
  */
 function user_driver_license_edit_link($user = null)
 {
-    if ($user == null) {
+    if (empty($user)) {
         return page_link_to('user_driver_licenses');
     }
     return page_link_to('user_driver_licenses', ['user_id' => $user['UID']]);
@@ -79,7 +79,7 @@ function user_driver_license_load_user()
 
     if ($request->has('user_id')) {
         $user_source = User($request->input('user_id'));
-        if ($user_source == null) {
+        if (empty($user_source)) {
             redirect(user_driver_license_edit_link());
         }
     }
@@ -104,7 +104,7 @@ function user_driver_license_edit_controller()
     }
 
     $user_driver_license = UserDriverLicense($user_source['UID']);
-    if ($user_driver_license == null) {
+    if (empty($user_driver_license)) {
         $wants_to_drive = false;
         $user_driver_license = UserDriverLicense_new();
     } else {
@@ -122,7 +122,7 @@ function user_driver_license_edit_controller()
             $user_driver_license['has_license_forklift'] = $request->has('has_license_forklift');
 
             if (UserDriverLicense_valid($user_driver_license)) {
-                if ($user_driver_license['user_id'] == null) {
+                if (empty($user_driver_license['user_id'])) {
                     $user_driver_license = UserDriverLicenses_create($user_driver_license, $user_source);
                 } else {
                     UserDriverLicenses_update($user_driver_license);
@@ -133,7 +133,7 @@ function user_driver_license_edit_controller()
             } else {
                 error(_('Please select at least one driving license.'));
             }
-        } elseif ($user_driver_license['user_id'] != null) {
+        } elseif (!empty($user_driver_license['user_id'])) {
             UserDriverLicenses_delete($user_source['UID']);
             engelsystem_log('Driver license information removed.');
             success(_('Your driver license information has been removed.'));
diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php
index bd62c83c..1c3281ac 100644
--- a/includes/controller/user_worklog_controller.php
+++ b/includes/controller/user_worklog_controller.php
@@ -6,21 +6,21 @@
 function user_worklog_delete_controller()
 {
     global $user;
-    
+
     $request = request();
     $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
     if (empty($userWorkLog)) {
         redirect(user_link($user));
     }
     $user_source = User($userWorkLog['user_id']);
-    
+
     if ($request->has('confirmed')) {
         UserWorkLog_delete($userWorkLog);
-        
+
         success(_('Work log entry deleted.'));
         redirect(user_link($user_source));
     }
-    
+
     return [
         UserWorkLog_delete_title(),
         UserWorkLog_delete_view($user_source, $userWorkLog)
@@ -33,25 +33,25 @@ function user_worklog_delete_controller()
 function user_worklog_edit_controller()
 {
     global $user;
-    
+
     $request = request();
     $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
     if (empty($userWorkLog)) {
         redirect(user_link($user));
     }
     $user_source = User($userWorkLog['user_id']);
-    
+
     if ($request->has('submit')) {
         list ($valid, $userWorkLog) = user_worklog_from_request($userWorkLog);
-        
+
         if ($valid) {
             UserWorkLog_update($userWorkLog);
-            
+
             success(_('Work log entry updated.'));
             redirect(user_link($user_source));
         }
     }
-    
+
     return [
         UserWorkLog_edit_title(),
         UserWorkLog_edit_view($user_source, $userWorkLog)
@@ -60,33 +60,33 @@ function user_worklog_edit_controller()
 
 /**
  *
- * @param UserWorkLog $userWorkLog            
+ * @param UserWorkLog $userWorkLog
  * @return [bool $valid, UserWorkLog $userWorkLog]
  */
 function user_worklog_from_request($userWorkLog)
 {
     $request = request();
-    
+
     $valid = true;
-    
+
     $userWorkLog['work_timestamp'] = parse_date('Y-m-d H:i', $request->input('work_timestamp') . ' 00:00');
-    if ($userWorkLog['work_timestamp'] == null) {
+    if (is_null($userWorkLog['work_timestamp'])) {
         $valid = false;
         error(_('Please enter work date.'));
     }
-    
+
     $userWorkLog['work_hours'] = $request->input('work_hours');
     if (! preg_match("/[0-9]+(\.[0-9]+)?/", $userWorkLog['work_hours'])) {
         $valid = false;
         error(_('Please enter work hours in format ##[.##].'));
     }
-    
+
     $userWorkLog['comment'] = $request->input('comment');
     if (empty($userWorkLog['comment'])) {
         $valid = false;
         error(_('Please enter a comment.'));
     }
-    
+
     return [
         $valid,
         $userWorkLog
@@ -99,26 +99,26 @@ function user_worklog_from_request($userWorkLog)
 function user_worklog_add_controller()
 {
     global $user;
-    
+
     $request = request();
     $user_source = User($request->input('user_id'));
     if (empty($user_source)) {
         redirect(user_link($user));
     }
-    
+
     $userWorkLog = UserWorkLog_new($user_source);
-    
+
     if ($request->has('submit')) {
         list ($valid, $userWorkLog) = user_worklog_from_request($userWorkLog);
-        
+
         if ($valid) {
             UserWorkLog_create($userWorkLog);
-            
+
             success(_('Work log entry created.'));
             redirect(user_link($user_source));
         }
     }
-    
+
     return [
         UserWorkLog_add_title(),
         UserWorkLog_add_view($user_source, $userWorkLog)
@@ -128,7 +128,7 @@ function user_worklog_add_controller()
 /**
  * Link to work log entry add for given user.
  *
- * @param User $user            
+ * @param User $user
  */
 function user_worklog_add_link($user)
 {
@@ -141,7 +141,7 @@ function user_worklog_add_link($user)
 /**
  * Link to work log entry edit.
  *
- * @param UserWorkLog $userWorkLog            
+ * @param UserWorkLog $userWorkLog
  */
 function user_worklog_edit_link($userWorkLog)
 {
@@ -154,8 +154,8 @@ function user_worklog_edit_link($userWorkLog)
 /**
  * Link to work log entry delete.
  *
- * @param UserWorkLog $userWorkLog        
- * @param array[] $parameters    
+ * @param UserWorkLog $userWorkLog
+ * @param array[] $parameters
  */
 function user_worklog_delete_link($userWorkLog, $parameters = [])
 {
@@ -171,17 +171,17 @@ function user_worklog_delete_link($userWorkLog, $parameters = [])
 function user_worklogs_controller()
 {
     global $user, $privileges;
-    
+
     if (! in_array('admin_user_worklog', $privileges)) {
         redirect(user_link($user));
     }
-    
+
     $request = request();
     $action = $request->input('action');
     if (! $request->has('action')) {
         redirect(user_link($user));
     }
-    
+
     switch ($action) {
         case 'add':
             return user_worklog_add_controller();
@@ -191,5 +191,3 @@ function user_worklogs_controller()
             return user_worklog_delete_controller();
     }
 }
-
-?>
\ No newline at end of file
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 8a325621..b6334803 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -190,7 +190,7 @@ function user_controller()
     $user_source = $user;
     if ($request->has('user_id')) {
         $user_source = User($request->input('user_id'));
-        if ($user_source == null) {
+        if (empty($user_source)) {
             error(_('User not found.'));
             redirect(page_link_to('/'));
         }
@@ -220,12 +220,12 @@ function user_controller()
             );
         }
     }
-    
+
     if ($user_source['api_key'] == '') {
         User_reset_api_key($user_source, false);
     }
-    
-    if($user_source['force_active']) {
+
+    if ($user_source['force_active']) {
         $tshirt_score = _('Enough');
     } else {
         $tshirt_score = sprintf('%.2f', User_tshirt_score($user_source)) . '&nbsp;h';
@@ -297,7 +297,7 @@ function user_password_recovery_set_new_controller()
 {
     $request = request();
     $user_source = User_by_password_recovery_token($request->input('token'));
-    if ($user_source == null) {
+    if (empty($user_source)) {
         error(_('Token is not correct.'));
         redirect(page_link_to('login'));
     }
@@ -343,7 +343,7 @@ function user_password_recovery_start_controller()
             $email = strip_request_item('email');
             if (check_email($email)) {
                 $user_source = User_by_email($email);
-                if ($user_source == null) {
+                if (empty($user_source)) {
                     $valid = false;
                     error(_('E-mail address is not correct.'));
                 }
@@ -412,8 +412,7 @@ function load_user()
     }
 
     $user = User($request->input('user_id'));
-
-    if ($user == null) {
+    if (empty($user)) {
         error(_('User doesn\'t exist.'));
         redirect(page_link_to());
     }
-- 
cgit v1.2.3-54-g00ecf


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/controller/user_worklog_controller.php | 42 +++++++++-----
 includes/model/UserWorkLog_model.php            | 74 +++++++++++++++----------
 includes/model/User_model.php                   | 16 +++---
 includes/view/UserWorkLog_view.php              | 30 ++++++----
 includes/view/User_view.php                     | 58 +++++++++++++------
 public/index.php                                |  2 +-
 6 files changed, 143 insertions(+), 79 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php
index 1c3281ac..a7218071 100644
--- a/includes/controller/user_worklog_controller.php
+++ b/includes/controller/user_worklog_controller.php
@@ -2,6 +2,8 @@
 
 /**
  * Delete a work log entry.
+ *
+ * @return array
  */
 function user_worklog_delete_controller()
 {
@@ -29,6 +31,8 @@ function user_worklog_delete_controller()
 
 /**
  * Edit work log for user.
+ *
+ * @return array
  */
 function user_worklog_edit_controller()
 {
@@ -59,9 +63,10 @@ function user_worklog_edit_controller()
 }
 
 /**
+ * Handle form
  *
- * @param UserWorkLog $userWorkLog
- * @return [bool $valid, UserWorkLog $userWorkLog]
+ * @param array $userWorkLog
+ * @return array [bool $valid, UserWorkLog $userWorkLog]
  */
 function user_worklog_from_request($userWorkLog)
 {
@@ -69,14 +74,17 @@ function user_worklog_from_request($userWorkLog)
 
     $valid = true;
 
-    $userWorkLog['work_timestamp'] = parse_date('Y-m-d H:i', $request->input('work_timestamp') . ' 00:00');
+    $userWorkLog['work_timestamp'] = parse_date(
+        'Y-m-d H:i',
+        $request->input('work_timestamp') . ' 00:00'
+    );
     if (is_null($userWorkLog['work_timestamp'])) {
         $valid = false;
         error(_('Please enter work date.'));
     }
 
     $userWorkLog['work_hours'] = $request->input('work_hours');
-    if (! preg_match("/[0-9]+(\.[0-9]+)?/", $userWorkLog['work_hours'])) {
+    if (!preg_match("/[0-9]+(\.[0-9]+)?/", $userWorkLog['work_hours'])) {
         $valid = false;
         error(_('Please enter work hours in format ##[.##].'));
     }
@@ -95,6 +103,8 @@ function user_worklog_from_request($userWorkLog)
 
 /**
  * Add work log entry to user.
+ *
+ * @return array
  */
 function user_worklog_add_controller()
 {
@@ -128,12 +138,14 @@ function user_worklog_add_controller()
 /**
  * Link to work log entry add for given user.
  *
- * @param User $user
+ * @param array $user
+ *
+ * @return string
  */
 function user_worklog_add_link($user)
 {
     return page_link_to('user_worklog', [
-        'action' => 'add',
+        'action'  => 'add',
         'user_id' => $user['UID']
     ]);
 }
@@ -141,12 +153,13 @@ function user_worklog_add_link($user)
 /**
  * Link to work log entry edit.
  *
- * @param UserWorkLog $userWorkLog
+ * @param array $userWorkLog
+ * @return string
  */
 function user_worklog_edit_link($userWorkLog)
 {
     return page_link_to('user_worklog', [
-        'action' => 'edit',
+        'action'          => 'edit',
         'user_worklog_id' => $userWorkLog['id']
     ]);
 }
@@ -154,31 +167,34 @@ function user_worklog_edit_link($userWorkLog)
 /**
  * Link to work log entry delete.
  *
- * @param UserWorkLog $userWorkLog
+ * @param array   $userWorkLog
  * @param array[] $parameters
+ * @return string
  */
 function user_worklog_delete_link($userWorkLog, $parameters = [])
 {
     return page_link_to('user_worklog', array_merge([
-        'action' => 'delete',
+        'action'          => 'delete',
         'user_worklog_id' => $userWorkLog['id']
     ], $parameters));
 }
 
 /**
  * Work log entry actions
+ *
+ * @return array
  */
-function user_worklogs_controller()
+function user_worklog_controller()
 {
     global $user, $privileges;
 
-    if (! in_array('admin_user_worklog', $privileges)) {
+    if (!in_array('admin_user_worklog', $privileges)) {
         redirect(user_link($user));
     }
 
     $request = request();
     $action = $request->input('action');
-    if (! $request->has('action')) {
+    if (!$request->has('action')) {
         redirect(user_link($user));
     }
 
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);
     }
diff --git a/includes/view/UserWorkLog_view.php b/includes/view/UserWorkLog_view.php
index 79c049b3..772d4aee 100644
--- a/includes/view/UserWorkLog_view.php
+++ b/includes/view/UserWorkLog_view.php
@@ -2,13 +2,18 @@
 
 /**
  * Delete work log entry.
- * @param User $user_source
- * @param UserWorkLog $userWorkLog
+ *
+ * @param array $user_source
+ * @param array $userWorkLog
+ * @return string
  */
 function UserWorkLog_delete_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_delete_title(), [
-        info(sprintf(_('Do you want to delete the worklog entry for %s?'), User_Nick_render($user_source)), true),
+        info(sprintf(
+            _('Do you want to delete the worklog entry for %s?'),
+            User_Nick_render($user_source)
+        ), true),
         buttons([
             button(user_link($user_source), glyph('remove') . _('cancel')),
             button(user_worklog_delete_link($userWorkLog, [
@@ -28,9 +33,10 @@ function UserWorkLog_delete_title()
 
 /**
  * Render edit table.
- * 
- * @param User $user_source            
- * @param UserWorkLog $userWorkLog            
+ *
+ * @param array $user_source
+ * @param array $userWorkLog
+ * @return string
  */
 function UserWorkLog_edit_form($user_source, $userWorkLog)
 {
@@ -46,8 +52,9 @@ function UserWorkLog_edit_form($user_source, $userWorkLog)
 /**
  * Form for edit a user work log entry.
  *
- * @param User $user_source            
- * @param UserWorkLog $userWorkLog            
+ * @param array $user_source
+ * @param array $userWorkLog
+ * @return string
  */
 function UserWorkLog_edit_view($user_source, $userWorkLog)
 {
@@ -63,8 +70,9 @@ function UserWorkLog_edit_view($user_source, $userWorkLog)
 /**
  * Form for adding a user work log entry.
  *
- * @param User $user_source            
- * @param UserWorkLog $userWorkLog            
+ * @param array $user_source
+ * @param array $userWorkLog
+ * @return string
  */
 function UserWorkLog_add_view($user_source, $userWorkLog)
 {
@@ -92,5 +100,3 @@ function UserWorkLog_add_title()
 {
     return _('Add work log entry');
 }
-
-?>
\ No newline at end of file
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index cc468bd2..8eee610a 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -406,10 +406,21 @@ function User_view_myshift($shift, $user_source, $its_me)
  * @param array[] $shifts
  * @param array   $user_source
  * @param bool    $its_me
+ * @param int     $tshirt_score
+ * @param bool    $tshirt_admin
+ * @param array[] $user_worklogs
+ * @param         $admin_user_worklog_privilege
  * @return array
  */
-function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin, $user_worklogs, $admin_user_worklog_privilege)
-{
+function User_view_myshifts(
+    $shifts,
+    $user_source,
+    $its_me,
+    $tshirt_score,
+    $tshirt_admin,
+    $user_worklogs,
+    $admin_user_worklog_privilege
+) {
     $myshifts_table = [];
     $timesum = 0;
     foreach ($shifts as $shift) {
@@ -420,8 +431,8 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
         }
     }
 
-    if($its_me || $admin_user_worklog_privilege) {
-        foreach($user_worklogs as $worklog) {
+    if ($its_me || $admin_user_worklog_privilege) {
+        foreach ($user_worklogs as $worklog) {
             $myshifts_table[$worklog['work_timestamp']] = User_view_worklog($worklog, $admin_user_worklog_privilege);
             $timesum += $worklog['work_hours'] * 3600;
         }
@@ -453,12 +464,15 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
 
 /**
  * Renders table entry for user work log
- * @param UserWorkLog $worklog
- * @param bool $admin_user_worklog_privilege
+ *
+ * @param array $worklog
+ * @param bool  $admin_user_worklog_privilege
+ * @return array
  */
-function User_view_worklog($worklog, $admin_user_worklog_privilege) {
+function User_view_worklog($worklog, $admin_user_worklog_privilege)
+{
     $actions = '';
-    if($admin_user_worklog_privilege) {
+    if ($admin_user_worklog_privilege) {
         $actions = table_buttons([
             button(
                 user_worklog_edit_link($worklog),
@@ -479,11 +493,11 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
         'room'       => '',
         'shift_info' => _('Work log entry'),
         'comment'    => $worklog['comment'] . '<br>'
-                        . sprintf(
-                            _('Added by %s at %s'),
-                            User_Nick_render(User($worklog['created_user_id'])),
-                            date('Y-m-d H:i', $worklog['created_timestamp'])
-                        ),
+            . sprintf(
+                _('Added by %s at %s'),
+                User_Nick_render(User($worklog['created_user_id'])),
+                date('Y-m-d H:i', $worklog['created_timestamp'])
+            ),
         'actions'    => $actions
     ];
 }
@@ -500,6 +514,8 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
  * @param bool    $its_me
  * @param int     $tshirt_score
  * @param bool    $tshirt_admin
+ * @param bool    $admin_user_worklog_privilege
+ * @param array[] $user_worklogs
  * @return string
  */
 function User_view(
@@ -517,9 +533,17 @@ function User_view(
 ) {
     $user_name = htmlspecialchars($user_source['Vorname']) . ' ' . htmlspecialchars($user_source['Name']);
     $myshifts_table = '';
-    if($its_me || $admin_user_privilege) {
-        $my_shifts = User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin, $user_worklogs, $admin_user_worklog_privilege);
-        if(count($my_shifts) > 0) {
+    if ($its_me || $admin_user_privilege) {
+        $my_shifts = User_view_myshifts(
+            $shifts,
+            $user_source,
+            $its_me,
+            $tshirt_score,
+            $tshirt_admin,
+            $user_worklogs,
+            $admin_user_worklog_privilege
+        );
+        if (count($my_shifts) > 0) {
             $myshifts_table = table([
                 'date'       => _('Day &amp; time'),
                 'duration'   => _('Duration'),
@@ -528,7 +552,7 @@ function User_view(
                 'comment'    => _('Comment'),
                 'actions'    => _('Action')
             ], $my_shifts);
-        } elseif($user_source['force_active']) {
+        } elseif ($user_source['force_active']) {
             $myshifts_table = success(_('You have done enough to get a t-shirt.'), true);
         }
     }
diff --git a/public/index.php b/public/index.php
index adf22e71..db4c4294 100644
--- a/public/index.php
+++ b/public/index.php
@@ -132,7 +132,7 @@ if (
             $content = user_shifts();
             break;
         case 'user_worklog':
-            list($title, $content) = user_worklogs_controller();
+            list($title, $content) = user_worklog_controller();
             break;
         case 'user_messages':
             $title = messages_title();
-- 
cgit v1.2.3-54-g00ecf


From 646ffc19107999a1cdcd1c897fbb6d28d520bb13 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 14 Jan 2018 18:47:15 +0100
Subject: $bugfixes...

---
 includes/controller/event_config_controller.php | 2 +-
 includes/sys_page.php                           | 3 ++-
 tests/Feature/Model/RoomModelTest.php           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php
index a18b6f42..e64f47fd 100644
--- a/includes/controller/event_config_controller.php
+++ b/includes/controller/event_config_controller.php
@@ -28,7 +28,7 @@ function event_config_edit_controller()
     $teardown_end_date = null;
 
     $event_config = EventConfig();
-    if (empty($event_config)) {
+    if (!empty($event_config)) {
         $event_name = $event_config['event_name'];
         $buildup_start_date = $event_config['buildup_start_date'];
         $event_start_date = $event_config['event_start_date'];
diff --git a/includes/sys_page.php b/includes/sys_page.php
index 355a915f..55fb3b38 100644
--- a/includes/sys_page.php
+++ b/includes/sys_page.php
@@ -42,9 +42,10 @@ function check_request_datetime($date_name, $time_name, $allowed_days, $default_
 function parse_date($pattern, $value)
 {
     $datetime = DateTime::createFromFormat($pattern, trim($value));
-    if (is_null($datetime)) {
+    if (!$datetime) {
         return null;
     }
+
     return $datetime->getTimestamp();
 }
 
diff --git a/tests/Feature/Model/RoomModelTest.php b/tests/Feature/Model/RoomModelTest.php
index 4edb20c3..22aa4b8e 100644
--- a/tests/Feature/Model/RoomModelTest.php
+++ b/tests/Feature/Model/RoomModelTest.php
@@ -24,11 +24,11 @@ class RoomModelTest extends TestCase
 
         $room = Room($this->room_id);
 
-        $this->assertNotFalse($room);
+        $this->assertNotEmpty($room);
         $this->assertNotNull($room);
         $this->assertEquals($room['Name'], 'test');
 
-        $this->assertNull(Room(-1));
+        $this->assertEmpty(Room(-1));
     }
 
     public function tearDown()
-- 
cgit v1.2.3-54-g00ecf


From 1090d5e889827056e445b5c1fe0fa7f8e395d8ec Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Tue, 28 Aug 2018 18:28:09 +0200
Subject: Update shifts_controller.php

fix problem when missing needed angeltype entry
---
 includes/controller/shifts_controller.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index b8ed0180..7cac5b4a 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -277,6 +277,10 @@ function shift_controller()
     $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
     foreach ($angeltypes as &$angeltype) {
         $needed_angeltype = NeededAngeltype_by_Shift_and_Angeltype($shift, $angeltype);
+        if(empty($needed_angeltype)) {
+            continue;
+        }
+        
         $shift_entries = ShiftEntries_by_shift_and_angeltype($shift['SID'], $angeltype['id']);
 
         $angeltype_signup_state = Shift_signup_allowed(
@@ -288,11 +292,7 @@ function shift_controller()
             $needed_angeltype,
             $shift_entries
         );
-        if (empty($shift_signup_state)) {
-            $shift_signup_state = $angeltype_signup_state;
-        } else {
-            $shift_signup_state->combineWith($angeltype_signup_state);
-        }
+        $shift_signup_state->combineWith($angeltype_signup_state);
         $angeltype['shift_signup_state'] = $angeltype_signup_state;
     }
 
-- 
cgit v1.2.3-54-g00ecf