X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=2ceb4b3abe3d21635772e50c9ada49badd63fc8c;hb=ad98b13400fdc2fa2299a22c9bd54c4cd27960c3;hp=6628ce342f1fdc14f5aaff4d6b0e047ea4b3df1d;hpb=3e7b58457f94c49a154b2f108f0188682a114aa2;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index 6628ce34..2ceb4b3a 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -178,7 +178,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
+  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights_array)) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
@@ -248,7 +248,7 @@ if ($request->isPost()) {
         $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
     }
   } else {
-    if (!ttTimeHelper::isValidDuration($cl_duration))
+    if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
       $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
@@ -259,7 +259,7 @@ if ($request->isPost()) {
   $new_date = new DateAndTime($user->date_format, $cl_date);
 
   // Prohibit creating entries in future.
-  if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
+  if (!$user->future_entries) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
       $err->add($i18n->getKey('error.future_date'));