X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=59ae7531bdd3bab0ee8b6b35f5a9fd3e64eaa777;hb=ecf7d911c95935f8cfb2403f645cd12f93d8c3f5;hp=cc3070c79dd4d9061f860888dc07fc4068d8d3a0;hpb=1fad211ab12fc66117094e33425f8414fccd2cfa;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index cc3070c7..59ae7531 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -35,13 +35,13 @@ import('ttTimeHelper');
 import('DateAndTime');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessAllowed('track_own_time')) {
   header('Location: access_denied.php');
   exit();
 }
 
 // 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);
@@ -59,7 +59,7 @@ $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_start = trim($request->getParameter('start'));
   $cl_finish = trim($request->getParameter('finish'));
   $cl_duration = trim($request->getParameter('duration'));
@@ -70,8 +70,10 @@ if ($request->getMethod() == 'POST') {
   $cl_project = $request->getParameter('project');
   $cl_task = $request->getParameter('task');
   $cl_billable = 1;
-  if (in_array('iv', explode(',', $user->plugins)))
+  if ($user->isPluginEnabled('iv'))
     $cl_billable = $request->getParameter('billable');
+  if ($user->isPluginEnabled('ps'))
+    $cl_paid = $request->getParameter('paid');
 } else {
   $cl_client = $time_rec['client_id'];
   $cl_project = $time_rec['project_id'];
@@ -88,17 +90,18 @@ if ($request->getMethod() == 'POST') {
     $fields = $custom_fields->get($time_rec['id']);
     if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
       $cl_cf_1 = $fields[0]['value'];
-    else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+    elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
       $cl_cf_1 = $fields[0]['option_id'];
   }
 
   $cl_billable = $time_rec['billable'];
+  $cl_paid = $time_rec['paid'];
 
   // Add an info message to the form if we are editing an uncompleted record.
-  if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
+  if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
     $cl_finish = '';
     $cl_duration = '';
-    $messages->add($i18n->getKey('form.time_edit.uncompleted'));
+    $msg->add($i18n->getKey('form.time_edit.uncompleted'));
   }
 }
 
@@ -106,7 +109,7 @@ if ($request->getMethod() == 'POST') {
 $form = new Form('timeRecordForm');
 
 // 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);',
@@ -132,7 +135,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)
@@ -175,11 +178,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')->setEnable(false);
-  $form->getElement('finish')->setEnable(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');"));
@@ -190,7 +193,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;',
@@ -201,71 +204,65 @@ if ($custom_fields && $custom_fields->fields[0]) {
 }
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-if (in_array('iv', explode(',', $user->plugins)))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable));
+if ($user->isPluginEnabled('iv'))
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
+if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+  $form->addInput(array('type'=>'checkbox','name'=>'paid','value'=>$cl_paid));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
 
   // 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 (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)
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
-    else if ($cl_start || $cl_finish) {
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+    elseif ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
     }
   } else {
-    if (!ttTimeHelper::isValidDuration($cl_duration))
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+    if (false === ttTimeHelper::postedDurationToMinutes($cl_duration))
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
   // Finished validating user input.
 
-  // Determine lock date.
-  $lock_interval = $user->lock_interval;
-  $lockdate = 0;
-  if ($lock_interval > 0) {
-    $lockdate = new DateAndTime();
-    $lockdate->decDay($lock_interval);
-  }
-
   // This is a new date for the time record.
   $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))
-      $errors->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->getKey('error.future_date'));
   }
 
   // Save record.
@@ -276,32 +273,34 @@ if ($request->getMethod() == 'POST') {
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
-      // 1) Prohibit saving locked time entries in any form.
-      if($lockdate && $item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
-      // 2) Prohibit saving completed unlocked entries into locked interval.
-      if($errors->no() && $lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+    if ($err->no()) {
+      // 1) Prohibit saving locked entries in any form.
+      if ($user->isDateLocked($item_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
+      // 2) Prohibit saving completed unlocked entries into locked range.
+      if ($err->no() && $user->isDateLocked($new_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $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(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, an update.
-    if ($errors->no()) {
+    if ($err->no()) {
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -313,13 +312,14 @@ if ($request->getMethod() == 'POST') {
         'finish'=>$cl_finish,
         'duration'=>$cl_duration,
         'note'=>$cl_note,
-        'billable'=>$cl_billable));
+        'billable'=>$cl_billable,
+        'paid'=>$cl_paid));
 
       // If we have custom fields - update values.
       if ($res && $custom_fields) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $res = $custom_fields->update($cl_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)
           $res = $custom_fields->update($cl_id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
       if ($res)
@@ -333,33 +333,34 @@ if ($request->getMethod() == 'POST') {
   // Save as new record.
   if ($request->getParameter('btn_copy')) {
     // We need to:
-    // 1) Prohibit saving into locked interval.
+    // 1) Prohibit saving into locked range.
     // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
-      // 1) Prohibit saving into locked interval.
-      if($lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+    if ($err->no()) {
+      // 1) Prohibit saving into locked range.
+      if ($user->isDateLocked($new_date))
+        $err->add($i18n->getKey('error.range_locked'));
+
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $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(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, a new insert.
-    if ($errors->no()) {
+    if ($err->no()) {
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -371,21 +372,22 @@ if ($request->getMethod() == 'POST') {
         'finish'=>$cl_finish,
         'duration'=>$cl_duration,
         'note'=>$cl_note,
-        'billable'=>$cl_billable));
+        'billable'=>$cl_billable,
+        'paid'=>$cl_paid));
 
       // Insert a custom field if we have it.
       $res = true;
       if ($id && $custom_fields && $cl_cf_1) {
         if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
           $res = $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)
           $res = $custom_fields->insert($id, $custom_fields->fields[0]['id'], $cl_cf_1, null);
       }
       if ($id && $res) {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
 
@@ -393,7 +395,7 @@ if ($request->getMethod() == 'POST') {
     header("Location: time_delete.php?id=$cl_id");
     exit();
   }
-} // POST
+} // isPost
 
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);