tnhfw / tnh-fw

core/libraries/FormValidation.php

Indentation +50 added lines, -50 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);
         }
         
         /**
@@ -426,7 +426,7 @@ 
         protected function filterValidationData() {
             foreach ($this->data as $key => $value ) {
                 if (is_array($value)) {
-                   $this->data[$key] = array_map('trim', $value);
+                    $this->data[$key] = array_map('trim', $value);
                 } else {
                     $this->data[$key] = trim($value);
                 }
@@ -473,7 +473,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])) {
@@ -504,7 +504,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 . '"');
@@ -597,7 +597,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);
             }
@@ -611,7 +611,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);
             }
@@ -625,7 +625,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);
             }
@@ -732,7 +732,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);
             }
         }
 
@@ -746,7 +746,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);
             }
         }
 
@@ -760,7 +760,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);
             }
         }
 
@@ -847,7 +847,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);
             }
         }
 
@@ -891,7 +891,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);
             }
         }
 
@@ -906,7 +906,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);
             }
         }
 
@@ -951,7 +951,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);
@@ -973,8 +973,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);
@@ -994,7 +994,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 +2 added lines, -2 removed lines

@@ -424,7 +424,7 @@ 
          * @return object the current instance
          */
         protected function filterValidationData() {
-            foreach ($this->data as $key => $value ) {
+            foreach ($this->data as $key => $value) {
                 if (is_array($value)) {
                    $this->data[$key] = array_map('trim', $value);
                 } else {
@@ -1037,7 +1037,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');
             }

core/classes/database/DatabaseQueryRunner.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
             if ((double) $responseTime >= 1.000000) {
                 $this->logger->warning(
                                         'High response time while processing database query [' . $this->query . '].' 
-                                        . 'The response time is [' .$responseTime . '] sec.'
+                                        . 'The response time is [' . $responseTime . '] sec.'
                                         );
             }
     		

Indentation +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@
     
     class DatabaseQueryRunner extends BaseClass {
 
-         /**
-         * The DatabaseConnection instance
-         * @var object
-         */
+            /**
+             * The DatabaseConnection instance
+             * @var object
+             */
         private $connection = null;
 
         /**

app/views/home.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
             <p>Required PHP version : <b>PHP >= <?php echo TNH_MIN_PHP_VERSION; ?>, PHP < <?php echo TNH_MAX_PHP_VERSION; ?></b></p>
             <p>Release date : <b><?php echo TNH_RELEASE_DATE; ?></b></p>
             <hr />
-            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b>
-            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b>
+            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b>
+            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b>
           </div>
         </div>
       </div>

core/classes/GlobalVar.php

Indentation +14 added lines, -14 removed lines

@@ -234,10 +234,10 @@ 
             return $this->removeVars($_ENV, $key);
         }
 
-         /**
-         * Get the value from $GLOBALS for given key. if the key is empty will return all values
-         * @see GlobalVar::getVars 
-         */
+            /**
+             * Get the value from $GLOBALS for given key. if the key is empty will return all values
+             * @see GlobalVar::getVars 
+             */
         public function globals($key = null, $xss = true) {
             return $this->getVars($GLOBALS, $key, $xss);
         }
@@ -259,16 +259,16 @@ 
         }
 
         
-         /**
-         * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will
-         * set the current super variable value by this.
-         * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc.
-         * @param  string|array  $key the item key to be set or array if need set the current global variable 
-         * by this value
-         * @param mixed $value the value to set if $key is not an array
-         *
-         * @return object       the current instance
-         */
+            /**
+             * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will
+             * set the current super variable value by this.
+             * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc.
+             * @param  string|array  $key the item key to be set or array if need set the current global variable 
+             * by this value
+             * @param mixed $value the value to set if $key is not an array
+             *
+             * @return object       the current instance
+             */
         protected function setVars(&$var, $key, $value = null) {
             if (is_array($key)) {
                 //set all

core/classes/Request.php

Indentation +4 added lines, -4 removed lines

@@ -207,10 +207,10 @@
             return $this;
         }
 
-         /**
-         * Return the instance of session.
-         * @return object the session instance
-         */
+            /**
+             * Return the instance of session.
+             * @return object the session instance
+             */
         public function getSession() {
             return $this->session;
         }

core/classes/Config.php

Indentation +6 added lines, -6 removed lines

@@ -163,17 +163,17 @@
         }
          
         /**
-        * 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');
             $serverPortValue = $globals->server('SERVER_PORT');
             $serverPort = 80;
             if ($serverPortValue) {
-                 $serverPort = $serverPortValue;
+                    $serverPort = $serverPortValue;
             }
             $port = '';
             if ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80)) {

core/classes/Module.php

Indentation +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
             $this->logger->debug('Check if the application contains the modules ...');
             $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR);
             if ($dirList !== false) {
-               $this->list = array_map('basename', $dirList);
+                $this->list = array_map('basename', $dirList);
             }
             if (!empty($this->list)) {
                 $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']');
@@ -61,8 +61,8 @@ 
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->info('The module [' .$name. '] already added skipping.');
-               return $this;
+                $this->logger->info('The module [' .$name. '] already added skipping.');
+                return $this;
             }
             $this->list[] = $name;
             return $this;
@@ -93,10 +93,10 @@ 
             $this->list = array();
         }
 
-         /**
-         * Get the list of module loaded
-         * @return array the module list
-         */
+            /**
+             * Get the list of module loaded
+             * @return array the module list
+             */
         public function getModuleList() {
             return $this->list;
         }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->info('The module [' .$name. '] already added skipping.');
+               $this->logger->info('The module [' . $name . '] already added skipping.');
                return $this;
             }
             $this->list[] = $name;

core/classes/model/Model.php

Indentation +17 added lines, -17 removed lines

@@ -680,22 +680,22 @@ 
             return $data;
         }
 
-         /**
-         * Get the return type array or object
-         * @return string|boolean
-         */
+            /**
+             * Get the return type array or object
+             * @return string|boolean
+             */
         protected function getReturnType(){
             $type = false;
             if ($this->_temporary_return_type == 'array') {
-               $type = 'array';
+                $type = 'array';
             }
             return $type;
         }
 
-         /**
-         * Check if soft delete is enable setting the condition
-         * @return object the current instance 
-         */
+            /**
+             * Check if soft delete is enable setting the condition
+             * @return object the current instance 
+             */
         protected function checkForSoftDelete(){
             if ($this->soft_delete && $this->_temporary_with_deleted !== true) {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
@@ -703,14 +703,14 @@ 
             return $this;
         }
 
-         /**
-         * Relate for "belongs_to" and "has_many"
-         * @param  string $relationship the name of relation
-         * @param  string|array $options      the model and primary key values
-         * @param  object|array $row          the row to update
-         * @param  string $type         the type can be "belongs_to", "has_many"
-         * @return mixed               the final row values
-         */
+            /**
+             * Relate for "belongs_to" and "has_many"
+             * @param  string $relationship the name of relation
+             * @param  string|array $options      the model and primary key values
+             * @param  object|array $row          the row to update
+             * @param  string $type         the type can be "belongs_to", "has_many"
+             * @return mixed               the final row values
+             */
         protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){
             if (in_array($relationship, $this->_with)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');

Spacing +5 added lines, -5 removed lines

@@ -143,7 +143,7 @@ 
                 $instance = $db;
             } else {
                 $obj = & get_instance();
-                if (isset($obj->database)){
+                if (isset($obj->database)) {
                     /**
                      * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                      * to prevent duplication
@@ -684,7 +684,7 @@ 
          * Get the return type array or object
          * @return string|boolean
          */
-        protected function getReturnType(){
+        protected function getReturnType() {
             $type = false;
             if ($this->_temporary_return_type == 'array') {
                $type = 'array';
@@ -696,7 +696,7 @@ 
          * Check if soft delete is enable setting the condition
          * @return object the current instance 
          */
-        protected function checkForSoftDelete(){
+        protected function checkForSoftDelete() {
             if ($this->soft_delete && $this->_temporary_with_deleted !== true) {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
@@ -711,11 +711,11 @@ 
          * @param  string $type         the type can be "belongs_to", "has_many"
          * @return mixed               the final row values
          */
-        protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){
+        protected function relateBelongsToAndHasMany($relationship, $options, $row, $type) {
             if (in_array($relationship, $this->_with)) {
                 get_instance()->loader->model($options['model'], $relationship . '_model');
 
-                if($type == 'belongs_to'){
+                if ($type == 'belongs_to') {
                     if (is_object($row)) {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
                     } else {

core/classes/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
          *
          * @codeCoverageIgnore
          */
-         protected function startAppSession() {
+            protected function startAppSession() {
             //$_SESSION is not available on cli mode 
             if (!IS_CLI) {
                 //set session params
@@ -143,7 +143,7 @@ 
          * @codeCoverageIgnore
          */
         protected function setAppSessionConfig() {
-             //the default is to store in the files
+                //the default is to store in the files
             $sessionHandler = $this->config->get('session_handler', 'files');
             $this->logger->info('Session handler: ' . $sessionHandler);
             if ($sessionHandler == 'files') {