tnhfw / tnh-fw

index.php

Indentation +5 added lines, -5 removed lines

@@ -189,11 +189,11 @@
      */
     define('VAR_PATH', ROOT_PATH . 'var' . DS);
     
-     /**
-     * The path to the directory of your cache files.
-     *
-     * This feature is available currently for database and views.
-     */
+        /**
+         * The path to the directory of your cache files.
+         *
+         * This feature is available currently for database and views.
+         */
     define('CACHE_PATH', VAR_PATH . 'cache' . DS);
     
     /**

app/config/autoload.php

Indentation +85 added lines, -85 removed lines

@@ -25,103 +25,103 @@
      */
 
     /**
-	* This file contains the configuration of resources that you want to load automatically: 
-	* personals or systems libraries, configuration files, models, languages
-	* personals functions or systems that are used often in your application 
-	* instead of loading them every time you want to use it.
-	* Note: loading a lot of resources can decrease the performance of your application.
-	*/
+     * This file contains the configuration of resources that you want to load automatically: 
+     * personals or systems libraries, configuration files, models, languages
+     * personals functions or systems that are used often in your application 
+     * instead of loading them every time you want to use it.
+     * Note: loading a lot of resources can decrease the performance of your application.
+     */
 
 
-	/**
-	* If you have personals libraries or systems to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['libraries'] = array('library1', 'library2');
-	*
-	* Using module:
-	* 
-	*   $autoload['libraries'] = array('module1/library1', 'module2/library1');
-	*
-	* Note: Systems libraries have priority over personals libraries, 
-	* ie the loading order is as follows: it looks in the folder of the systems libraries, 
-	* if it is found, it is loaded, if not, it search in the module directories, if it is found, 
-	* it is loaded, if not will search in personals libraries folder, 
-	* before returning an error in case it does not find it.
-	*/
+    /**
+     * If you have personals libraries or systems to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['libraries'] = array('library1', 'library2');
+     *
+     * Using module:
+     * 
+     *   $autoload['libraries'] = array('module1/library1', 'module2/library1');
+     *
+     * Note: Systems libraries have priority over personals libraries, 
+     * ie the loading order is as follows: it looks in the folder of the systems libraries, 
+     * if it is found, it is loaded, if not, it search in the module directories, if it is found, 
+     * it is loaded, if not will search in personals libraries folder, 
+     * before returning an error in case it does not find it.
+     */
     $autoload['libraries'] = array();
 
     /**
-	* If you have configuration files to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['config'] = array('config1', 'config2');
-	*
-	* Using module:
-	* 
-	*   $autoload['config'] = array('module1/config1', 'module2/config2');
-	*
-	* Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
-	* for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
-	* otherwise the system can not find this configuration file.
-	* For example :
-	*
-	*	$config['key1'] = value1;
-	* 	$config['key2'] = value2;
-	*
-	* Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
-	* or inside the "config" of your application modules
-	*/
+     * If you have configuration files to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['config'] = array('config1', 'config2');
+     *
+     * Using module:
+     * 
+     *   $autoload['config'] = array('module1/config1', 'module2/config2');
+     *
+     * Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder
+     * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
+     * otherwise the system can not find this configuration file.
+     * For example :
+     *
+     *	$config['key1'] = value1;
+     * 	$config['key2'] = value2;
+     *
+     * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
+     * or inside the "config" of your application modules
+     */
     $autoload['config'] = array();
 
     /**
-	* If you have models to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['models'] = array('model1', 'model2');
-	*
-	* Using module:
-	* 
-	*   $autoload['models'] = array('module1/model1', 'module2/model2');
-	*/
+     * If you have models to load automatically, then list them in the following array.
+     * For example :
+     *
+     *	$autoload['models'] = array('model1', 'model2');
+     *
+     * Using module:
+     * 
+     *   $autoload['models'] = array('module1/model1', 'module2/model2');
+     */
     $autoload['models'] = array();
 
     /**
-	* If you have systems or personals functions to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['functions'] = array('function1', 'function2');
-	*
-	* Using module:
-	* 
-	*   $autoload['functions'] = array('module1/function1', 'module2/function2');
-	*
-	* Note 1: Personal functions have priority over system functions,
-	* that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
-	* if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
-	* if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
-	* before returning an error in case he does not find it.
-	*
-	* Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
-	* will use:
-	* 
-	*  $autoload['functions'] = array('foo');
-	*/
+     * If you have systems or personals functions to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['functions'] = array('function1', 'function2');
+     *
+     * Using module:
+     * 
+     *   $autoload['functions'] = array('module1/function1', 'module2/function2');
+     *
+     * Note 1: Personal functions have priority over system functions,
+     * that is to say that the order of loading is the following : it looks in the directory of the modules functions, 
+     * if it is found, it is loaded, otherwise, it looks in the directory of the personal functions,
+     * if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
+     * before returning an error in case he does not find it.
+     *
+     * Note 2: the file name must have as prefix "function_" for example "function_foo.php" then
+     * will use:
+     * 
+     *  $autoload['functions'] = array('foo');
+     */
     $autoload['functions'] = array();
 	
     /**
-	* If you have systems or personals languages to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['languages'] = array('lang1', 'lang2');
-	*
-	* Using module:
-	* 
-	*   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
-	*
-	* Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
-	* will use:
-	* 
-	*  $autoload['languages'] = array('foo');
-	*/
+     * If you have systems or personals languages to load automatically, specify them in the following array.
+     * For example :
+     *
+     * 	$autoload['languages'] = array('lang1', 'lang2');
+     *
+     * Using module:
+     * 
+     *   $autoload['languages'] = array('module1/lang1', 'module2/lang2');
+     *
+     * Note: the file name must have as prefix "lang_" for example "lang_foo.php" then
+     * will use:
+     * 
+     *  $autoload['languages'] = array('foo');
+     */
     $autoload['languages'] = array();

core/classes/Router.php

Indentation +12 added lines, -12 removed lines

@@ -241,12 +241,12 @@ 
         }
 
         /**
-        * 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')) {
@@ -423,11 +423,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
@@ -540,7 +540,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;
             }

core/libraries/Form.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                 $attributes['accept-charset'] = get_config('charset', 'UTF-8');
             }
             if (!empty($enctype)) {
-                 $attributes['enctype'] = $enctype;
+                    $attributes['enctype'] = $enctype;
             }
             $str .= attributes_to_string($attributes);
             $str .= '>';

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/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;
-         }
+            }
 
 
         /**

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;
         }
         

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);

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