X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_delete.php;h=0cdd8816e8c85145f4577b1c10c3428a75bc492e;hb=ae00c14ac2999773e17a761542932cb95420430a;hp=538d9c7a667777abca806e96af86dc07b554043b;hpb=9e82b53fc5d8cb1e54b5fde774fa68a916f28b4c;p=timetracker.git diff --git a/time_delete.php b/time_delete.php index 538d9c7a..0cdd8816 100644 --- a/time_delete.php +++ b/time_delete.php @@ -33,17 +33,11 @@ import('ttTimeHelper'); import('DateAndTime'); // Access check. -if (!ttAccessCheck(right_data_entry)) { +if (!ttAccessAllowed('track_own_time')) { header('Location: access_denied.php'); exit(); } -// Use Custom Fields plugin if we have one. -// if (file_exists("plugins/CustomFields.class.php")) { -// require_once("plugins/CustomFields.class.php"); -// $custom_fields = new CustomFields($user->team_id); -// } - $cl_id = $request->getParameter('id'); $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser()); @@ -58,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->getKey('error.range_locked')); if ($err->no()) { @@ -89,7 +76,7 @@ if ($request->isPost()) { header('Location: time.php'); exit(); } -} // POST +} // isPost $form = new Form('timeRecordForm'); $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));