X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=expense_edit.php;h=213cfcba739e8b280ae8a414d7cbaff4e38bbc91;hb=11441db31dcbed7b2070e800bcb1b0e6547b86bd;hp=16b9abba712f4ee438969b43d874645bd2a57e9a;hpb=0dfc4dda20c54e173938eaf196f8e071ce790830;p=timetracker.git

diff --git a/expense_edit.php b/expense_edit.php
index 16b9abba..213cfcba 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -140,14 +140,6 @@ if ($request->isPost()) {
   if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
   if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
 
-  // 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 expense item.
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
@@ -161,16 +153,17 @@ if ($request->isPost()) {
   // Save record.
   if ($request->getParameter('btn_save')) {
     // We need to:
-    // 1) Prohibit updating locked entries (that are in locked interval).
-    // 2) Prohibit saving unlocked entries into locked interval.
+    // 1) Prohibit updating locked entries (that are in locked range).
+    // 2) Prohibit saving unlocked entries into locked range.
 
     // Now, step by step.
-    // 1) Prohibit updating locked entries.
-    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 unlocked entries into locked range.
+    if ($err->no() && $user->isDateLocked($new_date))
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Now, an update.
     if ($err->no()) {
@@ -185,8 +178,8 @@ if ($request->isPost()) {
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
-    if($lockdate && $new_date->before($lockdate))
-      $err->add($i18n->getKey('error.period_locked'));
+    if ($user->isDateLocked($new_date))
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Now, a new insert.
     if ($err->no()) {