X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=2dca2447c161f8ccab3df36528885964114348b1;hb=eb55e2f8ca3859482a389795e03b45283e14ef36;hp=01d1797bc8a73dcf0aad0d5e2d5807c014b559ae;hpb=74704a7d4ecfb939bbcddeeec397b9de3b85bd2f;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index 01d1797b..2dca2447 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -56,10 +56,10 @@ $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-  
+
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_start = trim($request->getParameter('start'));
   $cl_finish = trim($request->getParameter('finish'));
   $cl_duration = trim($request->getParameter('duration'));
@@ -79,21 +79,21 @@ if ($request->getMethod() == 'POST') {
   $cl_start = $time_rec['start'];
   $cl_finish = $time_rec['finish'];
   $cl_duration = $time_rec['duration'];
-  $cl_date	= $item_date->toString($user->date_format);
+  $cl_date = $item_date->toString($user->date_format);
   $cl_note = $time_rec['comment'];
-    
+
   // If we have custom fields - obtain values for them.
   if ($custom_fields) {
     // Get custom field value for time record.
-  	$fields = $custom_fields->get($time_rec['id']);
-  	if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+    $fields = $custom_fields->get($time_rec['id']);
+    if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
       $cl_cf_1 = $fields[0]['value'];
     else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
       $cl_cf_1 = $fields[0]['option_id'];
   }
-  
+
   $cl_billable = $time_rec['billable'];
-  
+
   // Add an info message to the form if we are editing an uncompleted record.
   if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
     $cl_finish = '';
@@ -101,22 +101,21 @@ if ($request->getMethod() == 'POST') {
     $messages->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }
-  
+
 // Initialize elements of 'timeRecordForm'.
 $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plugins))) {
-    $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'fillProjectDropdown(this.value);',
-      'name'=>'client',
-      'style'=>'width: 250px;',
-      'value'=>$cl_client,
-      'data'=>$active_clients,
-      'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-    ));
+  $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
+  $form->addInput(array('type'=>'combobox',
+    'onchange'=>'fillProjectDropdown(this.value);',
+    'name'=>'client',
+    'style'=>'width: 250px;',
+    'value'=>$cl_client,
+    'data'=>$active_clients,
+    'datakeys'=>array('id', 'name'),
+    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
   // Note: in other modes the client list is filtered to relevant clients only. See below.
 }
 
@@ -130,13 +129,12 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
     'value'=>$cl_project,
     'data'=>$project_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-  ));
+    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
   if (in_array('cl', explode(',', $user->plugins))) {
     $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
-    // We need an array of assigned project ids to do some trimming. 
+    // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
 
@@ -158,8 +156,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
       'value'=>$cl_client,
       'data'=>$client_list,
       'datakeys'=>array('id', 'name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-    ));
+      'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
   }
 }
 
@@ -171,10 +168,9 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     'value'=>$cl_task,
     'data'=>$task_list,
     'datakeys'=>array('id','name'),
-    'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-  ));
+    'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
 }
-  
+
 // Add other controls.
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
@@ -183,7 +179,7 @@ if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type
 if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
   // Make the start and finish fields read-only.
   $form->getElement('start')->setEnable(false);
-  $form->getElement('finish')->setEnable(false);	
+  $form->getElement('finish')->setEnable(false);
 }
 if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
@@ -193,15 +189,14 @@ $form->addInput(array('type'=>'textarea','name'=>'note','style'=>'width: 250px;
 if ($custom_fields && $custom_fields->fields[0]) {
   // Only one custom field is supported at this time.
   if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
-  	$form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
+    $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
   } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
     $form->addInput(array('type'=>'combobox',
       'name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
       'data'=>$custom_fields->options,
-      'empty' => array('' => $i18n->getKey('dropdown.select'))
-    ));
+      'empty' => array('' => $i18n->getKey('dropdown.select'))));
   }
 }
 // Hidden control for record id.
@@ -213,48 +208,48 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_to
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
 
   // Validate user input.
   if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-    $errors->add($i18n->getKey('error.client'));
+    $err->add($i18n->getKey('error.client'));
   if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->getKey('error.project'));
   }
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+    if (!$cl_task) $err->add($i18n->getKey('error.task'));
   }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
     else if ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
     }
   } else {
     if (!ttTimeHelper::isValidDuration($cl_duration))
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
   // Finished validating user input.
-      
+
   // Determine lock date.
   $lock_interval = $user->lock_interval;
   $lockdate = 0;
@@ -270,7 +265,7 @@ if ($request->getMethod() == 'POST') {
   if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $errors->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->getKey('error.future_date'));
   }
 
   // Save record.
@@ -279,47 +274,47 @@ if ($request->getMethod() == 'POST') {
     // 1) Prohibit saving locked time entries in any form.
     // 2) Prohibit saving completed unlocked entries into locked interval.
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      
+
     // Now, step by step.
-    if ($errors->isEmpty()) {
+    if ($err->no()) {
       // 1) Prohibit saving locked time entries in any form.
       if($lockdate && $item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));        
+        $err->add($i18n->getKey('error.period_locked'));
       // 2) Prohibit saving completed unlocked entries into locked interval.
-      if($errors->isEmpty() && $lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));        
+      if($err->no() && $lockdate && $new_date->before($lockdate))
+        $err->add($i18n->getKey('error.period_locked'));
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
         }
       }
     }
-    
+
     // Prohibit creating an overlapping record.
-    if ($errors->isEmpty()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $errors->add($i18n->getKey('error.overlap'));
-    } 
+        $err->add($i18n->getKey('error.overlap'));
+    }
 
     // Now, an update.
-    if ($errors->isEmpty()) {
+    if ($err->no()) {
       $res = ttTimeHelper::update(array(
-          'id'=>$cl_id,  
-          'date'=>$new_date->toString(DB_DATEFORMAT),
-          'user_id'=>$user->getActiveUser(),
-          'client'=>$cl_client,
-          'project'=>$cl_project,
-          'task'=>$cl_task,
-          'start'=>$cl_start,
-          'finish'=>$cl_finish,
-          'duration'=>$cl_duration,
-          'note'=>$cl_note,
-          'billable'=>$cl_billable));
-      	
+        'id'=>$cl_id,
+        'date'=>$new_date->toString(DB_DATEFORMAT),
+        'user_id'=>$user->getActiveUser(),
+        'client'=>$cl_client,
+        'project'=>$cl_project,
+        'task'=>$cl_task,
+        'start'=>$cl_start,
+        'finish'=>$cl_finish,
+        'duration'=>$cl_duration,
+        'note'=>$cl_note,
+        'billable'=>$cl_billable));
+
       // If we have custom fields - update values.
       if ($res && $custom_fields) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
@@ -334,38 +329,38 @@ if ($request->getMethod() == 'POST') {
       }
     }
   }
-      
+
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
     // 1) Prohibit saving into locked interval.
     // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
-      
+
     // Now, step by step.
-    if ($errors->isEmpty()) {
+    if ($err->no()) {
       // 1) Prohibit saving into locked interval.
       if($lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.period_locked'));
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
         }
       }
     }
-    
+
     // Prohibit creating an overlapping record.
-    if ($errors->isEmpty()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, a new insert.
-    if ($errors->isEmpty()) {
-      	
+    if ($err->no()) {
+
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
         'user_id'=>$user->getActiveUser(),
@@ -390,15 +385,15 @@ if ($request->getMethod() == 'POST') {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
-  
+
   if ($request->getParameter('btn_delete')) {
     header("Location: time_delete.php?id=$cl_id");
     exit();
   }
-} // End of if ($request->getMethod() == "POST")
+} // isPost
 
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);