Fixed usage of isDateLocked()

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a4a6e9706abed0e6bd9dcdc54a446d671eeab2ff..d18884c22bb6034fede33c4bf4106daae2b4d8a2 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.9.21.3466 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.21.3467 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/expense_edit.php b/expense_edit.php
index e4d1d0561a2e35ba4a2f570b12ce2f221c90be0c..2a996543ca3d80f4e49bea8cc58d43e21377bb6a 100644 (file)
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -178,7 +178,7 @@ if ($request->isPost()) {
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.

-    if($lockdate && $new_date->before($lockdate))
+    if ($user->isDateLocked($new_date))

       $err->add($i18n->getKey('error.period_locked'));
 
     // Now, a new insert.
       $err->add($i18n->getKey('error.period_locked'));
 
     // Now, a new insert.

diff --git a/mobile/timer.php b/mobile/timer.php
index 1ccc78934e8f2b9178289ac77d7b11ccf2411fff..752ebca90077c3ba759c7997b8797d957c9d79d3 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -179,14 +179,6 @@ if ($custom_fields && $custom_fields->fields[0]) {
   }
 }
 
   }
 }
 

-// Determine lock date. Time entries earlier than lock date cannot be created or modified.
-$lock_interval = $user->lock_interval;
-$lockdate = 0;
-if ($lock_interval > 0) {
-  $lockdate = new DateAndTime();
-  $lockdate->decDay($lock_interval);
-}
-

 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_start')) {
 // Submit.
 if ($request->isPost()) {
   if ($request->getParameter('btn_start')) {


@@ -215,7 +207,7 @@ if ($request->isPost()) {
     }
 
     // Prohibit creating time entries in locked interval.
     }
 
     // Prohibit creating time entries in locked interval.

-    if($lockdate && $selected_date->before($lockdate))
+    if ($user->isDateLocked($selected_date))

       $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.
       $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.