X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expense_delete.php;h=c5f53aa91f87e05ec1fa275c7b539db9dcdbed24;hb=ad98b13400fdc2fa2299a22c9bd54c4cd27960c3;hp=69ceb66302861c9352f31ee0b250139ec7d45397;hpb=fd3db1c1a2b975a23c907b2e9b714a0cfe47f3e0;p=timetracker.git

diff --git a/expense_delete.php b/expense_delete.php
index 69ceb663..c5f53aa9 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -32,7 +32,7 @@ import('DateAndTime');
 import('ttExpenseHelper');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('ex')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -43,39 +43,28 @@ $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->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
 
-    // Determine if it's okay to delete the record.
+    // 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'));
 
-    // 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 ($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();
   }
-} // POST
+} // isPost
 
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));