tnhfw / tnh-fw

core/classes/Controller.php

Indentation +126 added lines, -126 removed lines

@@ -1,146 +1,146 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Controller{
+    class Controller{
 		
-		/**
-		 * The name of the module if this controller belong to an module
-		 * @var string
-		 */
-		public $moduleName = null;
+        /**
+         * The name of the module if this controller belong to an module
+         * @var string
+         */
+        public $moduleName = null;
 
-		/**
-		 * The singleton of the super object
-		 * @var Controller
-		 */
-		private static $instance;
+        /**
+         * The singleton of the super object
+         * @var Controller
+         */
+        private static $instance;
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		protected $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        protected $logger;
 
-		/**
-		 * Class constructor
-		 * @param object $logger the Log instance to use if is null will create one
-		 */
-		public function __construct(Log $logger = null){
-			//setting the Log instance
-			$this->setLoggerFromParamOrCreateNewInstance($logger);
+        /**
+         * Class constructor
+         * @param object $logger the Log instance to use if is null will create one
+         */
+        public function __construct(Log $logger = null){
+            //setting the Log instance
+            $this->setLoggerFromParamOrCreateNewInstance($logger);
 			
-			//instance of the super object
-			self::$instance = & $this;
+            //instance of the super object
+            self::$instance = & $this;
 
-			//Load the resources loaded during the application bootstrap
-			$this->logger->debug('Adding the loaded classes to the super instance');
-			foreach (class_loaded() as $var => $class){
-				$this->$var =& class_loader($class);
-			}
+            //Load the resources loaded during the application bootstrap
+            $this->logger->debug('Adding the loaded classes to the super instance');
+            foreach (class_loaded() as $var => $class){
+                $this->$var =& class_loader($class);
+            }
 			
-			//set module using the router
-			$this->setModuleNameFromRouter();
+            //set module using the router
+            $this->setModuleNameFromRouter();
 
-			//load the required resources
-			$this->loadRequiredResources();
+            //load the required resources
+            $this->loadRequiredResources();
 			
-			//set the cache using the configuration
-			$this->setCacheFromParamOrConfig(null);
+            //set the cache using the configuration
+            $this->setCacheFromParamOrConfig(null);
 			
-			//set application session configuration
-			$this->logger->debug('Setting PHP application session handler');
-			set_session_config();
+            //set application session configuration
+            $this->logger->debug('Setting PHP application session handler');
+            set_session_config();
 
-			//dispatch the loaded instance of super controller event
-			$this->eventdispatcher->dispatch('SUPER_CONTROLLER_CREATED');
-		}
+            //dispatch the loaded instance of super controller event
+            $this->eventdispatcher->dispatch('SUPER_CONTROLLER_CREATED');
+        }
 
 
-		/**
-		 * This is a very useful method it's used to get the super object instance
-		 * @return Controller the super object instance
-		 */
-		public static function &get_instance(){
-			return self::$instance;
-		}
+        /**
+         * This is a very useful method it's used to get the super object instance
+         * @return Controller the super object instance
+         */
+        public static function &get_instance(){
+            return self::$instance;
+        }
 
-		/**
-		 * This method is used to set the module name
-		 */
-		protected function setModuleNameFromRouter(){
-			//set the module using the router instance
-			if(isset($this->router) && $this->router->getModule()){
-				$this->moduleName = $this->router->getModule();
-			}
-		}
+        /**
+         * This method is used to set the module name
+         */
+        protected function setModuleNameFromRouter(){
+            //set the module using the router instance
+            if(isset($this->router) && $this->router->getModule()){
+                $this->moduleName = $this->router->getModule();
+            }
+        }
 
-		/**
-		 * Set the cache using the argument otherwise will use the configuration
-		 * @param CacheInterface $cache the implementation of CacheInterface if null will use the configured
-		 */
-		protected function setCacheFromParamOrConfig(CacheInterface $cache = null){
-			$this->logger->debug('Setting the cache handler instance');
-			//set cache handler instance
-			if(get_config('cache_enable', false)){
-				if ($cache !== null){
-					$this->cache = $cache;
-				} else if (isset($this->{strtolower(get_config('cache_handler'))})){
-					$this->cache = $this->{strtolower(get_config('cache_handler'))};
-					unset($this->{strtolower(get_config('cache_handler'))});
-				} 
-			}
-		}
+        /**
+         * Set the cache using the argument otherwise will use the configuration
+         * @param CacheInterface $cache the implementation of CacheInterface if null will use the configured
+         */
+        protected function setCacheFromParamOrConfig(CacheInterface $cache = null){
+            $this->logger->debug('Setting the cache handler instance');
+            //set cache handler instance
+            if(get_config('cache_enable', false)){
+                if ($cache !== null){
+                    $this->cache = $cache;
+                } else if (isset($this->{strtolower(get_config('cache_handler'))})){
+                    $this->cache = $this->{strtolower(get_config('cache_handler'))};
+                    unset($this->{strtolower(get_config('cache_handler'))});
+                } 
+            }
+        }
 
-		/**
-		 * Set the Log instance using argument or create new instance
-		 * @param object $logger the Log instance if not null
-		 */
-		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-			if($logger !== null){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-				$this->logger->setLogger('MainController');
-	        }
-		}
+        /**
+         * Set the Log instance using argument or create new instance
+         * @param object $logger the Log instance if not null
+         */
+        protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
+            if($logger !== null){
+                $this->logger = $logger;
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('MainController');
+            }
+        }
 
-		/**
-		 * This method is used to load the required resources for framework to work
-		 * @return void 
-		 */
-		private function loadRequiredResources(){
-			$this->logger->debug('Loading the required classes into super instance');
-			$this->eventdispatcher =& class_loader('EventDispatcher', 'classes');
-			$this->loader =& class_loader('Loader', 'classes');
-			$this->lang =& class_loader('Lang', 'classes');
-			$this->request =& class_loader('Request', 'classes');
-			//dispatch the request instance created event
-			$this->eventdispatcher->dispatch('REQUEST_CREATED');
-			$this->response =& class_loader('Response', 'classes', 'classes');
-		}
+        /**
+         * This method is used to load the required resources for framework to work
+         * @return void 
+         */
+        private function loadRequiredResources(){
+            $this->logger->debug('Loading the required classes into super instance');
+            $this->eventdispatcher =& class_loader('EventDispatcher', 'classes');
+            $this->loader =& class_loader('Loader', 'classes');
+            $this->lang =& class_loader('Lang', 'classes');
+            $this->request =& class_loader('Request', 'classes');
+            //dispatch the request instance created event
+            $this->eventdispatcher->dispatch('REQUEST_CREATED');
+            $this->response =& class_loader('Response', 'classes', 'classes');
+        }
 
-	}
+    }

config/config.php

Indentation +273 added lines, -273 removed lines

@@ -1,337 +1,337 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 	
-	/**
-	* This file contains the main configuration of your application
-	* web address, front controller, error logging, session parameters, CSRF, Cache, 
-	* Whitelist IP access, etc.
-	*/
+    /**
+     * This file contains the main configuration of your application
+     * web address, front controller, error logging, session parameters, CSRF, Cache, 
+     * Whitelist IP access, etc.
+     */
 	
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* Basic configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/**
-	* The web address of your application.
-	*
-	* The address of your application or website terminated by a slash.
-	* You can use a domain name or IP address, for example:
-	*
-	* $config['base_url'] = 'http://www.mysite.com';
-	* or
-	* $config['base_url'] = 'http://198.15.25.12';
-	*
-	* If this value is empty, we try to determine it automatically by using 
-	* the server variables "SERVER_ADDR" or "SCRIPT_NAME",
-	* we recommend that you specify this value for a server in production this may reduce the performance of your application.
-	*/
-	$config['base_url'] = '';
+    /**
+     * The web address of your application.
+     *
+     * The address of your application or website terminated by a slash.
+     * You can use a domain name or IP address, for example:
+     *
+     * $config['base_url'] = 'http://www.mysite.com';
+     * or
+     * $config['base_url'] = 'http://198.15.25.12';
+     *
+     * If this value is empty, we try to determine it automatically by using 
+     * the server variables "SERVER_ADDR" or "SCRIPT_NAME",
+     * we recommend that you specify this value for a server in production this may reduce the performance of your application.
+     */
+    $config['base_url'] = '';
 	
-	/**
-	* The front controller
-	*
-	* This represents the name of the file called by the application during the loading 
-	* process generally the file "index.php". 
-	* If your webserver supports the url rewrite module, then you can leave this value empty. 
-	* You will find a sample file to hide this file in the url inside the root folder of your 
-	* application "htaccess.txt" for the apache web server just rename it to ".htaccess"
-	* 
-	* Without the rewrite module url enabled, leave this value to "index.php", in this case your urls look like:
-	*
-	* http://www.yoursite.com/index.php/controller/method
-	* 
-	* otherwise if the module is available and activated you can put this value empty and your urls look like:
-	*
-	* http://www.yoursite.com/controller/method
-	*
-	*/
-	$config['front_controller'] = 'index.php';
+    /**
+     * The front controller
+     *
+     * This represents the name of the file called by the application during the loading 
+     * process generally the file "index.php". 
+     * If your webserver supports the url rewrite module, then you can leave this value empty. 
+     * You will find a sample file to hide this file in the url inside the root folder of your 
+     * application "htaccess.txt" for the apache web server just rename it to ".htaccess"
+     * 
+     * Without the rewrite module url enabled, leave this value to "index.php", in this case your urls look like:
+     *
+     * http://www.yoursite.com/index.php/controller/method
+     * 
+     * otherwise if the module is available and activated you can put this value empty and your urls look like:
+     *
+     * http://www.yoursite.com/controller/method
+     *
+     */
+    $config['front_controller'] = 'index.php';
 	
-	/**
-	 *  Url suffix
-	 */
-	$config['url_suffix'] = '';
+    /**
+     *  Url suffix
+     */
+    $config['url_suffix'] = '';
 	
-	/**
-	 *  site charset
-	 */
-	$config['charset'] = 'UTF-8';
+    /**
+     *  site charset
+     */
+    $config['charset'] = 'UTF-8';
 	
-	/**
-	* Compress the output before send to browser
-	*
-	* Enables Gzip output compression for faster page loads.  When enabled,
-	* the Response class will test whether your server supports Gzip.
-	* Even if it does, however, not all browsers support compression
-	* so enable only if you are reasonably sure your visitors can handle it.
-	*
-	* This is only used if "zlib.output_compression" is turned off in your php configuration.
-	* Please do not use it together with httpd-level output compression.
-	*
-	* IMPORTANT NOTE:  If you are getting a blank page when compression is enabled it
-	* means you are prematurely outputting something to your browser. It could
-	* even be a line of whitespace at the end of one of your scripts. For
-	* compression to work, nothing can be sent before the output buffer is called
-	* by the Response class.  Do not 'echo' any values with compression enabled.
-	*/
-	$config['compress_output'] = false;
+    /**
+     * Compress the output before send to browser
+     *
+     * Enables Gzip output compression for faster page loads.  When enabled,
+     * the Response class will test whether your server supports Gzip.
+     * Even if it does, however, not all browsers support compression
+     * so enable only if you are reasonably sure your visitors can handle it.
+     *
+     * This is only used if "zlib.output_compression" is turned off in your php configuration.
+     * Please do not use it together with httpd-level output compression.
+     *
+     * IMPORTANT NOTE:  If you are getting a blank page when compression is enabled it
+     * means you are prematurely outputting something to your browser. It could
+     * even be a line of whitespace at the end of one of your scripts. For
+     * compression to work, nothing can be sent before the output buffer is called
+     * by the Response class.  Do not 'echo' any values with compression enabled.
+     */
+    $config['compress_output'] = false;
 
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* Language configuration section
 	+------------------------------------------------------------------+
 	*/
-	/**
-	 * list of available supported language
-	 * array(
-	 * 		'lang_key' => 'human readable'
-	 * )
-	 */
-	$config['languages'] = array('en' => 'english');
+    /**
+     * list of available supported language
+     * array(
+     * 		'lang_key' => 'human readable'
+     * )
+     */
+    $config['languages'] = array('en' => 'english');
 
-	/**
-	 * the default language to use if can not find the client language
-	 * need match with the array key of the supported languages
-	 */
-	$config['default_language'] = 'en'; //en = english, fr = french
+    /**
+     * the default language to use if can not find the client language
+     * need match with the array key of the supported languages
+     */
+    $config['default_language'] = 'en'; //en = english, fr = french
 
-	/**
-	 * the name of cookie used to store the client language
-	 */
-	$config['language_cookie_name'] = 'cookie_lang';
+    /**
+     * the name of cookie used to store the client language
+     */
+    $config['language_cookie_name'] = 'cookie_lang';
 
 
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* Logs configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/** 
-	* The log level
-	*
-	* The valid level are: OFF, NONE, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, ALL
-	*
-	* 'OFF' or 'NONE' = do not save log
-	* 'FATAL' = enable log for fatal level and above (FATAL)
-	* 'ERROR' = enable log for error level and above (ERROR, FATAL)
-	* 'WARNING' or WARN = enable log for warning level and above (WARNING, ERROR, FATAL)
-	* 'INFO' = enable log for info level and above (INFO, WARNING, ERROR, FATAL)
-	* 'DEBUG' = enable log for debug level and above (DEBUG, INFO, WARNING, ERROR, FATAL)
-	* 'ALL' = enable log for all level
-	*
-	* The default value is NONE if the config value is: null, '', 0, false
-	* 
-	* Note: in production environment it's recommand to set the log level to 'WARNING' if not in small
-	* of time the log file size will increase very fast and will cost the application performance
-	* and also the filesystem usage of your server.
-	*/
-	$config['log_level'] = 'NONE';
+    /** 
+     * The log level
+     *
+     * The valid level are: OFF, NONE, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, ALL
+     *
+     * 'OFF' or 'NONE' = do not save log
+     * 'FATAL' = enable log for fatal level and above (FATAL)
+     * 'ERROR' = enable log for error level and above (ERROR, FATAL)
+     * 'WARNING' or WARN = enable log for warning level and above (WARNING, ERROR, FATAL)
+     * 'INFO' = enable log for info level and above (INFO, WARNING, ERROR, FATAL)
+     * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, WARNING, ERROR, FATAL)
+     * 'ALL' = enable log for all level
+     *
+     * The default value is NONE if the config value is: null, '', 0, false
+     * 
+     * Note: in production environment it's recommand to set the log level to 'WARNING' if not in small
+     * of time the log file size will increase very fast and will cost the application performance
+     * and also the filesystem usage of your server.
+     */
+    $config['log_level'] = 'NONE';
 
 
-	/**
-	* The path to log directory
-	* 
-	* The path that the log data will be saved ending with de "/" or "\", leave empty if you
-	* want use the default configuration
-	* warning : if set, this directory must exist and will be writable and owned by the web server
-	* else the default value will be used i.e the constant LOG_PATH
-	* for security raison this directory must be outside of the document root of your
-	* website.
-	*/	
-	$config['log_save_path'] = '';
+    /**
+     * The path to log directory
+     * 
+     * The path that the log data will be saved ending with de "/" or "\", leave empty if you
+     * want use the default configuration
+     * warning : if set, this directory must exist and will be writable and owned by the web server
+     * else the default value will be used i.e the constant LOG_PATH
+     * for security raison this directory must be outside of the document root of your
+     * website.
+     */	
+    $config['log_save_path'] = '';
 	
-	/**
-	* The logger name to use for the log
-	* 
-	* If this config is set so means only log message with this or these logger(s) will be saved
-	*
-	* Example:
-	* $config['log_logger_name'] = array('MY_LOGGER1', 'MY_LOGGER2'); //only log message with MY_LOGGER1 or MY_LOGGER2 will be saved in file.
-	*/	
-	$config['log_logger_name'] = array();
+    /**
+     * The logger name to use for the log
+     * 
+     * If this config is set so means only log message with this or these logger(s) will be saved
+     *
+     * Example:
+     * $config['log_logger_name'] = array('MY_LOGGER1', 'MY_LOGGER2'); //only log message with MY_LOGGER1 or MY_LOGGER2 will be saved in file.
+     */	
+    $config['log_logger_name'] = array();
 	
 	
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* Session configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/**
-	* The session name 
-	*
-	* By default is PHPSESSID. this must be alpha-numerical characters
-	*/
-	$config['session_name'] = 'PHPSESSID';
+    /**
+     * The session name 
+     *
+     * By default is PHPSESSID. this must be alpha-numerical characters
+     */
+    $config['session_name'] = 'PHPSESSID';
 	
-	/**
-	* Session save path
-	*
-	* The path that the session data will be saved, leave empty if you
-	* want use the default configuration in the php.ini
-	* warning : if set, this directory must exist and will be writable and owned by the web server
-	* for security raison this directory must be outside of the document root of your
-	* website.
-	* Note: if the session handler is "database" the session_save_path is the model name to use
-	*/
-	$config['session_save_path'] = '';
+    /**
+     * Session save path
+     *
+     * The path that the session data will be saved, leave empty if you
+     * want use the default configuration in the php.ini
+     * warning : if set, this directory must exist and will be writable and owned by the web server
+     * for security raison this directory must be outside of the document root of your
+     * website.
+     * Note: if the session handler is "database" the session_save_path is the model name to use
+     */
+    $config['session_save_path'] = '';
 
-	/**
-	* Session handler
-	*
-	* The session handler that we will use to manage the session.
-	* currently the possible values are "files", "database".
-	*/
-	$config['session_handler'] = 'files';
+    /**
+     * Session handler
+     *
+     * The session handler that we will use to manage the session.
+     * currently the possible values are "files", "database".
+     */
+    $config['session_handler'] = 'files';
 	
-	/**
-	* Session secret
-	*
-	* This is used to hash the session data if the config "session_handler" is set to "database"
-	* warning : do not change this value until you already set
-	* for security raison use the very complicated value include $%)@^&^\''\'\'
-	* NOTE: this value is an base64 so you need use the tool that generate it, like
-	*  PHP function base64_encode()
-	*/
-	$config['session_secret'] = '';
+    /**
+     * Session secret
+     *
+     * This is used to hash the session data if the config "session_handler" is set to "database"
+     * warning : do not change this value until you already set
+     * for security raison use the very complicated value include $%)@^&^\''\'\'
+     * NOTE: this value is an base64 so you need use the tool that generate it, like
+     *  PHP function base64_encode()
+     */
+    $config['session_secret'] = '';
 
-	/**
-	 * number of second that consider the session already expire
-	 */
-	$config['session_inactivity_time'] = 600; //in second
+    /**
+     * number of second that consider the session already expire
+     */
+    $config['session_inactivity_time'] = 600; //in second
 
-	/**
-	* Session cookie lifetime
-	*
-	* The cookie lifetime that the session will be dropped in seconds, leave 0 if you want
-	* the cookie expire after the browser is closed
-	*/
-	$config['session_cookie_lifetime'] = 0;
+    /**
+     * Session cookie lifetime
+     *
+     * The cookie lifetime that the session will be dropped in seconds, leave 0 if you want
+     * the cookie expire after the browser is closed
+     */
+    $config['session_cookie_lifetime'] = 0;
 	
-	/**
-	* Session cookie path
-	*
-	* The path to your website that the cookie is available "/" means all path is available
-	* example : /mysubdirectory => available in http://www.mysite.com/mysubdirectory
-	*/
-	$config['session_cookie_path'] = '/';
+    /**
+     * Session cookie path
+     *
+     * The path to your website that the cookie is available "/" means all path is available
+     * example : /mysubdirectory => available in http://www.mysite.com/mysubdirectory
+     */
+    $config['session_cookie_path'] = '/';
 	
-	/** 
-	* Session cookie domain
-	*
-	* The domain of your website that the cookie is available if you want the cookie is available
-	* in all your subdomain use this dot before the domain name for example ".mysite.com".
-	* leave empty if you want use the default configuration
-	*/
-	$config['session_cookie_domain'] = '';
+    /** 
+     * Session cookie domain
+     *
+     * The domain of your website that the cookie is available if you want the cookie is available
+     * in all your subdomain use this dot before the domain name for example ".mysite.com".
+     * leave empty if you want use the default configuration
+     */
+    $config['session_cookie_domain'] = '';
 	
-	/**
-	* Session cookie secure
-	* 
-	* If your website use SSL i.e https, you set "true" for this configuration, so the cookie
-	* is available only if the website use the secure connection else set this value to "false"
-	*/
-	$config['session_cookie_secure'] = false;
+    /**
+     * Session cookie secure
+     * 
+     * If your website use SSL i.e https, you set "true" for this configuration, so the cookie
+     * is available only if the website use the secure connection else set this value to "false"
+     */
+    $config['session_cookie_secure'] = false;
 	
 
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* CSRF configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/**
-	 * CSRF status
-	 *
-	 * if you would to use the CSRF (that we recommand you), set this key to true
-	 */
-	$config['csrf_enable'] = false;
+    /**
+     * CSRF status
+     *
+     * if you would to use the CSRF (that we recommand you), set this key to true
+     */
+    $config['csrf_enable'] = false;
 
-	/**
-	 * CSRF key
-	 *
-	 * the key used to store the csrf data
-	 */
-	$config['csrf_key'] = 'csrf_key';
+    /**
+     * CSRF key
+     *
+     * the key used to store the csrf data
+     */
+    $config['csrf_key'] = 'csrf_key';
 
-	/**
-	 * CSRF expire
-	 *
-	 * expire time in seconds of the CSRF data
-	 */
-	$config['csrf_expire'] = 120;
+    /**
+     * CSRF expire
+     *
+     * expire time in seconds of the CSRF data
+     */
+    $config['csrf_expire'] = 120;
 	
 	
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* Cache configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/**
-	 * Cache status
-	 *
-	 * If you would to use the cache functionnality set this value to true
-	 */
-	$config['cache_enable'] = false;
+    /**
+     * Cache status
+     *
+     * If you would to use the cache functionnality set this value to true
+     */
+    $config['cache_enable'] = false;
 	
-	/**
-	 * Cache Time To Live
-	 *
-	 * expire time in seconds of the cache data
-	 */
-	$config['cache_ttl'] = 120; //in second
+    /**
+     * Cache Time To Live
+     *
+     * expire time in seconds of the cache data
+     */
+    $config['cache_ttl'] = 120; //in second
 
-	/**
-	* Cache handler class
-	*
-	* The cache handler class inside (CORE_CLASSES_CACHE_PATH, LIBRARY_PATH) directories that implements 
-	* the interface "CacheInterface" that we will use to manage the cache.
-	* currently the possible values are "FileCache", "ApcCache".
-	*/
-	$config['cache_handler'] = 'FileCache';
+    /**
+     * Cache handler class
+     *
+     * The cache handler class inside (CORE_CLASSES_CACHE_PATH, LIBRARY_PATH) directories that implements 
+     * the interface "CacheInterface" that we will use to manage the cache.
+     * currently the possible values are "FileCache", "ApcCache".
+     */
+    $config['cache_handler'] = 'FileCache';
 	
 	
-	/*+---------------------------------------------------------------+
+    /*+---------------------------------------------------------------+
 	* White list IP access configuration section
 	+------------------------------------------------------------------+
 	*/
 	
-	/**
-	 * White list ip status
-	 *
-	 * if you would to use the white list ip access, set this key to true
-	 */
-	$config['white_list_ip_enable'] = false;
+    /**
+     * White list ip status
+     *
+     * if you would to use the white list ip access, set this key to true
+     */
+    $config['white_list_ip_enable'] = false;
 	
-	/**
-	 * White listed ip addresses
-	 *
-	 * add the allowed ip address list to access this application.
-	 * You can use the wildcard address
-	 * @example: '18.90.09.*', '10.*.*.*', '*'
-	 * 
-	 */
-	$config['white_list_ip_addresses'] = array('127.0.0.1', '::1');
+    /**
+     * White listed ip addresses
+     *
+     * add the allowed ip address list to access this application.
+     * You can use the wildcard address
+     * @example: '18.90.09.*', '10.*.*.*', '*'
+     * 
+     */
+    $config['white_list_ip_addresses'] = array('127.0.0.1', '::1');
 
-	
\ No newline at end of file
+    
\ No newline at end of file

index.php

Indentation +235 added lines, -235 removed lines

@@ -1,267 +1,267 @@
 <?php
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	/**
-	* the directory separator, under windows it is \ and unix, linux /
-	*/
-	define('DS', DIRECTORY_SEPARATOR);
+    /**
+     * the directory separator, under windows it is \ and unix, linux /
+     */
+    define('DS', DIRECTORY_SEPARATOR);
 
-	/**
-	* The root directory of the application.
-	*
-	* you can place this directory outside of your web directory, for example "/home/your_app", etc.
-	*/
-	define('ROOT_PATH', dirname(realpath(__FILE__)) . DS);
+    /**
+     * The root directory of the application.
+     *
+     * you can place this directory outside of your web directory, for example "/home/your_app", etc.
+     */
+    define('ROOT_PATH', dirname(realpath(__FILE__)) . DS);
 
-	/**
-	* The path to the directory.
-	*
-	* That contains your static files (javascript, css, images, etc.)
-	* Note: the path must be relative to the file index.php (the front-end controller).
-	*/
-	define('ASSETS_PATH', 'assets/');
+    /**
+     * The path to the directory.
+     *
+     * That contains your static files (javascript, css, images, etc.)
+     * Note: the path must be relative to the file index.php (the front-end controller).
+     */
+    define('ASSETS_PATH', 'assets/');
 
-	/**
-	* The path to the directory of your cache files.
-	*
-	* This feature is available currently for database and views.
-	*/
-	define('CACHE_PATH', ROOT_PATH . 'cache' . DS);
+    /**
+     * The path to the directory of your cache files.
+     *
+     * This feature is available currently for database and views.
+     */
+    define('CACHE_PATH', ROOT_PATH . 'cache' . DS);
 
-	/**
-	* The path to the application directory. 
-	*
-	* It contains your most often used files that is to say which contains your files of the application, 
-	* in MVC architecture (controllers, models, views).
-	*/
-	define('APPS_PATH', ROOT_PATH . 'classes' . DS);
+    /**
+     * The path to the application directory. 
+     *
+     * It contains your most often used files that is to say which contains your files of the application, 
+     * in MVC architecture (controllers, models, views).
+     */
+    define('APPS_PATH', ROOT_PATH . 'classes' . DS);
 
-	/**
-	* The path to the controller directory of your application.
-	*
-	* If you already know the MVC architecture you know what a controller means; 
-	* it is he who makes the business logic of your application in general.
-	*/
-	define('APPS_CONTROLLER_PATH', APPS_PATH . 'controllers' . DS);
+    /**
+     * The path to the controller directory of your application.
+     *
+     * If you already know the MVC architecture you know what a controller means; 
+     * it is he who makes the business logic of your application in general.
+     */
+    define('APPS_CONTROLLER_PATH', APPS_PATH . 'controllers' . DS);
 
-	/**
-	* The path to the directory of your model classes of your application. 
-	*
-	* If you already know the MVC architecture you know what a model means; 
-	* it's the one who interacts with the database, in one word persistent data from your application.
-	*/
-	define('APPS_MODEL_PATH', APPS_PATH . 'models' . DS);
+    /**
+     * The path to the directory of your model classes of your application. 
+     *
+     * If you already know the MVC architecture you know what a model means; 
+     * it's the one who interacts with the database, in one word persistent data from your application.
+     */
+    define('APPS_MODEL_PATH', APPS_PATH . 'models' . DS);
 
-	/**
-	* The path to the directory of your views.
-	*
-	* If you already know the MVC architecture you know what a view means, 
-	* a view is just a user interface (html page, form, etc.) that is to say 
-	* everything displayed in the browser interface, etc.
-	*/
-	define('APPS_VIEWS_PATH', APPS_PATH . 'views' . DS);
+    /**
+     * The path to the directory of your views.
+     *
+     * If you already know the MVC architecture you know what a view means, 
+     * a view is just a user interface (html page, form, etc.) that is to say 
+     * everything displayed in the browser interface, etc.
+     */
+    define('APPS_VIEWS_PATH', APPS_PATH . 'views' . DS);
 
-	/**
-	* The path to the configuration directory.
-	*
-	* That contains most of the configuration files for your 
-	* application (database, class loading file, functions, etc.)
-	*/
-	define('CONFIG_PATH', ROOT_PATH . 'config' . DS);
+    /**
+     * The path to the configuration directory.
+     *
+     * That contains most of the configuration files for your 
+     * application (database, class loading file, functions, etc.)
+     */
+    define('CONFIG_PATH', ROOT_PATH . 'config' . DS);
 
-	/** 
-	* The core directory
-	*
-	* It is recommended to put this folder out of the web directory of your server and 
-	* you should not change its content because in case of update you could lose the modified files.
-	*/
-	define('CORE_PATH', ROOT_PATH . 'core' . DS);
+    /** 
+     * The core directory
+     *
+     * It is recommended to put this folder out of the web directory of your server and 
+     * you should not change its content because in case of update you could lose the modified files.
+     */
+    define('CORE_PATH', ROOT_PATH . 'core' . DS);
 	
-	/**
-	* The path to the directory of core classes that used by the system.
-	*
-	* It contains PHP classes that are used by the framework internally.
-	*/
-	define('CORE_CLASSES_PATH', CORE_PATH . 'classes' . DS);
+    /**
+     * The path to the directory of core classes that used by the system.
+     *
+     * It contains PHP classes that are used by the framework internally.
+     */
+    define('CORE_CLASSES_PATH', CORE_PATH . 'classes' . DS);
 	
-	/**
-	* The path to the directory of core classes for the cache used by the system.
-	*
-	* It contains PHP classes for the cache drivers.
-	*/
-	define('CORE_CLASSES_CACHE_PATH', CORE_CLASSES_PATH . 'cache' . DS);
+    /**
+     * The path to the directory of core classes for the cache used by the system.
+     *
+     * It contains PHP classes for the cache drivers.
+     */
+    define('CORE_CLASSES_CACHE_PATH', CORE_CLASSES_PATH . 'cache' . DS);
 	
     /**
-	* The path to the directory of core classes for the database used by the system.
-	*
-	* It contains PHP classes for the database library, drivers, etc.
-	*/
-	define('CORE_CLASSES_DATABASE_PATH', CORE_CLASSES_PATH . 'database' . DS);
+     * The path to the directory of core classes for the database used by the system.
+     *
+     * It contains PHP classes for the database library, drivers, etc.
+     */
+    define('CORE_CLASSES_DATABASE_PATH', CORE_CLASSES_PATH . 'database' . DS);
     
-	/**
-	* The path to the directory of core classes for the model used by the system.
-	*
-	* It contains PHP classes for the models.
-	*/
-	define('CORE_CLASSES_MODEL_PATH', CORE_CLASSES_PATH . 'model' . DS);
+    /**
+     * The path to the directory of core classes for the model used by the system.
+     *
+     * It contains PHP classes for the models.
+     */
+    define('CORE_CLASSES_MODEL_PATH', CORE_CLASSES_PATH . 'model' . DS);
 
-	/**
-	* The path to the directory of functions or helper systems.
-	*
-	* It contains PHP functions that perform a particular task: character string processing, URL, etc.
-	*/
-	define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . DS);
+    /**
+     * The path to the directory of functions or helper systems.
+     *
+     * It contains PHP functions that perform a particular task: character string processing, URL, etc.
+     */
+    define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . DS);
 
-	/**
-	* The path to the core directory of languages files. 
-	*
-	*/
-	define('CORE_LANG_PATH', CORE_PATH . 'lang' . DS);
+    /**
+     * The path to the core directory of languages files. 
+     *
+     */
+    define('CORE_LANG_PATH', CORE_PATH . 'lang' . DS);
 
-	/**
-	* The path to the system library directory.
-	*
-	* Which contains the libraries most often used in your web application, as for the 
-	* core directory it is advisable to put it out of the root directory of your application.
-	*/
-	define('CORE_LIBRARY_PATH', CORE_PATH . 'libraries' . DS);
+    /**
+     * The path to the system library directory.
+     *
+     * Which contains the libraries most often used in your web application, as for the 
+     * core directory it is advisable to put it out of the root directory of your application.
+     */
+    define('CORE_LIBRARY_PATH', CORE_PATH . 'libraries' . DS);
 
-	/**
-	* The path to the system view directory.
-	*
-	* That contains the views used for the system, such as error messages, and so on.
-	*/
-	define('CORE_VIEWS_PATH', CORE_PATH . 'views' . DS);
+    /**
+     * The path to the system view directory.
+     *
+     * That contains the views used for the system, such as error messages, and so on.
+     */
+    define('CORE_VIEWS_PATH', CORE_PATH . 'views' . DS);
 	
-	/**
-	* The path to the directory of your PHP personal functions or helper.
-	*
-	* It contains your PHP functions that perform a particular task: utilities, etc.
-	* Note: Do not put your personal functions or helpers in the system functions directory, 
-	* because if you update the system you may lose them.
-	*/
-	define('FUNCTIONS_PATH', ROOT_PATH . 'functions' . DS);
+    /**
+     * The path to the directory of your PHP personal functions or helper.
+     *
+     * It contains your PHP functions that perform a particular task: utilities, etc.
+     * Note: Do not put your personal functions or helpers in the system functions directory, 
+     * because if you update the system you may lose them.
+     */
+    define('FUNCTIONS_PATH', ROOT_PATH . 'functions' . DS);
 
-	/**
-	* The path to the app directory of personal language. 
-	*
-	* This feature is not yet available. 
-	* You can help us do this if you are nice or wish to see the developed framework.
-	*/
-	define('APP_LANG_PATH', ROOT_PATH . 'lang' . DS);
+    /**
+     * The path to the app directory of personal language. 
+     *
+     * This feature is not yet available. 
+     * You can help us do this if you are nice or wish to see the developed framework.
+     */
+    define('APP_LANG_PATH', ROOT_PATH . 'lang' . DS);
 
-	/**
-	* The path to the directory of your personal libraries
-	*
-	* It contains your PHP classes, package, etc.
-	* Note: you should not put your personal libraries in the system library directory, 
-	* because it is recalled in case of updating the system you might have surprises.
-	*/
-	define('LIBRARY_PATH', ROOT_PATH . 'libraries' . DS);
+    /**
+     * The path to the directory of your personal libraries
+     *
+     * It contains your PHP classes, package, etc.
+     * Note: you should not put your personal libraries in the system library directory, 
+     * because it is recalled in case of updating the system you might have surprises.
+     */
+    define('LIBRARY_PATH', ROOT_PATH . 'libraries' . DS);
 
-	/**
-	* The path to the directory that contains the log files.
-	*
-	* Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
-	* under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
-	* details see the documentation of your web server.
-	* Example for Unix or linux with apache web server:
-	* # chmod -R 700 /path/to/your/logs/directory/
-	* # chown -R www-data:www-data /path/to/your/logs/directory/
-	*/
-	define('LOGS_PATH', ROOT_PATH . 'logs' . DS);
+    /**
+     * The path to the directory that contains the log files.
+     *
+     * Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
+     * under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
+     * details see the documentation of your web server.
+     * Example for Unix or linux with apache web server:
+     * # chmod -R 700 /path/to/your/logs/directory/
+     * # chown -R www-data:www-data /path/to/your/logs/directory/
+     */
+    define('LOGS_PATH', ROOT_PATH . 'logs' . DS);
 
-	/**
-	* The path to the modules directory. 
-	*
-	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
-	* in HMVC architecture (hierichical, controllers, models, views).
-	*/
-	define('MODULE_PATH', ROOT_PATH . 'modules' . DS);
+    /**
+     * The path to the modules directory. 
+     *
+     * It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
+     * in HMVC architecture (hierichical, controllers, models, views).
+     */
+    define('MODULE_PATH', ROOT_PATH . 'modules' . DS);
 
-	/**
-	* The path to the directory of sources external to your application.
-	*
-	* If you have already used "composer" you know what that means.
-	*/
-	define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
+    /**
+     * The path to the directory of sources external to your application.
+     *
+     * If you have already used "composer" you know what that means.
+     */
+    define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
 
-	/**
-	* The front controller of your application.
-	*
-	* "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
-	* your application by using the rewrite module URL of your web server .
-	* For example, under apache web server, there is a configuration example file that is located at the root 
-	* of your framework folder : "htaccess.txt" rename it to ".htaccess".
-	*/
-	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+    /**
+     * The front controller of your application.
+     *
+     * "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
+     * your application by using the rewrite module URL of your web server .
+     * For example, under apache web server, there is a configuration example file that is located at the root 
+     * of your framework folder : "htaccess.txt" rename it to ".htaccess".
+     */
+    define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 	
-	/**
-	 * Check if user run the application under CLI
-	 */
-	define('IS_CLI', stripos('cli', php_sapi_name()) !== false);
+    /**
+     * Check if user run the application under CLI
+     */
+    define('IS_CLI', stripos('cli', php_sapi_name()) !== false);
 
-	/**
-	* The environment of your application (production, test, development). 
-	*
-	* if your application is still in development you use the value "development" 
-	* so you will have the display of the error messages, etc. 
-	* Once you finish the development of your application that is to put it online 
-	* you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
-	* the loading of the system, will be fast.
-	*/
-	define('ENVIRONMENT', 'development');
+    /**
+     * The environment of your application (production, test, development). 
+     *
+     * if your application is still in development you use the value "development" 
+     * so you will have the display of the error messages, etc. 
+     * Once you finish the development of your application that is to put it online 
+     * you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
+     * the loading of the system, will be fast.
+     */
+    define('ENVIRONMENT', 'development');
 
-	/* ---------------------------------------------------------------------------------- */
-	///////////////////////////////////////////////////////////////////////////////////////
-	/******************** DO NOT CHANGE THE LINES BELOW *********************************/
-	/////////////////////////////////////////////////////////////////////////////////////
+    /* ---------------------------------------------------------------------------------- */
+    ///////////////////////////////////////////////////////////////////////////////////////
+    /******************** DO NOT CHANGE THE LINES BELOW *********************************/
+    /////////////////////////////////////////////////////////////////////////////////////
 
-	switch (ENVIRONMENT) {
-		case 'development':
-			error_reporting(-1);
-			ini_set('display_errors', 1);
-		break;
-		case 'testing':
-		case 'production':
-			ini_set('display_errors', 0);
-			if (version_compare(PHP_VERSION, '5.3', '>=')) {
-				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-			}
-			else{
-				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-			}
-		break;
-		default:
-			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-			echo 'The application environment is not set correctly.';
-			exit(1);
-	}
+    switch (ENVIRONMENT) {
+        case 'development':
+            error_reporting(-1);
+            ini_set('display_errors', 1);
+        break;
+        case 'testing':
+        case 'production':
+            ini_set('display_errors', 0);
+            if (version_compare(PHP_VERSION, '5.3', '>=')) {
+                error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+            }
+            else{
+                error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+            }
+        break;
+        default:
+            header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+            echo 'The application environment is not set correctly.';
+            exit(1);
+    }
 	
-	/**
-	* let's go.
-	* Everything is OK now we launch our application.
-	*/
-	require_once CORE_PATH . 'bootstrap.php';
\ No newline at end of file
+    /**
+     * let's go.
+     * Everything is OK now we launch our application.
+     */
+    require_once CORE_PATH . 'bootstrap.php';
\ No newline at end of file

tests/tnhfw/classes/database/DatabaseTest.php

Indentation +33 added lines, -33 removed lines

@@ -1,52 +1,52 @@
 <?php 
 
-	use PHPUnit\Framework\TestCase;
+    use PHPUnit\Framework\TestCase;
 
-	class DatabaseTest extends TestCase
-	{	
+    class DatabaseTest extends TestCase
+    {	
 	
-		public static function setUpBeforeClass()
-		{
+        public static function setUpBeforeClass()
+        {
 		
-		}
+        }
 		
-		public static function tearDownAfterClass()
-		{
+        public static function tearDownAfterClass()
+        {
 			
-		}
+        }
 		
-		protected function setUp()
-		{
-		}
+        protected function setUp()
+        {
+        }
 
-		protected function tearDown()
-		{
-		}
+        protected function tearDown()
+        {
+        }
 		
-		public function testConnectToDatabaseSuccessfully()
-		{
+        public function testConnectToDatabaseSuccessfully()
+        {
             $cfg = get_db_config();
             $db = new Database($cfg, false);
             $isConnected = $db->connect();
             $this->assertTrue($isConnected);
-		}
+        }
         
         public function testCannotConnectToDatabase()
-		{
-             $db = new Database(array(
-                                  'driver' => '',
-                                  'username' => '',
-                                  'password' => '',
-                                  'database' => '',
-                                  'hostname' => '',
-                                  'charset' => '',
-                                  'collation' => '',
-                                  'prefix' => '',
-                                  'port' => ''
+        {
+                $db = new Database(array(
+                                    'driver' => '',
+                                    'username' => '',
+                                    'password' => '',
+                                    'database' => '',
+                                    'hostname' => '',
+                                    'charset' => '',
+                                    'collation' => '',
+                                    'prefix' => '',
+                                    'port' => ''
                                 ), 
                                 false);
-             $isConnected = $db->connect();
-			$this->assertFalse($isConnected);
-		}
+                $isConnected = $db->connect();
+            $this->assertFalse($isConnected);
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

core/classes/database/Database.php

Indentation +356 added lines, -356 removed lines

@@ -1,119 +1,119 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-  /**
-   * TNH Framework
-   *
-   * A simple PHP framework using HMVC architecture
-   *
-   * This content is released under the GNU GPL License (GPL)
-   *
-   * Copyright (C) 2017 Tony NGUEREZA
-   *
-   * This program is free software; you can redistribute it and/or
-   * modify it under the terms of the GNU General Public License
-   * as published by the Free Software Foundation; either version 3
-   * of the License, or (at your option) any later version.
-   *
-   * This program is distributed in the hope that it will be useful,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * GNU General Public License for more details.
-   *
-   * You should have received a copy of the GNU General Public License
-   * along with this program; if not, write to the Free Software
-   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
-  class Database{
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
+    class Database{
 	
-  	/**
-  	 * The PDO instance
-  	 * @var object
-  	*/
+        /**
+         * The PDO instance
+         * @var object
+         */
     private $pdo                 = null;
     
-  	/**
-  	 * The database name used for the application
-  	 * @var string
-  	*/
-	  private $databaseName        = null;
+        /**
+         * The database name used for the application
+         * @var string
+         */
+        private $databaseName        = null;
 	
-  	/**
-  	 * The number of rows returned by the last query
-  	 * @var int
-  	*/
+        /**
+         * The number of rows returned by the last query
+         * @var int
+         */
     private $numRows             = 0;
 	
-  	/**
-  	 * The last insert id for the primary key column that have auto increment or sequence
-  	 * @var mixed
-  	*/
+        /**
+         * The last insert id for the primary key column that have auto increment or sequence
+         * @var mixed
+         */
     private $insertId            = null;
 	
-  	/**
-  	 * The full SQL query statment after build for each command
-  	 * @var string
-  	*/
+        /**
+         * The full SQL query statment after build for each command
+         * @var string
+         */
     private $query               = null;
 	
-  	/**
-  	 * The result returned for the last query
-  	 * @var mixed
-  	*/
+        /**
+         * The result returned for the last query
+         * @var mixed
+         */
     private $result              = array();
 	
-  	/**
-  	 * The cache default time to live in second. 0 means no need to use the cache feature
-  	 * @var int
-  	*/
-  	private $cacheTtl             = 0;
+        /**
+         * The cache default time to live in second. 0 means no need to use the cache feature
+         * @var int
+         */
+        private $cacheTtl             = 0;
 	
-  	/**
-  	 * The cache current time to live. 0 means no need to use the cache feature
-  	 * @var int
-  	*/
+        /**
+         * The cache current time to live. 0 means no need to use the cache feature
+         * @var int
+         */
     private $temporaryCacheTtl   = 0;
 	
-  	/**
-  	 * The number of executed query for the current request
-  	 * @var int
-  	*/
+        /**
+         * The number of executed query for the current request
+         * @var int
+         */
     private $queryCount          = 0;
 	
-  	/**
-  	 * The default data to be used in the statments query INSERT, UPDATE
-  	 * @var array
-  	*/
+        /**
+         * The default data to be used in the statments query INSERT, UPDATE
+         * @var array
+         */
     private $data                = array();
 	
-  	/**
-  	 * The database configuration
-  	 * @var array
-  	*/
+        /**
+         * The database configuration
+         * @var array
+         */
     private $config              = array();
 	
-  	/**
-  	 * The logger instance
-  	 * @var object
-  	 */
+        /**
+         * The logger instance
+         * @var object
+         */
     private $logger              = null;
 
     /**
-    * The cache instance
-    * @var object
-    */
+     * The cache instance
+     * @var object
+     */
     private $cacheInstance       = null;
 
     
-  	/**
-    * The DatabaseQueryBuilder instance
-    * @var object
-    */
+        /**
+         * The DatabaseQueryBuilder instance
+         * @var object
+         */
     private $queryBuilder        = null;
     
     /**
-    * The DatabaseQueryRunner instance
-    * @var object
-    */
+     * The DatabaseQueryRunner instance
+     * @var object
+     */
     private $queryRunner         = null;
 
 
@@ -126,7 +126,7 @@ 
         //Set Log instance to use
         $this->setLoggerFromParamOrCreate(null);
 		
-    		//Set DatabaseQueryBuilder instance to use
+            //Set DatabaseQueryBuilder instance to use
         $this->setDependencyInstanceFromParamOrCreate('queryBuilder', null, 'DatabaseQueryBuilder', 'classes/database');
        
         //Set DatabaseQueryRunner instance to use
@@ -144,8 +144,8 @@ 
      * @return bool 
      */
     public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+        $config = $this->getDatabaseConfiguration();
+        if (! empty($config)){
         try{
             $this->pdo = new PDO($this->getDsnValueFromConfig(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
@@ -156,14 +156,14 @@ 
             $this->updateQueryBuilderAndRunnerProperties();
 
             return is_object($this->pdo);
-          }
-          catch (PDOException $e){
+            }
+            catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
-          }
-      }
-      return false;
+            }
+        }
+        return false;
     }
 
 
@@ -172,7 +172,7 @@ 
      * @return int
      */
     public function numRows(){
-      return $this->numRows;
+        return $this->numRows;
     }
 
     /**
@@ -180,7 +180,7 @@ 
      * @return mixed
      */
     public function insertId(){
-      return $this->insertId;
+        return $this->insertId;
     }
 
 
@@ -191,13 +191,13 @@ 
      * @return mixed       the query SQL string or the record result
      */
     public function get($returnSQLQueryOrResultType = false){
-      $this->queryBuilder->limit(1);
-      $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+        $this->queryBuilder->limit(1);
+        $query = $this->getAll(true);
+        if ($returnSQLQueryOrResultType === true){
         return $query;
-      } else {
+        } else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
-      }
+        }
     }
 
     /**
@@ -207,11 +207,11 @@ 
      * @return mixed       the query SQL string or the record result
      */
     public function getAll($returnSQLQueryOrResultType = false){
-	   $query = $this->queryBuilder->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
-      	return $query;
-      }
-      return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
+        $query = $this->queryBuilder->getQuery();
+        if ($returnSQLQueryOrResultType === true){
+            return $query;
+        }
+        return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
     }
 
     /**
@@ -221,19 +221,19 @@ 
      * @return mixed          the insert id of the new record or null
      */
     public function insert($data = array(), $escape = true){
-      if (empty($data) && ! empty($this->data)){
+        if (empty($data) && ! empty($this->data)){
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->data;
-      }
-      $query = $this->queryBuilder->insert($data, $escape)->getQuery();
-      $result = $this->query($query);
-      if ($result){
+        }
+        $query = $this->queryBuilder->insert($data, $escape)->getQuery();
+        $result = $this->query($query);
+        if ($result){
         $this->insertId = $this->pdo->lastInsertId();
-		    //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
+            //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
         return ! ($this->insertId) ? true : $this->insertId;
-      }
-      return false;
+        }
+        return false;
     }
 
     /**
@@ -243,13 +243,13 @@ 
      * @return mixed          the update status
      */
     public function update($data = array(), $escape = true){
-      if (empty($data) && ! empty($this->data)){
+        if (empty($data) && ! empty($this->data)){
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->data;
-      }
-      $query = $this->queryBuilder->update($data, $escape)->getQuery();
-      return $this->query($query);
+        }
+        $query = $this->queryBuilder->update($data, $escape)->getQuery();
+        return $this->query($query);
     }
 
     /**
@@ -257,8 +257,8 @@ 
      * @return mixed the delete status
      */
     public function delete(){
-		  $query = $this->queryBuilder->delete()->getQuery();
-    	return $this->query($query);
+            $query = $this->queryBuilder->delete()->getQuery();
+        return $this->query($query);
     }
 
     /**
@@ -267,17 +267,17 @@ 
      * @return object        the current Database instance
      */
     public function setCache($ttl = 0){
-      $this->cacheTtl = $ttl;
-      $this->temporaryCacheTtl = $ttl;
-      return $this;
+        $this->cacheTtl = $ttl;
+        $this->temporaryCacheTtl = $ttl;
+        return $this;
     }
 	
-	/**
-	 * Enabled cache temporary for the current query not globally	
-	 * @param  integer $ttl the cache time to live in second
-	 * @return object        the current Database instance
-	 */
-  	public function cached($ttl = 0){
+    /**
+     * Enabled cache temporary for the current query not globally	
+     * @param  integer $ttl the cache time to live in second
+     * @return object        the current Database instance
+     */
+        public function cached($ttl = 0){
         $this->temporaryCacheTtl = $ttl;
         return $this;
     }
@@ -290,11 +290,11 @@ 
      * need escaped
      */
     public function escape($data, $escaped = true){
-      $data = trim($data);
-      if($escaped){
+        $data = trim($data);
+        if($escaped){
         return $this->pdo->quote($data);
-      }
-      return $data; 
+        }
+        return $data; 
     }
 
     /**
@@ -302,7 +302,7 @@ 
      * @return int
      */
     public function queryCount(){
-      return $this->queryCount;
+        return $this->queryCount;
     }
 
     /**
@@ -310,7 +310,7 @@ 
      * @return string
      */
     public function getQuery(){
-      return $this->query;
+        return $this->query;
     }
 
     /**
@@ -318,7 +318,7 @@ 
      * @return string
      */
     public function getDatabaseName(){
-      return $this->databaseName;
+        return $this->databaseName;
     }
 
     /**
@@ -326,17 +326,17 @@ 
      * @return object
      */
     public function getPdo(){
-      return $this->pdo;
+        return $this->pdo;
     }
 
     /**
      * Set the PDO instance
      * @param object $pdo the pdo object
-	 * @return object Database
+     * @return object Database
      */
     public function setPdo(PDO $pdo){
-      $this->pdo = $pdo;
-      return $this;
+        $this->pdo = $pdo;
+        return $this;
     }
 
 
@@ -345,44 +345,44 @@ 
      * @return Log
      */
     public function getLogger(){
-      return $this->logger;
+        return $this->logger;
     }
 
     /**
      * Set the log instance
      * @param Log $logger the log object
-	 * @return object Database
+     * @return object Database
      */
     public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
+        $this->logger = $logger;
+        return $this;
     }
 
-     /**
-     * Return the cache instance
-     * @return CacheInterface
-     */
+        /**
+         * Return the cache instance
+         * @return CacheInterface
+         */
     public function getCacheInstance(){
-      return $this->cacheInstance;
+        return $this->cacheInstance;
     }
 
     /**
      * Set the cache instance
      * @param CacheInterface $cache the cache object
-	 * @return object Database
+     * @return object Database
      */
     public function setCacheInstance($cache){
-      $this->cacheInstance = $cache;
-      return $this;
+        $this->cacheInstance = $cache;
+        return $this;
     }
 	
 	
-	   /**
-     * Return the DatabaseQueryBuilder instance
-     * @return object DatabaseQueryBuilder
-     */
+        /**
+         * Return the DatabaseQueryBuilder instance
+         * @return object DatabaseQueryBuilder
+         */
     public function getQueryBuilder(){
-      return $this->queryBuilder;
+        return $this->queryBuilder;
     }
 
     /**
@@ -390,8 +390,8 @@ 
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
     public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
-      $this->queryBuilder = $queryBuilder;
-      return $this;
+        $this->queryBuilder = $queryBuilder;
+        return $this;
     }
     
     /**
@@ -399,7 +399,7 @@ 
      * @return object DatabaseQueryRunner
      */
     public function getQueryRunner(){
-      return $this->queryRunner;
+        return $this->queryRunner;
     }
 
     /**
@@ -407,8 +407,8 @@ 
      * @param object DatabaseQueryRunner $queryRunner the DatabaseQueryRunner object
      */
     public function setQueryRunner(DatabaseQueryRunner $queryRunner){
-      $this->queryRunner = $queryRunner;
-      return $this;
+        $this->queryRunner = $queryRunner;
+        return $this;
     }
 
     /**
@@ -416,7 +416,7 @@ 
      * @return array
      */
     public function getData(){
-      return $this->data;
+        return $this->data;
     }
 
     /**
@@ -427,62 +427,62 @@ 
      * @return object        the current Database instance
      */
     public function setData($key, $value = null, $escape = true){
-  	  if (is_array($key)){
-    		foreach($key as $k => $v){
-    			$this->setData($k, $v, $escape);
-    		}	
-  	  } else {
+        if (is_array($key)){
+            foreach($key as $k => $v){
+                $this->setData($k, $v, $escape);
+            }	
+        } else {
         $this->data[$key] = $this->escape($value, $escape);
-  	  }
-      return $this;
+        }
+        return $this;
     }
 
-     /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean $returnAsList  indicate whether to return all record or just one row 
-     * @param  boolean $returnAsArray return the result as array or not
-     * @return mixed         the query result
-     */
+        /**
+         * Execute an SQL query
+         * @param  string  $query the query SQL string
+         * @param  boolean $returnAsList  indicate whether to return all record or just one row 
+         * @param  boolean $returnAsArray return the result as array or not
+         * @return mixed         the query result
+         */
     public function query($query, $returnAsList = true, $returnAsArray = false){
-      $this->reset();
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
-      //If is the SELECT query
-      $isSqlSELECTQuery = stristr($this->query, 'SELECT');
+        $this->reset();
+        $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+        //If is the SELECT query
+        $isSqlSELECTQuery = stristr($this->query, 'SELECT');
 
-      //cache expire time
-      $cacheExpire = $this->temporaryCacheTtl;
+        //cache expire time
+        $cacheExpire = $this->temporaryCacheTtl;
       
-      //return to the initial cache time
-      $this->temporaryCacheTtl = $this->cacheTtl;
+        //return to the initial cache time
+        $this->temporaryCacheTtl = $this->cacheTtl;
       
-      //config for cache
-      $cacheEnable = get_config('cache_enable');
+        //config for cache
+        $cacheEnable = get_config('cache_enable');
       
-      //the database cache content
-      $cacheContent = null;
+        //the database cache content
+        $cacheContent = null;
 
-      //if can use cache feature for this query
-      $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
+        //if can use cache feature for this query
+        $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
-          $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-          $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
-      }
+        if ($dbCacheStatus && $isSqlSELECTQuery){
+            $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+            $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
+        }
       
-      if (!$cacheContent){
-  	   	//count the number of query execution to server
+        if (!$cacheContent){
+                //count the number of query execution to server
         $this->queryCount++;
         
         $queryResult = $this->queryRunner->setQuery($query)
-                                          ->setReturnType($returnAsList)
-                                          ->setReturnAsArray($returnAsArray)
-                                          ->execute();
+                                            ->setReturnType($returnAsList)
+                                            ->setReturnAsArray($returnAsArray)
+                                            ->execute();
 
         if (!is_object($queryResult)){
-          $this->result = false;
-          $this->numRows = 0;
-          return $this->result;
+            $this->result = false;
+            $this->numRows = 0;
+            return $this->result;
         }
         $this->result  = $queryResult->getResult();
         $this->numRows = $queryResult->getNumRows();
@@ -490,72 +490,72 @@ 
             $key = $this->getCacheKeyForQuery($this->query, $returnAsList, $returnAsArray);
             $this->setCacheContentForQuery($this->query, $key, $this->result, $cacheExpire);
         }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-          $this->result = $cacheContent;
-          $this->numRows = count($this->result);
-      }
-      return $this->result;
-    }
-
-   /**
-    * Setting the database 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 database configuration file
-    * @param boolean $autoConnect whether to connect to database after set the configuration
-	  * @return object Database
-    */
+        } else if ($isSqlSELECTQuery){
+            $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+            $this->result = $cacheContent;
+            $this->numRows = count($this->result);
+        }
+        return $this->result;
+    }
+
+    /**
+     * Setting the database 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 database configuration file
+     * @param boolean $autoConnect whether to connect to database after set the configuration
+     * @return object Database
+     */
     public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true, $autoConnect = false){
-      $db = array();
-      if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
-          //here don't use require_once because somewhere user can create database instance directly
-          require CONFIG_PATH . 'database.php';
-      }
+        $db = array();
+        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+            //here don't use require_once because somewhere user can create database instance directly
+            require CONFIG_PATH . 'database.php';
+        }
       
-      //merge with the parameter  
-      $db = array_merge($db, $overwriteConfig);
+        //merge with the parameter  
+        $db = array_merge($db, $overwriteConfig);
       
-      //get the default configuration
-      $config = $this->getDatabaseDefaultConfiguration();
+        //get the default configuration
+        $config = $this->getDatabaseDefaultConfiguration();
 		  
-    	$config = array_merge($config, $db);
-    	//determine the port using the hostname like localhost:3307
-      //hostname will be "localhost", and port "3307"
-      $p = explode(':', $config['hostname']);
-  	  if (count($p) >= 2){
-  		  $config['hostname'] = $p[0];
-  		  $config['port'] = $p[1];
-  		}
+        $config = array_merge($config, $db);
+        //determine the port using the hostname like localhost:3307
+        //hostname will be "localhost", and port "3307"
+        $p = explode(':', $config['hostname']);
+        if (count($p) >= 2){
+            $config['hostname'] = $p[0];
+            $config['port'] = $p[1];
+            }
 		
-		 $this->databaseName = $config['database'];
-		 $this->config = $config;
-		 $this->logger->info(
-								'The database configuration are listed below: ' 
-								. stringfy_vars(array_merge(
-															$this->config, 
-															array('password' => string_hidden($this->config['password']))
-												))
-							);
-  	  if($autoConnect){
-    		 //Now connect to the database
-    		 $this->connect();
-  		}
-		 return $this;
-    }
-
-    /**
-   * Return the database configuration
-   * @return array
-   */
+            $this->databaseName = $config['database'];
+            $this->config = $config;
+            $this->logger->info(
+                                'The database configuration are listed below: ' 
+                                . stringfy_vars(array_merge(
+                                                            $this->config, 
+                                                            array('password' => string_hidden($this->config['password']))
+                                                ))
+                            );
+        if($autoConnect){
+                //Now connect to the database
+                $this->connect();
+            }
+            return $this;
+    }
+
+    /**
+     * Return the database configuration
+     * @return array
+     */
     public  function getDatabaseConfiguration(){
-      return $this->config;
+        return $this->config;
     }
 
     /**
      * Close the connexion
      */
     public function close(){
-      $this->pdo = null;
+        $this->pdo = null;
     }
 
     /**
@@ -563,16 +563,16 @@ 
      * @return array
      */
     protected function getDatabaseDefaultConfiguration(){
-      return array(
-              'driver' => '',
-              'username' => '',
-              'password' => '',
-              'database' => '',
-              'hostname' => 'localhost',
-              'charset' => 'utf8',
-              'collation' => 'utf8_general_ci',
-              'prefix' => '',
-              'port' => ''
+        return array(
+                'driver' => '',
+                'username' => '',
+                'password' => '',
+                'database' => '',
+                'hostname' => 'localhost',
+                'charset' => 'utf8',
+                'collation' => 'utf8_general_ci',
+                'prefix' => '',
+                'port' => ''
             );
     }
 
@@ -581,18 +581,18 @@ 
      * @return void
      */
     protected function updateQueryBuilderAndRunnerProperties(){
-       //update queryBuilder with some properties needed
-     if (is_object($this->queryBuilder)){
+        //update queryBuilder with some properties needed
+        if (is_object($this->queryBuilder)){
         $this->queryBuilder->setDriver($this->config['driver'])
-                           ->setPrefix($this->config['prefix'])
-                           ->setPdo($this->pdo);
-     }
+                            ->setPrefix($this->config['prefix'])
+                            ->setPdo($this->pdo);
+        }
 
-      //update queryRunner with some properties needed
-     if (is_object($this->queryRunner)){
+        //update queryRunner with some properties needed
+        if (is_object($this->queryRunner)){
         $this->queryRunner->setDriver($this->config['driver'])
-                          ->setPdo($this->pdo);
-     }
+                            ->setPdo($this->pdo);
+        }
     }
 	
 
@@ -601,21 +601,21 @@ 
      * @return string|null the DSN string or null if can not find it
      */
     protected function getDsnValueFromConfig(){
-      $dsn = null;
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+        $dsn = null;
+        $config = $this->getDatabaseConfiguration();
+        if (! empty($config)){
         $driver = $config['driver'];
         $driverDsnMap = array(
-                              'mysql'  => $this->getDsnValueForDriver('mysql'),
-                              'pgsql'  => $this->getDsnValueForDriver('pgsql'),
-                              'sqlite' => $this->getDsnValueForDriver('sqlite'),
-                              'oracle' => $this->getDsnValueForDriver('oracle')
-                              );
+                                'mysql'  => $this->getDsnValueForDriver('mysql'),
+                                'pgsql'  => $this->getDsnValueForDriver('pgsql'),
+                                'sqlite' => $this->getDsnValueForDriver('sqlite'),
+                                'oracle' => $this->getDsnValueForDriver('oracle')
+                                );
         if (isset($driverDsnMap[$driver])){
-          $dsn = $driverDsnMap[$driver];
+            $dsn = $driverDsnMap[$driver];
         }
-      }    
-      return $dsn;
+        }    
+        return $dsn;
     }
 
     /**
@@ -624,32 +624,32 @@ 
      * @return string|null         the dsn name
      */
     protected function getDsnValueForDriver($driver){
-      $dsn = '';
-      $config = $this->getDatabaseConfiguration();
-      if (empty($config)){
+        $dsn = '';
+        $config = $this->getDatabaseConfiguration();
+        if (empty($config)){
         return null;
-      }
-      switch ($driver) {
+        }
+        switch ($driver) {
         case 'mysql':
         case 'pgsql':
           $port = '';
-          if (! empty($config['port'])) {
+            if (! empty($config['port'])) {
             $port = 'port=' . $config['port'] . ';';
-          }
-          $dsn = $driver . ':host=' . $config['hostname'] . ';' . $port . 'dbname=' . $config['database'];
-          break;
+            }
+            $dsn = $driver . ':host=' . $config['hostname'] . ';' . $port . 'dbname=' . $config['database'];
+            break;
         case 'sqlite':
           $dsn = 'sqlite:' . $config['database'];
-          break;
-          case 'oracle':
+            break;
+            case 'oracle':
           $port = '';
-          if (! empty($config['port'])) {
+            if (! empty($config['port'])) {
             $port = ':' . $config['port'];
-          }
-          $dsn =  'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
-          break;
-      }
-      return $dsn;
+            }
+            $dsn =  'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
+            break;
+        }
+        return $dsn;
     }
 
     /**
@@ -661,11 +661,11 @@ 
     protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray){
         $cacheKey = $this->getCacheKeyForQuery($query, $returnAsList, $returnAsArray);
         if (! is_object($this->cacheInstance)){
-    			//can not call method with reference in argument
-    			//like $this->setCacheInstance(& get_instance()->cache);
-    			//use temporary variable
-    			$instance = & get_instance()->cache;
-    			$this->cacheInstance = $instance;
+                //can not call method with reference in argument
+                //like $this->setCacheInstance(& get_instance()->cache);
+                //use temporary variable
+                $instance = & get_instance()->cache;
+                $this->cacheInstance = $instance;
         }
         return $this->cacheInstance->get($cacheKey);
     }
@@ -677,80 +677,80 @@ 
      * @param mixed $result the query result to save
      * @param int $expire the cache TTL
      */
-     protected function setCacheContentForQuery($query, $key, $result, $expire){
+        protected function setCacheContentForQuery($query, $key, $result, $expire){
         $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
         if (! is_object($this->cacheInstance)){
-  				//can not call method with reference in argument
-  				//like $this->setCacheInstance(& get_instance()->cache);
-  				//use temporary variable
-  				$instance = & get_instance()->cache;
-  				$this->cacheInstance = $instance;
-  			}
+                    //can not call method with reference in argument
+                    //like $this->setCacheInstance(& get_instance()->cache);
+                    //use temporary variable
+                    $instance = & get_instance()->cache;
+                    $this->cacheInstance = $instance;
+                }
         $this->cacheInstance->set($key, $result, $expire);
-     }
+        }
 
     
-	 /**
-     * Return the cache key for the given query
-     * @see Database::query
-     * 
-     *  @return string
-     */
+        /**
+         * Return the cache key for the given query
+         * @see Database::query
+         * 
+         *  @return string
+         */
     protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray){
-      return md5($query . $returnAsList . $returnAsArray);
-    }
-
-     /**
-     * Set the dependencies instance using argument or create new instance if is null
-     * @param string $name this class property name.
-     * @param object $instance the instance. If is not null will use it
-     * otherwise will create new instance.
-     * @param string $loadClassName the name of class to load using class_loader function.
-     * @param string $loadClassPath the path of class to load using class_loader function.
-     *
-     * @return object this current instance
-     */
+        return md5($query . $returnAsList . $returnAsArray);
+    }
+
+        /**
+         * Set the dependencies instance using argument or create new instance if is null
+         * @param string $name this class property name.
+         * @param object $instance the instance. If is not null will use it
+         * otherwise will create new instance.
+         * @param string $loadClassName the name of class to load using class_loader function.
+         * @param string $loadClassPath the path of class to load using class_loader function.
+         *
+         * @return object this current instance
+         */
     protected function setDependencyInstanceFromParamOrCreate($name, $instance = null, $loadClassName = null, $loadClassePath = 'classes'){
-      if ($instance !== null){
+        if ($instance !== null){
         $this->{$name} = $instance;
         return $this;
-      }
-      $this->{$name} =& class_loader($loadClassName, $loadClassePath);
-      return $this;
+        }
+        $this->{$name} =& class_loader($loadClassName, $loadClassePath);
+        return $this;
     }
     
-	   /**
-     * Set the Log instance using argument or create new instance
-     * @param object $logger the Log instance if not null
-     *
-     * @return object this current instance
-     */
+        /**
+         * Set the Log instance using argument or create new instance
+         * @param object $logger the Log instance if not null
+         *
+         * @return object this current instance
+         */
     protected function setLoggerFromParamOrCreate(Log $logger = null){
-      $this->setDependencyInstanceFromParamOrCreate('logger', $logger, 'Log', 'classes');
-      if ($logger === null){
+        $this->setDependencyInstanceFromParamOrCreate('logger', $logger, 'Log', 'classes');
+        if ($logger === null){
         $this->logger->setLogger('Library::Database');
-      }
-      return $this;
+        }
+        return $this;
     }
 	
     /**
      * Reset the database class attributs to the initail values before each query.
      */
     private function reset(){
-	   //query builder reset
-      $this->queryBuilder->reset();
-      $this->numRows  = 0;
-      $this->insertId = null;
-      $this->query    = null;
-      $this->result   = array();
-      $this->data     = array();
+        //query builder reset
+        $this->queryBuilder->reset();
+        $this->numRows  = 0;
+        $this->insertId = null;
+        $this->query    = null;
+        $this->result   = array();
+        $this->data     = array();
     }
 
     /**
      * The class destructor
      */
     public function __destruct(){
-      $this->pdo = null;
+        $this->pdo = null;
     }
 
 }