Getting rid of PHP Deprecated warnings.

[timetracker.git] / time_edit.php

diff --git a/time_edit.php b/time_edit.php
index a3421a8..d486d65 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -95,7 +95,7 @@ if ($request->isPost()) {
   $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')) {
+  if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
     $cl_finish = '';
     $cl_duration = '';
     $msg->add($i18n->getKey('form.time_edit.uncompleted'));
@@ -250,14 +250,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);
 
@@ -277,12 +269,14 @@ if ($request->isPost()) {
 
     // 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) {
@@ -333,14 +327,15 @@ if ($request->isPost()) {
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
-    // 1) Prohibit saving into locked interval.
+    // 1) Prohibit saving into locked range.
     // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
     if ($err->no()) {
-      // 1) Prohibit saving into locked interval.
-      if($lockdate && $new_date->before($lockdate))
-        $err->add($i18n->getKey('error.period_locked'));
+      // 1) Prohibit saving into locked range.
+      if ($user->isDateLocked($new_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {