Switched to using shorter ActionErrors functions

[timetracker.git] / expense_delete.php

diff --git a/expense_delete.php b/expense_delete.php
index e8828e0..c4953a0 100644 (file)
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -36,19 +36,19 @@ if (!ttAccessCheck(right_data_entry)) {
   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->getKey('error.sys'));
-  
+
 if ($request->getMethod() == 'POST') {
-  if ($request->getParameter('delete_button'))  {  // Delete button pressed.
-  
+  if ($request->getParameter('delete_button')) { // Delete button pressed.
+
     // Determine if it's okay to delete the record.
 
-       // Determine lock date.
+    // Determine lock date.
     $lock_interval = $user->lock_interval;
     $lockdate = 0;
     if ($lock_interval > 0) {
@@ -61,8 +61,8 @@ if ($request->getMethod() == 'POST') {
       if ($item_date->before($lockdate))
         $errors->add($i18n->getKey('error.period_locked'));
     }
-           
-    if ($errors->isEmpty()) {
+
+    if ($errors->no()) {
       // Mark the record as deleted.
       if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
         header('Location: expenses.php');
@@ -72,11 +72,11 @@ if ($request->getMethod() == 'POST') {
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.
-       header('Location: expenses.php');
-       exit();
+    header('Location: expenses.php');
+    exit();
   }
-}
-               
+} // POST
+
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
@@ -87,4 +87,3 @@ $smarty->assign('forms', array($form->getName() => $form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.delete_expense'));
 $smarty->assign('content_page_name', 'expense_delete.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file