One more fix to header output.

[timetracker.git] / invoice_delete.php

diff --git a/invoice_delete.php b/invoice_delete.php
index 7ef50f8..29160ba 100644 (file)
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttInvoiceHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_invoices') || !$user->isPluginEnabled('iv')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -44,30 +44,30 @@ $form = new Form('invoiceDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_invoice_id));
 $form->addInput(array('type'=>'combobox',
     'name'=>'delete_invoice_entries',
-    'data'=>array('0'=>$i18n->getKey('dropdown.do_not_delete'),'1'=>$i18n->getKey('dropdown.delete')),
+    'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete')),
 ));
-$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'),'onclick'=>'return confirm_deleting_entries();'));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
     if (ttInvoiceHelper::getInvoice($cl_invoice_id)) {
       if (ttInvoiceHelper::delete($cl_invoice_id, $request->getParameter('delete_invoice_entries'))) {
         header('Location: invoices.php');
-       exit();
+        exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
-  } else if ($request->getParameter('btn_cancel')) {
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
     header('Location: invoices.php');
     exit();
   }
-} // post
+} // isPost
 
 $smarty->assign('invoice_to_delete', $invoice_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.invoiceDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_invoice'));
+$smarty->assign('title', $i18n->get('title.delete_invoice'));
 $smarty->assign('content_page_name', 'invoice_delete.tpl');
 $smarty->display('index.tpl');