tnhfw / tnh-fw

core/libraries/Assets.php

Indentation +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
      */
     class Assets extends BaseClass {
 
-         /**
-         * Construct new instance
-         */
+            /**
+             * Construct new instance
+             */
         public function __construct() {
             parent::__construct();
         }
@@ -95,7 +95,7 @@ 
          * @see Assets:link
          */
         public function css($path) {
-           return $this->link($path, 'css');
+            return $this->link($path, 'css');
         }
 
         /**

core/libraries/FormValidation.php

Spacing +3 added lines, -3 removed lines

@@ -443,10 +443,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);
                 }
             }
@@ -1161,7 +1161,7 @@ 
                                  $rule, 
                                  $paramValue
                              ); 
-            } else{
+            } else {
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');
             }

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 string|null
          */
         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
+                                );
         }
 
         /**
@@ -1030,7 +1030,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);
@@ -1055,8 +1055,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);
@@ -1079,7 +1079,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);
@@ -1096,13 +1096,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
+                                );       
         }
 
         /**
@@ -1124,12 +1124,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');

core/libraries/Browser.php

Indentation +122 added lines, -122 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
+    defined('ROOT_PATH') || exit('Access denied');
     /**
      * TNH Framework
      *
@@ -28,68 +28,68 @@ 
      * SOFTWARE.
      */
     
-	class Browser {
-
-		/**
-		 * List of know platforms
-		 * @var array
-		 */
-		private $platforms = array(
-									'/windows nt 10/i'      =>  'Windows 10',
-									'/windows phone 10/i'   =>  'Windows Phone 10',
-									'/windows phone 8.1/i'  =>  'Windows Phone 8.1',
-									'/windows phone 8/i'    =>  'Windows Phone 8',
-									'/windows nt 6.3/i'     =>  'Windows 8.1',
-									'/windows nt 6.2/i'     =>  'Windows 8',
-									'/windows nt 6.1/i'     =>  'Windows 7',
-									'/windows nt 6.0/i'     =>  'Windows Vista',
-									'/windows nt 5.2/i'     =>  'Windows Server 2003/XP x64',
-									'/windows nt 5.1/i'     =>  'Windows XP',
-									'/windows xp/i'         =>  'Windows XP',
-									'/windows nt 5.0/i'     =>  'Windows 2000',
-									'/windows me/i'         =>  'Windows ME',
-									'/win98/i'              =>  'Windows 98',
-									'/win95/i'              =>  'Windows 95',
-									'/win16/i'              =>  'Windows 3.11',
-									'/ipad/i'               =>  'iPad',
+    class Browser {
+
+        /**
+         * List of know platforms
+         * @var array
+         */
+        private $platforms = array(
+                                    '/windows nt 10/i'      =>  'Windows 10',
+                                    '/windows phone 10/i'   =>  'Windows Phone 10',
+                                    '/windows phone 8.1/i'  =>  'Windows Phone 8.1',
+                                    '/windows phone 8/i'    =>  'Windows Phone 8',
+                                    '/windows nt 6.3/i'     =>  'Windows 8.1',
+                                    '/windows nt 6.2/i'     =>  'Windows 8',
+                                    '/windows nt 6.1/i'     =>  'Windows 7',
+                                    '/windows nt 6.0/i'     =>  'Windows Vista',
+                                    '/windows nt 5.2/i'     =>  'Windows Server 2003/XP x64',
+                                    '/windows nt 5.1/i'     =>  'Windows XP',
+                                    '/windows xp/i'         =>  'Windows XP',
+                                    '/windows nt 5.0/i'     =>  'Windows 2000',
+                                    '/windows me/i'         =>  'Windows ME',
+                                    '/win98/i'              =>  'Windows 98',
+                                    '/win95/i'              =>  'Windows 95',
+                                    '/win16/i'              =>  'Windows 3.11',
+                                    '/ipad/i'               =>  'iPad',
                                     '/ipod/i'               =>  'iPod',
                                     '/iphone/i'             =>  'iPhone',
                                     '/macintosh|mac os x/i' =>  'Mac OS X',
-									'/mac_powerpc/i'        =>  'Mac OS 9',
-									'/android/i'            =>  'Android',
-									'/ubuntu/i'             =>  'Ubuntu',
-									'/linux/i'              =>  'Linux',
-									'/blackberry/i'         =>  'BlackBerry',
-									'/webos/i'              =>  'Mobile'
-								);
-
-		/**
-		 * List of know browsers
-		 * @var array
-		 */
-	 	private $browsers = array(
-									'/mobile/i'     =>  'Handheld Browser',
-									'/msie/i'       =>  'Internet Explorer',
-									'/firefox/i'    =>  'Firefox',
-									'/chrome/i'     =>  'Chrome',
-									'/safari/i'     =>  'Safari',
-									'/edge/i'       =>  'Edge',
-									'/opera/i'      =>  'Opera',
-									'/netscape/i'   =>  'Netscape',
-									'/maxthon/i'    =>  'Maxthon',
-									'/konqueror/i'  =>  'Konqueror'
-								);
-
-	 	/**
-	 	 * Agent string
-	 	 * @var string
-	 	 */
-		private $agent = '';
-
-		/**
-		 * Browser name
-		 * @var string
-		 */
+                                    '/mac_powerpc/i'        =>  'Mac OS 9',
+                                    '/android/i'            =>  'Android',
+                                    '/ubuntu/i'             =>  'Ubuntu',
+                                    '/linux/i'              =>  'Linux',
+                                    '/blackberry/i'         =>  'BlackBerry',
+                                    '/webos/i'              =>  'Mobile'
+                                );
+
+        /**
+         * List of know browsers
+         * @var array
+         */
+            private $browsers = array(
+                                    '/mobile/i'     =>  'Handheld Browser',
+                                    '/msie/i'       =>  'Internet Explorer',
+                                    '/firefox/i'    =>  'Firefox',
+                                    '/chrome/i'     =>  'Chrome',
+                                    '/safari/i'     =>  'Safari',
+                                    '/edge/i'       =>  'Edge',
+                                    '/opera/i'      =>  'Opera',
+                                    '/netscape/i'   =>  'Netscape',
+                                    '/maxthon/i'    =>  'Maxthon',
+                                    '/konqueror/i'  =>  'Konqueror'
+                                );
+
+            /**
+             * Agent string
+             * @var string
+             */
+        private $agent = '';
+
+        /**
+         * Browser name
+         * @var string
+         */
         private $browserName = '';
 
         /**
@@ -128,7 +128,7 @@ 
          */
         private $isFacebook = false;
 
-		/**
+        /**
          * Class constructor
          */
         public function __construct($userAgent = '') {
@@ -231,12 +231,12 @@ 
             return $this->isFacebook;
         }
 
-         /**
-         * Returns a formatted string with a summary of the details of the browser.
-         * @codeCoverageIgnore
-         * 
-         * @return string formatted string with a summary of the browser
-         */
+            /**
+             * Returns a formatted string with a summary of the details of the browser.
+             * @codeCoverageIgnore
+             * 
+             * @return string formatted string with a summary of the browser
+             */
         public function __toString() {
             return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
                 "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
@@ -248,70 +248,70 @@ 
         /**
          * Determine the user's platform
          */
-		protected function checkPlatform() { 
-			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
-					$this->platform = $value;
-					break;
-				}
-			}   
-		}
-
-		/**
+        protected function checkPlatform() { 
+            foreach ($this->platforms as $regex => $value) { 
+                if (preg_match($regex, $this->agent) ) {
+                    $this->platform = $value;
+                    break;
+                }
+            }   
+        }
+
+        /**
          * Routine to determine the browser type
          */
-		protected function checkBrowser() {
-			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
-					$this->browserName = $value;
-					break;
-				}
-			}
-		}
-
-		/**
+        protected function checkBrowser() {
+            foreach ($this->browsers as $regex => $value) { 
+                if (preg_match($regex, $this->agent ) ) {
+                    $this->browserName = $value;
+                    break;
+                }
+            }
+        }
+
+        /**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
-			$detected = $this->getBrowser();
-			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
-			$regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
-			if (preg_match_all($regex, $this->agent, $matches)) {
-				$found = array_search($browser, $matches['browser']);
-				$this->version = $matches['version'][$found];
-			}
-		}
-
-		/**
+        protected function checkBrowserVersion(){
+            $detected = $this->getBrowser();
+            $detect = array_search($detected, $this->browsers);
+            $browser = str_replace(array('/i','/'), '', $detect);
+            $regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
+            if (preg_match_all($regex, $this->agent, $matches)) {
+                $found = array_search($browser, $matches['browser']);
+                $this->version = $matches['version'][$found];
+            }
+        }
+
+        /**
          * Determine if the browser is Mobile or not
          */
-		protected function checkMobile() {
-			if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket'
+        protected function checkMobile() {
+            if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket'
                 . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent) ) {
-				$this->isMobile = true;
-			}
-		}
+                $this->isMobile = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Tablet or not
          */
-		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
-				$this->isTablet = true;
-			}
-		}
+        protected function checkTablet() {
+            if (preg_match('/tablet|ipad/i', $this->agent) ) {
+                $this->isTablet = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Robot or not
          */
-		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
-				$this->isRobot = true;
-			}
-		}
+        protected function checkBot() {
+            if (preg_match('/bot/i', $this->agent) ) {
+                $this->isRobot = true;
+            }
+        }
 
-		/**
+        /**
          * Detect if URL is loaded from FacebookExternalHit
          */
         protected function checkFacebook() {
@@ -324,10 +324,10 @@ 
         }
 
 
-		 /**
-         * Protected routine to calculate and determine what
-         *  the browser is in use (including platform)
-         */
+            /**
+             * Protected routine to calculate and determine what
+             *  the browser is in use (including platform)
+             */
         protected function determine() {
             $this->checkPlatform();
             $this->checkBrowser();
@@ -338,4 +338,4 @@ 
             $this->checkFacebook();
         }
 		
-	}
+    }

Spacing +9 added lines, -9 removed lines

@@ -144,7 +144,7 @@ 
          * Reset all properties
          */
         public function reset() {
-            $this->agent =  get_instance()->globalvar->server('HTTP_USER_AGENT');
+            $this->agent = get_instance()->globalvar->server('HTTP_USER_AGENT');
             $this->browserName = 'unknown';
             $this->version = 'unknown';
             $this->platform = 'unknown';
@@ -250,7 +250,7 @@ 
          */
 		protected function checkPlatform() { 
 			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->platform = $value;
 					break;
 				}
@@ -262,7 +262,7 @@ 
          */
 		protected function checkBrowser() {
 			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->browserName = $value;
 					break;
 				}
@@ -272,10 +272,10 @@ 
 		/**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
+		protected function checkBrowserVersion() {
 			$detected = $this->getBrowser();
 			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
+			$browser = str_replace(array('/i', '/'), '', $detect);
 			$regex = "/(?<browser>version|{$browser})[\/]+(?<version>[0-9.|a-zA-Z.]*)/i";
 			if (preg_match_all($regex, $this->agent, $matches)) {
 				$found = array_search($browser, $matches['browser']);
@@ -288,7 +288,7 @@ 
          */
 		protected function checkMobile() {
 			if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket'
-                . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent) ) {
+                . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent)) {
 				$this->isMobile = true;
 			}
 		}
@@ -297,7 +297,7 @@ 
          * Determine if the browser is Tablet or not
          */
 		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
+			if (preg_match('/tablet|ipad/i', $this->agent)) {
 				$this->isTablet = true;
 			}
 		}
@@ -306,7 +306,7 @@ 
          * Determine if the browser is Robot or not
          */
 		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
+			if (preg_match('/bot/i', $this->agent)) {
 				$this->isRobot = true;
 			}
 		}
@@ -318,7 +318,7 @@ 
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

Braces +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

core/classes/Lang.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             if ($cookieLang && $this->isValid($cookieLang)) {
                 $this->current = $cookieLang;
                 $this->logger->info('Language from cookie [' . $cfgKey . '] is valid so '
-                                     .'we will set the language using the cookie value [' . $cookieLang . ']');
+                                        .'we will set the language using the cookie value [' . $cookieLang . ']');
             } else {
                 $this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']');
                 $this->current = $this->getDefault();

core/classes/Loader.php

Indentation +2 added lines, -2 removed lines

@@ -219,7 +219,7 @@ 
             $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module);
             if ($moduleConfigPath) {
                 $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], '
-                                  . 'the file path is [' . $moduleConfigPath . '] we will used it');
+                                    . 'the file path is [' . $moduleConfigPath . '] we will used it');
                 $configFilePath = $moduleConfigPath;
             } else {
                 $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location');
@@ -479,7 +479,7 @@ 
             $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module);
             if ($moduleLibraryPath) {
                 $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the '
-                                   . 'file path is [' . $moduleLibraryPath . '] we will used it');
+                                    . 'file path is [' . $moduleLibraryPath . '] we will used it');
                 $libraryFilePath = $moduleLibraryPath;
             } else {
                 $this->logger->info('Cannot find library [' . $class . '] from modules using the default location');

Spacing +2 added lines, -2 removed lines

@@ -335,7 +335,7 @@ 
          * @param  string $appLang the application language, only if type = "language"
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
+        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) {
             //Default to "function"
             $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             if ($type == 'language') {
@@ -359,7 +359,7 @@ 
          * @param  string|null $module the module if is not null will return it
          * @return string|null
          */
-        protected function getModuleFromSuperController($module){
+        protected function getModuleFromSuperController($module) {
             $obj = & get_instance();
             if (!$module && !empty($obj->moduleName)) {
                 $module = $obj->moduleName;

core/classes/model/DBSessionHandlerModel.php

Indentation +10 added lines, -10 removed lines

@@ -29,8 +29,8 @@ 
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**
@@ -40,14 +40,14 @@ 
          *
          * @example
          * 	array(
-	 *	      'sid' => '', //VARCHAR(100) Note: this a primary key
-	 *	      'sdata' => '', //TEXT
-	 *	      'stime' => '', //unix timestamp (INT|BIGINT)
-	 *	      'shost' => '', //VARCHAR(255)
-	 *	      'sip' => '', //VARCHAR(128) 
-	 *	      'sbrowser' => '', //VARCHAR(255) 
-	 *	      'skey' => '' //VARCHAR(255) 
-	 *	);
+         *	      'sid' => '', //VARCHAR(100) Note: this a primary key
+         *	      'sdata' => '', //TEXT
+         *	      'stime' => '', //unix timestamp (INT|BIGINT)
+         *	      'shost' => '', //VARCHAR(255)
+         *	      'sip' => '', //VARCHAR(128) 
+         *	      'sbrowser' => '', //VARCHAR(255) 
+         *	      'skey' => '' //VARCHAR(255) 
+         *	);
          */
         protected $sessionTableColumns = array();
 

core/classes/Config.php

Indentation +9 added lines, -9 removed lines

@@ -46,9 +46,9 @@ 
             if ($init) {
                 $this->init();
                 //@codeCoverageIgnoreStart
-                 if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
+                    if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
                     $this->logger->warning('You are in production environment, please set '
-                                           . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
+                                            . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
                 }
                 //@codeCoverageIgnoreEnd
             }
@@ -146,7 +146,7 @@ 
             if (empty($this->config['base_url'])) {
                 if (ENVIRONMENT == 'production') {
                     $this->logger->warning('Application base URL is not set or invalid, please'
-                                           . ' set application base URL to increase the application loading time');
+                                            . ' set application base URL to increase the application loading time');
                 }
                 $baseUrl = null;
                 $protocol = 'http';
@@ -173,7 +173,7 @@ 
                                                                     );
                 } else {
                     $this->logger->warning('Can not determine the application '
-                                           . 'base URL automatically, use http://localhost as default');
+                                            . 'base URL automatically, use http://localhost as default');
                     $baseUrl = 'http://localhost/';
                 }
                 $this->config['base_url'] = $baseUrl;
@@ -182,11 +182,11 @@ 
         }
          
         /**
-        * Return the server port using variable
-        *
-        * @codeCoverageIgnore
-        * @return string
-        */
+         * Return the server port using variable
+         *
+         * @codeCoverageIgnore
+         * @return string
+         */
         protected function getServerPort() {
             $globals = & class_loader('GlobalVar', 'classes');
             $serverPort = $globals->server('SERVER_PORT');

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
          * Get some parameters need like ip address, hostname, browser info, etc.
          * @return array
          */
-        protected function getSessionDataParams(){
+        protected function getSessionDataParams() {
             $this->OBJ->loader->functions('user_agent'); 
             $this->OBJ->loader->library('Browser'); 
             

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -276,14 +276,14 @@ 
         }
 
         /**
-        * Setting the route configuration using the configuration file 
-        * and additional configuration from param
-        * @param array $overwriteConfig the additional configuration 
-        * to overwrite with the existing one
-        * @param boolean $useConfigFile whether to use route configuration file
-        * 
-        * @return object
-        */
+         * Setting the route configuration using the configuration file 
+         * and additional configuration from param
+         * @param array $overwriteConfig the additional configuration 
+         * to overwrite with the existing one
+         * @param boolean $useConfigFile whether to use route configuration file
+         * 
+         * @return object
+         */
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -364,7 +364,7 @@ 
             //the URL like http://domain.com/module/controller/method/arg1/arg2/argn 
             if (!$this->controller) {
                 $this->logger->info('Cannot determine the routing information ' 
-                       . 'using the predefined routes configuration, will use the request URI parameters');
+                        . 'using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the route URI param
                 $this->determineRouteParamsFromRequestUri();
             }
@@ -478,11 +478,11 @@ 
             }
         }
 
-         /**
-         * Remove the URL suffix and query string values if exists
-         * @param  string $uri the route URI to process
-         * @return string      the final route uri after processed
-         */
+            /**
+             * Remove the URL suffix and query string values if exists
+             * @param  string $uri the route URI to process
+             * @return string      the final route uri after processed
+             */
         protected function removeSuffixAndQueryStringFromUri($uri) {
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
@@ -598,7 +598,7 @@ 
                 $this->logger->info(
                                     'After loop in predefined routes configuration,'
                                     . 'the module name is set but the controller is not set,' 
-									. 'so we will use module as the controller'
+                                    . 'so we will use module as the controller'
                                 );
                 $this->controller = $this->module;
             }

Spacing +6 added lines, -6 removed lines

@@ -450,7 +450,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(
@@ -581,7 +581,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 
@@ -608,7 +608,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 ' 
@@ -625,7 +625,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])) {
@@ -646,7 +646,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;
@@ -658,7 +658,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);
                     }
                 }