Fixed a problem with predefined expenses missing on mobile pages.

[timetracker.git] / time_delete.php

diff --git a/time_delete.php b/time_delete.php
index 84e7bc1..c501728 100644 (file)
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,42 +38,29 @@ if (!ttAccessCheck(right_data_entry)) {
   exit();
 }
 
-// Use Custom Fields plugin if we have one.
-// if (file_exists("plugins/CustomFields.class.php")) {
-//   require_once("plugins/CustomFields.class.php");
-//   $custom_fields = new CustomFields($user->team_id);
-// }
-
 $cl_id = $request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
 if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
-  
+
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
-        
-if ($request->getMethod() == 'POST') {
-  if ($request->getParameter('delete_button'))  {  // Delete button pressed.
-  
+
+if ($request->isPost()) {
+  if ($request->getParameter('delete_button')) { // Delete button pressed.
+
     // Determine if it's okay to delete the record.
     $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-    // Determine lock date.
-    $lock_interval = $user->lock_interval;
-    $lockdate = 0;
-    if ($lock_interval > 0) {
-      $lockdate = new DateAndTime();
-      $lockdate->decDay($lock_interval);
-    }
+
     // Determine if the record is uncompleted.
     $uncompleted = ($time_rec['duration'] == '0:00');
-       
-    if($lockdate && $item_date->before($lockdate) && !$uncompleted) {
-      $errors->add($i18n->getKey('error.period_locked'));
-    }
-           
-    if ($errors->isEmpty()) {
-       
+
+    if ($user->isDateLocked($item_date) && !$uncompleted)
+      $err->add($i18n->getKey('error.range_locked'));
+
+    if ($err->no()) {
+
       // Delete the record.
       $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
 
@@ -81,16 +68,16 @@ if ($request->getMethod() == 'POST') {
         header('Location: time.php');
         exit();
       } else {
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
       }
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.
-       header('Location: time.php');
-       exit();
+    header('Location: time.php');
+    exit();
   }
-}
-               
+} // isPost
+
 $form = new Form('timeRecordForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));