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/user_worklog_controller.php | 60 ++++++++++++-------------
 1 file changed, 29 insertions(+), 31 deletions(-)

(limited to 'includes/controller/user_worklog_controller.php')

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
-- 
cgit v1.2.3-70-g09d2