database: updated checks for selectOne

10 files changed, 78 insertions, 82 deletions

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)) . ' 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());
     }