X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=23cc63d5abbf21d025499aa648eb1d6534198955;hb=566ab32f690c6e281a85c79345af95dca9a97898;hp=16f69d2ab9e12058e44a747d92375c40eb9e553a;hpb=38dd91dcf8a9ecf6b7ceb73a9aabf787b96b6f6e;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index 16f69d2a..23cc63d5 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -40,15 +40,16 @@ if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   exit();
 }
 $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.
+$time_rec = ttTimeHelper::getRecord($cl_id);
+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();
 }
 // End of access checks.
 
+$user_id = $user->getUser();
+
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
@@ -257,6 +258,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.