X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftime_edit.php;h=452baf29d6406f9447d0dad80db45e6a13752142;hb=b76e427286701104c84a869461ceb7339b1b943a;hp=052ec1f18b4f4e5ae0afcb9f1c6e3f8b5fec18f5;hpb=05b0f8e4762b8a2ca2002a8f7545b7ff68cc3925;p=timetracker.git

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 052ec1f1..452baf29 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -249,14 +249,6 @@ if ($request->isPost()) {
   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;
-  if ($lock_interval > 0) {
-    $lockdate = new DateAndTime();
-    $lockdate->decDay($lock_interval);
-  }
-
   // This is a new date for the time record.
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
@@ -270,18 +262,20 @@ if ($request->isPost()) {
   // Save record.
   if ($request->getParameter('btn_save')) {
     // We need to:
-    // 1) Prohibit saving locked time entries in any form.
-    // 2) Prohibit saving completed unlocked entries into locked interval.
+    // 1) Prohibit saving locked entries in any form.
+    // 2) Prohibit saving completed unlocked entries into locked range.
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
     if ($err->no()) {
-      // 1) Prohibit saving locked time entries in any form.
-      if($lockdate && $item_date->before($lockdate))
-        $err->add($i18n->getKey('error.period_locked'));
-      // 2) Prohibit saving completed unlocked entries into locked interval.
-      if($err->no() && $lockdate && $new_date->before($lockdate))
-        $err->add($i18n->getKey('error.period_locked'));
+      // 1) Prohibit saving locked entries in any form.
+      if ($user->isDateLocked($item_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
+      // 2) Prohibit saving completed unlocked entries into locked range.
+      if ($err->no() && $user->isDateLocked($new_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {