tnhfw / tnh-fw

core/classes/Router.php

Spacing +11 added lines, -11 removed lines

@@ -394,7 +394,7 @@ 
             $this->determineRouteParamsInformation();
 
             //if the request method not match
-            if(!$this->routeMethodMatch){
+            if (!$this->routeMethodMatch) {
                  //create the instance of Controller
                 $cError = new Controller();
                 $cError->response->setStatus(405);
@@ -465,7 +465,7 @@ 
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
          * @return void
          */
-        protected function removeDocumentRootFrontControllerFromSegments(){
+        protected function removeDocumentRootFrontControllerFromSegments() {
             $segment = $this->segments;
             $globals = & class_loader('GlobalVar', 'classes');
             $rootFolder = substr($globals->server('SCRIPT_NAME'), 0, strpos(
@@ -475,7 +475,7 @@ 
             //Remove "/" at the first or folder root
             $rootFolder = trim($rootFolder, $this->uriTrim);
             $segmentString = implode('/', $segment);
-            if(preg_match('#^' . $rootFolder .'#', $segmentString)){
+            if (preg_match('#^' . $rootFolder . '#', $segmentString)) {
                 $segmentString = substr($segmentString, strlen($rootFolder));
             }
             //Remove the "/" after replace like "root_folder/foo" => "/foo"
@@ -521,11 +521,11 @@ 
         protected function setRouteParamsUsingPredefinedConfig($findIndex) {
             $callback = $this->callback[$findIndex];
             //if callback is array so means user defined the HTTP Method
-            if(is_array($callback) && count($callback) > 0){
-                if(array_key_exists($this->requestMethod, $callback)){
+            if (is_array($callback) && count($callback) > 0) {
+                if (array_key_exists($this->requestMethod, $callback)) {
                     $callback = $callback[$this->requestMethod];
                 }
-                else{
+                else {
                     //Wrong request method
                     $this->logger->warning('The request method [' . $this->requestMethod . '] is not allowed');
                     $this->routeMethodMatch = false;
@@ -611,7 +611,7 @@ 
                     break;
                 }
             }
-            if($findIndex !== -1){
+            if ($findIndex !== -1) {
                 /*
                 * $args[0] => full string captured by preg_match
                 * $args[1], $args[2], $args[n] => contains the value of 
@@ -638,7 +638,7 @@ 
          * Find file path of the current controller using the current module
          * @return boolean true if the file path is found otherwise false.
          */
-        protected function findControllerFullPathUsingCurrentModule(){
+        protected function findControllerFullPathUsingCurrentModule() {
             $path = $this->moduleInstance->findControllerFullPath(ucfirst($this->controller), $this->module);
             if (!$path) {
                 $this->logger->info('The controller [' . $this->controller . '] not ' 
@@ -655,7 +655,7 @@ 
          * or the current request does not use module
          * @return void
          */
-        protected function setRouteParamsIfNoModuleOrNotFound(){
+        protected function setRouteParamsIfNoModuleOrNotFound() {
             $segment = $this->segments;
             //controller
             if (isset($segment[0])) {
@@ -676,7 +676,7 @@ 
          * or the current request use module
          * @return void
          */
-        protected function setRouteParamsIfAppHasModuleOrFound(){
+        protected function setRouteParamsIfAppHasModuleOrFound() {
             //get the module list
             $modules = $this->moduleInstance->getModuleList();
             $segment = $this->segments;
@@ -688,7 +688,7 @@ 
                 if (isset($segment[0])) {
                     $this->controller = $segment[0];
                     //check if the request use the same module name and controller
-                    if($this->findControllerFullPathUsingCurrentModule()){
+                    if ($this->findControllerFullPathUsingCurrentModule()) {
                         array_shift($segment);
                     }
                 }

core/libraries/FormValidation.php

Indentation +203 added lines, -203 removed lines

@@ -124,11 +124,11 @@ 
             }
         }
 
-         /**
-         * Reset the form validation instance
-         *
-         * @return object the current instance
-         */
+            /**
+             * Reset the form validation instance
+             *
+             * @return object the current instance
+             */
         public function reset() {
             $this->rules        = array();
             $this->labels       = array();
@@ -152,11 +152,11 @@ 
             return $this;
         }
 
-         /**
-         * Return the validation data
-         * 
-         * @return array the validation data
-         */
+            /**
+             * Return the validation data
+             * 
+             * @return array the validation data
+             */
         public function getData() {
             return $this->data;
         }
@@ -205,11 +205,11 @@ 
             return $this->rules;
         }
 
-         /**
-         * Return the list of the validations rules for the given field
-         * 
-         * @return array
-         */
+            /**
+             * Return the list of the validations rules for the given field
+             * 
+             * @return array
+             */
         public function getFieldRules($field) {
             $rules = array();
             if (array_key_exists($field, $this->rules)) {
@@ -225,7 +225,7 @@ 
          * @return mixed
          */
         public function getFieldValue($field) {
-             $value = null;
+                $value = null;
             if (array_key_exists($field, $this->data)) {
                 $value = $this->data[$field];
             }
@@ -247,15 +247,15 @@ 
         }
             
         
-       /**
-        * Return the list of validation errors
-        * 
-        * @return array the errors list. 
-        * Format:
-        *  [field1] => 'error message 1', 
-        *  [field2] => 'error message 2' 
-        */
-       public function getErrors() {
+        /**
+         * Return the list of validation errors
+         * 
+         * @return array the errors list. 
+         * Format:
+         *  [field1] => 'error message 1', 
+         *  [field2] => 'error message 2' 
+         */
+        public function getErrors() {
             return $this->errors;
         }
 
@@ -348,7 +348,7 @@ 
          * @param string|null $field2     the second field used in some validation rule like "matches", "not_equal"
          *
          */
-         protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
+            protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) {
             //if the field is not required and his value is not set don't set error
             //but in case the field have value validate it
             if (!$this->fieldIsRequired($field) && strlen($value) <= 0) {
@@ -392,9 +392,9 @@ 
          * @return string       the name of the validation method
          */
         protected function getRuleValidationMethod($rule) {
-             $parts = explode('_', $rule);
-             $parts = array_map('ucfirst', $parts);
-             return 'checkRule' . implode('', $parts);
+                $parts = explode('_', $rule);
+                $parts = array_map('ucfirst', $parts);
+                return 'checkRule' . implode('', $parts);
         }
         
         /**
@@ -405,7 +405,7 @@ 
         protected function filterValidationData() {
             foreach ($this->data as $key => $value ) {
                 if (is_string($value)) {
-                   $this->data[$key] = trim($value);
+                    $this->data[$key] = trim($value);
                 } else if(is_array($value)) {
                     $this->data[$key] = array_map('trim', $value);
                 }
@@ -452,7 +452,7 @@ 
                 $template['{field2}']  = $field2;
                 $template['{value2}'] = $this->getFieldValue($field2);
                 $template['{label2}'] = $this->getFieldLabel($field2);
-             }     
+                }     
             $message = $this->messages[$rule];
             //Check for custom message
             if (isset($this->customErrors[$field][$rule])) {
@@ -483,7 +483,7 @@ 
                 //Get the name of the method to validate this rule
                 $method = $this->getRuleValidationMethod($realRuleName);
                 if (method_exists($this, $method)) {
-                       call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
+                        call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
                 } else {
                     $this->forceError = true;
                     show_error('Invalid validaton rule "' . $realRuleName . '"');
@@ -575,14 +575,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */ 
         protected function checkRuleMinLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);  
-           $this->setSimpleFieldError(
-                                     strlen($value) < $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);  
+            $this->setSimpleFieldError(
+                                        strlen($value) < $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -593,14 +593,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleMaxLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);
-           $this->setSimpleFieldError(
-                                     strlen($value) > $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);
+            $this->setSimpleFieldError(
+                                        strlen($value) > $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -611,14 +611,14 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleExactLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);
-           $this->setSimpleFieldError(
-                                     strlen($value) != $paramValue, 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue
-                                 );
+            $value = $this->getFieldValue($field);
+            $this->setSimpleFieldError(
+                                        strlen($value) != $paramValue, 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue
+                                    );
         }
 
         /**
@@ -631,13 +631,13 @@ 
         protected function checkRuleMatches($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSimpleFieldError(
-                                     $value != $this->getFieldValue($paramValue), 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue,
-                                     $paramValue //field2
-                                 );
+                                        $value != $this->getFieldValue($paramValue), 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue,
+                                        $paramValue //field2
+                                    );
         }
 
         /**
@@ -650,13 +650,13 @@ 
         protected function checkRuleNotEqual($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSimpleFieldError(
-                                     $value == $this->getFieldValue($paramValue), 
-                                     $field, 
-                                     $value, 
-                                     $rule, 
-                                     $paramValue,
-                                     $paramValue //field2
-                                 );
+                                        $value == $this->getFieldValue($paramValue), 
+                                        $field, 
+                                        $value, 
+                                        $rule, 
+                                        $paramValue,
+                                        $paramValue //field2
+                                    );
         }
 
         /**
@@ -669,12 +669,12 @@ 
         protected function checkRuleMin($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
             $this->setSimpleFieldError(
-                                 $value < $paramValue, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $value < $paramValue, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -687,12 +687,12 @@ 
         protected function checkRuleMax($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field); 
             $this->setSimpleFieldError(
-                                 $value > $paramValue, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $value > $paramValue, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -708,12 +708,12 @@ 
             $betweens = explode(',', $paramValue, 2);
             $betweens = array_map('trim', $betweens);
             $this->setSimpleFieldError(
-                                 ($value < $betweens[0]) || ($value > $betweens[1]), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    ($value < $betweens[0]) || ($value > $betweens[1]), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -730,12 +730,12 @@ 
             $list = array_map('trim', $list);
             $paramValue = implode(',', $list);
             $this->setSimpleFieldError(
-                                 !in_array($value, $list), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             ); 
+                                    !in_array($value, $list), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                ); 
         }
 
         /**
@@ -748,12 +748,12 @@ 
         protected function checkRuleNumeric($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             $this->setSimpleFieldError(
-                                 !is_numeric($value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !is_numeric($value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -765,13 +765,13 @@ 
          */
         protected function checkRuleInteger($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
-             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_INT) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                $this->setSimpleFieldError(
+                                    filter_var($value, FILTER_VALIDATE_INT) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -784,12 +784,12 @@ 
         protected function checkRuleIntegerNatural($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -802,12 +802,12 @@ 
         protected function checkRuleAlpha($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 !preg_match('/^[\pL\pM\s]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\s]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -820,12 +820,12 @@ 
         protected function checkRuleAlphaDash($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 !preg_match('/^[\pL\pM_-]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM_-]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -838,12 +838,12 @@ 
         protected function checkRuleAlnum($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 !preg_match('/^[\pL\pM\pN\s]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\pN\s]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -856,12 +856,12 @@ 
         protected function checkRuleAlnumDash($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 !preg_match('/^[\pL\pM\pN_-]+$/u', $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    !preg_match('/^[\pL\pM\pN_-]+$/u', $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -874,12 +874,12 @@ 
         protected function checkRuleEmail($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field); 
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_EMAIL) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_EMAIL) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -895,12 +895,12 @@ 
             $format = $paramValue;
             $dateValue = date_create_from_format($format, $value);  
             $this->setSimpleFieldError(
-                                 $dateValue === false || $dateValue->format($format) !== $value, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    $dateValue === false || $dateValue->format($format) !== $value, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -913,13 +913,13 @@ 
          */
         protected function checkRuleDateBefore($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
-             $this->setSimpleFieldError(
-                                 strtotime($value) >= strtotime($paramValue), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                $this->setSimpleFieldError(
+                                    strtotime($value) >= strtotime($paramValue), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -933,12 +933,12 @@ 
         protected function checkRuleDateAfter($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 strtotime($value) <= strtotime($paramValue), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    strtotime($value) <= strtotime($paramValue), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -951,12 +951,12 @@ 
         protected function checkRuleUrl($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_URL) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_URL) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -970,12 +970,12 @@ 
         protected function checkRuleIp($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);   
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -988,12 +988,12 @@ 
         protected function checkRuleIpv4($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);  
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1006,12 +1006,12 @@ 
         protected function checkRuleIpv6($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);   
             $this->setSimpleFieldError(
-                                 filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );
+                                    filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );
         }
 
         /**
@@ -1032,7 +1032,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $obj->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $obj->database->get();
             if ($obj->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1059,8 +1059,8 @@ 
             list($table, $column) = explode('.', $data[0]);
             list($columnKey, $valueKey) = explode('=', $data[1]);
             $obj->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value)
-                                              ->where($columnKey, '!=', trim($valueKey));
+                                                ->where($column, $value)
+                                                ->where($columnKey, '!=', trim($valueKey));
             $obj->database->get();
             if ($obj->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1085,7 +1085,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $obj->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $obj->database->get();
             if ($obj->database->numRows() <= 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -1102,13 +1102,13 @@ 
          */
         protected function checkRuleRegex($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);
-             $this->setSimpleFieldError(
-                                 !preg_match($paramValue, $value), 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             );       
+                $this->setSimpleFieldError(
+                                    !preg_match($paramValue, $value), 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                );       
         }
 
         /**
@@ -1130,12 +1130,12 @@ 
             $value = $this->getFieldValue($field);    
             if (is_callable($paramValue)) {
                 $this->setSimpleFieldError(
-                                 call_user_func_array($paramValue, array($value)) === false, 
-                                 $field, 
-                                 $value, 
-                                 $rule, 
-                                 $paramValue
-                             ); 
+                                    call_user_func_array($paramValue, array($value)) === false, 
+                                    $field, 
+                                    $value, 
+                                    $rule, 
+                                    $paramValue
+                                ); 
             } else{
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');

Spacing +4 added lines, -4 removed lines

@@ -403,10 +403,10 @@ 
          * @return object the current instance
          */
         protected function filterValidationData() {
-            foreach ($this->data as $key => $value ) {
+            foreach ($this->data as $key => $value) {
                 if (is_string($value)) {
                    $this->data[$key] = trim($value);
-                } else if(is_array($value)) {
+                } else if (is_array($value)) {
                     $this->data[$key] = array_map('trim', $value);
                 }
             }
@@ -449,7 +449,7 @@ 
                             '{paramValue}' => $paramValue
                             );
             if ($field2 !== null) {
-                $template['{field2}']  = $field2;
+                $template['{field2}'] = $field2;
                 $template['{value2}'] = $this->getFieldValue($field2);
                 $template['{label2}'] = $this->getFieldLabel($field2);
              }     
@@ -1136,7 +1136,7 @@ 
                                  $rule, 
                                  $paramValue
                              ); 
-            } else{
+            } else {
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');
             }