X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_delete.php;h=c50172849aceea17cd40f842ede54d2334cfcb23;hb=da25ca5669ac88985d37a68392ed736ac03dcc3c;hp=26b1793c491a4c3d016bc26b9a85f5d11cff3b0c;hpb=eb55e2f8ca3859482a389795e03b45283e14ef36;p=timetracker.git diff --git a/time_delete.php b/time_delete.php index 26b1793c..c5017284 100644 --- a/time_delete.php +++ b/time_delete.php @@ -38,12 +38,6 @@ if (!ttAccessCheck(right_data_entry)) { 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()) {