tnhfw / tnh-fw

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

Indentation +15 added lines, -15 removed lines

@@ -276,14 +276,14 @@ 
         }
 
         /**
-        * Setting the route configuration using the configuration file 
-        * and additional configuration from param
-        * @param array $overwriteConfig the additional configuration 
-        * to overwrite with the existing one
-        * @param boolean $useConfigFile whether to use route configuration file
-        * 
-        * @return object
-        */
+         * Setting the route configuration using the configuration file 
+         * and additional configuration from param
+         * @param array $overwriteConfig the additional configuration 
+         * to overwrite with the existing one
+         * @param boolean $useConfigFile whether to use route configuration file
+         * 
+         * @return object
+         */
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -364,7 +364,7 @@ 
             //the URL like http://domain.com/module/controller/method/arg1/arg2/argn 
             if (!$this->controller) {
                 $this->logger->info('Cannot determine the routing information ' 
-                       . 'using the predefined routes configuration, will use the request URI parameters');
+                        . 'using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the route URI param
                 $this->determineRouteParamsFromRequestUri();
             }
@@ -478,11 +478,11 @@ 
             }
         }
 
-         /**
-         * Remove the URL suffix and query string values if exists
-         * @param  string $uri the route URI to process
-         * @return string      the final route uri after processed
-         */
+            /**
+             * Remove the URL suffix and query string values if exists
+             * @param  string $uri the route URI to process
+             * @return string      the final route uri after processed
+             */
         protected function removeSuffixAndQueryStringFromUri($uri) {
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
@@ -598,7 +598,7 @@ 
                 $this->logger->info(
                                     'After loop in predefined routes configuration,'
                                     . 'the module name is set but the controller is not set,' 
-									. 'so we will use module as the controller'
+                                    . 'so we will use module as the controller'
                                 );
                 $this->controller = $this->module;
             }

core/classes/Url.php

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/classes/Response.php

Indentation +27 added lines, -27 removed lines

@@ -185,7 +185,7 @@ 
                 $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] '
                                     . 'using the default location');
             }
-	    if (!$path) {
+        if (!$path) {
                 $path = $this->getDefaultFilePathForView($viewFile);
             }
             $this->logger->info('The view file path to be loaded is [' . $path . ']');
@@ -261,12 +261,12 @@ 
             return $this->finalPageContent;
         }
 
-         /**
-         * Set the final page to be rendered
-         * @param string $finalPage the content of the final page
-         * 
-         * @return object
-         */
+            /**
+             * Set the final page to be rendered
+             * @param string $finalPage the content of the final page
+             * 
+             * @return object
+             */
         public function setFinalPageContent($finalPage) {
             $this->finalPageContent = $finalPage;
             return $this;
@@ -339,12 +339,12 @@ 
             //@codeCoverageIgnoreEnd
         }
 
-         /**
-         * Dispatch the FINAL_VIEW_READY event
-         *             
-         * @return string|null the final view content after processing by each listener
-         * if they exists otherwise the same content will be returned
-         */
+            /**
+             * Dispatch the FINAL_VIEW_READY event
+             *             
+             * @return string|null the final view content after processing by each listener
+             * if they exists otherwise the same content will be returned
+             */
         protected function dispatchFinalViewEvent() {
             //dispatch
             $event = get_instance()->eventdispatcher->dispatch(
@@ -388,12 +388,12 @@ 
                                           && (bool) ini_get('zlib.output_compression') === false;
         }
 
-         /**
-         * Return the default full file path for view
-         * @param  string $file    the filename
-         * 
-         * @return string|null          the full file path
-         */
+            /**
+             * Return the default full file path for view
+             * @param  string $file    the filename
+             * 
+             * @return string|null          the full file path
+             */
         protected function getDefaultFilePathForView($file){
             $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH);
             $fullFilePath = null;
@@ -426,7 +426,7 @@ 
                 $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE');
                 if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) {
                     $this->logger->info('The cache page content is not yet expire for the '
-                                         . 'URL [' . $this->currentUrl . '] send 304 header to browser');
+                                            . 'URL [' . $this->currentUrl . '] send 304 header to browser');
                     $this->sendHeaders(304);
                     return true;
                 }
@@ -441,8 +441,8 @@ 
          */
         protected function sendCachePageContentToBrowser(&$cache) {
             $this->logger->info('The cache page content is expired or the browser does '
-                 . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
-                 . 'send cache headers to tell the browser');
+                    . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] '
+                    . 'send cache headers to tell the browser');
             $this->sendHeaders(200);
             //current page cache key
             $pageCacheKey = $this->currentUrlCacheKey;
@@ -581,18 +581,18 @@ 
             }
         }
 
-         /**
-         * Set the mandory headers, like security, etc.
-         */
+            /**
+             * Set the mandory headers, like security, etc.
+             */
         protected function setRequiredHeaders() {
             $requiredHeaders = array(
                                 'X-XSS-Protection' => '1; mode=block',
                                 'X-Frame-Options'  => 'SAMEORIGIN'
                             );
             foreach ($requiredHeaders as $key => $value) {
-               if (!isset($this->headers[$key])) {
+                if (!isset($this->headers[$key])) {
                     $this->headers[$key] = $value;
-               } 
+                } 
             }
         }
     }

core/classes/Log.php

Indentation +14 added lines, -14 removed lines

@@ -180,13 +180,13 @@ 
             $this->log(self::DEBUG, $message);
         } 
 		
-	/**
-         * Logs with an arbitrary level.
-         *
-         * @param  integer|string $level   the log level in integer or string format,
-         * if is string will convert into integer. 
-         * @param  string $message the log message to be saved
-         */
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param  integer|string $level   the log level in integer or string format,
+     * if is string will convert into integer. 
+     * @param  string $message the log message to be saved
+     */
         public function log($level, $message) {
             $configLogLevel = get_config('log_level');
             if (!$configLogLevel) {
@@ -198,11 +198,11 @@ 
                 //NOTE: here need put the show_error() "logging" to false 
                 //to prevent self function loop call
                 show_error('Invalid config log level [' . $configLogLevel . '], '
-                           . 'the value must be one of the following: ' 
-                           . implode(', ', array_map('strtoupper', self::$validConfigLevel))
-                           , 'Log Config Error', 
-                           $logging = false
-                       );
+                            . 'the value must be one of the following: ' 
+                            . implode(', ', array_map('strtoupper', self::$validConfigLevel))
+                            , 'Log Config Error', 
+                            $logging = false
+                        );
                 return;	
             }
 			
@@ -271,7 +271,7 @@ 
         protected function levelCanSaveLog($level) {
             $result = true;
             $configLogLevel = get_config('log_level');
-             //check if can save log regarding the log level configuration
+                //check if can save log regarding the log level configuration
             $configLevel = self::getLevelValue($configLogLevel);
             if ($configLevel > $level) {
                 //can't log
@@ -351,7 +351,7 @@ 
                 //NOTE: here need put the show_error() "logging" to false 
                 //to prevent self function loop call
                 show_error('Error : the log dir does not exist or is not writable',
-                           'Log directory error', $logging = false);
+                            'Log directory error', $logging = false);
             }
             return $logSavePath . 'logs-' . date('Y-m-d') . '.log';
         }

core/bootstrap.php

Indentation +29 added lines, -29 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
@@ -93,7 +93,7 @@ 
                     . '] please install a PHP version that is compatible.', 'PHP Error environment');	
     }
     $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_MIN_PHP_VERSION 
-                   . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
+                    . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue');
 
     /**
      * Setting of the PHP error message handling function
@@ -155,7 +155,7 @@ 
     /**
      * Register controllers autoload function
      */
-     spl_autoload_register('autoload_controller');
+        spl_autoload_register('autoload_controller');
 
     /**
      * Loading Security class

core/classes/Module.php

Indentation +8 added lines, -8 removed lines

@@ -58,8 +58,8 @@ 
          */
         public function add($name) {
             if (in_array($name, $this->list)) {
-               $this->logger->warning('The module [' .$name. '] already added skipping.');
-               return $this;
+                $this->logger->warning('The module [' .$name. '] already added skipping.');
+                return $this;
             }
             $this->list[] = $name;
             return $this;
@@ -91,10 +91,10 @@ 
             $this->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 function getModuleList() {
             return $this->list;
         }
@@ -241,7 +241,7 @@ 
             $this->logger->debug('Check if the application contains the modules ...');
             $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR);
             if ($dirList !== false) {
-               $this->list = array_map('basename', $dirList);
+                $this->list = array_map('basename', $dirList);
             }
             if (!empty($this->list)) {
                 $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']');
@@ -264,7 +264,7 @@ 
             $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
             if (file_exists($filePath)) {
                 $this->logger->info('Found class [' . $class . '] in module [' . $module . '] '
-                                     . 'for [' . $type . '] the file path is [' . $filePath . ']');
+                                        . 'for [' . $type . '] the file path is [' . $filePath . ']');
                 return $filePath;
             }
             $this->logger->info('Class [' . $class . '] does not exist in the module [' . $module . '] for [' . $type . ']');

core/classes/database/DatabaseConnection.php

Indentation +38 added lines, -38 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;
 
         /**
@@ -113,11 +113,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 {
                 if(empty($this->config) && file_exists(CONFIG_PATH . 'database.php')) {
@@ -182,9 +182,9 @@ 
             );
             if ($port) {
                 $driversPort = array(
-                      'mysql'  => 'port=' . $port . ';',
-                      'pgsql'  => 'port=' . $port . ';',
-                      'oracle' => ':' . $port
+                        'mysql'  => 'port=' . $port . ';',
+                        'pgsql'  => 'port=' . $port . ';',
+                        'oracle' => ':' . $port
                 );
                 if (isset($driversPort[$driver])) {
                     $port = $driversPort[$driver];
@@ -422,7 +422,7 @@ 
             $this->populatePropertiesFromConfig();
 
             if (!empty($this->config)) {
-               //For logging
+                //For logging
                 $configInfo = $this->config;
                 //Hide password from log
                 $configInfo['password'] = string_hidden($this->getPassword());
@@ -431,11 +431,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);