Dutch translation improved.

[timetracker.git] / quotas.php

diff --git a/quotas.php b/quotas.php
index 15a7a49ac6456ece549ddb2615fd97e1fee8fe0c..c921fba4ccad3748af38bd12298b488e6c3d9160 100644 (file)
--- a/quotas.php
+++ b/quotas.php
@@ -32,11 +32,15 @@ import('form.Form');
 import('ttTeamHelper');
 import('ttTimeHelper');
 
 import('ttTeamHelper');
 import('ttTimeHelper');
 

-// Access check.
-if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('mq')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {

   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }

+if (!$user->isPluginEnabled('mq')) {
+  header('Location: feature_disabled.php');
+  exit();
+}

 
 // Start and end fallback values for the Year dropdown.
 $yearStart = 2015;
 
 // Start and end fallback values for the Year dropdown.
 $yearStart = 2015;


@@ -71,31 +75,31 @@ $quota = new MonthlyQuota();
 
 if ($request->isPost()){
   // Validate user input.
 
 if ($request->isPost()){
   // Validate user input.

-  if (false === ttTimeHelper::durationToMinutes($request->getParameter('workdayHours')))
-    $err->add($i18n->getKey('error.field'), $i18n->getKey('form.quota.workday_hours'));
+  if (false === ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours')))
+    $err->add($i18n->get('error.field'), $i18n->get('form.quota.workday_hours'));

 
   for ($i = 0; $i < count($months); $i++){
     $val = $request->getParameter($months[$i]);
 
   for ($i = 0; $i < count($months); $i++){
     $val = $request->getParameter($months[$i]);

-    if (false === ttTimeHelper::quotaToMinutes($val))
-      $err->add($i18n->getKey('error.field'), $months[$i]);
+    if (false === ttTimeHelper::postedDurationToMinutes($val, 44640/*24*60*31*/))
+      $err->add($i18n->get('error.field'), $months[$i]);

   }
   // Finished validating user input.
 
   if ($err->no()) {
 
     // Handle workday hours.
   }
   // Finished validating user input.
 
   if ($err->no()) {
 
     // Handle workday hours.

-    $workday_minutes = ttTimeHelper::durationToMinutes($request->getParameter('workdayHours'));
+    $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));

     if ($workday_minutes != $user->workday_minutes) {
       if (!ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
     if ($workday_minutes != $user->workday_minutes) {
       if (!ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))

-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));

     }
 
     // Handle monthly quotas for a selected year.
     $selectedYear = (int) $request->getParameter('year');
     for ($i = 0; $i < count($months); $i++){
     }
 
     // Handle monthly quotas for a selected year.
     $selectedYear = (int) $request->getParameter('year');
     for ($i = 0; $i < count($months); $i++){

-      $quota_in_minutes = ttTimeHelper::quotaToMinutes($request->getParameter($months[$i]));
+      $quota_in_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter($months[$i]), 44640/*24*60*31*/);

       if (!$quota->update($selectedYear, $i+1, $quota_in_minutes))
       if (!$quota->update($selectedYear, $i+1, $quota_in_minutes))

-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));

     }
 
     if ($err->no()) {
     }
 
     if ($err->no()) {


@@ -125,6 +129,6 @@ for ($i=0; $i < count($months); $i++) {
 
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('title', $i18n->getKey('title.monthly_quotas'));
+$smarty->assign('title', $i18n->get('title.monthly_quotas'));

 $smarty->assign('content_page_name', 'quotas.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'quotas.tpl');
 $smarty->display('index.tpl');