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

diff --git a/expense_delete.php b/expense_delete.php
index d0b11cc8..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();
 }
@@ -46,21 +46,10 @@ if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
 if ($request->isPost()) {
   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))
-        $err->add($i18n->getKey('error.period_locked'));
-    }
+    // 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.
@@ -75,7 +64,7 @@ if ($request->isPost()) {
     header('Location: expenses.php');
     exit();
   }
-} // POST
+} // isPost
 
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));