X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_delete.php;h=2ad3ea4125dfee9daa1da0bf9d980c6c2ecac3e6;hb=4dcb88a76a3de466ee6116ae0852f53ba2b259a5;hp=273cba3534b8a69c4aae36420eae708a60e64abb;hpb=c4ba91b8e545d337e78496d0b780dc30b46ec05f;p=timetracker.git

diff --git a/time_delete.php b/time_delete.php
index 273cba35..2ad3ea41 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -33,7 +33,7 @@ import('ttTimeHelper');
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -42,7 +42,7 @@ $cl_id = $request->getParameter('id');
 $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->getKey('error.sys'));
+if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
@@ -52,19 +52,12 @@ if ($request->isPost()) {
 
     // Determine if it's okay to delete the record.
     $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
-    // Determine lock date.
-    $lock_interval = $user->lock_interval;
-    $lockdate = 0;
-    if ($lock_interval > 0) {
-      $lockdate = new DateAndTime();
-      $lockdate->decDay($lock_interval);
-    }
+
     // Determine if the record is uncompleted.
     $uncompleted = ($time_rec['duration'] == '0:00');
 
-    if($lockdate && $item_date->before($lockdate) && !$uncompleted) {
-      $err->add($i18n->getKey('error.period_locked'));
-    }
+    if ($user->isDateLocked($item_date) && !$uncompleted)
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
 
@@ -75,7 +68,7 @@ if ($request->isPost()) {
         header('Location: time.php');
         exit();
       } else {
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
       }
     }
   }
@@ -87,11 +80,11 @@ if ($request->isPost()) {
 
 $form = new Form('timeRecordForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('time_rec', $time_rec);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_time_record'));
+$smarty->assign('title', $i18n->get('title.delete_time_record'));
 $smarty->assign('content_page_name', 'time_delete.tpl');
 $smarty->display('index.tpl');