X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expense_edit.php;h=db26f1b64d9dcfacd3909a1bcc62fedf501eee61;hb=06d053703b7c0ed744e93de417119cfa2a6a86e2;hp=16b9abba712f4ee438969b43d874645bd2a57e9a;hpb=0dfc4dda20c54e173938eaf196f8e071ce790830;p=timetracker.git

diff --git a/expense_edit.php b/expense_edit.php
index 16b9abba..db26f1b6 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();
 }
@@ -119,7 +119,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
       'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
   }
 }
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'item_name','style'=>'width: 250px;','value'=>$cl_item_name));
+$form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name));
 $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost));
 $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date));
 // Hidden control for record id.
@@ -140,14 +140,6 @@ if ($request->isPost()) {
   if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
   if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
 
-  // Determine lock date.
-  $lock_interval = $user->lock_interval;
-  $lockdate = 0;
-  if ($lock_interval > 0) {
-    $lockdate = new DateAndTime();
-    $lockdate->decDay($lock_interval);
-  }
-
   // This is a new date for the expense item.
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
@@ -161,16 +153,17 @@ if ($request->isPost()) {
   // Save record.
   if ($request->getParameter('btn_save')) {
     // We need to:
-    // 1) Prohibit updating locked entries (that are in locked interval).
-    // 2) Prohibit saving unlocked entries into locked interval.
+    // 1) Prohibit updating locked entries (that are in locked range).
+    // 2) Prohibit saving unlocked entries into locked range.
 
     // Now, step by step.
-    // 1) Prohibit updating locked entries.
-    if($lockdate && $item_date->before($lockdate))
-      $err->add($i18n->getKey('error.period_locked'));
-    // 2) Prohibit saving completed unlocked entries into locked interval.
-    if($err->no() && $lockdate && $new_date->before($lockdate))
-      $err->add($i18n->getKey('error.period_locked'));
+    // 1) Prohibit saving locked entries in any form.
+    if ($user->isDateLocked($item_date))
+      $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.range_locked'));
 
     // Now, an update.
     if ($err->no()) {
@@ -185,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()) {