X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=predefined_expense_delete.php;h=9b4450325e3e1a9a99a0da02a2fe23d00f69d6f2;hb=bd92aeb3404ed8625272abccc9a8766f13ab75e6;hp=3b1cde554cea4d757c25327052dd36992c7c38e5;hpb=b401022733a9645ed701522585b2d57db936f5cc;p=timetracker.git

diff --git a/predefined_expense_delete.php b/predefined_expense_delete.php
index 3b1cde55..9b445032 100644
--- a/predefined_expense_delete.php
+++ b/predefined_expense_delete.php
@@ -30,11 +30,15 @@ require_once('initialize.php');
 import('form.Form');
 import('ttPredefinedExpenseHelper');
 
-// Access check.
-if (!ttAccessAllowed('manage_advanced_settings') || !$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);
@@ -42,8 +46,8 @@ $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')) {
@@ -52,9 +56,9 @@ if ($request->isPost()) {
         header('Location: predefined_expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } 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 +68,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');