tnhfw / tnh-fw

core/libraries/Browser.php

Indentation +122 added lines, -122 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 $browserName = '';
 
         /**
@@ -128,7 +128,7 @@ 
          */
         private $isFacebook = false;
 
-		/**
+        /**
          * Class constructor
          */
         public function __construct($userAgent = '') {
@@ -231,12 +231,12 @@ 
             return $this->isFacebook;
         }
 
-         /**
-         * 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" .
@@ -248,70 +248,70 @@ 
         /**
          * Determine the user's platform
          */
-		protected function checkPlatform() { 
-			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
-					$this->platform = $value;
-					break;
-				}
-			}   
-		}
-
-		/**
+        protected function checkPlatform() { 
+            foreach ($this->platforms as $regex => $value) { 
+                if (preg_match($regex, $this->agent) ) {
+                    $this->platform = $value;
+                    break;
+                }
+            }   
+        }
+
+        /**
          * Routine to determine the browser type
          */
-		protected function checkBrowser() {
-			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
-					$this->browserName = $value;
-					break;
-				}
-			}
-		}
-
-		/**
+        protected function checkBrowser() {
+            foreach ($this->browsers as $regex => $value) { 
+                if (preg_match($regex, $this->agent ) ) {
+                    $this->browserName = $value;
+                    break;
+                }
+            }
+        }
+
+        /**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
-			$detected = $this->getBrowser();
-			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
-			$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->version = $matches['version'][$found];
-			}
-		}
-
-		/**
+        protected function checkBrowserVersion(){
+            $detected = $this->getBrowser();
+            $detect = array_search($detected, $this->browsers);
+            $browser = str_replace(array('/i','/'), '', $detect);
+            $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->version = $matches['version'][$found];
+            }
+        }
+
+        /**
          * Determine if the browser is Mobile or not
          */
-		protected function checkMobile() {
-			if (preg_match('/(android|avantgo|blackberry|bolt|boost|cricket'
+        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->isMobile = true;
-			}
-		}
+                $this->isMobile = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Tablet or not
          */
-		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
-				$this->isTablet = true;
-			}
-		}
+        protected function checkTablet() {
+            if (preg_match('/tablet|ipad/i', $this->agent) ) {
+                $this->isTablet = true;
+            }
+        }
 
-		/**
+        /**
          * Determine if the browser is Robot or not
          */
-		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
-				$this->isRobot = true;
-			}
-		}
+        protected function checkBot() {
+            if (preg_match('/bot/i', $this->agent) ) {
+                $this->isRobot = true;
+            }
+        }
 
-		/**
+        /**
          * Detect if URL is loaded from FacebookExternalHit
          */
         protected function checkFacebook() {
@@ -324,10 +324,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();
@@ -338,4 +338,4 @@ 
             $this->checkFacebook();
         }
 		
-	}
+    }

Spacing +9 added lines, -9 removed lines

@@ -144,7 +144,7 @@ 
          * Reset all properties
          */
         public function reset() {
-            $this->agent =  get_instance()->globalvar->server('HTTP_USER_AGENT');
+            $this->agent = get_instance()->globalvar->server('HTTP_USER_AGENT');
             $this->browserName = 'unknown';
             $this->version = 'unknown';
             $this->platform = 'unknown';
@@ -250,7 +250,7 @@ 
          */
 		protected function checkPlatform() { 
 			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->platform = $value;
 					break;
 				}
@@ -262,7 +262,7 @@ 
          */
 		protected function checkBrowser() {
 			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->browserName = $value;
 					break;
 				}
@@ -272,10 +272,10 @@ 
 		/**
          * Routine to determine the browser version
          */
-		protected function checkBrowserVersion(){
+		protected function checkBrowserVersion() {
 			$detected = $this->getBrowser();
 			$detect = array_search($detected, $this->browsers);
-			$browser = str_replace(array('/i','/'), '', $detect);
+			$browser = str_replace(array('/i', '/'), '', $detect);
 			$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']);
@@ -288,7 +288,7 @@ 
          */
 		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) ) {
+                . '|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i', $this->agent)) {
 				$this->isMobile = true;
 			}
 		}
@@ -297,7 +297,7 @@ 
          * Determine if the browser is Tablet or not
          */
 		protected function checkTablet() {
-			if (preg_match('/tablet|ipad/i', $this->agent) ) {
+			if (preg_match('/tablet|ipad/i', $this->agent)) {
 				$this->isTablet = true;
 			}
 		}
@@ -306,7 +306,7 @@ 
          * Determine if the browser is Robot or not
          */
 		protected function checkBot() {
-			if (preg_match('/bot/i', $this->agent) ) {
+			if (preg_match('/bot/i', $this->agent)) {
 				$this->isRobot = true;
 			}
 		}
@@ -318,7 +318,7 @@ 
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

Braces +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->isRobot = true;
                 $this->isFacebook = true;
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->isFacebook = true;
             }
         }

core/classes/Lang.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             if ($cookieLang && $this->isValid($cookieLang)) {
                 $this->current = $cookieLang;
                 $this->logger->info('Language from cookie [' . $cfgKey . '] is valid so '
-                                     .'we will set the language using the cookie value [' . $cookieLang . ']');
+                                        .'we will set the language using the cookie value [' . $cookieLang . ']');
             } else {
                 $this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']');
                 $this->current = $this->getDefault();

core/classes/Loader.php

Indentation +2 added lines, -2 removed lines

@@ -219,7 +219,7 @@ 
             $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module);
             if ($moduleConfigPath) {
                 $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], '
-                                  . 'the file path is [' . $moduleConfigPath . '] we will used it');
+                                    . 'the file path is [' . $moduleConfigPath . '] we will used it');
                 $configFilePath = $moduleConfigPath;
             } else {
                 $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location');
@@ -479,7 +479,7 @@ 
             $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module);
             if ($moduleLibraryPath) {
                 $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the '
-                                   . 'file path is [' . $moduleLibraryPath . '] we will used it');
+                                    . 'file path is [' . $moduleLibraryPath . '] we will used it');
                 $libraryFilePath = $moduleLibraryPath;
             } else {
                 $this->logger->info('Cannot find library [' . $class . '] from modules using the default location');

Spacing +2 added lines, -2 removed lines

@@ -335,7 +335,7 @@ 
          * @param  string $appLang the application language, only if type = "language"
          * @return string|null          the full file path
          */
-        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
+        protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) {
             //Default to "function"
             $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             if ($type == 'language') {
@@ -359,7 +359,7 @@ 
          * @param  string|null $module the module if is not null will return it
          * @return string|null
          */
-        protected function getModuleFromSuperController($module){
+        protected function getModuleFromSuperController($module) {
             $obj = & get_instance();
             if (!$module && !empty($obj->moduleName)) {
                 $module = $obj->moduleName;

core/classes/model/DBSessionHandlerModel.php

Indentation +10 added lines, -10 removed lines

@@ -29,8 +29,8 @@ 
      */
 	
     /**
-    * DB session handler model class
-    */
+     * DB session handler model class
+     */
     abstract class DBSessionHandlerModel extends Model {
 		
         /**
@@ -40,14 +40,14 @@ 
          *
          * @example
          * 	array(
-	 *	      'sid' => '', //VARCHAR(100) Note: this a primary key
-	 *	      'sdata' => '', //TEXT
-	 *	      'stime' => '', //unix timestamp (INT|BIGINT)
-	 *	      'shost' => '', //VARCHAR(255)
-	 *	      'sip' => '', //VARCHAR(128) 
-	 *	      'sbrowser' => '', //VARCHAR(255) 
-	 *	      'skey' => '' //VARCHAR(255) 
-	 *	);
+         *	      'sid' => '', //VARCHAR(100) Note: this a primary key
+         *	      'sdata' => '', //TEXT
+         *	      'stime' => '', //unix timestamp (INT|BIGINT)
+         *	      'shost' => '', //VARCHAR(255)
+         *	      'sip' => '', //VARCHAR(128) 
+         *	      'sbrowser' => '', //VARCHAR(255) 
+         *	      'skey' => '' //VARCHAR(255) 
+         *	);
          */
         protected $sessionTableColumns = array();
 

core/classes/Config.php

Indentation +9 added lines, -9 removed lines

@@ -46,9 +46,9 @@ 
             if ($init) {
                 $this->init();
                 //@codeCoverageIgnoreStart
-                 if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
+                    if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'notice'))) {
                     $this->logger->warning('You are in production environment, please set '
-                                           . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
+                                            . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance');
                 }
                 //@codeCoverageIgnoreEnd
             }
@@ -146,7 +146,7 @@ 
             if (empty($this->config['base_url'])) {
                 if (ENVIRONMENT == 'production') {
                     $this->logger->warning('Application base URL is not set or invalid, please'
-                                           . ' set application base URL to increase the application loading time');
+                                            . ' set application base URL to increase the application loading time');
                 }
                 $baseUrl = null;
                 $protocol = 'http';
@@ -173,7 +173,7 @@ 
                                                                     );
                 } else {
                     $this->logger->warning('Can not determine the application '
-                                           . 'base URL automatically, use http://localhost as default');
+                                            . 'base URL automatically, use http://localhost as default');
                     $baseUrl = 'http://localhost/';
                 }
                 $this->config['base_url'] = $baseUrl;
@@ -182,11 +182,11 @@ 
         }
          
         /**
-        * Return the server port using variable
-        *
-        * @codeCoverageIgnore
-        * @return string
-        */
+         * Return the server port using variable
+         *
+         * @codeCoverageIgnore
+         * @return string
+         */
         protected function getServerPort() {
             $globals = & class_loader('GlobalVar', 'classes');
             $serverPort = $globals->server('SERVER_PORT');

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
          * Get some parameters need like ip address, hostname, browser info, etc.
          * @return array
          */
-        protected function getSessionDataParams(){
+        protected function getSessionDataParams() {
             $this->OBJ->loader->functions('user_agent'); 
             $this->OBJ->loader->library('Browser');