Disallowed editing records assigned to timesheets.

[timetracker.git] / time_edit.php

diff --git a/time_edit.php b/time_edit.php
index 16f69d2ab9e12058e44a747d92375c40eb9e553a..48db27ea747f90eef1048d5129050922099f32ea 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -42,8 +42,8 @@ if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
 $cl_id = (int)$request->getParameter('id');
 $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.
+if (!$time_rec || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit editing not ours, or assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
@@ -257,6 +257,7 @@ if ($request->isPost()) {
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+  if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
   // Finished validating user input.
 
   // This is a new date for the time record.