Introduced shorter functions for Errors class

diff --git a/WEB-INF/lib/form/ActionErrors.class.php b/WEB-INF/lib/form/ActionErrors.class.php
index 04a6333f0db677277616b1b29e8c7b7f8529feec..0206136146ea9751a01eaa8438af99c5a57586b5 100644 (file)
--- a/WEB-INF/lib/form/ActionErrors.class.php
+++ b/WEB-INF/lib/form/ActionErrors.class.php
@@ -28,14 +28,26 @@
 
 class ActionErrors {
     var $errors = array();
 
 class ActionErrors {
     var $errors = array();

-    
+

     function ActionErrors() {
     }
     function ActionErrors() {
     }

-    
+

     function isEmpty() {
     function isEmpty() {

-        return (count($this->errors)>0 ? false : true );
+        return (count($this->errors)>0 ? false : true);

     }
     }

-    
+
+    function exist() {
+        return (count($this->errors)>0 ? true : false);
+    }
+
+    function no() {
+        return (count($this->errors)>0 ? false : true);
+    }
+
+    function yes() {
+        return (count($this->errors)>0 ? true : false);
+    }
+

     function add($message, $arg0 = '', $arg1 = '') {
        $patterns = array ("/\{0\}/","/\{1\}/");
                $replace = array ($arg0, $arg1);
     function add($message, $arg0 = '', $arg1 = '') {
        $patterns = array ("/\{0\}/","/\{1\}/");
                $replace = array ($arg0, $arg1);


@@ -43,14 +55,6 @@ class ActionErrors {
         $this->errors[]["message"] = $message;
     }    
     
         $this->errors[]["message"] = $message;
     }    
     

-    function addAll($arr) {
-       if (is_array($arr)) {
-               foreach ($arr as $k=>$v) {
-                       $this->errors[$k] = $v;
-               }
-       }
-    }
-    

     function get($key) {
         return $this->errors["$key"]["message"];
     }
     function get($key) {
         return $this->errors["$key"]["message"];
     }

diff --git a/admin_options.php b/admin_options.php
index 2a44e3e2e2be486fbe6e289632a79ff6956432e5..ac7183776ab98df0c9c15b111c58c655630dd725 100644 (file)
--- a/admin_options.php
+++ b/admin_options.php
@@ -55,7 +55,7 @@ if ($request->getMethod() == 'POST') {
       $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
 
       $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
 

-  if ($errors->isEmpty() && $cl_password1) {
+  if ($errors->no() && $cl_password1) {

     if (ttUserHelper::setPassword($user->id, $cl_password1)) {
       header('Location: admin_teams.php');
       exit();
     if (ttUserHelper::setPassword($user->id, $cl_password1)) {
       header('Location: admin_teams.php');
       exit();

diff --git a/admin_team_edit.php b/admin_team_edit.php
index fa67f7aa63609b61d1234801ce3c39ddf23b4a38..d443928b2f1dd2abcc61e7ee24275c9c8d2fe1ff 100644 (file)
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -90,7 +90,7 @@ if ($request->getMethod() == 'POST') {
     if ($cl_manager_login != $team_details['manager_login'])
       if (ttUserHelper::getUserByLogin($cl_manager_login)) $errors->add($i18n->getKey('error.user_exists'));
 
     if ($cl_manager_login != $team_details['manager_login'])
       if (ttUserHelper::getUserByLogin($cl_manager_login)) $errors->add($i18n->getKey('error.user_exists'));
 

-    if ($errors->isEmpty()) {
+    if ($errors->no()) {

       $update_result = ttTeamHelper::update($team_id, array('name'=>$cl_team_name));
       if ($update_result) {
         $update_result = ttUserHelper::update($team_details['manager_id'], array(
       $update_result = ttTeamHelper::update($team_id, array('name'=>$cl_team_name));
       if ($update_result) {
         $update_result = ttUserHelper::update($team_details['manager_id'], array(