Refactoring: renamed getActiveUser() to getUser().

[timetracker.git] / time_delete.php

diff --git a/time_delete.php b/time_delete.php
index ec3c677cc318272eb9d94e7c77094fe3027aad68..4e368df2412634a69eeb7fdb8ff55c1d8e4c7ee8 100644 (file)
--- a/time_delete.php
+++ b/time_delete.php
@@ -32,17 +32,19 @@ import('ttUserHelper');
 import('ttTimeHelper');
 import('DateAndTime');
 
-// Access check.
+// Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($time_rec['invoice_id']) die($i18n->get('error.sys'));
+$cl_id = (int)$request->getParameter('id');
+$time_rec = ttTimeHelper::getRecord($cl_id, $user->getUser());
+if (!$time_rec || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours or invoiced records.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 // Escape comment for presentation.
 $time_rec['comment'] = htmlspecialchars($time_rec['comment']);
@@ -62,7 +64,7 @@ if ($request->isPost()) {
     if ($err->no()) {
 
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
+      $result = ttTimeHelper::delete($cl_id, $user->getUser());
 
       if ($result) {
         header('Location: time.php');