Refactoring: renamed getActiveUser() to getUser().

[timetracker.git] / mobile / time_edit.php

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 40f58e8d9aee0837a258695f1718824a58efba48..56d373ff950049668122af49c6161c28ab8d2b4d 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -40,7 +40,7 @@ if (!ttAccessAllowed('track_own_time')) {
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
   exit();
 }
 $cl_id = (int)$request->getParameter('id');

-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());

 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');
 if (!$time_rec || $time_rec['invoice_id']) {
   // Prohibit editing not ours or invoiced records.
   header('Location: access_denied.php');


@@ -279,7 +279,7 @@ if ($request->isPost()) {
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
       // 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());
+        $not_completed_rec = ttTimeHelper::getUncompleted($user->getUser());

         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
           $err->add($i18n->get('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->get('error.goto_uncompleted')."</a>");


@@ -289,7 +289,7 @@ if ($request->isPost()) {
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {
 
     // Prohibit creating an overlapping record.
     if ($err->no()) {

-      if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
+      if (ttTimeHelper::overlaps($user->getUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))

         $err->add($i18n->get('error.overlap'));
     }
 
         $err->add($i18n->get('error.overlap'));
     }
 


@@ -298,7 +298,7 @@ if ($request->isPost()) {
       $res = ttTimeHelper::update(array(
           'id'=>$cl_id,  
           'date'=>$new_date->toString(DB_DATEFORMAT),
       $res = ttTimeHelper::update(array(
           'id'=>$cl_id,  
           'date'=>$new_date->toString(DB_DATEFORMAT),

-          'user_id'=>$user->getActiveUser(),
+          'user_id'=>$user->getUser(),

           'client'=>$cl_client,
           'project'=>$cl_project,
           'task'=>$cl_task,
           'client'=>$cl_client,
           'project'=>$cl_project,
           'task'=>$cl_task,