X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=week.php;h=29c15e4798bc8d3dd8e128a8b85ce5d2aa90c77f;hb=074e8daef75c2b729e75f350b52935a6b7ecfba8;hp=44a05bdc5910294ce75b9c28ec661f95c8ec3268;hpb=16cbd33bec16854f1b6a4caf4ac24ededc8326f3;p=timetracker.git

diff --git a/week.php b/week.php
index 44a05bdc..29c15e47 100644
--- a/week.php
+++ b/week.php
@@ -39,7 +39,7 @@ import('ttTimeHelper');
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry) || !$user->isPluginEnabled('wv')) {
+if (!ttAccessAllowed('track_own_time') || !$user->isPluginEnabled('wv')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -198,7 +198,7 @@ class WeekViewCellRenderer extends DefaultCellRenderer {
 // Elements of weekTimeForm.
 $form = new Form('weekTimeForm');
 
-if ($user->canManageTeam()) {
+if ($user->can('track_time')) {
   $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
   if (count($user_list) > 1) {
     $form->addInput(array('type'=>'combobox',
@@ -368,11 +368,12 @@ if ($request->isPost()) {
             $existingDuration = $dataArray[$rowNumber][$dayHeader]['duration'];
             // If posted value is not null, check and normalize it.
             if ($postedDuration) {
-              if (ttTimeHelper::isValidDuration($postedDuration)) {
-                $postedDuration = ttTimeHelper::normalizeDuration($postedDuration, false); // No leading zero.
-              } else {
+              if (false === ttTimeHelper::postedDurationToMinutes($postedDuration)) {
                 $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
                 $result = false; break; // Break out. Stop any further processing.
+              } else {
+                $minutes = ttTimeHelper::postedDurationToMinutes($postedDuration);
+                $postedDuration = ttTimeHelper::minutesToDuration($minutes);
               }
             }
             // Do not process if value has not changed.
@@ -462,7 +463,7 @@ if ($request->isPost()) {
     }
   }
   elseif ($request->getParameter('onBehalfUser')) {
-    if($user->canManageTeam()) {
+    if($user->can('track_time')) {
       unset($_SESSION['behalf_id']);
       unset($_SESSION['behalf_name']);