X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftime_edit.php;h=6ec41defbf7665df67d707b1c080d70cd20b8e67;hb=5f64df1308fd641565631e6e38d282432f5e6250;hp=81e5ab8ed084f77b4ddab2a96b8b9e8e8202ccc7;hpb=058d776c118501eb510967c8b870bc346bc39e71;p=timetracker.git

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 81e5ab8e..6ec41def 100644
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -35,7 +35,7 @@ import('ttTimeHelper');
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -175,11 +175,11 @@ 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)) {
-  // Make the start and finish fields read-only.
-  $form->getElement('start')->setEnabled(false);
-  $form->getElement('finish')->setEnabled(false);
+  if ($user->punch_mode && !$user->canOverridePunchMode()) {
+    // Make the start and finish fields read-only.
+    $form->getElement('start')->setEnabled(false);
+    $form->getElement('finish')->setEnabled(false);
+  }
 }
 if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
@@ -218,6 +218,9 @@ if ($request->isPost()) {
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     if (!$cl_project) $err->add($i18n->getKey('error.project'));
   }
+  if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
+    if (!$cl_task) $err->add($i18n->getKey('error.task'));
+  }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
       $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
@@ -239,7 +242,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'));
@@ -250,7 +253,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'));