From 1fad211ab12fc66117094e33425f8414fccd2cfa Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 21 Mar 2016 18:06:21 -0700 Subject: [PATCH] Switched to using shorter ActionErrors functions --- WEB-INF/lib/form/ActionErrors.class.php | 4 ---- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/header.tpl | 4 ++-- WEB-INF/templates/mobile/header.tpl | 2 +- cf_dropdown_option_add.php | 4 ++-- cf_dropdown_option_delete.php | 2 +- cf_dropdown_option_edit.php | 4 ++-- client_add.php | 2 +- client_edit.php | 2 +- expense_delete.php | 2 +- expense_edit.php | 6 +++--- expenses.php | 2 +- import.php | 2 +- invoice_add.php | 4 ++-- invoice_send.php | 2 +- login.php | 2 +- mobile/login.php | 2 +- mobile/time.php | 6 +++--- mobile/time_delete.php | 2 +- mobile/time_edit.php | 8 ++++---- mobile/timer.php | 6 +++--- notification_add.php | 2 +- notification_edit.php | 2 +- password_change.php | 2 +- profile_edit.php | 2 +- project_add.php | 2 +- project_edit.php | 2 +- register.php | 2 +- report_send.php | 2 +- reports.php | 6 +++--- task_add.php | 2 +- task_edit.php | 2 +- time.php | 6 +++--- time_delete.php | 2 +- time_edit.php | 14 +++++++------- user_add.php | 2 +- user_edit.php | 2 +- 37 files changed, 59 insertions(+), 63 deletions(-) diff --git a/WEB-INF/lib/form/ActionErrors.class.php b/WEB-INF/lib/form/ActionErrors.class.php index 02061361..9cdc21b6 100644 --- a/WEB-INF/lib/form/ActionErrors.class.php +++ b/WEB-INF/lib/form/ActionErrors.class.php @@ -32,10 +32,6 @@ class ActionErrors { function ActionErrors() { } - function isEmpty() { - return (count($this->errors)>0 ? false : true); - } - function exist() { return (count($this->errors)>0 ? true : false); } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index f9543921..76cd6620 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.16.3430 | Copyright © Anuko | +  Anuko Time Tracker 1.9.16.3431 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl index 90a42891..2e058ef5 100644 --- a/WEB-INF/templates/header.tpl +++ b/WEB-INF/templates/header.tpl @@ -160,7 +160,7 @@ With 101% height we essentially force the scrollbar to always appear. --> -{if !$errors->isEmpty()} +{if $errors->yes()}
@@ -174,7 +174,7 @@ With 101% height we essentially force the scrollbar to always appear. --> -{if !$messages->isEmpty()} +{if $messages->yes()}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl index a2b23116..b09f0da6 100644 --- a/WEB-INF/templates/mobile/header.tpl +++ b/WEB-INF/templates/mobile/header.tpl @@ -69,7 +69,7 @@ -{if !$messages->isEmpty()} +{if $messages->yes()}
diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php index 2ffb83f6..c1fa7e00 100644 --- a/cf_dropdown_option_add.php +++ b/cf_dropdown_option_add.php @@ -42,7 +42,7 @@ if (false === $field) $errors->add($i18n->getKey('error.db')); $form = new Form('optionAddForm'); -if ($errors->isEmpty()) { +if ($errors->no()) { $form->addInput(array('type'=>'hidden','name'=>'field_id','value'=>$cl_field_id)); $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>'')); $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add'))); @@ -54,7 +54,7 @@ if ($request->getMethod() == 'POST') { // Validate user input. if (!ttValidString($cl_option_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); - if ($errors->isEmpty()) { + if ($errors->no()) { $res = CustomFields::insertOption($cl_field_id, $cl_option_name); if ($res) { header("Location: cf_dropdown_options.php?field_id=$cl_field_id"); diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php index c53f16eb..a1f4b139 100644 --- a/cf_dropdown_option_delete.php +++ b/cf_dropdown_option_delete.php @@ -62,7 +62,7 @@ if ($request->getMethod() == 'POST') { if (false === $option) $errors->add($i18n->getKey('error.db')); - if ($errors->isEmpty()) { + if ($errors->no()) { $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_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'))); diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php index f61225bc..4c5fc4a7 100644 --- a/cf_dropdown_option_edit.php +++ b/cf_dropdown_option_edit.php @@ -42,7 +42,7 @@ if (false === $cl_name) $errors->add($i18n->getKey('error.db')); $form = new Form('optionEditForm'); -if ($errors->isEmpty()) { +if ($errors->no()) { $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name)); $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id)); $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save'))); @@ -54,7 +54,7 @@ if ($request->getMethod() == 'POST') { // Validate user input. if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); - if ($errors->isEmpty()) { + if ($errors->no()) { $res = CustomFields::updateOption($cl_id, $cl_name); if ($res) { // Determine field id for redirect. diff --git a/client_add.php b/client_add.php index 4aef5ab7..b2cdbe76 100644 --- a/client_add.php +++ b/client_add.php @@ -64,7 +64,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_address, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address')); if (!ttValidFloat($cl_tax, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.tax')); - if ($errors->isEmpty()) { + if ($errors->no()) { if (!ttClientHelper::getClientByName($cl_name)) { if (ttClientHelper::insert(array( 'team_id' => $user->team_id, diff --git a/client_edit.php b/client_edit.php index 747ed2b8..d594222a 100644 --- a/client_edit.php +++ b/client_edit.php @@ -77,7 +77,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_address, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address')); if (!ttValidFloat($cl_tax, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.tax')); - if ($errors->isEmpty()) { + if ($errors->no()) { if ($request->getParameter('btn_save')) { $client = ttClientHelper::getClientByName($cl_name); if (($client && ($cl_id == $client['id'])) || !$client) { diff --git a/expense_delete.php b/expense_delete.php index 69ceb663..c4953a06 100644 --- a/expense_delete.php +++ b/expense_delete.php @@ -62,7 +62,7 @@ if ($request->getMethod() == 'POST') { $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'); diff --git a/expense_edit.php b/expense_edit.php index 89ca38c4..ffe04555 100644 --- a/expense_edit.php +++ b/expense_edit.php @@ -169,11 +169,11 @@ if ($request->getMethod() == 'POST') { if($lockdate && $item_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // 2) Prohibit saving completed unlocked entries into locked interval. - if($errors->isEmpty() && $lockdate && $new_date->before($lockdate)) + if($errors->no() && $lockdate && $new_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // Now, an update. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttExpenseHelper::update(array('id'=>$cl_id,'date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(), 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost))) { header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT)); @@ -189,7 +189,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); // Now, a new insert. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttExpenseHelper::insert(array('date'=>$new_date->toString(DB_DATEFORMAT),'user_id'=>$user->getActiveUser(), 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) { header('Location: expenses.php?date='.$new_date->toString(DB_DATEFORMAT)); diff --git a/expenses.php b/expenses.php index 0f93b3bf..15ccad5e 100644 --- a/expenses.php +++ b/expenses.php @@ -166,7 +166,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); // Insert record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(), 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) { header('Location: expenses.php'); diff --git a/import.php b/import.php index 7d61e038..f604c4ff 100644 --- a/import.php +++ b/import.php @@ -45,7 +45,7 @@ if ($request->getMethod() == 'POST') { $import = new ttImportHelper($errors); $import->importXml(); - if ($errors->isEmpty()) + if ($errors->no()) $messages->add($i18n->getKey('form.import.success')); } // POST diff --git a/invoice_add.php b/invoice_add.php index 9074ce2a..0ee614f9 100644 --- a/invoice_add.php +++ b/invoice_add.php @@ -73,7 +73,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidDate($cl_finish)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date')); $fields = array('date'=>$cl_date,'name'=>$cl_number,'client_id'=>$cl_client,'project_id'=>$cl_project,'start_date'=>$cl_start,'end_date'=>$cl_finish); - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttInvoiceHelper::getInvoiceByName($cl_number)) $errors->add($i18n->getKey('error.invoice_exists')); @@ -81,7 +81,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.no_invoiceable_items')); } - if ($errors->isEmpty()) { + if ($errors->no()) { // Now we can go ahead and create our invoice. if (ttInvoiceHelper::createInvoice($fields)) { header('Location: invoices.php'); diff --git a/invoice_send.php b/invoice_send.php index 399e08cb..18d8db6b 100644 --- a/invoice_send.php +++ b/invoice_send.php @@ -71,7 +71,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_subject)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject')); if (!ttValidString($cl_comment, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.comment')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Save last invoice emails for future use. $sc->setValue(SYSC_LAST_INVOICE_EMAIL, $cl_receiver); $sc->setValue(SYSC_LAST_INVOICE_CC, $cl_cc); diff --git a/login.php b/login.php index f193aa2e..3051a206 100644 --- a/login.php +++ b/login.php @@ -47,7 +47,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login')); if (!ttValidString($cl_password)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Use the "limit" plugin if we have one. Ignore include errors. // The "limit" plugin is not required for normal operation of Time Tracker. @include('plugins/limit/access_check.php'); diff --git a/mobile/login.php b/mobile/login.php index d92ff5b3..1a96526b 100644 --- a/mobile/login.php +++ b/mobile/login.php @@ -49,7 +49,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login')); if (!ttValidString($cl_password)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Use the "limit" plugin if we have one. Ignore include errors. // The "limit" plugin is not required for normal operation of the Time Tracker. diff --git a/mobile/time.php b/mobile/time.php index 8d2f7079..f638ecae 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -246,18 +246,18 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); // Prohibit creating another uncompleted record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == ''))) $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted').""); } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish)) $errors->add($i18n->getKey('error.overlap')); } - if ($errors->isEmpty()) { + if ($errors->no()) { $id = ttTimeHelper::insert(array( 'date' => $cl_date, 'user_id' => $user->getActiveUser(), diff --git a/mobile/time_delete.php b/mobile/time_delete.php index be9d498c..cd702f7b 100644 --- a/mobile/time_delete.php +++ b/mobile/time_delete.php @@ -73,7 +73,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); } - if ($errors->isEmpty()) { + if ($errors->no()) { // Delete the record. $result = ttTimeHelper::delete($cl_id, $user->getActiveUser()); diff --git a/mobile/time_edit.php b/mobile/time_edit.php index d6dc7d1e..87dc587a 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -275,12 +275,12 @@ if ($request->getMethod() == 'POST') { // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. // Now, step by step. - if ($errors->isEmpty()) { + if ($errors->no()) { // 1) Prohibit saving locked time entries in any form. if($lockdate && $item_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // 2) Prohibit saving completed unlocked entries into locked interval. - if($errors->isEmpty() && $lockdate && $new_date->before($lockdate)) + if($errors->no() && $lockdate && $new_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); @@ -294,13 +294,13 @@ if ($request->getMethod() == 'POST') { } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id)) $errors->add($i18n->getKey('error.overlap')); } // Now, an update. - if ($errors->isEmpty()) { + if ($errors->no()) { $res = ttTimeHelper::update(array( 'id'=>$cl_id, 'date'=>$new_date->toString(DB_DATEFORMAT), diff --git a/mobile/timer.php b/mobile/timer.php index fa00ced2..7710f40f 100644 --- a/mobile/timer.php +++ b/mobile/timer.php @@ -219,17 +219,17 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); // Prohibit creating another uncompleted record. - if ($errors->isEmpty() && $uncompleted) { + if ($errors->no() && $uncompleted) { $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted').""); } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish)) $errors->add($i18n->getKey('error.overlap')); } - if ($errors->isEmpty()) { + if ($errors->no()) { $id = ttTimeHelper::insert(array( 'date' => $cl_date, 'user_id' => $user->getActiveUser(), diff --git a/notification_add.php b/notification_add.php index 8a0cddf1..fd8d0c84 100644 --- a/notification_add.php +++ b/notification_add.php @@ -68,7 +68,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidCronSpec($cl_cron_spec)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule')); if (!ttValidEmail($cl_email)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Calculate next execution time. $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); diff --git a/notification_edit.php b/notification_edit.php index f4d1d1d0..6e5bd936 100644 --- a/notification_edit.php +++ b/notification_edit.php @@ -72,7 +72,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidCronSpec($cl_cron_spec)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule')); if (!ttValidEmail($cl_email)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Calculate next execution time. $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); diff --git a/password_change.php b/password_change.php index e7d27505..9302ef04 100644 --- a/password_change.php +++ b/password_change.php @@ -71,7 +71,7 @@ if ($request->getMethod() == 'POST') { if ($cl_password1 !== $cl_password2) $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Use the "limit" plugin if we have one. Ignore include errors. // The "limit" plugin is not required for normal operation of Time Tracker. $cl_login = $user->login; // $cl_login is used in access_check.cpp. diff --git a/profile_edit.php b/profile_edit.php index 3ef146ed..9732fb66 100644 --- a/profile_edit.php +++ b/profile_edit.php @@ -204,7 +204,7 @@ if ($request->getMethod() == 'POST') { } // Finished validating user input. - if ($errors->isEmpty()) { + if ($errors->no()) { if ($cl_lock_interval == null || trim($cl_lock_interval) == '') $cl_lock_interval = 0; diff --git a/project_add.php b/project_add.php index d799044c..b7bef62a 100644 --- a/project_add.php +++ b/project_add.php @@ -70,7 +70,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); if (!ttValidString($cl_description, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.description')); - if ($errors->isEmpty()) { + if ($errors->no()) { if (!ttProjectHelper::getProjectByName($cl_name)) { if (ttProjectHelper::insert(array( 'team_id' => $user->team_id, diff --git a/project_edit.php b/project_edit.php index 10d142f7..25bafcbb 100644 --- a/project_edit.php +++ b/project_edit.php @@ -87,7 +87,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); if (!ttValidString($cl_description, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.description')); - if ($errors->isEmpty()) { + if ($errors->no()) { if ($request->getParameter('btn_save')) { $existing_project = ttProjectHelper::getProjectByName($cl_name); if (!$existing_project || ($cl_project_id == $existing_project['id'])) { diff --git a/register.php b/register.php index 23217181..035e29b6 100644 --- a/register.php +++ b/register.php @@ -73,7 +73,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password')); if (!ttValidEmail($cl_manager_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email')); - if ($errors->isEmpty()) { + if ($errors->no()) { if (!ttUserHelper::getUserByLogin($cl_manager_login)) { // Create a new team. $team_id = ttTeamHelper::insert(array('name'=>$cl_team_name,'currency'=>$cl_currency)); diff --git a/report_send.php b/report_send.php index d8a0690d..505613e2 100644 --- a/report_send.php +++ b/report_send.php @@ -65,7 +65,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_subject)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject')); if (!ttValidString($cl_comment, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.comment')); - if ($errors->isEmpty()) { + if ($errors->no()) { // Save last report emails for future use. $sc->setValue(SYSC_LAST_REPORT_EMAIL, $cl_receiver); $sc->setValue(SYSC_LAST_REPORT_CC, $cl_cc); diff --git a/reports.php b/reports.php index c22bf25c..004ae6a6 100644 --- a/reports.php +++ b/reports.php @@ -264,11 +264,11 @@ if ($request->getMethod() == 'POST') { // User clicked the Save button. We need to save form options as new favorite report. if (!ttValidString($bean->getAttribute('new_fav_report'))) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite')); - if ($errors->isEmpty()) { + if ($errors->no()) { $id = ttFavReportHelper::saveReport($user->id, $bean); if (!$id) $errors->add($i18n->getKey('error.db')); - if ($errors->isEmpty()) { + if ($errors->no()) { $bean->setAttribute('favorite_report', $id); $bean->saveBean(); header('Location: reports.php'); @@ -306,7 +306,7 @@ if ($request->getMethod() == 'POST') { $bean->saveBean(); - if ($errors->isEmpty()) { + if ($errors->no()) { // Now we can go ahead and create a report. header('Location: report.php'); exit(); diff --git a/task_add.php b/task_add.php index f9d5981e..205bb727 100644 --- a/task_add.php +++ b/task_add.php @@ -60,7 +60,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); if (!ttValidString($cl_description, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.description')); - if ($errors->isEmpty()) { + if ($errors->no()) { if (!ttTaskHelper::getTaskByName($cl_name)) { if (ttTaskHelper::insert(array( 'team_id' => $user->team_id, diff --git a/task_edit.php b/task_edit.php index 549a74f5..47968508 100644 --- a/task_edit.php +++ b/task_edit.php @@ -71,7 +71,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); if (!ttValidString($cl_description, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.description')); - if ($errors->isEmpty()) { + if ($errors->no()) { if ($request->getParameter('btn_save')) { $existing_task = ttTaskHelper::getTaskByName($cl_name); if (!$existing_task || ($cl_task_id == $existing_task['id'])) { diff --git a/time.php b/time.php index 9b20578a..b01cd944 100644 --- a/time.php +++ b/time.php @@ -267,19 +267,19 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); // Prohibit creating another uncompleted record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (($not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser())) && (($cl_finish == '') && ($cl_duration == ''))) $errors->add($i18n->getKey('error.uncompleted_exists')." ".$i18n->getKey('error.goto_uncompleted').""); } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish)) $errors->add($i18n->getKey('error.overlap')); } // Insert record. - if ($errors->isEmpty()) { + if ($errors->no()) { $id = ttTimeHelper::insert(array( 'date' => $cl_date, 'user_id' => $user->getActiveUser(), diff --git a/time_delete.php b/time_delete.php index e07d1d33..9c53323e 100644 --- a/time_delete.php +++ b/time_delete.php @@ -72,7 +72,7 @@ if ($request->getMethod() == 'POST') { $errors->add($i18n->getKey('error.period_locked')); } - if ($errors->isEmpty()) { + if ($errors->no()) { // Delete the record. $result = ttTimeHelper::delete($cl_id, $user->getActiveUser()); diff --git a/time_edit.php b/time_edit.php index d362709e..cc3070c7 100644 --- a/time_edit.php +++ b/time_edit.php @@ -276,12 +276,12 @@ if ($request->getMethod() == 'POST') { // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. // Now, step by step. - if ($errors->isEmpty()) { + if ($errors->no()) { // 1) Prohibit saving locked time entries in any form. if($lockdate && $item_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // 2) Prohibit saving completed unlocked entries into locked interval. - if($errors->isEmpty() && $lockdate && $new_date->before($lockdate)) + if($errors->no() && $lockdate && $new_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. $uncompleted = ($cl_finish == '' && $cl_duration == ''); @@ -295,13 +295,13 @@ if ($request->getMethod() == 'POST') { } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id)) $errors->add($i18n->getKey('error.overlap')); } // Now, an update. - if ($errors->isEmpty()) { + if ($errors->no()) { $res = ttTimeHelper::update(array( 'id'=>$cl_id, 'date'=>$new_date->toString(DB_DATEFORMAT), @@ -337,7 +337,7 @@ if ($request->getMethod() == 'POST') { // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists. // Now, step by step. - if ($errors->isEmpty()) { + if ($errors->no()) { // 1) Prohibit saving into locked interval. if($lockdate && $new_date->before($lockdate)) $errors->add($i18n->getKey('error.period_locked')); @@ -353,13 +353,13 @@ if ($request->getMethod() == 'POST') { } // Prohibit creating an overlapping record. - if ($errors->isEmpty()) { + if ($errors->no()) { if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish)) $errors->add($i18n->getKey('error.overlap')); } // Now, a new insert. - if ($errors->isEmpty()) { + if ($errors->no()) { $id = ttTimeHelper::insert(array( 'date'=>$new_date->toString(DB_DATEFORMAT), diff --git a/user_add.php b/user_add.php index e6340de9..92861d90 100644 --- a/user_add.php +++ b/user_add.php @@ -144,7 +144,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidEmail($cl_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email')); if (!ttValidFloat($cl_rate, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate')); - if ($errors->isEmpty()) { + if ($errors->no()) { if (!ttUserHelper::getUserByLogin($cl_login)) { $fields = array( 'name' => $cl_name, diff --git a/user_edit.php b/user_edit.php index e314e53e..060367d8 100644 --- a/user_edit.php +++ b/user_edit.php @@ -175,7 +175,7 @@ if ($request->getMethod() == 'POST') { if (!ttValidEmail($cl_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email')); if (!ttValidFloat($cl_rate, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate')); - if ($errors->isEmpty()) { + if ($errors->no()) { $existing_user = ttUserHelper::getUserByLogin($cl_login); if (!$existing_user || ($user_id == $existing_user['id'])) { -- 2.20.1