X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/45c855269d952873285f7a835e82fc2b3eff3971..722638fd8cc9400c5228106537effa1dcd0f7fa5:/mobile/time_edit.php diff --git a/mobile/time_edit.php b/mobile/time_edit.php index 40f58e8d..b2655e8f 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -40,7 +40,8 @@ if (!ttAccessAllowed('track_own_time')) { exit(); } $cl_id = (int)$request->getParameter('id'); -$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser()); +$user_id = $user->getUser(); +$time_rec = ttTimeHelper::getRecord($cl_id, $user_id); if (!$time_rec || $time_rec['invoice_id']) { // Prohibit editing not ours or invoiced records. header('Location: access_denied.php'); @@ -279,7 +280,7 @@ if ($request->isPost()) { // 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_id); if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) { // We have another not completed record. $err->add($i18n->get('error.uncompleted_exists')." ".$i18n->get('error.goto_uncompleted').""); @@ -289,7 +290,7 @@ if ($request->isPost()) { // 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_id, $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id)) $err->add($i18n->get('error.overlap')); } @@ -298,7 +299,7 @@ if ($request->isPost()) { $res = ttTimeHelper::update(array( 'id'=>$cl_id, 'date'=>$new_date->toString(DB_DATEFORMAT), - 'user_id'=>$user->getActiveUser(), + 'user_id'=>$user_id, 'client'=>$cl_client, 'project'=>$cl_project, 'task'=>$cl_task,