X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=b3756b44e891cea73801431248b54f26807dc38d;hb=61454f100b86e1f68bbbc7d14de64e8796b3d51f;hp=c66ae578fb5ba9ad59ac0412777d3500c5c419ac;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index c66ae578..b3756b44 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -98,7 +98,7 @@ if ($request->isPost()) {
   if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
     $cl_finish = '';
     $cl_duration = '';
-    $messages->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }
 
@@ -212,42 +212,42 @@ 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.
@@ -265,7 +265,7 @@ if ($request->isPost()) {
   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.
@@ -276,32 +276,32 @@ if ($request->isPost()) {
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
+    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->no() && $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->no()) {
+    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->no()) {
+    if ($err->no()) {
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -337,29 +337,29 @@ if ($request->isPost()) {
     // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
+    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->no()) {
+    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->no()) {
+    if ($err->no()) {
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -385,7 +385,7 @@ if ($request->isPost()) {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
 
@@ -393,7 +393,7 @@ if ($request->isPost()) {
     header("Location: time_delete.php?id=$cl_id");
     exit();
   }
-} // POST
+} // isPost
 
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);