X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Ftime_delete.php;h=9e818e78adb35548667c6055eb804b95a282050d;hb=073ce24b1ae308defce4e057fc990607a3034380;hp=ef955e9a7e3f7e0c38228662d60d17b68c64101f;hpb=33399ff6a8bdfe9b989810dafe9c4dbf3cf3b685;p=timetracker.git diff --git a/mobile/time_delete.php b/mobile/time_delete.php index ef955e9a..9e818e78 100644 --- a/mobile/time_delete.php +++ b/mobile/time_delete.php @@ -49,13 +49,13 @@ $time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser()); // Prohibit deleting invoiced records. if ($time_rec['invoice_id']) die($i18n->getKey('error.sys')); - + // Escape comment for presentation. $time_rec['comment'] = htmlspecialchars($time_rec['comment']); - -if ($request->getMethod() == 'POST') { + +if ($request->isPost()) { if ($request->getParameter('delete_button')) { // Delete button pressed. - + // Determine if it's okay to delete the record. $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']); @@ -68,13 +68,13 @@ if ($request->getMethod() == 'POST') { } // Determine if the record is uncompleted. $uncompleted = ($time_rec['duration'] == '0:00'); - + if($lockdate && $item_date->before($lockdate) && !$uncompleted) { - $errors->add($i18n->getKey('error.period_locked')); + $err->add($i18n->getKey('error.period_locked')); } - - if ($errors->isEmpty()) { - + + if ($err->no()) { + // Delete the record. $result = ttTimeHelper::delete($cl_id, $user->getActiveUser()); @@ -82,16 +82,16 @@ if ($request->getMethod() == 'POST') { header('Location: time.php'); exit(); } else { - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } } } if ($request->getParameter('cancel_button')) { // Cancel button pressed. - header('Location: time.php'); - exit(); + header('Location: time.php'); + exit(); } -} - +} // isPost + $form = new Form('timeRecordForm'); $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id)); $form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));