X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expense_delete.php;h=788fb59faf64909eb47b0a484c244cf93137a751;hb=f504e16303445771d7f069ed49a5a29bbd7ef737;hp=06c9690b0fca79cfd673e56f13268dd584935183;hpb=a62e4bdd1bc89ea4f3cf29507399b5b8f229597a;p=timetracker.git

diff --git a/expense_delete.php b/expense_delete.php
index 06c9690b..788fb59f 100644
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -31,17 +31,24 @@ import('form.Form');
 import('DateAndTime');
 import('ttExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!(ttAccessAllowed('track_own_expenses') || ttAccessAllowed('track_expenses'))) {
   header('Location: access_denied.php');
   exit();
 }
-
-$cl_id = $request->getParameter('id');
-$expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
-
-// Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+$cl_id = (int)$request->getParameter('id');
+// Get the expense item we are deleting.
+$expense_item = ttExpenseHelper::getItem($cl_id);
+if (!$expense_item || $expense_item['approved'] || $expense_item['invoice_id']) {
+  // Prohibit deleting not ours, approved, or invoiced items.
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -53,7 +60,7 @@ if ($request->isPost()) {
 
     if ($err->no()) {
       // Mark the record as deleted.
-      if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
+      if (ttExpenseHelper::markDeleted($cl_id)) {
         header('Location: expenses.php');
         exit();
       } else
@@ -71,8 +78,11 @@ $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
-$smarty->assign('expense_item', $expense_item);
+$show_project = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
+$smarty->assign('expense_item', $expense_item);
+$smarty->assign('show_project', $show_project);
 $smarty->assign('title', $i18n->get('title.delete_expense'));
 $smarty->assign('content_page_name', 'expense_delete.tpl');
 $smarty->display('index.tpl');