tnhfw / tnh-fw

core/classes/BaseStaticClass.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 self::$logger = $logger[0];
             }
             if ($setLoggerName) {
-               self::$logger->setLogger('Class::' . get_called_class());
+                self::$logger->setLogger('Class::' . get_called_class());
             }
             return self::$logger;			
         }

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

core/libraries/Email.php

Indentation +2 added lines, -2 removed lines

@@ -282,7 +282,7 @@ 
             }
             $filename = $this->encodeUtf8($this->filterOther((string) $filename));
             if (empty($data)) {
-               $data = $this->getAttachmentData($path);
+                $data = $this->getAttachmentData($path);
             }
             $this->_attachments[] = array(
                 'path' => $path,
@@ -346,7 +346,7 @@ 
             $addresses = array();
             foreach ($pairs as $name => $email) {
                 if (is_numeric($name)) {
-                   $name = null;
+                    $name = null;
                 }
                 $addresses[] = $this->formatHeader($email, $name);
             }

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/libraries/Browser.php

Indentation +120 added lines, -120 removed lines

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

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 {
 		
         /**