Switched to using shorter ActionErrors functions

diff --git a/WEB-INF/lib/form/ActionErrors.class.php b/WEB-INF/lib/form/ActionErrors.class.php
index 0206136..9cdc21b 100644 (file)
--- 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 f954392..76cd662 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.16.3430 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.16.3431 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 90a4289..2e058ef 100644 (file)
--- 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. -->
       <!-- End of page title and user details -->
 
       <!-- Output errors -->
-{if !$errors->isEmpty()}
+{if $errors->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="error">
@@ -174,7 +174,7 @@ With 101% height we essentially force the scrollbar to always appear. -->
       <!-- End of output errors -->
 
       <!-- Output messages -->
-{if !$messages->isEmpty()}
+{if $messages->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">

diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index a2b2311..b09f0da 100644 (file)
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -69,7 +69,7 @@
       <!-- End of output errors -->
 
       <!-- Output messages -->
-{if !$messages->isEmpty()}
+{if $messages->yes()}
       <table cellspacing="4" cellpadding="7" width="{$tab_width}" border="0">
         <tr>
           <td class="info_message">

diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index 2ffb83f..c1fa7e0 100644 (file)
--- 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 c53f16e..a1f4b13 100644 (file)
--- 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 f61225b..4c5fc4a 100644 (file)
--- 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 4aef5ab..b2cdbe7 100644 (file)
--- 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 747ed2b..d594222 100644 (file)
--- 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 69ceb66..c4953a0 100644 (file)
--- 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 89ca38c..ffe0455 100644 (file)
--- 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 0f93b3b..15ccad5 100644 (file)
--- 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 7d61e03..f604c4f 100644 (file)
--- 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 9074ce2..0ee614f 100644 (file)
--- 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 399e08c..18d8db6 100644 (file)
--- 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 f193aa2..3051a20 100644 (file)
--- 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 d92ff5b..1a96526 100644 (file)
--- 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 8d2f707..f638eca 100644 (file)
--- 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')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
     }
 
     // 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 be9d498..cd702f7 100644 (file)
--- 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 d6dc7d1..87dc587 100644 (file)
--- 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 fa00ced..7710f40 100644 (file)
--- 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')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
     }
 
     // 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 8a0cddf..fd8d0c8 100644 (file)
--- 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 f4d1d1d..6e5bd93 100644 (file)
--- 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 e7d2750..9302ef0 100644 (file)
--- 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 3ef146e..9732fb6 100644 (file)
--- 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 d799044..b7bef62 100644 (file)
--- 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 10d142f..25bafcb 100644 (file)
--- 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 2321718..035e29b 100644 (file)
--- 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 d8a0690..505613e 100644 (file)
--- 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 c22bf25..004ae6a 100644 (file)
--- 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 f9d5981..205bb72 100644 (file)
--- 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 549a74f..4796850 100644 (file)
--- 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 9b20578..b01cd94 100644 (file)
--- 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')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
     }
 
     // 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 e07d1d3..9c53323 100644 (file)
--- 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 d362709..cc3070c 100644 (file)
--- 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 e6340de..92861d9 100644 (file)
--- 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 e314e53..060367d 100644 (file)
--- 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'])) {