tnhfw / tnh-fw

core/classes/Security.php

Indentation +4 added lines, -4 removed lines

@@ -84,10 +84,10 @@
         }
 		
         /**
-        * This method is used to check the whitelist IP address access
-        *
-        * @return boolean
-        */
+         * This method is used to check the whitelist IP address access
+         *
+         * @return boolean
+         */
         public static function checkWhiteListIpAccess() {
             $logger = self::getLogger();
             $logger->debug('Validation of the IP address access ...');

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

Indentation +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
             $logger->debug('Check if the application contains the modules ...');
             $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR);
             if ($dirList !== false) {
-               self::$list = array_map('basename', $dirList);
+                self::$list = array_map('basename', $dirList);
             }
             if (!empty(self::$list)) {
                 $logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
@@ -57,8 +57,8 @@ 
         public function add($name) {
             $logger = self::getLogger();
             if (in_array($name, self::$list)) {
-               $logger->info('The module [' .$name. '] already added skipping.');
-               return $this;
+                $logger->info('The module [' .$name. '] already added skipping.');
+                return $this;
             }
             self::$list[] = $name;
             return $this;
@@ -88,10 +88,10 @@ 
             self::$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 static function getModuleList() {
             return self::$list;
         }

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

core/classes/database/DatabaseQueryRunner.php

Indentation +5 added lines, -5 removed lines

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

core/classes/database/Database.php

Indentation +8 added lines, -9 removed lines

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

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