X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expense_delete.php;h=38800b629d21fc1687022abccaa470a7013c9bd7;hb=11441db31dcbed7b2070e800bcb1b0e6547b86bd;hp=bb8f5597984a16dd31f42977ea8fa2ef56242f8c;hpb=cd50de0c97ad2c93e786aa20778352647d3b3a10;p=timetracker.git

diff --git a/expense_delete.php b/expense_delete.php
index bb8f5597..38800b62 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -36,47 +36,36 @@ if (!ttAccessCheck(right_data_entry)) {
   header('Location: access_denied.php');
   exit();
 }
-  
+
 $cl_id = $request->getParameter('id');
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
 if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
-  
-if ($request->getMethod() == 'POST') {
-  if ($request->getParameter('delete_button'))  {  // Delete button pressed.
-  
-    // Determine if it's okay to delete the record.
 
-    // Determine lock date.
-    $lock_interval = $user->lock_interval;
-    $lockdate = 0;
-    if ($lock_interval > 0) {
-      $lockdate = new DateAndTime();
-      $lockdate->decDay($lock_interval);
-    }
-    if ($lockdate) {
-      $item_date = new DateAndTime(DB_DATEFORMAT);
-      $item_date->parseVal($expense_item['date'], DB_DATEFORMAT);
-      if ($item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
-    }
-           
-    if ($errors->isEmpty()) {
+if ($request->isPost()) {
+  if ($request->getParameter('delete_button')) { // Delete button pressed.
+
+    // Determine if it is okay to delete the record.
+    $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
+    if ($user->isDateLocked($item_date))
+      $err->add($i18n->getKey('error.range_locked'));
+
+    if ($err->no()) {
       // Mark the record as deleted.
       if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
         header('Location: expenses.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: expenses.php');
     exit();
   }
-}
-		
+} // isPost
+
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
@@ -87,4 +76,3 @@ $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.delete_expense'));
 $smarty->assign('content_page_name', 'expense_delete.tpl');
 $smarty->display('index.tpl');
-