tnhfw / tnh-fw

core/common.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
         static $cfg;
         if (empty($cfg)) {
             $cfg[0] = & load_configurations();
-            if(! is_array($cfg[0])){
+            if (!is_array($cfg[0])) {
                 $cfg[0] = array();
             }
         }

Indentation +9 added lines, -9 removed lines

@@ -270,15 +270,15 @@
         die();
     }
 
-       /**
-     *  Function defined for handling PHP exception error message, 
-     *  it displays an error message using the function "show_error"
-     *  
-     *  @param object $ex instance of the "Exception" class or a derived class
-     *  @codeCoverageIgnore
-     *  
-     *  @return boolean
-     */
+        /**
+         *  Function defined for handling PHP exception error message, 
+         *  it displays an error message using the function "show_error"
+         *  
+         *  @param object $ex instance of the "Exception" class or a derived class
+         *  @codeCoverageIgnore
+         *  
+         *  @return boolean
+         */
     function fw_exception_handler($ex) {
         if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) {
             show_error('An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());

core/classes/DBSessionHandler.php

Spacing +1 added lines, -1 removed lines

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

core/libraries/Browser.php

Braces +1 added lines, -1 removed lines

@@ -364,7 +364,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);
             }
         }

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();
         }
 		
-	}
+    }

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->_browser_name = '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();
 			$d = array_search($detected, $this->_browsers);
-			$browser = str_replace(array("/i","/"), "", $d);
+			$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"]);
@@ -343,7 +343,7 @@ 
          * 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) ) {
+			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);
 			}
 		}
@@ -352,7 +352,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);
 			}
 		}
@@ -361,7 +361,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);
 			}
 		}
@@ -373,7 +373,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/classes/model/Model.php

Indentation +17 added lines, -17 removed lines

@@ -746,22 +746,22 @@ 
             return $this->loaderInstance;
         }
 
-         /**
-         * Get the return type array or object
-         * @return string|boolean
-         */
+            /**
+             * Get the return type array or object
+             * @return string|boolean
+             */
         protected function getReturnType(){
             $type = false;
             if ($this->_temporary_return_type == 'array') {
-               $type = 'array';
+                $type = 'array';
             }
             return $type;
         }
 
-         /**
-         * Check if soft delete is enable setting the condition
-         * @return object the current instance 
-         */
+            /**
+             * Check if soft delete is enable setting the condition
+             * @return object the current instance 
+             */
         protected function checkForSoftDelete(){
             if ($this->soft_delete && $this->_temporary_with_deleted !== true) {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
@@ -769,14 +769,14 @@ 
             return $this;
         }
 
-         /**
-         * Relate for "belongs_to" and "has_many"
-         * @param  string $relationship the name of relation
-         * @param  string|array $options      the model and primary key values
-         * @param  object|array $row          the row to update
-         * @param  string $type         the type can be "belongs_to", "has_many"
-         * @return mixed               the final row values
-         */
+            /**
+             * Relate for "belongs_to" and "has_many"
+             * @param  string $relationship the name of relation
+             * @param  string|array $options      the model and primary key values
+             * @param  object|array $row          the row to update
+             * @param  string $type         the type can be "belongs_to", "has_many"
+             * @return mixed               the final row values
+             */
         protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){
             if (in_array($relationship, $this->_with)) {
                 $loaderInstance = $this->getLoaderInstanceOrCreate();

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
                 $instance = $db;
             } else {
                 $obj = & get_instance();
-                if (isset($obj->database)){
+                if (isset($obj->database)) {
                     /**
                      * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                      * to prevent duplication
@@ -730,7 +730,7 @@ 
          * @return object
          */
         protected function getLoaderInstanceOrCreate() {
-            if (! is_object($this->loaderInstance)) {
+            if (!is_object($this->loaderInstance)) {
                 $this->loaderInstance = & get_instance()->loader;
             } 
             return $this->loaderInstance;
@@ -740,7 +740,7 @@ 
          * Get the return type array or object
          * @return string|boolean
          */
-        protected function getReturnType(){
+        protected function getReturnType() {
             $type = false;
             if ($this->_temporary_return_type == 'array') {
                $type = 'array';
@@ -752,7 +752,7 @@ 
          * Check if soft delete is enable setting the condition
          * @return object the current instance 
          */
-        protected function checkForSoftDelete(){
+        protected function checkForSoftDelete() {
             if ($this->soft_delete && $this->_temporary_with_deleted !== true) {
                 $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
@@ -767,12 +767,12 @@ 
          * @param  string $type         the type can be "belongs_to", "has_many"
          * @return mixed               the final row values
          */
-        protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){
+        protected function relateBelongsToAndHasMany($relationship, $options, $row, $type) {
             if (in_array($relationship, $this->_with)) {
                 $loaderInstance = $this->getLoaderInstanceOrCreate();
                 $loaderInstance->model($options['model'], $relationship . '_model');
 
-                if($type == 'belongs_to'){
+                if ($type == 'belongs_to') {
                     if (is_object($row)) {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
                     } else {

core/classes/Loader.php

Braces +1 added lines, -2 removed lines

@@ -316,8 +316,7 @@
             $searchDir = null;
             if ($type == 'function') {
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-            }
-            else if ($type == 'language') {
+            } else if ($type == 'language') {
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
                 $file = $appLang . DS . $file;
             }

Indentation +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
         protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){
             $searchDir = null;
             if ($type == 'function') {
-               $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
             }
             else if ($type == 'language') {
                 $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);

Spacing +2 added lines, -2 removed lines

@@ -308,7 +308,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) {
             $searchDir = null;
             if ($type == 'function') {
                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
@@ -334,7 +334,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/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);
             }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      * @link      http://github.com/eoghanobrien/php-simple-mail
      */
 
-    class Email extends BaseClass{
+    class Email extends BaseClass {
         /**
          * @var int $_wrap
          */

core/classes/Module.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         public function add($name) {
             $logger = self::getLogger();
             if (in_array($name, self::$list)) {
-               $logger->info('The module [' .$name. '] already added skipping.');
+               $logger->info('The module [' . $name . '] already added skipping.');
                return $this;
             }
             self::$list[] = $name;

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