tnhfw / tnh-fw

core/classes/Security.php

Indentation +4 added lines, -4 removed lines

@@ -98,10 +98,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 function checkWhiteListIpAccess() {
             $this->logger->debug('Validation of the IP address access ...');
             $this->logger->debug('Check if whitelist IP access is enabled in the configuration ...');

app/views/home.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
             <p>Required PHP version : <b>PHP &gt;= <?php echo TNH_MIN_PHP_VERSION; ?>, PHP &lt; <?php echo TNH_MAX_PHP_VERSION; ?></b></p>
             <p>Release date : <b><?php echo TNH_RELEASE_DATE; ?></b></p>
             <hr />
-            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b>
-            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b>
+            <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b>
+            <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b>
           </div>
         </div>
       </div>

core/libraries/Assets.php

Indentation +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
      */
     class Assets extends BaseClass {
 
-         /**
-         * Construct new instance
-         */
+            /**
+             * Construct new instance
+             */
         public function __construct() {
             parent::__construct();
         }

core/classes/Url.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
      * SOFTWARE.
      */
 
-    class Url extends BaseClass{
+    class Url extends BaseClass {
 
         /**
          * Construct new instance
@@ -151,7 +151,7 @@ 
          * @return string the final path after add suffix if configured
          * otherwise the same value will be returned
          */
-        protected function addSuffixInPath($path){
+        protected function addSuffixInPath($path) {
             $suffix = get_config('url_suffix');
             if ($suffix && $path) {
                 if (strpos($path, '?') !== false) {

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                     break;
                 }
             }
-			$port = get_instance()->request->server('SERVER_PORT');
+            $port = get_instance()->request->server('SERVER_PORT');
             
             if ($port && !in_array($port, array(80, 443))) {
                 $domain .= ':' . $port;

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 $browserName = '';
 
         /**
@@ -128,7 +128,7 @@ 
          */
         private $isFacebook = false;
 
-		/**
+        /**
          * Class constructor
          */
         public function __construct($userAgent = '') {
@@ -255,12 +255,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" .
@@ -304,70 +304,70 @@ 
         /**
          * 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();
-			$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->setVersion($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->setVersion($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->setMobile(true);
-			}
-		}
+                $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() {
@@ -380,10 +380,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();
@@ -394,4 +394,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';
@@ -306,7 +306,7 @@ 
          */
 		protected function checkPlatform() { 
 			foreach ($this->platforms as $regex => $value) { 
-				if (preg_match($regex, $this->agent) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->setPlatform($value);
 					break;
 				}
@@ -318,7 +318,7 @@ 
          */
 		protected function checkBrowser() {
 			foreach ($this->browsers as $regex => $value) { 
-				if (preg_match($regex, $this->agent ) ) {
+				if (preg_match($regex, $this->agent)) {
 					$this->setBrowser($value);
 					break;
 				}
@@ -328,10 +328,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']);
@@ -344,7 +344,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->setMobile(true);
 			}
 		}
@@ -353,7 +353,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->setTablet(true);
 			}
 		}
@@ -362,7 +362,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->setRobot(true);
 			}
 		}
@@ -374,7 +374,7 @@ 
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->setRobot(true);
                 $this->setFacebook(true);
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->setFacebook(true);
             }
         }

Braces +1 added lines, -1 removed lines

@@ -374,7 +374,7 @@
             if (stristr($this->agent, 'FacebookExternalHit')) {
                 $this->setRobot(true);
                 $this->setFacebook(true);
-            }  else if (stristr($this->agent, 'FBIOS')) {
+            } else if (stristr($this->agent, 'FBIOS')) {
                 $this->setFacebook(true);
             }
         }

core/libraries/Upload.php

Spacing +3 added lines, -3 removed lines

@@ -283,7 +283,7 @@ 
          *
          * @return object the current instance
          */
-        public function setUploadedFileData(array $fileData){
+        public function setUploadedFileData(array $fileData) {
             $this->uploadedFileData = $fileData;
             return $this;
         }
@@ -526,7 +526,7 @@ 
          *    @return    boolean
          */
         public function isAllowOverwriting() {
-            return $this->overwriteFile ;
+            return $this->overwriteFile;
         }
 
         /**
@@ -565,7 +565,7 @@ 
          *    @return    string
          */
         public function getDestinationDirectory() {
-            return $this->destinationDirectory ;
+            return $this->destinationDirectory;
         }
 
         /**

Indentation +48 added lines, -48 removed lines

@@ -277,10 +277,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the uploade file array
-         *    @return    array
-         */
+            /**
+             *    Get the uploade file array
+             *    @return    array
+             */
         public function getUploadedFileData() {
             return $this->uploadedFileData;
         }
@@ -320,10 +320,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the filename
-         *    @return    string
-         */
+            /**
+             *    Get the filename
+             *    @return    string
+             */
         public function getFilename() {
             return $this->filename;
         }
@@ -352,23 +352,23 @@ 
             return $this;
         }
 
-         /**
-         *    Get the max file size
-         *    @return    double|int
-         */
+            /**
+             *    Get the max file size
+             *    @return    double|int
+             */
         public function getMaxFileSize() {
             return $this->maxFileSize;
         }
 
-         /**
-         *    Append a mime type to allowed mime types
-         *
-         *    @since     1.0
-         *    @version   1.0.1
-         *    @param     string      $mime
-         *    @return    object
-         *    @method    boolean     setAllowMimeType
-         */
+            /**
+             *    Append a mime type to allowed mime types
+             *
+             *    @since     1.0
+             *    @version   1.0.1
+             *    @param     string      $mime
+             *    @return    object
+             *    @method    boolean     setAllowMimeType
+             */
         public function setAllowMimeType($mime) {
             $this->allowedMimeTypes[] = strtolower($mime);
             $this->file['allowed_mime_types'][] = strtolower($mime); 
@@ -485,10 +485,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the upload function name like "copy", "move_uploaded_file"
-         *    @return    string
-         */
+            /**
+             *    Get the upload function name like "copy", "move_uploaded_file"
+             *    @return    string
+             */
         public function getUploadFunction() {
             return $this->uploadFunction;
         }
@@ -506,10 +506,10 @@ 
             return $this;
         }
 
-         /**
-         *    Get the allow overwriting
-         *    @return    boolean
-         */
+            /**
+             *    Get the allow overwriting
+             *    @return    boolean
+             */
         public function isAllowOverwriting() {
             return $this->overwriteFile ;
         }
@@ -614,14 +614,14 @@ 
             return $this->error;
         }
 
-         /**
-         *    Retrive status of upload
-         *
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         *    @method    boolean    getStatus
-         */
+            /**
+             *    Retrive status of upload
+             *
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             *    @method    boolean    getStatus
+             */
         public function getStatus() {
             return $this->file['status'];
         }
@@ -654,11 +654,11 @@ 
                                 && is_file($file);
         }
 
-         /**
-         * Set the filename if is empty using the uploaded data information
-         *
-         * @return object the current instance
-         */
+            /**
+             * Set the filename if is empty using the uploaded data information
+             *
+             * @return object the current instance
+             */
         protected function setFilenameUsingUploadedData() {
             // set original filename if not have a new name
             if (empty($this->filename)) {
@@ -745,12 +745,12 @@ 
             return true;
         }
 
-         /**
-         *    Check the file overwritting
-         *    @since     1.0
-         *    @version   1.0
-         *    @return    boolean
-         */
+            /**
+             *    Check the file overwritting
+             *    @since     1.0
+             *    @version   1.0
+             *    @return    boolean
+             */
         protected function checkFileOverwritting() {
             if ($this->fileExists($this->destinationDirectory . $this->filename)) {
                 return $this->overwriteFile;

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
          * Get some parameters data 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'); 
             

core/libraries/Cookie.php

Indentation +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
         public function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false) {
             if (headers_sent()) {
                 show_error('There exists a cookie that we wanted to create that we couldn\'t '
-						    . 'because headers was already sent. Make sure to do this first ' 
-							. 'before outputing anything.');
+                            . 'because headers was already sent. Make sure to do this first ' 
+                            . 'before outputing anything.');
             }
             $timestamp = $expire;
             if ($expire) {

core/classes/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
          *
          * @codeCoverageIgnore
          */
-         private function startAppSession() {
+            private function startAppSession() {
             //$_SESSION is not available on cli mode 
             if (!IS_CLI) {
                 //set session params
@@ -143,7 +143,7 @@ 
          * @codeCoverageIgnore
          */
         private function setAppSessionConfig() {
-             //the default is to store in the files
+                //the default is to store in the files
             $sessionHandler = $this->config->get('session_handler', 'files');
             $this->logger->info('Session handler: ' . $sessionHandler);
             if ($sessionHandler == 'files') {