Merges an updated upstream from main.

[timetracker.git] / mobile / timer.php

diff --git a/mobile/timer.php b/mobile/timer.php
index 7710f40..d2d3a8d 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -51,7 +51,7 @@ $_SESSION['date'] = $cl_date;
 // TODO: for time page we may limit the day to today only.
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);
@@ -64,8 +64,8 @@ $cl_finish = trim($request->getParameter('browser_time'));
 $cl_cf_1 = trim($request->getParameter('cf_1', ($request->getMethod()=='POST'? null : @$_SESSION['cf_1'])));
 $_SESSION['cf_1'] = $cl_cf_1;
 $cl_billable = 1;
-if (in_array('iv', explode(',', $user->plugins))) {
-  if ($request->getMethod() == 'POST') {
+if ($user->isPluginEnabled('iv')) {
+  if ($request->isPost()) {
     $cl_billable = $request->getParameter('billable');
     $_SESSION['billable'] = (int) $cl_billable;
   } else 
@@ -87,7 +87,7 @@ $enable_controls = ($uncompleted == null);
 $form = new Form('timerRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode && in_array('cl', explode(',', $user->plugins))) {
+if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
     $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
@@ -115,7 +115,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
     'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
 
   // Dropdown for clients if the clients plugin is enabled.
-  if (in_array('cl', explode(',', $user->plugins))) {
+  if ($user->isPluginEnabled('cl')) {
     $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
     // We need an array of assigned project ids to do some trimming. 
     foreach($project_list as $project)
@@ -154,7 +154,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
     'datakeys'=>array('id','name'),
     'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
 }
-if (in_array('iv', explode(',', $user->plugins)))
+if ($user->isPluginEnabled('iv'))
   $form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable,'enable'=>$enable_controls));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on button click.
 $form->addInput(array('type'=>'hidden','name'=>'browser_time','value'=>''));  // User current time, which gets filled in on button click.
@@ -169,7 +169,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
   // Only one custom field is supported at this time.
   if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) {
     $form->addInput(array('type'=>'text','name'=>'cf_1','value'=>$cl_cf_1));
-  } else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
+  } elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
@@ -179,31 +179,23 @@ if ($custom_fields && $custom_fields->fields[0]) {
   }
 }
 
-// Determine lock date. Time entries earlier than lock date cannot be created or modified.
-$lock_interval = $user->lock_interval;
-$lockdate = 0;
-if ($lock_interval > 0) {
-  $lockdate = new DateAndTime();
-  $lockdate->decDay($lock_interval);
-}
-
 // Submit.
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($request->getParameter('btn_start')) {
     // Start button clicked. We need to create a new uncompleted record with only the start time.
     $cl_finish = null;
 
     // Validate user input.
-    if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-      $errors->add($i18n->getKey('error.client'));
+    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+      $err->add($i18n->getKey('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->getKey('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->getKey('error.task'));
     }
     // Finished validating user input.
 
@@ -211,25 +203,25 @@ if ($request->getMethod() == 'POST') {
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
-    if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+    if ($user->isDateLocked($selected_date))
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($errors->no() && $uncompleted) {
-      $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+    if ($err->no() && $uncompleted) {
+      $err->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
     }
 
     // Prohibit creating an overlapping record.
-    if ($errors->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
@@ -247,7 +239,7 @@ if ($request->getMethod() == 'POST') {
       if ($id && $custom_fields && $cl_cf_1) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cl_cf_1);
-        else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
           $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
 
@@ -255,7 +247,7 @@ if ($request->getMethod() == 'POST') {
         header('Location: timer.php');
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   if ($request->getParameter('btn_stop')) {
@@ -280,14 +272,14 @@ if ($request->getMethod() == 'POST') {
         header('Location: timer.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record['id']);
       exit();
     }
   }
-} // POST
+} // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $cl_date);
 $smarty->assign('week_total', $week_total);