Renamed errors to err to keep things shorter

diff --git a/access_denied.php b/access_denied.php
index 05983f5..d5c58fe 100644 (file)
--- a/access_denied.php
+++ b/access_denied.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 
-$errors->add($i18n->getKey('error.access_denied'));  
+$err->add($i18n->getKey('error.access_denied'));
 if ($auth->isAuthenticated()) $GLOBALS['SMARTY']->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->getKey('label.error'));

diff --git a/admin_options.php b/admin_options.php
index b06af62..a7e567f 100644 (file)
--- a/admin_options.php
+++ b/admin_options.php
@@ -49,18 +49,18 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 if ($request->isPost()) {
   if ($cl_password1 || $cl_password2) {
     // Validate user input.
-    if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
 
-  if ($errors->no() && $cl_password1) {
+  if ($err->no() && $cl_password1) {
     if (ttUserHelper::setPassword($user->id, $cl_password1)) {
       header('Location: admin_teams.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/admin_team_add.php b/admin_team_add.php
index 06f19bc..d17f864 100644 (file)
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -60,18 +60,18 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_team_name, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-  if (!ttValidString($cl_manager_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-  if (!ttValidString($cl_manager_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+  if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+  if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+  if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
   if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->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 (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_manager_login)) {
       // Create a new team.
       if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
@@ -89,9 +89,9 @@ if ($request->isPost()) {
       if ($team_id && $user_id) {
         header('Location: admin_teams.php');
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
 } // isPost
 

diff --git a/admin_team_delete.php b/admin_team_delete.php
index 5cb2e85..19de9a7 100644 (file)
--- a/admin_team_delete.php
+++ b/admin_team_delete.php
@@ -51,7 +51,7 @@ if ($request->isPost()) {
       header('Location: admin_teams.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {

diff --git a/admin_team_edit.php b/admin_team_edit.php
index 1ac618e..84057b0 100644 (file)
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -75,22 +75,22 @@ $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getK
 if ($request->isPost()) {
   if ($request->getParameter('btn_save')) {
     // Validate user input.
-    if (!ttValidString($cl_team_name, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_manager_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-    if (!ttValidString($cl_manager_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+    if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+    if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+    if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
     if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-      if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-      if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+      if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+      if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
       if ($cl_password1 !== $cl_password2)
-        $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+        $err->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 (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
 
     // New login must be unique.
     if ($cl_manager_login != $team_details['manager_login'])
-      if (ttUserHelper::getUserByLogin($cl_manager_login)) $errors->add($i18n->getKey('error.user_exists'));
+      if (ttUserHelper::getUserByLogin($cl_manager_login)) $err->add($i18n->getKey('error.user_exists'));
 
-    if ($errors->no()) {
+    if ($err->no()) {
       $update_result = ttTeamHelper::update($team_id, array('name'=>$cl_team_name));
       if ($update_result) {
         $update_result = ttUserHelper::update($team_details['manager_id'], array(
@@ -104,7 +104,7 @@ if ($request->isPost()) {
         header('Location: admin_teams.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   }
 

diff --git a/cf_custom_field_add.php b/cf_custom_field_add.php
index d6766ef..656cb9b 100644 (file)
--- a/cf_custom_field_add.php
+++ b/cf_custom_field_add.php
@@ -55,15 +55,15 @@ $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey(
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_field_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_field_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $res = CustomFields::insertField($cl_field_name, $cl_field_type, $cl_required);
     if ($res) {
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index 162ddeb..86fa7d8 100644 (file)
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -48,7 +48,7 @@ if ($request->isPost()) {
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
   if ($request->getParameter('btn_cancel')) {
     // Cancel button pressed.
@@ -58,9 +58,9 @@ if ($request->isPost()) {
 } else {
   $field = CustomFields::getField($id);        
   if (false === $field)
-    $errors->add($i18n->getKey('error.db'));
+    $err->add($i18n->getKey('error.db'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$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_custom_field_edit.php b/cf_custom_field_edit.php
index 0488f64..f368515 100644 (file)
--- a/cf_custom_field_edit.php
+++ b/cf_custom_field_edit.php
@@ -39,10 +39,10 @@ if (!ttAccessCheck(right_manage_team)) {
 $cl_id = $request->getParameter('id');
 $field = CustomFields::getField($cl_id);
 if (false === $field)
-  $errors->add($i18n->getKey('error.db'));
+  $err->add($i18n->getKey('error.db'));
 
 $form = new Form('fieldForm');
-if ($errors->no()) {
+if ($err->no()) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$field['label']));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
   $form->addInput(array('type'=>'checkbox','name'=>'required','data'=>1,'value'=>$field['required']));
@@ -60,15 +60,15 @@ if ($request->isPost()) {
     $cl_required = 0;
 
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $res = CustomFields::updateField($cl_id, $cl_name, $cl_type, $cl_required);
     if ($res) {
       header('Location: cf_custom_fields.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index 7feae8a..a8de8e5 100644 (file)
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.php
@@ -39,10 +39,10 @@ if (!ttAccessCheck(right_manage_team)) {
 $cl_field_id = $request->getParameter('field_id');
 $field = CustomFields::getField($cl_field_id);
 if (false === $field)
-  $errors->add($i18n->getKey('error.db'));
+  $err->add($i18n->getKey('error.db'));
 
 $form = new Form('optionAddForm');
-if ($errors->no()) {
+if ($err->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')));
@@ -52,15 +52,15 @@ if ($request->isPost()) {
   $cl_option_name = trim($request->getParameter('name'));
 
   // Validate user input.
-  if (!ttValidString($cl_option_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_option_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $res = CustomFields::insertOption($cl_field_id, $cl_option_name);
     if ($res) {
       header("Location: cf_dropdown_options.php?field_id=$cl_field_id");
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 270d56f..ed29592 100644 (file)
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -50,7 +50,7 @@ if ($request->isPost()) {
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
   if ($request->getParameter('btn_cancel')) {
     // Cancel button pressed.
@@ -60,9 +60,9 @@ if ($request->isPost()) {
 } else {
   $option = CustomFields::getOptionName($cl_id);
   if (false === $option)
-    $errors->add($i18n->getKey('error.db'));
+    $err->add($i18n->getKey('error.db'));
 
-  if ($errors->no()) {
+  if ($err->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 0f47e18..bf5b17e 100644 (file)
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -39,10 +39,10 @@ if (!ttAccessCheck(right_manage_team)) {
 $cl_id = $request->getParameter('id');
 $cl_name = CustomFields::getOptionName($cl_id);
 if (false === $cl_name)
-  $errors->add($i18n->getKey('error.db'));
+  $err->add($i18n->getKey('error.db'));
 
 $form = new Form('optionEditForm');
-if ($errors->no()) {
+if ($err->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')));
@@ -52,9 +52,9 @@ if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
 
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $res = CustomFields::updateOption($cl_id, $cl_name);
     if ($res) {
       // Determine field id for redirect.
@@ -62,7 +62,7 @@ if ($request->isPost()) {
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/cf_dropdown_options.php b/cf_dropdown_options.php
index e12900b..a7718fb 100644 (file)
--- a/cf_dropdown_options.php
+++ b/cf_dropdown_options.php
@@ -39,7 +39,7 @@ if (!ttAccessCheck(right_manage_team)) {
 $field_id = $request->getParameter('field_id');
 $options = CustomFields::getOptions($field_id);
 if (false === $options)
-  $errors->add($i18n->getKey('error.db'));
+  $err->add($i18n->getKey('error.db'));
 
 $form = new Form('dropdownOptionsForm');
 

diff --git a/client_add.php b/client_add.php
index 1bdb160..7a90d22 100644 (file)
--- a/client_add.php
+++ b/client_add.php
@@ -60,11 +60,11 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
         'team_id' => $user->team_id,
@@ -76,9 +76,9 @@ if ($request->isPost()) {
         header('Location: clients.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
      } else
-       $errors->add($i18n->getKey('error.client_exists'));
+       $err->add($i18n->getKey('error.client_exists'));
   }
 } // POST
 

diff --git a/client_delete.php b/client_delete.php
index e566455..e22704f 100644 (file)
--- a/client_delete.php
+++ b/client_delete.php
@@ -55,10 +55,10 @@ if ($request->isPost()) {
         header('Location: clients.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   } else 
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');

diff --git a/client_edit.php b/client_edit.php
index a106cf9..c64618d 100644 (file)
--- a/client_edit.php
+++ b/client_edit.php
@@ -73,11 +73,11 @@ $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       $client = ttClientHelper::getClientByName($cl_name);
       if (($client && ($cl_id == $client['id'])) || !$client) {
@@ -91,9 +91,9 @@ if ($request->isPost()) {
           header('Location: clients.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->getKey('error.client_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -108,9 +108,9 @@ if ($request->isPost()) {
           header('Location: clients.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.client_exists'));
+        $err->add($i18n->getKey('error.client_exists'));
     }
   }
 } // POST

diff --git a/expense_delete.php b/expense_delete.php
index dd3f912..d0b11cc 100644 (file)
--- a/expense_delete.php
+++ b/expense_delete.php
@@ -59,16 +59,16 @@ if ($request->isPost()) {
       $item_date = new DateAndTime(DB_DATEFORMAT);
       $item_date->parseVal($expense_item['date'], DB_DATEFORMAT);
       if ($item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.period_locked'));
     }
 
-    if ($errors->no()) {
+    if ($err->no()) {
       // Mark the record as deleted.
       if (ttExpenseHelper::markDeleted($cl_id, $user->getActiveUser())) {
         header('Location: expenses.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.

diff --git a/expense_edit.php b/expense_edit.php
index 422e83a..1703c17 100644 (file)
--- a/expense_edit.php
+++ b/expense_edit.php
@@ -132,13 +132,13 @@ $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
 if ($request->isPost()) {
   // Validate user input.
   if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-    $errors->add($i18n->getKey('error.client'));
+    $err->add($i18n->getKey('error.client'));
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->getKey('error.project'));
   }
-  if (!ttValidString($cl_item_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
-  if (!ttValidFloat($cl_cost)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
+  if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
 
   // Determine lock date.
   $lock_interval = $user->lock_interval;
@@ -155,7 +155,7 @@ if ($request->isPost()) {
   if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $errors->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->getKey('error.future_date'));
   }
 
   // Save record.
@@ -167,13 +167,13 @@ if ($request->isPost()) {
     // Now, step by step.
     // 1) Prohibit updating locked entries.
     if($lockdate && $item_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));        
+      $err->add($i18n->getKey('error.period_locked'));
     // 2) Prohibit saving completed unlocked entries into locked interval.
-    if($errors->no() && $lockdate && $new_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));        
+    if($err->no() && $lockdate && $new_date->before($lockdate))
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Now, an update.
-    if ($errors->no()) {
+    if ($err->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));
@@ -186,16 +186,16 @@ if ($request->isPost()) {
   if ($request->getParameter('btn_copy')) {
     // We need to prohibit saving into locked interval.
     if($lockdate && $new_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Now, a new insert.
-    if ($errors->no()) {
+    if ($err->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));
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   }
 

diff --git a/expenses.php b/expenses.php
index f9112e3..52fa81d 100644 (file)
--- a/expenses.php
+++ b/expenses.php
@@ -146,33 +146,33 @@ if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
     if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-      $errors->add($i18n->getKey('error.client'));
+      $err->add($i18n->getKey('error.client'));
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->getKey('error.project'));
     }
-    if (!ttValidString($cl_item_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
-    if (!ttValidFloat($cl_cost)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
+    if (!ttValidString($cl_item_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.item'));
+    if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
 
     // Prohibit creating entries in future.
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
     // Finished validating input data.
 
     // Prohibit creating time entries in locked interval.
     if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Insert record.
-    if ($errors->no()) {
+    if ($err->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');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   }
   else if ($request->getParameter('onBehalfUser')) {

diff --git a/export.php b/export.php
index 5893d80..fb0e756 100644 (file)
--- a/export.php
+++ b/export.php
@@ -74,7 +74,7 @@ if ($request->isPost()) {
     }
     exit;
   } else
-    $errors->add($i18n->getKey('error.sys'));
+    $err->add($i18n->getKey('error.sys'));
 } // POST
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

diff --git a/import.php b/import.php
index d10ee00..e4a74ee 100644 (file)
--- a/import.php
+++ b/import.php
@@ -43,9 +43,9 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
 
-  $import = new ttImportHelper($errors);
+  $import = new ttImportHelper($err);
   $import->importXml();
-  if ($errors->no())
+  if ($err->no())
     $messages->add($i18n->getKey('form.import.success'));
 } // POST
 

diff --git a/initialize.php b/initialize.php
index 9dc9d7b..2cb0f5b 100644 (file)
--- a/initialize.php
+++ b/initialize.php
@@ -152,7 +152,7 @@ import('html.HttpRequest');
 $request = new ttHttpRequest();
 
 import('form.ActionErrors');
-$errors = new ActionErrors();
+$err = new ActionErrors();
 $messages = new ActionErrors();
 
 // Create an instance of ttUser class. This gets us most of user details.
@@ -193,7 +193,7 @@ $GLOBALS['USER'] = &$user;
 
 // Assign things for smarty to use in template files.
 $smarty->assign('i18n', $i18n->keys);
-$smarty->assign('errors', $errors);
+$smarty->assign('errors', $err);
 $smarty->assign('messages', $messages);
 
 // TODO: move this code out of here to the files that use it.

diff --git a/invoice_add.php b/invoice_add.php
index e536f87..347f6b4 100644 (file)
--- a/invoice_add.php
+++ b/invoice_add.php
@@ -66,28 +66,28 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_number)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.invoice.number'));
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!$cl_client) $errors->add($i18n->getKey('error.client'));
-  if (!ttValidDate($cl_start)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
-  if (!ttValidDate($cl_finish)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+  if (!ttValidString($cl_number)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.invoice.number'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!$cl_client) $err->add($i18n->getKey('error.client'));
+  if (!ttValidDate($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
+  if (!ttValidDate($cl_finish)) $err->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->no()) {
+  if ($err->no()) {
     if (ttInvoiceHelper::getInvoiceByName($cl_number))
-      $errors->add($i18n->getKey('error.invoice_exists'));
+      $err->add($i18n->getKey('error.invoice_exists'));
 
     if (!ttInvoiceHelper::invoiceableItemsExist($fields))
-      $errors->add($i18n->getKey('error.no_invoiceable_items'));
+      $err->add($i18n->getKey('error.no_invoiceable_items'));
   }
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Now we can go ahead and create our invoice.
     if (ttInvoiceHelper::createInvoice($fields)) {
       header('Location: invoices.php');
       exit();
     }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/invoice_delete.php b/invoice_delete.php
index 89f132d..579155a 100644 (file)
--- a/invoice_delete.php
+++ b/invoice_delete.php
@@ -56,9 +56,9 @@ if ($request->isPost()) {
         header('Location: invoices.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   } else if ($request->getParameter('btn_cancel')) {
     header('Location: invoices.php');
     exit();

diff --git a/invoice_send.php b/invoice_send.php
index d5f9308..fba99ca 100644 (file)
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -66,12 +66,12 @@ $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidEmailList($cl_receiver)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  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 (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Save last invoice emails for future use.
     $sc->setValue(SYSC_LAST_INVOICE_EMAIL, $cl_receiver);
     $sc->setValue(SYSC_LAST_INVOICE_CC, $cl_cc);
@@ -90,7 +90,7 @@ if ($request->isPost()) {
     if ($mailer->send($cl_subject, $body))
       $messages->add($i18n->getKey('form.mail.invoice_sent'));
     else
-      $errors->add($i18n->getKey('error.mail_send'));
+      $err->add($i18n->getKey('error.mail_send'));
   }
 } // POST
 

diff --git a/login.php b/login.php
index 67b47da..886800c 100644 (file)
--- a/login.php
+++ b/login.php
@@ -44,10 +44,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_t
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
 
-  if ($errors->no()) {
+  if ($err->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');
@@ -76,12 +76,12 @@ if ($request->isPost()) {
         exit();
       }
     } else
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->getKey('error.auth'));
   }
 } // POST
 
 if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
-  $errors->add($i18n->getKey('error.no_teams'));
+  $err->add($i18n->getKey('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);

diff --git a/mobile/access_denied.php b/mobile/access_denied.php
index 5325a34..836579a 100644 (file)
--- a/mobile/access_denied.php
+++ b/mobile/access_denied.php
@@ -28,7 +28,7 @@
 
 require_once('../initialize.php');
 
-$errors->add($i18n->getKey('error.access_denied'));
+$err->add($i18n->getKey('error.access_denied'));
 if ($auth->isAuthenticated()) $GLOBALS['SMARTY']->assign('authenticated', true); // Used in header.tpl for menu display.
 
 $smarty->assign('title', $i18n->getKey('label.error'));

diff --git a/mobile/login.php b/mobile/login.php
index 3d382db..7e5d871 100644 (file)
--- a/mobile/login.php
+++ b/mobile/login.php
@@ -46,10 +46,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_login','onclick'=>'browser_t
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_password)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
 
-  if ($errors->no()) {
+  if ($err->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.
@@ -80,12 +80,12 @@ if ($request->isPost()) {
         exit();
       }
     } else
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->getKey('error.auth'));
   }
 } // POST
 
 if(!isTrue(MULTITEAM_MODE) && !ttTeamHelper::getTeams())
-  $errors->add($i18n->getKey('error.no_teams'));
+  $err->add($i18n->getKey('error.no_teams'));
 
 // Determine whether to show login hint. It is currently used only for Windows LDAP authentication.
 $show_hint = ('ad' == $GLOBALS['AUTH_MODULE_PARAMS']['type']);

diff --git a/mobile/time.php b/mobile/time.php
index bc03184..f353948 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -197,67 +197,67 @@ if ($request->isPost()) {
 
     // Validate user input.
     if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-      $errors->add($i18n->getKey('error.client'));
+      $err->add($i18n->getKey('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->getKey('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->getKey('error.task'));
     }
     if (!$cl_duration) {
       if ('0' == $cl_duration)
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
       else if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
         if ($cl_finish) {
           if (!ttTimeHelper::isValidTime($cl_finish))
-            $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+            $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
           if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+            $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
         }
       } else {
         if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
         }
         if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
       }
     } else {
       if (!ttTimeHelper::isValidDuration($cl_duration))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
     }
-    if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
     if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($errors->no()) {
+    if ($err->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>");
+        $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
@@ -283,7 +283,7 @@ if ($request->isPost()) {
         header('Location: time.php');
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
 } // POST

diff --git a/mobile/time_delete.php b/mobile/time_delete.php
index 1683302..4dde97d 100644 (file)
--- a/mobile/time_delete.php
+++ b/mobile/time_delete.php
@@ -70,10 +70,10 @@ if ($request->isPost()) {
     $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->no()) {
+    if ($err->no()) {
 
       // Delete the record.
       $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
@@ -82,7 +82,7 @@ if ($request->isPost()) {
         header('Location: time.php');
         exit();
       } else {
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
       }
     }
   }

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 83e8915..7130b8c 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -211,42 +211,42 @@ if ($request->isPost()) {
 
   // Validate user input.
   if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-    $errors->add($i18n->getKey('error.client'));
+    $err->add($i18n->getKey('error.client'));
   if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->getKey('error.project'));
   }
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+    if (!$cl_task) $err->add($i18n->getKey('error.task'));
   }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
     else if ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
     }
   } else {
     if (!ttTimeHelper::isValidDuration($cl_duration))
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
   // Finished validating user input.
 
   // Determine lock date.
@@ -264,7 +264,7 @@ if ($request->isPost()) {
   if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $errors->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->getKey('error.future_date'));
   }
 
   // Save record.
@@ -275,32 +275,32 @@ if ($request->isPost()) {
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
+    if ($err->no()) {
       // 1) Prohibit saving locked time entries in any form.
       if($lockdate && $item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.period_locked'));
       // 2) Prohibit saving completed unlocked entries into locked interval.
-      if($errors->no() && $lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+      if($err->no() && $lockdate && $new_date->before($lockdate))
+        $err->add($i18n->getKey('error.period_locked'));
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, an update.
-    if ($errors->no()) {
+    if ($err->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 99a8852..6e3a447 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -195,15 +195,15 @@ if ($request->isPost()) {
 
     // Validate user input.
     if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-      $errors->add($i18n->getKey('error.client'));
+      $err->add($i18n->getKey('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->getKey('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->getKey('error.task'));
     }
     // Finished validating user input.
 
@@ -211,25 +211,25 @@ if ($request->isPost()) {
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
     if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.
-    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>");
+    if ($err->no() && $uncompleted) {
+      $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
@@ -255,7 +255,7 @@ if ($request->isPost()) {
         header('Location: timer.php');
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   if ($request->getParameter('btn_stop')) {
@@ -280,7 +280,7 @@ if ($request->isPost()) {
         header('Location: timer.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record['id']);

diff --git a/notification_add.php b/notification_add.php
index feeaa04..80bd33e 100644 (file)
--- a/notification_add.php
+++ b/notification_add.php
@@ -64,11 +64,11 @@ $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey(
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $errors->add($i18n->getKey('error.report')); 
-  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 (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
+  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Calculate next execution time.
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); 
 
@@ -82,7 +82,7 @@ if ($request->isPost()) {
         header('Location: notifications.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/notification_delete.php b/notification_delete.php
index 6723824..cd0d748 100644 (file)
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -52,9 +52,9 @@ if ($request->isPost()) {
         header('Location: notifications.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   } else if ($request->getParameter('btn_cancel')) {
     header('Location: notifications.php');
     exit();

diff --git a/notification_edit.php b/notification_edit.php
index b3d2dc1..f145208 100644 (file)
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -68,11 +68,11 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $errors->add($i18n->getKey('error.report')); 
-  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 (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
+  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Calculate next execution time.
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
 
@@ -87,7 +87,7 @@ if ($request->isPost()) {
         header('Location: notifications.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/password_change.php b/password_change.php
index 84e8f6a..0c51280 100644 (file)
--- a/password_change.php
+++ b/password_change.php
@@ -66,12 +66,12 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-  if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+  if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+  if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
   if ($cl_password1 !== $cl_password2)
-    $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+    $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
 
-  if ($errors->no()) {
+  if ($err->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.
@@ -84,7 +84,7 @@ if ($request->isPost()) {
       header('Location: time.php');
       exit();
     } else {
-      $errors->add($i18n->getKey('error.auth'));
+      $err->add($i18n->getKey('error.auth'));
     }
   }
 } // POST

diff --git a/password_reset.php b/password_reset.php
index d67372c..9c2ed4e 100644 (file)
--- a/password_reset.php
+++ b/password_reset.php
@@ -44,9 +44,9 @@ if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 
   // Validate user input.
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
 
-  if ($errors->IsEmpty()) {
+  if ($err->IsEmpty()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
       // User with a specified login was not found.
       // In this case, if login looks like email, try finding user by email.
@@ -55,13 +55,13 @@ if ($request->isPost()) {
         if ($login)
           $cl_login = $login;
         else
-          $errors->add($i18n->getKey('error.no_login'));
+          $err->add($i18n->getKey('error.no_login'));
       } else
-        $errors->add($i18n->getKey('error.no_login'));
+        $err->add($i18n->getKey('error.no_login'));
     }
   }
 
-  if ($errors->IsEmpty()) {
+  if ($err->IsEmpty()) {
     $user = new ttUser($cl_login); // Note: reusing $user from initialize.php here.
 
     // Prepare and save a temporary reference for user.
@@ -83,7 +83,7 @@ if ($request->isPost()) {
       if (ttValidEmail($cl_login))
         $receiver = $cl_login;
       else
-        $errors->add($i18n->getKey('error.no_email')); 
+        $err->add($i18n->getKey('error.no_email'));
     }
 
     if ($receiver) {

diff --git a/profile_edit.php b/profile_edit.php
index b39903f..a4c9db6 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -181,30 +181,30 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
   if ($can_change_login) {
-    if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+    if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
 
     // New login must be unique.
     if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
-  if (!ttValidEmail($cl_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
   if ($user->canManageTeam()) {
-    if (!ttValidString($cl_team, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_address, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.address'));
-    if (!ttValidString($cl_currency, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
-    if (!ttValidInteger($cl_lock_interval, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.lock_interval'));
+    if (!ttValidString($cl_team, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+    if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.address'));
+    if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
+    if (!ttValidInteger($cl_lock_interval, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.lock_interval'));
   }
   // Finished validating user input.
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if ($cl_lock_interval == null || trim($cl_lock_interval) == '')
       $cl_lock_interval = 0;
 
@@ -256,7 +256,7 @@ if ($request->isPost()) {
       header('Location: time.php');
       exit();
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   }
 } // POST
 

diff --git a/project_add.php b/project_add.php
index e00a220..c2a30c5 100644 (file)
--- a/project_add.php
+++ b/project_add.php
@@ -67,10 +67,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey(
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
       if (ttProjectHelper::insert(array(
         'team_id' => $user->team_id,
@@ -82,9 +82,9 @@ if ($request->isPost()) {
           header('Location: projects.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.project_exists'));
+      $err->add($i18n->getKey('error.project_exists'));
   }
 } // POST
 

diff --git a/project_delete.php b/project_delete.php
index 6801272..b8a482a 100644 (file)
--- a/project_delete.php
+++ b/project_delete.php
@@ -52,9 +52,9 @@ if ($request->isPost()) {
         header('Location: projects.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   } else if ($request->getParameter('btn_cancel')) {
     header('Location: projects.php');
     exit();

diff --git a/project_edit.php b/project_edit.php
index cb62d20..7f2cd34 100644 (file)
--- a/project_edit.php
+++ b/project_edit.php
@@ -84,10 +84,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       $existing_project = ttProjectHelper::getProjectByName($cl_name);
       if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
@@ -102,9 +102,9 @@ if ($request->isPost()) {
            header('Location: projects.php');
            exit();
         } else
-           $errors->add($i18n->getKey('error.db'));
+           $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->getKey('error.project_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -119,9 +119,9 @@ if ($request->isPost()) {
           header('Location: projects.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.project_exists'));
+        $err->add($i18n->getKey('error.project_exists'));
     }
   }
 } // POST

diff --git a/register.php b/register.php
index eb74948..03d77b6 100644 (file)
--- a/register.php
+++ b/register.php
@@ -63,17 +63,17 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_team_name, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-  if (!ttValidString($cl_currency, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
-  if (!ttValidString($cl_manager_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-  if (!ttValidString($cl_manager_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
-  if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-  if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+  if (!ttValidString($cl_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+  if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
+  if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+  if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+  if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+  if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
   if ($cl_password1 !== $cl_password2)
-    $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'));
+    $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+  if (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_manager_login)) {
       // Create a new team.
       $team_id = ttTeamHelper::insert(array('name'=>$cl_team_name,'currency'=>$cl_currency));
@@ -96,9 +96,9 @@ if ($request->isPost()) {
         }
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
 } // POST
 

diff --git a/report_send.php b/report_send.php
index ecd9544..4903245 100644 (file)
--- a/report_send.php
+++ b/report_send.php
@@ -60,12 +60,12 @@ $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidEmailList($cl_receiver)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  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 (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Save last report emails for future use.
     $sc->setValue(SYSC_LAST_REPORT_EMAIL, $cl_receiver);
     $sc->setValue(SYSC_LAST_REPORT_CC, $cl_cc);
@@ -87,7 +87,7 @@ if ($request->isPost()) {
     if ($mailer->send($cl_subject, $body))
       $messages->add($i18n->getKey('form.mail.report_sent'));
     else
-      $errors->add($i18n->getKey('error.mail_send'));
+      $err->add($i18n->getKey('error.mail_send'));
   }
 }
 

diff --git a/reports.php b/reports.php
index e2b149f..894526d 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -262,13 +262,13 @@ if ($request->isPost()) {
     }
   } elseif ($bean->getAttribute('btn_save')) {
     // 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 (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite'));
 
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttFavReportHelper::saveReport($user->id, $bean);
       if (!$id)
-        $errors->add($i18n->getKey('error.db'));
-      if ($errors->no()) {
+        $err->add($i18n->getKey('error.db'));
+      if ($err->no()) {
         $bean->setAttribute('favorite_report', $id);
         $bean->saveBean();
         header('Location: reports.php');
@@ -294,19 +294,19 @@ if ($request->isPost()) {
       $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
 
       if ($start_date->isError() || !$bean->getAttribute('start_date'))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
 
       $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
       if ($end_date->isError() || !$bean->getAttribute('end_date'))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
 
       if ($start_date->compare($end_date) > 0)
-        $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
+        $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
     }
 
     $bean->saveBean();
 
-    if ($errors->no()) {
+    if ($err->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 da35416..15e8e7f 100644 (file)
--- a/task_add.php
+++ b/task_add.php
@@ -57,10 +57,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttTaskHelper::getTaskByName($cl_name)) {
       if (ttTaskHelper::insert(array(
         'team_id' => $user->team_id,
@@ -71,9 +71,9 @@ if ($request->isPost()) {
           header('Location: tasks.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.task_exists'));
+      $err->add($i18n->getKey('error.task_exists'));
   }
 } // POST
 

diff --git a/task_delete.php b/task_delete.php
index c0834a7..d4321fb 100644 (file)
--- a/task_delete.php
+++ b/task_delete.php
@@ -52,9 +52,9 @@ if ($request->isPost()) {
         header('Location: tasks.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
   } else if ($request->getParameter('btn_cancel')) {
     header('Location: tasks.php');
     exit();

diff --git a/task_edit.php b/task_edit.php
index 2a90133..bdd99b5 100644 (file)
--- a/task_edit.php
+++ b/task_edit.php
@@ -68,10 +68,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey
 
 if ($request->isPost()) {
   // Validate user input.
-  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 (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       $existing_task = ttTaskHelper::getTaskByName($cl_name);
       if (!$existing_task || ($cl_task_id == $existing_task['id'])) {
@@ -85,9 +85,9 @@ if ($request->isPost()) {
           header('Location: tasks.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->getKey('error.task_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
@@ -101,9 +101,9 @@ if ($request->isPost()) {
           header('Location: tasks.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->getKey('error.db'));
       } else
-        $errors->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->getKey('error.task_exists'));
     }
   }
 } // POST

diff --git a/time.php b/time.php
index b7ea572..c79315d 100644 (file)
--- a/time.php
+++ b/time.php
@@ -218,68 +218,68 @@ if ($request->isPost()) {
 
     // Validate user input.
     if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-      $errors->add($i18n->getKey('error.client'));
+      $err->add($i18n->getKey('error.client'));
     if ($custom_fields) {
-      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+      if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
     }
     if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+      if (!$cl_project) $err->add($i18n->getKey('error.project'));
     }
     if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-      if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+      if (!$cl_task) $err->add($i18n->getKey('error.task'));
     }
     if (!$cl_duration) {
       if ('0' == $cl_duration)
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
       else if ($cl_start || $cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_start))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
         if ($cl_finish) {
           if (!ttTimeHelper::isValidTime($cl_finish))
-            $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+            $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
           if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-            $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+            $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
         }
       } else {
         if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
         }
         if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-          $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+          $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
       }
     } else {
       if (!ttTimeHelper::isValidDuration($cl_duration))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
     }
-    if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+    if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
     // Finished validating user input.
 
     // Prohibit creating entries in future.
     if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
       $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
       if ($selected_date->after($browser_today))
-        $errors->add($i18n->getKey('error.future_date'));
+        $err->add($i18n->getKey('error.future_date'));
     }
 
     // Prohibit creating time entries in locked interval.
     if($lockdate && $selected_date->before($lockdate))
-      $errors->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.period_locked'));
 
     // Prohibit creating another uncompleted record.
-    if ($errors->no()) {
+    if ($err->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>");
+        $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $cl_date, $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Insert record.
-    if ($errors->no()) {
+    if ($err->no()) {
       $id = ttTimeHelper::insert(array(
         'date' => $cl_date,
         'user_id' => $user->getActiveUser(),
@@ -304,7 +304,7 @@ if ($request->isPost()) {
         header('Location: time.php');
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   else if ($request->getParameter('btn_stop')) {
@@ -330,7 +330,7 @@ if ($request->isPost()) {
           'note'=>$record['comment'],
           'billable'=>$record['billable']));
       if (!$res)
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else {
       // Cannot complete, redirect for manual edit.
       header('Location: time_edit.php?id='.$record_id);

diff --git a/time_delete.php b/time_delete.php
index 8bbc597..538d9c7 100644 (file)
--- a/time_delete.php
+++ b/time_delete.php
@@ -69,10 +69,10 @@ if ($request->isPost()) {
     $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->no()) {
+    if ($err->no()) {
 
       // Delete the record.
       $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
@@ -81,7 +81,7 @@ if ($request->isPost()) {
         header('Location: time.php');
         exit();
       } else {
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
       }
     }
   }

diff --git a/time_edit.php b/time_edit.php
index c66ae57..7e4f7bf 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -212,42 +212,42 @@ if ($request->isPost()) {
 
   // Validate user input.
   if (in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)) && !$cl_client)
-    $errors->add($i18n->getKey('error.client'));
+    $err->add($i18n->getKey('error.client'));
   if ($custom_fields) {
-    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $errors->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
+    if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->getKey('error.field'), $custom_fields->fields[0]['label']);
   }
   if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_project) $errors->add($i18n->getKey('error.project'));
+    if (!$cl_project) $err->add($i18n->getKey('error.project'));
   }
   if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-    if (!$cl_task) $errors->add($i18n->getKey('error.task'));
+    if (!$cl_task) $err->add($i18n->getKey('error.task'));
   }
   if (!$cl_duration) {
     if ('0' == $cl_duration)
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
     else if ($cl_start || $cl_finish) {
       if (!ttTimeHelper::isValidTime($cl_start))
-        $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start'));
       if ($cl_finish) {
         if (!ttTimeHelper::isValidTime($cl_finish))
-          $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
+          $err->add($i18n->getKey('error.field'), $i18n->getKey('label.finish'));
         if (!ttTimeHelper::isValidInterval($cl_start, $cl_finish))
-          $errors->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
+          $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.finish'), $i18n->getKey('label.start'));
       }
     } else {
       if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.start'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.finish'));
       }
       if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
-        $errors->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
+        $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration'));
     }
   } else {
     if (!ttTimeHelper::isValidDuration($cl_duration))
-      $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
+      $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
   }
-  if (!ttValidDate($cl_date)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
-  if (!ttValidString($cl_note, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
+  if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
+  if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));
   // Finished validating user input.
 
   // Determine lock date.
@@ -265,7 +265,7 @@ if ($request->isPost()) {
   if (defined('FUTURE_ENTRIES') && !isTrue(FUTURE_ENTRIES)) {
     $browser_today = new DateAndTime(DB_DATEFORMAT, $request->getParameter('browser_today', null));
     if ($new_date->after($browser_today))
-      $errors->add($i18n->getKey('error.future_date'));
+      $err->add($i18n->getKey('error.future_date'));
   }
 
   // Save record.
@@ -276,32 +276,32 @@ if ($request->isPost()) {
     // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
+    if ($err->no()) {
       // 1) Prohibit saving locked time entries in any form.
       if($lockdate && $item_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.period_locked'));
       // 2) Prohibit saving completed unlocked entries into locked interval.
-      if($errors->no() && $lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+      if($err->no() && $lockdate && $new_date->before($lockdate))
+        $err->add($i18n->getKey('error.period_locked'));
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec && ($time_rec['id'] <> $not_completed_rec['id'])) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish, $cl_id))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, an update.
-    if ($errors->no()) {
+    if ($err->no()) {
       $res = ttTimeHelper::update(array(
         'id'=>$cl_id,
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -337,29 +337,29 @@ if ($request->isPost()) {
     // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
 
     // Now, step by step.
-    if ($errors->no()) {
+    if ($err->no()) {
       // 1) Prohibit saving into locked interval.
       if($lockdate && $new_date->before($lockdate))
-        $errors->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.period_locked'));
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
       if ($uncompleted) {
         $not_completed_rec = ttTimeHelper::getUncompleted($user->getActiveUser());
         if ($not_completed_rec) {
           // We have another not completed record.
-          $errors->add($i18n->getKey('error.uncompleted_exists')." <a href = 'time_edit.php?id=".$not_completed_rec['id']."'>".$i18n->getKey('error.goto_uncompleted')."</a>");
+          $err->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->no()) {
+    if ($err->no()) {
       if (ttTimeHelper::overlaps($user->getActiveUser(), $new_date->toString(DB_DATEFORMAT), $cl_start, $cl_finish))
-        $errors->add($i18n->getKey('error.overlap'));
+        $err->add($i18n->getKey('error.overlap'));
     }
 
     // Now, a new insert.
-    if ($errors->no()) {
+    if ($err->no()) {
 
       $id = ttTimeHelper::insert(array(
         'date'=>$new_date->toString(DB_DATEFORMAT),
@@ -385,7 +385,7 @@ if ($request->isPost()) {
         header('Location: time.php?date='.$new_date->toString(DB_DATEFORMAT));
         exit();
       }
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
 

diff --git a/user_add.php b/user_add.php
index 9834fec..26cbe69 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -68,7 +68,7 @@ if ($request->isPost()) {
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $errors->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
     }
   }
 }
@@ -133,18 +133,18 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
   if (!$auth->isPasswordExternal()) {
-    if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
-  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 (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
       $fields = array(
         'name' => $cl_name,
@@ -160,9 +160,9 @@ if ($request->isPost()) {
         header('Location: users.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
 } // POST
 

diff --git a/user_delete.php b/user_delete.php
index 8ea639c..092dcb4 100644 (file)
--- a/user_delete.php
+++ b/user_delete.php
@@ -84,7 +84,7 @@ if ($request->isPost()) {
       }
       exit();
     } else {
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   if ($request->getParameter('btn_cancel')) {

diff --git a/user_edit.php b/user_edit.php
index 9026fe0..1183b76 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -85,7 +85,7 @@ if ($request->isPost()) {
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $errors->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
     }
   }
 } else {
@@ -164,18 +164,18 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
   if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-    if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-    if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
-  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 (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);
     if (!$existing_user || ($user_id == $existing_user['id'])) {
 
@@ -219,9 +219,9 @@ if ($request->isPost()) {
         exit();
 
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
 } // POST