tnhfw / tnh-fw

core/classes/model/DBSessionHandlerModel.php

Indentation +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**

core/classes/database/DatabaseQueryRunner.php

Indentation +5 added lines, -5 removed lines

@@ -30,10 +30,10 @@ 
     
     class DatabaseQueryRunner extends BaseClass {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**
@@ -186,7 +186,7 @@ 
                 //by default count() return 1 if the parameter is not an array
                 //object or object implements Countable.
                 if (is_array($result) || is_object($result) || $result instanceof Countable) {
-                     $numRows = count($result);  
+                        $numRows = count($result);  
                 }
             } else {
                 $numRows = $this->pdoStatment->rowCount(); 

core/classes/database/Database.php

Indentation +8 added lines, -9 removed lines

@@ -387,9 +387,9 @@ 
                 $this->queryCount++;
                 
                 $queryResult = $this->queryRunner->setQuery($query)
-                                                 ->setReturnType($returnAsList)
-                                                 ->setReturnAsArray($returnAsArray)
-                                                 ->execute();
+                                                    ->setReturnType($returnAsList)
+                                                    ->setReturnAsArray($returnAsArray)
+                                                    ->execute();
 
                 if (is_object($queryResult)) {
                     $this->result  = $queryResult->getResult();
@@ -405,11 +405,11 @@ 
             return $this->result;
         }
 
-         /**
-         * Set the connection instance using database configuration file
-         *
-         * @return object|void
-         */
+            /**
+             * Set the connection instance using database configuration file
+             *
+             * @return object|void
+             */
         protected function setConnectionUsingConfigFile(){
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
             $connection = &class_loader('DatabaseConnection', 'classes/database');
@@ -422,7 +422,6 @@ 
 
         /**
          * Get the database configuration using the configuration file
-         
          * @return array the database configuration from file
          */
         protected function getDatabaseConfigFromFile() {

Spacing +1 added lines, -1 removed lines

@@ -410,7 +410,7 @@
          *
          * @return object|void
          */
-        protected function setConnectionUsingConfigFile(){
+        protected function setConnectionUsingConfigFile() {
             $dbConfigFromFile = $this->getDatabaseConfigFromFile();
             $connection = &class_loader('DatabaseConnection', 'classes/database');
             $connection->setConfig($dbConfigFromFile);

core/classes/database/DatabaseConnection.php

Indentation +35 added lines, -35 removed lines

@@ -42,28 +42,28 @@ 
          */
         private $driver = null;
 
-         /**
-         * The database hostname
-         * @var string
-         */
+            /**
+             * The database hostname
+             * @var string
+             */
         private $hostname = null;
 
-          /**
-         * The database port
-         * @var integer
-         */
+            /**
+             * The database port
+             * @var integer
+             */
         private $port = null;
         
-         /**
-         * The database username
-         * @var string
-         */
+            /**
+             * The database username
+             * @var string
+             */
         private $username = null;
 
-         /**
-         * The database password
-         * @var string
-         */
+            /**
+             * The database password
+             * @var string
+             */
         private $password = null;
 
         /**
@@ -72,10 +72,10 @@ 
          */
         private $databaseName = null;
 
-         /**
-         * The database charset
-         * @var string
-         */
+            /**
+             * The database charset
+             * @var string
+             */
         private $charset = null;
 
         /**
@@ -84,10 +84,10 @@ 
          */
         private $collation = null;
 
-         /**
-         * The database tables prefix
-         * @var string
-         */
+            /**
+             * The database tables prefix
+             * @var string
+             */
         private $prefix = null;
 
         /**
@@ -114,11 +114,11 @@ 
             }
         }
 
-         /**
-         * This is method is used to connect to database
-         * 
-         * @return boolean true in case of successfully connection false if error
-         */
+            /**
+             * This is method is used to connect to database
+             * 
+             * @return boolean true in case of successfully connection false if error
+             */
         public function connect() {
             try {
                 $this->pdo = new PDO($this->getDsnValue(), $this->getUsername(), $this->getPassword());
@@ -409,7 +409,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -418,11 +418,11 @@ 
             return $this;
         }
 
-         /**
-         * Update the properties using the current database configuration
-         * 
-         * @return object the current instance
-         */
+            /**
+             * Update the properties using the current database configuration
+             * 
+             * @return object the current instance
+             */
         protected function populatePropertiesFromConfig() {
             foreach ($this->config as $key => $value) {
                 $setter = 'set' . ucfirst($key);

core/classes/database/DatabaseQueryBuilder.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@ 
     
     class DatabaseQueryBuilder {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**
@@ -727,12 +727,12 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+            protected function buildQueryPart($property, $command = ''){
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
             return null;
-         }
+            }
 
 
         /**

Spacing +6 added lines, -6 removed lines

@@ -414,7 +414,7 @@ 
             $_keys = array();
             foreach ($keys as $k => $v) {
                 $v = $this->checkForNullValue($v);
-                if (! is_numeric($v)) {
+                if (!is_numeric($v)) {
                     $v = $this->connection->escape($v, $escape);
                 }
                 $_keys[] = $v;
@@ -727,7 +727,7 @@ 
          * 
          * @return string|null
          */
-         protected function buildQueryPart($property, $command = ''){
+         protected function buildQueryPart($property, $command = '') {
             if (!empty($this->{$property})) {
                 return $command . $this->{$property};
             }
@@ -742,7 +742,7 @@ 
          * @param string $clause the clause type "IS NULL", "IS NOT NULLs"
          * @return object        the current DatabaseQueryBuilder instance
          */
-        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL'){
+        protected function whereIsNullAndNotNull($field, $andOr = 'AND', $clause = 'IS NULL') {
             if (is_array($field)) {
                 foreach ($field as $f) {
                     $this->whereIsNullAndNotNull($f, $andOr, $clause);
@@ -760,7 +760,7 @@ 
          *
          * @return object the current instance
          */
-        protected function setSelectStr($newSelect){
+        protected function setSelectStr($newSelect) {
             $this->select = (($this->select == '*' || empty($this->select)) 
                                     ? $newSelect 
                                     : $this->select . ', ' . $newSelect);
@@ -774,8 +774,8 @@ 
          * @return string        the empty string if the value is null
          * otherwise the same value will be returned
          */
-        protected function checkForNullValue($value){
-            if(is_null($value)){
+        protected function checkForNullValue($value) {
+            if (is_null($value)) {
                 return '';
             }
             return $value;

core/classes/database/DatabaseCache.php

Indentation +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
             //If is the SELECT query
             $this->isSelectQuery = stristr($this->query, 'SELECT') !== false;
 
-             //if can use cache feature for this query
+                //if can use cache feature for this query
             $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0;
         }
         

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
         public function getCacheContent() {
             //set some attributes values
             $this->setPropertiesValues();
-            if(! $this->isSelectQuery || ! $this->dbCacheStatus){
+            if (!$this->isSelectQuery || !$this->dbCacheStatus) {
                 $this->logger->info('The cache is not enabled for this query or is not a SELECT query'); 
                 return null;
             }
@@ -185,7 +185,7 @@ 
         public function saveCacheContent($result) {
             //set some attributes values
             $this->setPropertiesValues();
-            if(! $this->isSelectQuery || ! $this->dbCacheStatus){
+            if (!$this->isSelectQuery || !$this->dbCacheStatus) {
                 //just return true
                 return true;
             }

core/libraries/FormValidation.php

Indentation +49 added lines, -49 removed lines

@@ -133,11 +133,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();
@@ -160,11 +160,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;
         }
@@ -213,11 +213,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)) {
@@ -233,7 +233,7 @@ 
          * @return string|null
          */
         public function getFieldValue($field) {
-             $value = null;
+                $value = null;
             if (array_key_exists($field, $this->data)) {
                 $value = $this->data[$field];
             }
@@ -255,15 +255,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;
         }
 
@@ -346,11 +346,11 @@ 
             return $this;
         }
 
-         /**
-         * Set the database instance using get_instance() if is null
-         *
-         * @return object the current instance
-         */
+            /**
+             * Set the database instance using get_instance() if is null
+             *
+             * @return object the current instance
+             */
         protected function setDatabaseFromSuperInstanceIfNotSet(){
             if (!is_object($this->database)) {
                 $this->database = get_instance()->database;
@@ -387,7 +387,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) {
@@ -413,9 +413,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);
         }
         
         /**
@@ -469,7 +469,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])) {
@@ -500,7 +500,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;
@@ -594,7 +594,7 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */ 
         protected function checkRuleMinLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);    
+            $value = $this->getFieldValue($field);    
             if (strlen($value) < $paramValue) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
@@ -608,7 +608,7 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleMaxLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);    
+            $value = $this->getFieldValue($field);    
             if (strlen($value) > $paramValue) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
@@ -622,7 +622,7 @@ 
          * @param  string|null  $paramValue  the rule parameter
          */
         protected function checkRuleExactLength($field, $rule, $paramValue) {
-           $value = $this->getFieldValue($field);    
+            $value = $this->getFieldValue($field);    
             if (strlen($value) != $paramValue) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
@@ -729,7 +729,7 @@ 
         protected function checkRuleNumeric($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             if (!is_numeric($value)) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -743,7 +743,7 @@ 
         protected function checkRuleInteger($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             if (filter_var($value, FILTER_VALIDATE_INT) === false) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -757,7 +757,7 @@ 
         protected function checkRuleIntegerNatural($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             if (filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -844,7 +844,7 @@ 
             $format = $paramValue;
             $dateValue = date_create_from_format($format, $value);    
             if ($dateValue === false || $dateValue->format($format) !== $value) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -888,7 +888,7 @@ 
         protected function checkRuleUrl($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             if (filter_var($value, FILTER_VALIDATE_URL) === false) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -903,7 +903,7 @@ 
         protected function checkRuleIp($field, $rule, $paramValue) {
             $value = $this->getFieldValue($field);    
             if (filter_var($value, FILTER_VALIDATE_IP) === false) {
-               $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
+                $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
             }
         }
 
@@ -948,7 +948,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $this->database->get();
             if ($this->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -970,8 +970,8 @@ 
             list($table, $column) = explode('.', $data[0]);
             list($columnKey, $valueKey) = explode('=', $data[1]);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value)
-                                              ->where($columnKey, '!=', trim($valueKey));
+                                                ->where($column, $value)
+                                                ->where($columnKey, '!=', trim($valueKey));
             $this->database->get();
             if ($this->database->numRows() > 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
@@ -991,7 +991,7 @@ 
             $value = $this->getFieldValue($field);    
             list($table, $column) = explode('.', $paramValue);
             $this->database->getQueryBuilder()->from($table)
-                                              ->where($column, $value);
+                                                ->where($column, $value);
             $this->database->get();
             if ($this->database->numRows() <= 0) {
                 $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);

Spacing +8 added lines, -8 removed lines

@@ -183,7 +183,7 @@ 
             //if the rule is array
             if (is_array($rule)) {
                 $rules = $rule;
-            } else{
+            } else {
                 //the rule is not an array explode pipe values
                 $rules = explode('|', $rule);
             }
@@ -285,7 +285,7 @@ 
             $this->checkCsrf();
 
             //Now loop in each field rule and validate it
-            foreach($this->rules as $field => $rules) {
+            foreach ($this->rules as $field => $rules) {
                 $this->validateField($field, $rules);
             }
             $this->valid = empty($this->errors) && $this->forceError === false;
@@ -320,7 +320,7 @@ 
             if ($field !== null) {
                 $this->customErrors[$field][$rule] = $message;
             } else {
-                foreach(array_keys($this->rules) as $field) {
+                foreach (array_keys($this->rules) as $field) {
                     $this->customErrors[$field][$rule] = $message;
                 }
             }
@@ -351,7 +351,7 @@ 
          *
          * @return object the current instance
          */
-        protected function setDatabaseFromSuperInstanceIfNotSet(){
+        protected function setDatabaseFromSuperInstanceIfNotSet() {
             if (!is_object($this->database)) {
                 $this->database = get_instance()->database;
             }
@@ -424,7 +424,7 @@ 
          * @return object the current instance
          */
         protected function filterValidationData() {
-            foreach($this->data as $key => $value ) {
+            foreach ($this->data as $key => $value) {
                 $this->data[$key] = trim($value);
             }
             return $this;
@@ -484,7 +484,7 @@ 
          * @param  array $rules the list of rule to validate
          */
         protected function validateField($field, array $rules) {
-            foreach($rules as $rule) {
+            foreach ($rules as $rule) {
                 $match = array();
                 $paramValue = null;
                 //Is the rule with parameter ??
@@ -502,7 +502,7 @@ 
                 if (method_exists($this, $method)) {
                        call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
                 }
-                else{
+                else {
                     $this->forceError = true;
                     show_error('Invalid validaton rule "' . $realRuleName . '"');
                 }
@@ -1034,7 +1034,7 @@ 
                 if (call_user_func_array($paramValue, array($value)) === false) {
                     $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue);
                 }
-            } else{
+            } else {
                 $this->forceError = true;
                 show_error('The callback validation function/method "' . $paramValue . '" does not exist');
             }

Braces +1 added lines, -2 removed lines

@@ -501,8 +501,7 @@
                 $method = $this->getRuleValidationMethod($realRuleName);
                 if (method_exists($this, $method)) {
                        call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue));
-                }
-                else{
+                } else{
                     $this->forceError = true;
                     show_error('Invalid validaton rule "' . $realRuleName . '"');
                 }