X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/55c8f6a2bce9518c28337b18823b8300d1875ab8..fb3ac3aef52d4ab63ab302443185be73eca4121e:/expense_edit.php

diff --git a/expense_edit.php b/expense_edit.php
index e4d1d056..2f026917 100644
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -33,7 +33,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();
 }
@@ -159,11 +159,11 @@ if ($request->isPost()) {
     // Now, step by step.
     // 1) Prohibit saving locked entries in any form.
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.range_locked'));
 
     // 2) Prohibit saving unlocked entries into locked range.
     if ($err->no() && $user->isDateLocked($new_date))
-      $err->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Now, an update.
     if ($err->no()) {
@@ -178,8 +178,8 @@ if ($request->isPost()) {
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
-    if($lockdate && $new_date->before($lockdate))
-      $err->add($i18n->getKey('error.period_locked'));
+    if ($user->isDateLocked($new_date))
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Now, a new insert.
     if ($err->no()) {