X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time.php;h=08a79ebd6c59bc6344bf389decb1f5bc0f2a7dee;hb=7fafd0cdc53c376b557a5504af53dacdfbcdb533;hp=b01cd9448e3af083d12ead44af7c976036195153;hpb=1fad211ab12fc66117094e33425f8414fccd2cfa;p=timetracker.git

diff --git a/time.php b/time.php
index b01cd944..08a79ebd 100644
--- a/time.php
+++ b/time.php
@@ -73,7 +73,7 @@ $cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? n
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
 if (in_array('iv', explode(',', $user->plugins))) {
-  if ($request->getMethod() == 'POST') {
+  if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
   } else 
@@ -213,73 +213,73 @@ if ($lock_interval > 0) {
 }
 
 // Submit.
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
 
     // 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 (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
     if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($errors->no()) {
+    if ($err->no()) {
       if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == '')))
-        $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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Insert record.
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
@@ -304,7 +304,7 @@ if ($request->getMethod() == 'POST') {
         header('Location: time.php');
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   else if ($request->getParameter('btn_stop')) {
@@ -330,7 +330,7 @@ if ($request->getMethod() == 'POST') {
           'note'=>$record['comment'],
           'billable'=>$record['billable']));
       if (!$res)
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record_id);
@@ -350,7 +350,7 @@ if ($request->getMethod() == 'POST') {
       exit();
     }
   }
-} // POST
+} // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);