X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=predefined_expense_delete.php;h=d8fc057fcc14158d83af37ca9102a1cd3862131f;hb=e23ea8f905bd9122e5c52a3457d05ebb20f6570b;hp=1c8a0fed401ff33346396a6dbb08597f566a9e1a;hpb=e2ac6192ba07b02c08cd0697a62983259ff73b78;p=timetracker.git

diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index 1c8a0fed..d8fc057f 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -30,31 +30,38 @@ require_once('initialize.php');
 import('form.Form');
 import('ttPredefinedExpenseHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('ex')) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
   header('Location: access_denied.php');
   exit();
 }
-
+if (!$user->isPluginEnabled('ex')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 $cl_predefined_expense_id = (int)$request->getParameter('id');
 $predefined_expense = ttPredefinedExpenseHelper::get($cl_predefined_expense_id);
+if (!$predefined_expense) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+
 $predefined_expense_to_delete = $predefined_expense['name'];
 
 $form = new Form('predefinedExpenseDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_predefined_expense_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttPredefinedExpenseHelper::get($cl_predefined_expense_id)) {
-      if (ttPredefinedExpenseHelper::delete($cl_predefined_expense_id)) {
-        header('Location: predefined_expenses.php');
-        exit();
-      } else
-        $err->add($i18n->getKey('error.db'));
+    if (ttPredefinedExpenseHelper::delete($cl_predefined_expense_id)) {
+      header('Location: predefined_expenses.php');
+      exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: predefined_expenses.php');
     exit();
@@ -64,6 +71,6 @@ if ($request->isPost()) {
 $smarty->assign('predefined_expense_to_delete', $predefined_expense_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.predefinedExpenseDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_predefined_expense'));
+$smarty->assign('title', $i18n->get('title.delete_predefined_expense'));
 $smarty->assign('content_page_name', 'predefined_expense_delete.tpl');
 $smarty->display('index.tpl');