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/bootstrap.php

Indentation +27 added lines, -27 removed lines

@@ -1,32 +1,32 @@
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-     /**
-     * TNH Framework
-     *
-     * A simple PHP framework using HMVC architecture
-     *
-     * This content is released under the MIT License (MIT)
-     *
-     * Copyright (c) 2017 TNH Framework
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in all
-     * copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
+        /**
+         * TNH Framework
+         *
+         * A simple PHP framework using HMVC architecture
+         *
+         * This content is released under the MIT License (MIT)
+         *
+         * Copyright (c) 2017 TNH Framework
+         *
+         * Permission is hereby granted, free of charge, to any person obtaining a copy
+         * of this software and associated documentation files (the "Software"), to deal
+         * in the Software without restriction, including without limitation the rights
+         * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         * copies of the Software, and to permit persons to whom the Software is
+         * furnished to do so, subject to the following conditions:
+         *
+         * The above copyright notice and this permission notice shall be included in all
+         * copies or substantial portions of the Software.
+         *
+         * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         * SOFTWARE.
+         */
 
     /**
      *  @file bootstrap.php

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/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() {

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