tnhfw / tnh-fw

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

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

Spacing +93 added lines, -93 removed lines

@@ -23,98 +23,98 @@ 
    * 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{
+  class Database {
 	
   	/**
   	 * The PDO instance
   	 * @var object
   	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
   	/**
   	 * The database name used for the application
   	 * @var string
   	*/
-	  private $databaseName        = null;
+	  private $databaseName = null;
 	
   	/**
   	 * The number of rows returned by the last query
   	 * @var int
   	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
   	/**
   	 * The last insert id for the primary key column that have auto increment or sequence
   	 * @var mixed
   	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
   	/**
   	 * The full SQL query statment after build for each command
   	 * @var string
   	*/
-    private $query               = null;
+    private $query = null;
 	
   	/**
   	 * The result returned for the last query
   	 * @var mixed
   	*/
-    private $result              = array();
+    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;
+  	private $cacheTtl = 0;
 	
   	/**
   	 * The cache current time to live. 0 means no need to use the cache feature
   	 * @var int
   	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
   	/**
   	 * The number of executed query for the current request
   	 * @var int
   	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
   	/**
   	 * The default data to be used in the statments query INSERT, UPDATE
   	 * @var array
   	*/
-    private $data                = array();
+    private $data = array();
 	
   	/**
   	 * The database configuration
   	 * @var array
   	*/
-    private $config              = array();
+    private $config = array();
 	
   	/**
   	 * The logger instance
   	 * @var object
   	 */
-    private $logger              = null;
+    private $logger = null;
 
     /**
     * The cache instance
     * @var object
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
     
   	/**
     * The DatabaseQueryBuilder instance
     * @var object
     */
-    private $queryBuilder        = null;
+    private $queryBuilder = null;
     
     /**
     * The DatabaseQueryRunner instance
     * @var object
     */
-    private $queryRunner         = null;
+    private $queryRunner = null;
 
 
     /**
@@ -122,7 +122,7 @@ 
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      * @param boolean $autoConnect whether to connect to database automatically
      */
-    public function __construct($overwriteConfig = array(), $autoConnect = true){
+    public function __construct($overwriteConfig = array(), $autoConnect = true) {
         //Set Log instance to use
         $this->setLoggerFromParamOrCreate(null);
 		
@@ -143,10 +143,10 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $this->pdo = new PDO($this->getDsnValueFromConfig(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
@@ -157,7 +157,7 @@ 
 
             return is_object($this->pdo);
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
@@ -171,7 +171,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -179,7 +179,7 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
@@ -190,10 +190,10 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->queryBuilder->limit(1);
       $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       } else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
@@ -206,9 +206,9 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
 	   $query = $this->queryBuilder->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
+	   if ($returnSQLQueryOrResultType === true) {
       	return $query;
       }
       return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
@@ -220,18 +220,18 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
-      if (empty($data) && ! empty($this->data)){
+    public function insert($data = array(), $escape = true) {
+      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){
+      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 
-        return ! ($this->insertId) ? true : $this->insertId;
+        return !($this->insertId) ? true : $this->insertId;
       }
       return false;
     }
@@ -242,8 +242,8 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
-      if (empty($data) && ! empty($this->data)){
+    public function update($data = array(), $escape = true) {
+      if (empty($data) && !empty($this->data)) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->data;
@@ -256,7 +256,7 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
 		  $query = $this->queryBuilder->delete()->getQuery();
     	return $this->query($query);
     }
@@ -266,7 +266,7 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
+    public function setCache($ttl = 0) {
       $this->cacheTtl = $ttl;
       $this->temporaryCacheTtl = $ttl;
       return $this;
@@ -277,7 +277,7 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-  	public function cached($ttl = 0){
+  	public function cached($ttl = 0) {
         $this->temporaryCacheTtl = $ttl;
         return $this;
     }
@@ -289,9 +289,9 @@ 
      * @return mixed       the data after escaped or the same data if no
      * need escaped
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
       $data = trim($data);
-      if($escaped){
+      if ($escaped) {
         return $this->pdo->quote($data);
       }
       return $data; 
@@ -301,7 +301,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -309,7 +309,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -317,7 +317,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -325,7 +325,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -334,7 +334,7 @@ 
      * @param object $pdo the pdo object
 	 * @return object Database
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -344,7 +344,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -353,7 +353,7 @@ 
      * @param Log $logger the log object
 	 * @return object Database
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -362,7 +362,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -371,7 +371,7 @@ 
      * @param CacheInterface $cache the cache object
 	 * @return object Database
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -381,7 +381,7 @@ 
      * Return the DatabaseQueryBuilder instance
      * @return object DatabaseQueryBuilder
      */
-    public function getQueryBuilder(){
+    public function getQueryBuilder() {
       return $this->queryBuilder;
     }
 
@@ -389,7 +389,7 @@ 
      * Set the DatabaseQueryBuilder instance
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder) {
       $this->queryBuilder = $queryBuilder;
       return $this;
     }
@@ -398,7 +398,7 @@ 
      * Return the DatabaseQueryRunner instance
      * @return object DatabaseQueryRunner
      */
-    public function getQueryRunner(){
+    public function getQueryRunner() {
       return $this->queryRunner;
     }
 
@@ -406,7 +406,7 @@ 
      * Set the DatabaseQueryRunner instance
      * @param object DatabaseQueryRunner $queryRunner the DatabaseQueryRunner object
      */
-    public function setQueryRunner(DatabaseQueryRunner $queryRunner){
+    public function setQueryRunner(DatabaseQueryRunner $queryRunner) {
       $this->queryRunner = $queryRunner;
       return $this;
     }
@@ -415,7 +415,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -426,9 +426,9 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value = null, $escape = true){
-  	  if (is_array($key)){
-    		foreach($key as $k => $v){
+    public function setData($key, $value = null, $escape = true) {
+  	  if (is_array($key)) {
+    		foreach ($key as $k => $v) {
     			$this->setData($k, $v, $escape);
     		}	
   	  } else {
@@ -444,7 +444,7 @@ 
      * @param  boolean $returnAsArray return the result as array or not
      * @return mixed         the query result
      */
-    public function query($query, $returnAsList = true, $returnAsArray = false){
+    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
@@ -465,12 +465,12 @@ 
       //if can use cache feature for this query
       $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
+      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){
+      if (!$cacheContent) {
   	   	//count the number of query execution to server
         $this->queryCount++;
         
@@ -479,19 +479,19 @@ 
                                           ->setReturnAsArray($returnAsArray)
                                           ->execute();
 
-        if (!is_object($queryResult)){
+        if (!is_object($queryResult)) {
           $this->result = false;
           $this->numRows = 0;
           return $this->result;
         }
         $this->result  = $queryResult->getResult();
         $this->numRows = $queryResult->getNumRows();
-        if ($isSqlSELECTQuery && $dbCacheStatus){
+        if ($isSqlSELECTQuery && $dbCacheStatus) {
             $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');
+      } else if ($isSqlSELECTQuery) {
+          $this->logger->info('The result for query [' . $this->query . '] already cached use it');
           $this->result = $cacheContent;
           $this->numRows = count($this->result);
       }
@@ -505,9 +505,9 @@ 
     * @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){
+    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true, $autoConnect = false) {
       $db = array();
-      if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+      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';
       }
@@ -522,7 +522,7 @@ 
     	//determine the port using the hostname like localhost:3307
       //hostname will be "localhost", and port "3307"
       $p = explode(':', $config['hostname']);
-  	  if (count($p) >= 2){
+  	  if (count($p) >= 2) {
   		  $config['hostname'] = $p[0];
   		  $config['port'] = $p[1];
   		}
@@ -536,7 +536,7 @@ 
 															array('password' => string_hidden($this->config['password']))
 												))
 							);
-  	  if($autoConnect){
+  	  if ($autoConnect) {
     		 //Now connect to the database
     		 $this->connect();
   		}
@@ -547,14 +547,14 @@ 
    * Return the database configuration
    * @return array
    */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
       return $this->config;
     }
 
     /**
      * Close the connexion
      */
-    public function close(){
+    public function close() {
       $this->pdo = null;
     }
 
@@ -562,7 +562,7 @@ 
      * Return the database default configuration
      * @return array
      */
-    protected function getDatabaseDefaultConfiguration(){
+    protected function getDatabaseDefaultConfiguration() {
       return array(
               'driver' => '',
               'username' => '',
@@ -580,16 +580,16 @@ 
      * Update the DatabaseQueryBuilder and DatabaseQueryRunner properties
      * @return void
      */
-    protected function updateQueryBuilderAndRunnerProperties(){
+    protected function updateQueryBuilderAndRunnerProperties() {
        //update queryBuilder with some properties needed
-     if (is_object($this->queryBuilder)){
+     if (is_object($this->queryBuilder)) {
         $this->queryBuilder->setDriver($this->config['driver'])
                            ->setPrefix($this->config['prefix'])
                            ->setPdo($this->pdo);
      }
 
       //update queryRunner with some properties needed
-     if (is_object($this->queryRunner)){
+     if (is_object($this->queryRunner)) {
         $this->queryRunner->setDriver($this->config['driver'])
                           ->setPdo($this->pdo);
      }
@@ -600,10 +600,10 @@ 
      * This method is used to get the PDO DSN string using the configured driver
      * @return string|null the DSN string or null if can not find it
      */
-    protected function getDsnValueFromConfig(){
+    protected function getDsnValueFromConfig() {
       $dsn = null;
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+      if (!empty($config)) {
         $driver = $config['driver'];
         $driverDsnMap = array(
                               'mysql'  => $this->getDsnValueForDriver('mysql'),
@@ -611,7 +611,7 @@ 
                               'sqlite' => $this->getDsnValueForDriver('sqlite'),
                               'oracle' => $this->getDsnValueForDriver('oracle')
                               );
-        if (isset($driverDsnMap[$driver])){
+        if (isset($driverDsnMap[$driver])) {
           $dsn = $driverDsnMap[$driver];
         }
       }    
@@ -623,17 +623,17 @@ 
      * @param  string $driver the driver name
      * @return string|null         the dsn name
      */
-    protected function getDsnValueForDriver($driver){
+    protected function getDsnValueForDriver($driver) {
       $dsn = '';
       $config = $this->getDatabaseConfiguration();
-      if (empty($config)){
+      if (empty($config)) {
         return null;
       }
       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'];
@@ -643,10 +643,10 @@ 
           break;
           case 'oracle':
           $port = '';
-          if (! empty($config['port'])) {
+          if (!empty($config['port'])) {
             $port = ':' . $config['port'];
           }
-          $dsn =  'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
+          $dsn = 'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
           break;
       }
       return $dsn;
@@ -658,9 +658,9 @@ 
      *      
      * @return mixed
      */
-    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray) {
         $cacheKey = $this->getCacheKeyForQuery($query, $returnAsList, $returnAsArray);
-        if (! is_object($this->cacheInstance)){
+        if (!is_object($this->cacheInstance)) {
     			//can not call method with reference in argument
     			//like $this->setCacheInstance(& get_instance()->cache);
     			//use temporary variable
@@ -677,9 +677,9 @@ 
      * @param mixed $result the query result to save
      * @param int $expire the cache TTL
      */
-     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)){
+     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
@@ -696,7 +696,7 @@ 
      * 
      *  @return string
      */
-    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray) {
       return md5($query . $returnAsList . $returnAsArray);
     }
 
@@ -710,12 +710,12 @@ 
      *
      * @return object this current instance
      */
-    protected function setDependencyInstanceFromParamOrCreate($name, $instance = null, $loadClassName = null, $loadClassePath = 'classes'){
-      if ($instance !== null){
+    protected function setDependencyInstanceFromParamOrCreate($name, $instance = null, $loadClassName = null, $loadClassePath = 'classes') {
+      if ($instance !== null) {
         $this->{$name} = $instance;
         return $this;
       }
-      $this->{$name} =& class_loader($loadClassName, $loadClassePath);
+      $this->{$name} = & class_loader($loadClassName, $loadClassePath);
       return $this;
     }
     
@@ -725,9 +725,9 @@ 
      *
      * @return object this current instance
      */
-    protected function setLoggerFromParamOrCreate(Log $logger = null){
+    protected function setLoggerFromParamOrCreate(Log $logger = null) {
       $this->setDependencyInstanceFromParamOrCreate('logger', $logger, 'Log', 'classes');
-      if ($logger === null){
+      if ($logger === null) {
         $this->logger->setLogger('Library::Database');
       }
       return $this;
@@ -736,7 +736,7 @@ 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
-    private function reset(){
+    private function reset() {
 	   //query builder reset
       $this->queryBuilder->reset();
       $this->numRows  = 0;
@@ -749,7 +749,7 @@ 
     /**
      * The class destructor
      */
-    public function __destruct(){
+    public function __destruct() {
       $this->pdo = null;
     }
 

Braces +1 added lines, -2 removed lines

@@ -156,8 +156,7 @@
             $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;

core/libraries/Pagination.php

Indentation +42 added lines, -42 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 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.
+     */
 
     class Pagination{
         
-		/**
+        /**
          * The list of loaded config
          * @var array
          */
@@ -49,13 +49,13 @@ 
                 if (empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					$config = array_merge($config, $overwriteConfig);
-					$this->config = $config;
+                else{
+                    $config = array_merge($config, $overwriteConfig);
+                    $this->config = $config;
                     //put it gobally
-					Config::setAll($config);
-					unset($config);
-				}
+                    Config::setAll($config);
+                    unset($config);
+                }
             }
             else{
                 show_error('Unable to find the pagination configuration file');
@@ -92,11 +92,11 @@ 
             return $this->paginationQueryString;
         }
 
-         /**
-         * Set the value of the pagination query string
-         * @param string $paginationQueryString the new value
-         * @return object
-         */
+            /**
+             * Set the value of the pagination query string
+             * @param string $paginationQueryString the new value
+             * @return object
+             */
         public function setPaginationQueryString($paginationQueryString){
             $this->paginationQueryString = $paginationQueryString;
             return $this;
@@ -113,7 +113,7 @@ 
             $queryString = Url::queryString();
             $currentUrl = Url::current();
             $query = '';
-             if ($queryString == ''){
+                if ($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
             }
             else{
@@ -146,7 +146,7 @@ 
          */
         public function getLink($totalRows, $currentPageNumber){
             $numberOfLink = $this->config['nb_link'];
-			$numberOfRowPerPage = $this->config['pagination_per_page'];
+            $numberOfRowPerPage = $this->config['pagination_per_page'];
             if (empty($this->paginationQueryString)){
                 //determine the pagination query string value
                 $this->determinePaginationQueryStringValue();
@@ -159,8 +159,8 @@ 
             $numberOfRowPerPage = (int) $numberOfRowPerPage;
 			
             if ($currentPageNumber <= 0){
-				$currentPageNumber = 1;
-			}
+                $currentPageNumber = 1;
+            }
             if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0) {
                 return $navbar;
             }
@@ -185,7 +185,7 @@ 
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
             }
             else if ($currentPageNumber == $numberOfPage){
-               $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
+                $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
             return $navbar;
@@ -253,8 +253,8 @@ 
                 }
             }
             $navbar .= $this->config['next_open']
-                         . '<a href="' . $query . ($currentPageNumber + 1) . '">' 
-                         . $this->config['next_text'] . '</a>' . $this->config['next_close'];
+                            . '<a href="' . $query . ($currentPageNumber + 1) . '">' 
+                            . $this->config['next_text'] . '</a>' . $this->config['next_close'];
             return $navbar;
         }
 

Spacing +46 added lines, -46 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-    class Pagination{
+    class Pagination {
         
 		/**
          * The list of loaded config
@@ -42,14 +42,14 @@ 
          * Create an instance of pagination
          * @param array $overwriteConfig the list of configuration to overwrite the defined configuration in config_pagination.php
          */
-        public function __construct(array $overwriteConfig = array()){
-            if (file_exists(CONFIG_PATH . 'config_pagination.php')){
+        public function __construct(array $overwriteConfig = array()) {
+            if (file_exists(CONFIG_PATH . 'config_pagination.php')) {
                 $config = array();
                 require_once CONFIG_PATH . 'config_pagination.php';
-                if (empty($config) || ! is_array($config)){
+                if (empty($config) || !is_array($config)) {
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
+				else {
 					$config = array_merge($config, $overwriteConfig);
 					$this->config = $config;
                     //put it gobally
@@ -57,7 +57,7 @@ 
 					unset($config);
 				}
             }
-            else{
+            else {
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -68,8 +68,8 @@ 
          * config_pagination.php
          * @param array $config the configuration to overwrite
          */
-        public function setConfig(array $config = array()){
-            if (! empty($config)){
+        public function setConfig(array $config = array()) {
+            if (!empty($config)) {
                 $this->config = array_merge($this->config, $config);
                 Config::setAll($config);
             }
@@ -80,7 +80,7 @@ 
          * 
          * @return array
          */
-        public function getConfig(){
+        public function getConfig() {
             return $this->config;
         }
 
@@ -88,7 +88,7 @@ 
          * Return the value of the pagination query string
          * @return string
          */
-        public function getPaginationQueryString(){
+        public function getPaginationQueryString() {
             return $this->paginationQueryString;
         }
 
@@ -97,7 +97,7 @@ 
          * @param string $paginationQueryString the new value
          * @return object
          */
-        public function setPaginationQueryString($paginationQueryString){
+        public function setPaginationQueryString($paginationQueryString) {
             $this->paginationQueryString = $paginationQueryString;
             return $this;
         }
@@ -108,25 +108,25 @@ 
          * 
          * @return object
          */
-        public function determinePaginationQueryStringValue(){
+        public function determinePaginationQueryStringValue() {
             $pageQueryName = $this->config['page_query_string_name'];
             $queryString = Url::queryString();
             $currentUrl = Url::current();
             $query = '';
-             if ($queryString == ''){
+             if ($queryString == '') {
                 $query = '?' . $pageQueryName . '=';
             }
-            else{
+            else {
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
-                if ($nb == 1){
+                if ($nb == 1) {
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
                 }
-                else{
-                    if ($tab[0] == ''){
+                else {
+                    if ($tab[0] == '') {
                         $query = '?' . $pageQueryName . '=';
                     }
-                    else{
+                    else {
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -144,10 +144,10 @@ 
          * 
          * @return string the pagination link
          */
-        public function getLink($totalRows, $currentPageNumber){
+        public function getLink($totalRows, $currentPageNumber) {
             $numberOfLink = $this->config['nb_link'];
 			$numberOfRowPerPage = $this->config['pagination_per_page'];
-            if (empty($this->paginationQueryString)){
+            if (empty($this->paginationQueryString)) {
                 //determine the pagination query string value
                 $this->determinePaginationQueryStringValue();
             }
@@ -158,7 +158,7 @@ 
             $numberOfLink = (int) $numberOfLink;
             $numberOfRowPerPage = (int) $numberOfRowPerPage;
 			
-            if ($currentPageNumber <= 0){
+            if ($currentPageNumber <= 0) {
 				$currentPageNumber = 1;
 			}
             if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0) {
@@ -173,18 +173,18 @@ 
          * @param  int $numberOfPage      the total number of page
          * @return string
          */
-        protected function buildPaginationNavbar($currentPageNumber, $numberOfPage){
+        protected function buildPaginationNavbar($currentPageNumber, $numberOfPage) {
             $values = $this->getPaginationBeginAndEndNumber($currentPageNumber, $numberOfPage);
             $begin = $values['begin'];
             $end   = $values['end'];
             $navbar = null;
-            if ($currentPageNumber == 1){
+            if ($currentPageNumber == 1) {
                 $navbar .= $this->buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber);
             }
-            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage) {
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
             }
-            else if ($currentPageNumber == $numberOfPage){
+            else if ($currentPageNumber == $numberOfPage) {
                $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
@@ -197,32 +197,32 @@ 
          * @param  int $numberOfPage      the total number of page
          * @return array                    the begin and end number
          */
-        protected function getPaginationBeginAndEndNumber($currentPageNumber, $numberOfPage){
+        protected function getPaginationBeginAndEndNumber($currentPageNumber, $numberOfPage) {
             $start = null;
             $begin = null;
             $end   = null;
             $numberOfLink = $this->config['nb_link'];
-            if ($numberOfLink % 2 == 0){
+            if ($numberOfLink % 2 == 0) {
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end   = $currentPageNumber + ($numberOfLink / 2);
             }
-            else{
+            else {
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end   = $currentPageNumber + floor($numberOfLink / 2);
             }
-            if ($start <= 1){
+            if ($start <= 1) {
                 $begin = 1;
                 $end   = $numberOfLink;
             }
-            else if ($start > 1 && $end < $numberOfPage){
+            else if ($start > 1 && $end < $numberOfPage) {
                 $begin = $start;
                 $end = $end;
             }
-            else{
+            else {
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end   = $numberOfPage;
             }
-            if ($numberOfPage <= $numberOfLink){
+            if ($numberOfPage <= $numberOfLink) {
                 $begin = 1;
                 $end = $numberOfPage;
             }
@@ -239,14 +239,14 @@ 
          * @param  int $currentPageNumber the pagination current page number
          * @return string                    
          */
-        protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber){
+        protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber) {
             $navbar = null;
             $query = $this->paginationQueryString;
-            for($i = $begin; $i <= $end; $i++){
-                if ($i == $currentPageNumber){
+            for ($i = $begin; $i <= $end; $i++) {
+                if ($i == $currentPageNumber) {
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                 }
-                else{
+                else {
                     $navbar .= $this->config['digit_open'] 
                             . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                             . $this->config['digit_close'];
@@ -265,23 +265,23 @@ 
          * @param  int $currentPageNumber the pagination current page number
          * @return string                    
          */
-        protected function buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber){
+        protected function buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber) {
             $navbar = null;
             $query = $this->paginationQueryString;
             $navbar .= $this->config['previous_open'] 
                             . '<a href="' . $query . ($currentPageNumber - 1) . '">' 
                             . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-            for($i = $begin; $i <= $end; $i++){
-                if ($i == $currentPageNumber){
+            for ($i = $begin; $i <= $end; $i++) {
+                if ($i == $currentPageNumber) {
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                 }
-                else{
+                else {
                     $navbar .= $this->config['digit_open'] 
-                                    . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' 
+                                    . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                                     . $this->config['digit_close'];
                 }
             }
-            $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
+            $navbar .= $this->config['next_open'] . "<a href='$query" . ($currentPageNumber + 1) . "'>" . $this->config['next_text'] . "</a>" . $this->config['next_close'];
             return $navbar;
         }
 
@@ -292,19 +292,19 @@ 
          * @param  int $currentPageNumber the pagination current page number
          * @return string                    
          */
-        protected function buildPaginationLinkForLastPage($begin, $end, $currentPageNumber){
+        protected function buildPaginationLinkForLastPage($begin, $end, $currentPageNumber) {
             $navbar = null;
             $query = $this->paginationQueryString;
             $navbar .= $this->config['previous_open'] 
                         . '<a href="' . $query . ($currentPageNumber - 1) . '">' 
                         . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-            for($i = $begin; $i <= $end; $i++){
-                if ($i == $currentPageNumber){
+            for ($i = $begin; $i <= $end; $i++) {
+                if ($i == $currentPageNumber) {
                     $navbar .= $this->config['active_link_open'] 
                                 . $currentPageNumber 
                                 . $this->config['active_link_close'];
                 }
-                else{
+                else {
                     $navbar .= $this->config['digit_open'] 
                                 . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                                 . $this->config['digit_close'];

Braces +13 added lines, -26 removed lines

@@ -48,16 +48,14 @@ 
                 require_once CONFIG_PATH . 'config_pagination.php';
                 if (empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
-                }
-				else{
+                } else{
 					$config = array_merge($config, $overwriteConfig);
 					$this->config = $config;
                     //put it gobally
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
+            } else{
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -115,18 +113,15 @@ 
             $query = '';
              if ($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
-            }
-            else{
+            } else{
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
                 if ($nb == 1){
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
-                }
-                else{
+                } else{
                     if ($tab[0] == ''){
                         $query = '?' . $pageQueryName . '=';
-                    }
-                    else{
+                    } else{
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -180,11 +175,9 @@ 
             $navbar = null;
             if ($currentPageNumber == 1){
                 $navbar .= $this->buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber);
-            }
-            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            } else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
-            }
-            else if ($currentPageNumber == $numberOfPage){
+            } else if ($currentPageNumber == $numberOfPage){
                $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
@@ -205,20 +198,17 @@ 
             if ($numberOfLink % 2 == 0){
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end   = $currentPageNumber + ($numberOfLink / 2);
-            }
-            else{
+            } else{
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end   = $currentPageNumber + floor($numberOfLink / 2);
             }
             if ($start <= 1){
                 $begin = 1;
                 $end   = $numberOfLink;
-            }
-            else if ($start > 1 && $end < $numberOfPage){
+            } else if ($start > 1 && $end < $numberOfPage){
                 $begin = $start;
                 $end = $end;
-            }
-            else{
+            } else{
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end   = $numberOfPage;
             }
@@ -245,8 +235,7 @@ 
             for($i = $begin; $i <= $end; $i++){
                 if ($i == $currentPageNumber){
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                }
-                else{
+                } else{
                     $navbar .= $this->config['digit_open'] 
                             . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                             . $this->config['digit_close'];
@@ -274,8 +263,7 @@ 
             for($i = $begin; $i <= $end; $i++){
                 if ($i == $currentPageNumber){
                     $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                }
-                else{
+                } else{
                     $navbar .= $this->config['digit_open'] 
                                     . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' 
                                     . $this->config['digit_close'];
@@ -303,8 +291,7 @@ 
                     $navbar .= $this->config['active_link_open'] 
                                 . $currentPageNumber 
                                 . $this->config['active_link_close'];
-                }
-                else{
+                } else{
                     $navbar .= $this->config['digit_open'] 
                                 . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' 
                                 . $this->config['digit_close'];

core/libraries/Html.php

Indentation +318 added lines, -318 removed lines

@@ -1,335 +1,335 @@
 <?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 Html{
+    class Html{
 
-		/**
-		 * Generate the html anchor link
-		 * @param  string $link       the href attribute value
-		 * @param  string $anchor     the displayed anchor
-		 * @param  array  $attributes the additional attributes to be added
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @return string|void             the anchor link generated html if $return is true or display it if not
-		 */
-		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
-			$link = Url::site_url($link);
-			if(! $anchor){
-				$anchor = $link;
-			}
-			$str = null;
-			$str .= '<a href = "'.$link.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $anchor;
-			$str .= '</a>';
+        /**
+         * Generate the html anchor link
+         * @param  string $link       the href attribute value
+         * @param  string $anchor     the displayed anchor
+         * @param  array  $attributes the additional attributes to be added
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @return string|void             the anchor link generated html if $return is true or display it if not
+         */
+        public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
+            $link = Url::site_url($link);
+            if(! $anchor){
+                $anchor = $link;
+            }
+            $str = null;
+            $str .= '<a href = "'.$link.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $anchor;
+            $str .= '</a>';
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 		
-		/**
-		 * Generate an mailto anchor link
-		 * @param  string $link       the email address 
-		 * @param  string $anchor     the displayed value of the link
-		 * @param  array  $attributes the additional attributes to be added
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @return string|void             the generated html for mailto link if $return is true or display it if not
-		 */
-		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-			if(! $anchor){
-				$anchor = $link;
-			}
-			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
-			$str .= attributes_to_string($attributes);
-			$str .= '>';
-			$str .= $anchor;
-			$str .= '</a>';
+        /**
+         * Generate an mailto anchor link
+         * @param  string $link       the email address 
+         * @param  string $anchor     the displayed value of the link
+         * @param  array  $attributes the additional attributes to be added
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @return string|void             the generated html for mailto link if $return is true or display it if not
+         */
+        public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
+            if(! $anchor){
+                $anchor = $link;
+            }
+            $str = null;
+            $str .= '<a href = "mailto:'.$link.'"';
+            $str .= attributes_to_string($attributes);
+            $str .= '>';
+            $str .= $anchor;
+            $str .= '</a>';
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "br" tag  
-		 * @param  integer $nb the number of generated "<br />" tag
-		 * @param boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @return string|void      the generated "br" html if $return is true or display it if not
-		 */
-		public static function br($nb = 1, $return = true){
-			$nb = (int) $nb;
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<br />';
-			}
+        /**
+         * Generate the html "br" tag  
+         * @param  integer $nb the number of generated "<br />" tag
+         * @param boolean $return whether need return the generated html or just display it directly
+         *
+         * @return string|void      the generated "br" html if $return is true or display it if not
+         */
+        public static function br($nb = 1, $return = true){
+            $nb = (int) $nb;
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<br />';
+            }
 
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html content for tag "hr"
-		 * @param integer $nb the number of generated "<hr />" tag
-		 * @param  array   $attributes the tag attributes
-		 * @param  boolean $return    whether need return the generated html or just display it directly
-		 *
-		 * @return string|void the generated "hr" html if $return is true or display it if not.
-		 */
-		public static function hr($nb = 1, array $attributes = array(), $return = true){
-			$nb = (int) $nb;
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<hr' .attributes_to_string($attributes). ' />';
-			}
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html content for tag "hr"
+         * @param integer $nb the number of generated "<hr />" tag
+         * @param  array   $attributes the tag attributes
+         * @param  boolean $return    whether need return the generated html or just display it directly
+         *
+         * @return string|void the generated "hr" html if $return is true or display it if not.
+         */
+        public static function hr($nb = 1, array $attributes = array(), $return = true){
+            $nb = (int) $nb;
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<hr' .attributes_to_string($attributes). ' />';
+            }
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html content for tag like h1, h2, h3, h4, h5 and h6
-		 * @param  integer $type       the tag type 1 mean h1, 2 h2, etc,
-		 * @param  string  $text       the display text
-		 * @param integer $nb the number of generated "<h{1,2,3,4,5,6}>"
-		 * @param  array   $attributes the tag attributes
-		 * @param  boolean $return    whether need return the generated html or just display it directly
-		 *
-		 * @return string|void the generated header html if $return is true or display it if not.
-		 */
-		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
-			$nb = (int) $nb;
-			$type = (int) $type;
-			if($type <= 0 || $type > 6){
-				$type = 1;
-			}
-			$str = null;
-			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
-			}
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html content for tag like h1, h2, h3, h4, h5 and h6
+         * @param  integer $type       the tag type 1 mean h1, 2 h2, etc,
+         * @param  string  $text       the display text
+         * @param integer $nb the number of generated "<h{1,2,3,4,5,6}>"
+         * @param  array   $attributes the tag attributes
+         * @param  boolean $return    whether need return the generated html or just display it directly
+         *
+         * @return string|void the generated header html if $return is true or display it if not.
+         */
+        public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
+            $nb = (int) $nb;
+            $type = (int) $type;
+            if($type <= 0 || $type > 6){
+                $type = 1;
+            }
+            $str = null;
+            for ($i = 1; $i <= $nb; $i++) {
+                $str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+            }
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "ul" tag
-		 * @param  array   $data the data to use for each "li" tag
-		 * @param  array   $attributes   the "ul" properties attribute use the array index below for each tag:
-		 *  for ul "ul", for li "li".
-		 * @param  boolean $return whether need return the generated html or just display it directly
-		 *
-		 * @return string|void the generated "ul" html  if $return is true or display it if not.
-		 */
-		public static function ul($data = array(), $attributes = array(), $return = true){
-			$data = (array) $data;
-			$str = null;
-			$ulAttributes = '';
-			if(! empty($attributes['ul'])){
-				$ulAttributes = ' ' . attributes_to_string($attributes['ul']);
-			}
-			$liAttributes = '';
-			if(! empty($attributes['li'])){
-				$liAttributes = ' ' . attributes_to_string($attributes['li']);
-			}
-			$str .= '<ul' . $ulAttributes . '>';
-			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
-			}
-			$str .= '</ul>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html "ul" tag
+         * @param  array   $data the data to use for each "li" tag
+         * @param  array   $attributes   the "ul" properties attribute use the array index below for each tag:
+         *  for ul "ul", for li "li".
+         * @param  boolean $return whether need return the generated html or just display it directly
+         *
+         * @return string|void the generated "ul" html  if $return is true or display it if not.
+         */
+        public static function ul($data = array(), $attributes = array(), $return = true){
+            $data = (array) $data;
+            $str = null;
+            $ulAttributes = '';
+            if(! empty($attributes['ul'])){
+                $ulAttributes = ' ' . attributes_to_string($attributes['ul']);
+            }
+            $liAttributes = '';
+            if(! empty($attributes['li'])){
+                $liAttributes = ' ' . attributes_to_string($attributes['li']);
+            }
+            $str .= '<ul' . $ulAttributes . '>';
+            foreach ($data as $row) {
+                $str .= '<li' . $liAttributes .'>' .$row. '</li>';
+            }
+            $str .= '</ul>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "ol" tag
-		 * @param  array   $data the data to use for each "li" tag
-		 * @param  array   $attributes   the "ol" properties attribute use the array index below for each tag:
-		 *  for ol "ol", for li "li".
-		 * @param  boolean $return whether need return the generated html or just display it directly
-		 * @return string|void the generated "ol" html  if $return is true or display it if not.
-		 */
-		public static function ol($data = array(), $attributes = array(), $return = true){
-			$data = (array) $data;
-			$str = null;
-			$olAttributes = '';
-			if(! empty($attributes['ol'])){
-				$olAttributes = ' ' . attributes_to_string($attributes['ol']);
-			}
-			$liAttributes = '';
-			if(! empty($attributes['li'])){
-				$liAttributes = ' ' . attributes_to_string($attributes['li']);
-			}
-			$str .= '<ol' . $olAttributes . '>';
-			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
-			}
-			$str .= '</ol>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+        /**
+         * Generate the html "ol" tag
+         * @param  array   $data the data to use for each "li" tag
+         * @param  array   $attributes   the "ol" properties attribute use the array index below for each tag:
+         *  for ol "ol", for li "li".
+         * @param  boolean $return whether need return the generated html or just display it directly
+         * @return string|void the generated "ol" html  if $return is true or display it if not.
+         */
+        public static function ol($data = array(), $attributes = array(), $return = true){
+            $data = (array) $data;
+            $str = null;
+            $olAttributes = '';
+            if(! empty($attributes['ol'])){
+                $olAttributes = ' ' . attributes_to_string($attributes['ol']);
+            }
+            $liAttributes = '';
+            if(! empty($attributes['li'])){
+                $liAttributes = ' ' . attributes_to_string($attributes['li']);
+            }
+            $str .= '<ol' . $olAttributes . '>';
+            foreach ($data as $row) {
+                $str .= '<li' . $liAttributes .'>' .$row. '</li>';
+            }
+            $str .= '</ol>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * Generate the html "table" tag
-		 * @param  array   $headers            the table headers to use between (<thead>)
-		 * @param  array   $body the table body values between (<tbody>)
-		 * @param  array   $attributes   the table properties attribute use the array index below for each tag:
-		 *  for table "table", for thead "thead", for thead tr "thead_tr",
-		 *  for thead th "thead_th", for tbody "tbody", for tbody tr "tbody_tr", for tbody td "tbody_td", for tfoot "tfoot",
-		 *  for tfoot tr "tfoot_tr", for tfoot th "tfoot_th".
-		 * @param boolean $use_footer whether need to generate table footer (<tfoot>) use the $headers values
-		 * @param  boolean $return whether need return the generated html or just display it directly
-		 * @return string|void the generated "table" html  if $return is true or display it if not.
-		 */
-		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
-			$headers = (array) $headers;
-			$body = (array) $body;
-			$str = null;
-			$tableAttributes = '';
-			if(! empty($attributes['table'])){
-				$tableAttributes = ' ' . attributes_to_string($attributes['table']);
-			}
-			$str .= '<table' . $tableAttributes . '>';
-			$str .= self::buildTableHeader($headers, $attributes);
-			$str .= self::buildTableBody($body, $attributes);
+        /**
+         * Generate the html "table" tag
+         * @param  array   $headers            the table headers to use between (<thead>)
+         * @param  array   $body the table body values between (<tbody>)
+         * @param  array   $attributes   the table properties attribute use the array index below for each tag:
+         *  for table "table", for thead "thead", for thead tr "thead_tr",
+         *  for thead th "thead_th", for tbody "tbody", for tbody tr "tbody_tr", for tbody td "tbody_td", for tfoot "tfoot",
+         *  for tfoot tr "tfoot_tr", for tfoot th "tfoot_th".
+         * @param boolean $use_footer whether need to generate table footer (<tfoot>) use the $headers values
+         * @param  boolean $return whether need return the generated html or just display it directly
+         * @return string|void the generated "table" html  if $return is true or display it if not.
+         */
+        public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+            $headers = (array) $headers;
+            $body = (array) $body;
+            $str = null;
+            $tableAttributes = '';
+            if(! empty($attributes['table'])){
+                $tableAttributes = ' ' . attributes_to_string($attributes['table']);
+            }
+            $str .= '<table' . $tableAttributes . '>';
+            $str .= self::buildTableHeader($headers, $attributes);
+            $str .= self::buildTableBody($body, $attributes);
 
-			if($use_footer){
-				$str .= self::buildTableFooter($headers, $attributes);
-			}
-			$str .= '</table>';
-			if($return){
-				return $str;
-			}
-			echo $str;
-		}
+            if($use_footer){
+                $str .= self::buildTableFooter($headers, $attributes);
+            }
+            $str .= '</table>';
+            if($return){
+                return $str;
+            }
+            echo $str;
+        }
 
-		/**
-		 * This method is used to build the header of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableHeader(array $headers, $attributes = array()){
-			$str = null;
-			if(! empty($headers)){
-				$theadAttributes = '';
-				if(! empty($attributes['thead'])){
-					$theadAttributes = ' ' . attributes_to_string($attributes['thead']);
-				}
-				$theadtrAttributes = '';
-				if(! empty($attributes['thead_tr'])){
-					$theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
-				}
-				$thAttributes = '';
-				if(! empty($attributes['thead_th'])){
-					$thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
-				}
-				$str .= '<thead' . $theadAttributes .'>';
-				$str .= '<tr' . $theadtrAttributes .'>';
-				foreach ($headers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
-				}
-				$str .= '</tr>';
-				$str .= '</thead>';
-			}
-			return $str;
-		}
+        /**
+         * This method is used to build the header of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableHeader(array $headers, $attributes = array()){
+            $str = null;
+            if(! empty($headers)){
+                $theadAttributes = '';
+                if(! empty($attributes['thead'])){
+                    $theadAttributes = ' ' . attributes_to_string($attributes['thead']);
+                }
+                $theadtrAttributes = '';
+                if(! empty($attributes['thead_tr'])){
+                    $theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
+                }
+                $thAttributes = '';
+                if(! empty($attributes['thead_th'])){
+                    $thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
+                }
+                $str .= '<thead' . $theadAttributes .'>';
+                $str .= '<tr' . $theadtrAttributes .'>';
+                foreach ($headers as $value) {
+                    $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+                }
+                $str .= '</tr>';
+                $str .= '</thead>';
+            }
+            return $str;
+        }
 
-		/**
-		 * This method is used to build the body of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableBody(array $body, $attributes = array()){
-			$str = null;
-			$tbodyAttributes = '';
-			if(! empty($attributes['tbody'])){
-				$tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
-			}
-			$tbodytrAttributes = '';
-			if(! empty($attributes['tbody_tr'])){
-				$tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
-			}
-			$tbodytdAttributes = '';
-			if(! empty($attributes['tbody_td'])){
-				$tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
-			}
-			$str .= '<tbody' . $tbodyAttributes .'>';
-			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . $tbodytrAttributes .'>';
-					foreach ($row as $value) {
-						$str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
-					}
-					$str .= '</tr>';
-				}
-			}
-			$str .= '</tbody>';
-			return $str;
-		}
+        /**
+         * This method is used to build the body of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableBody(array $body, $attributes = array()){
+            $str = null;
+            $tbodyAttributes = '';
+            if(! empty($attributes['tbody'])){
+                $tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
+            }
+            $tbodytrAttributes = '';
+            if(! empty($attributes['tbody_tr'])){
+                $tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
+            }
+            $tbodytdAttributes = '';
+            if(! empty($attributes['tbody_td'])){
+                $tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
+            }
+            $str .= '<tbody' . $tbodyAttributes .'>';
+            foreach ($body as $row) {
+                if(is_array($row)){
+                    $str .= '<tr' . $tbodytrAttributes .'>';
+                    foreach ($row as $value) {
+                        $str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
+                    }
+                    $str .= '</tr>';
+                }
+            }
+            $str .= '</tbody>';
+            return $str;
+        }
 
-		/**
-		 * This method is used to build the footer of the html table
-		 * @see  Html::table 
-		 * @return string|null
-		 */
-		protected static function buildTableFooter(array $footers, $attributes = array()){
-			$str = null;
-			$tfootAttributes = '';
-			if(! empty($attributes['tfoot'])){
-				$tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
-			}
-			$tfoottrAttributes = '';
-			if(! empty($attributes['tfoot_tr'])){
-				$tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
-			}
-			$thAttributes = '';
-			if(! empty($attributes['tfoot_th'])){
-				$thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
-			}
-			$str .= '<tfoot' . $tfootAttributes .'>';
-				$str .= '<tr' . $tfoottrAttributes .'>';
-				foreach ($footers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
-				}
-				$str .= '</tr>';
-				$str .= '</tfoot>';
-			return $str;
-		}
-	}
+        /**
+         * This method is used to build the footer of the html table
+         * @see  Html::table 
+         * @return string|null
+         */
+        protected static function buildTableFooter(array $footers, $attributes = array()){
+            $str = null;
+            $tfootAttributes = '';
+            if(! empty($attributes['tfoot'])){
+                $tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
+            }
+            $tfoottrAttributes = '';
+            if(! empty($attributes['tfoot_tr'])){
+                $tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
+            }
+            $thAttributes = '';
+            if(! empty($attributes['tfoot_th'])){
+                $thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
+            }
+            $str .= '<tfoot' . $tfootAttributes .'>';
+                $str .= '<tr' . $tfoottrAttributes .'>';
+                foreach ($footers as $value) {
+                    $str .= '<th' . $thAttributes .'>' .$value. '</th>';
+                }
+                $str .= '</tr>';
+                $str .= '</tfoot>';
+            return $str;
+        }
+    }

Spacing +55 added lines, -55 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Html{
+	class Html {
 
 		/**
 		 * Generate the html anchor link
@@ -35,19 +35,19 @@ 
 		 *
 		 * @return string|void             the anchor link generated html if $return is true or display it if not
 		 */
-		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
 			$link = Url::site_url($link);
-			if(! $anchor){
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "'.$link.'"';
+			$str .= '<a href = "' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -62,18 +62,18 @@ 
 		 *
 		 * @return string|void             the generated html for mailto link if $return is true or display it if not
 		 */
-		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-			if(! $anchor){
+		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true) {
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
+			$str .= '<a href = "mailto:' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -86,14 +86,14 @@ 
 		 *
 		 * @return string|void      the generated "br" html if $return is true or display it if not
 		 */
-		public static function br($nb = 1, $return = true){
+		public static function br($nb = 1, $return = true) {
 			$nb = (int) $nb;
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
 				$str .= '<br />';
 			}
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -107,13 +107,13 @@ 
 		 *
 		 * @return string|void the generated "hr" html if $return is true or display it if not.
 		 */
-		public static function hr($nb = 1, array $attributes = array(), $return = true){
+		public static function hr($nb = 1, array $attributes = array(), $return = true) {
 			$nb = (int) $nb;
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<hr' .attributes_to_string($attributes). ' />';
+				$str .= '<hr' . attributes_to_string($attributes) . ' />';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -129,17 +129,17 @@ 
 		 *
 		 * @return string|void the generated header html if $return is true or display it if not.
 		 */
-		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
+		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true) {
 			$nb = (int) $nb;
 			$type = (int) $type;
-			if($type <= 0 || $type > 6){
+			if ($type <= 0 || $type > 6) {
 				$type = 1;
 			}
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+				$str .= '<h' . $type . attributes_to_string($attributes) . '>' . $text . '</h' . $type . '>';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -154,23 +154,23 @@ 
 		 *
 		 * @return string|void the generated "ul" html  if $return is true or display it if not.
 		 */
-		public static function ul($data = array(), $attributes = array(), $return = true){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
 			$ulAttributes = '';
-			if(! empty($attributes['ul'])){
+			if (!empty($attributes['ul'])) {
 				$ulAttributes = ' ' . attributes_to_string($attributes['ul']);
 			}
 			$liAttributes = '';
-			if(! empty($attributes['li'])){
+			if (!empty($attributes['li'])) {
 				$liAttributes = ' ' . attributes_to_string($attributes['li']);
 			}
 			$str .= '<ul' . $ulAttributes . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
+				$str .= '<li' . $liAttributes . '>' . $row . '</li>';
 			}
 			$str .= '</ul>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -184,23 +184,23 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "ol" html  if $return is true or display it if not.
 		 */
-		public static function ol($data = array(), $attributes = array(), $return = true){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
 			$olAttributes = '';
-			if(! empty($attributes['ol'])){
+			if (!empty($attributes['ol'])) {
 				$olAttributes = ' ' . attributes_to_string($attributes['ol']);
 			}
 			$liAttributes = '';
-			if(! empty($attributes['li'])){
+			if (!empty($attributes['li'])) {
 				$liAttributes = ' ' . attributes_to_string($attributes['li']);
 			}
 			$str .= '<ol' . $olAttributes . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . $liAttributes .'>' .$row. '</li>';
+				$str .= '<li' . $liAttributes . '>' . $row . '</li>';
 			}
 			$str .= '</ol>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -218,23 +218,23 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "table" html  if $return is true or display it if not.
 		 */
-		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true) {
 			$headers = (array) $headers;
 			$body = (array) $body;
 			$str = null;
 			$tableAttributes = '';
-			if(! empty($attributes['table'])){
+			if (!empty($attributes['table'])) {
 				$tableAttributes = ' ' . attributes_to_string($attributes['table']);
 			}
 			$str .= '<table' . $tableAttributes . '>';
 			$str .= self::buildTableHeader($headers, $attributes);
 			$str .= self::buildTableBody($body, $attributes);
 
-			if($use_footer){
+			if ($use_footer) {
 				$str .= self::buildTableFooter($headers, $attributes);
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -245,25 +245,25 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableHeader(array $headers, $attributes = array()){
+		protected static function buildTableHeader(array $headers, $attributes = array()) {
 			$str = null;
-			if(! empty($headers)){
+			if (!empty($headers)) {
 				$theadAttributes = '';
-				if(! empty($attributes['thead'])){
+				if (!empty($attributes['thead'])) {
 					$theadAttributes = ' ' . attributes_to_string($attributes['thead']);
 				}
 				$theadtrAttributes = '';
-				if(! empty($attributes['thead_tr'])){
+				if (!empty($attributes['thead_tr'])) {
 					$theadtrAttributes = ' ' . attributes_to_string($attributes['thead_tr']);
 				}
 				$thAttributes = '';
-				if(! empty($attributes['thead_th'])){
+				if (!empty($attributes['thead_th'])) {
 					$thAttributes = ' ' . attributes_to_string($attributes['thead_th']);
 				}
-				$str .= '<thead' . $theadAttributes .'>';
-				$str .= '<tr' . $theadtrAttributes .'>';
+				$str .= '<thead' . $theadAttributes . '>';
+				$str .= '<tr' . $theadtrAttributes . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
+					$str .= '<th' . $thAttributes . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
@@ -276,26 +276,26 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableBody(array $body, $attributes = array()){
+		protected static function buildTableBody(array $body, $attributes = array()) {
 			$str = null;
 			$tbodyAttributes = '';
-			if(! empty($attributes['tbody'])){
+			if (!empty($attributes['tbody'])) {
 				$tbodyAttributes = ' ' . attributes_to_string($attributes['tbody']);
 			}
 			$tbodytrAttributes = '';
-			if(! empty($attributes['tbody_tr'])){
+			if (!empty($attributes['tbody_tr'])) {
 				$tbodytrAttributes = ' ' . attributes_to_string($attributes['tbody_tr']);
 			}
 			$tbodytdAttributes = '';
-			if(! empty($attributes['tbody_td'])){
+			if (!empty($attributes['tbody_td'])) {
 				$tbodytdAttributes = ' ' . attributes_to_string($attributes['tbody_td']);
 			}
-			$str .= '<tbody' . $tbodyAttributes .'>';
+			$str .= '<tbody' . $tbodyAttributes . '>';
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . $tbodytrAttributes .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . $tbodytrAttributes . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . $tbodytdAttributes .'>' .$value. '</td>';	
+						$str .= '<td' . $tbodytdAttributes . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
@@ -309,24 +309,24 @@ 
 		 * @see  Html::table 
 		 * @return string|null
 		 */
-		protected static function buildTableFooter(array $footers, $attributes = array()){
+		protected static function buildTableFooter(array $footers, $attributes = array()) {
 			$str = null;
 			$tfootAttributes = '';
-			if(! empty($attributes['tfoot'])){
+			if (!empty($attributes['tfoot'])) {
 				$tfootAttributes = ' ' . attributes_to_string($attributes['tfoot']);
 			}
 			$tfoottrAttributes = '';
-			if(! empty($attributes['tfoot_tr'])){
+			if (!empty($attributes['tfoot_tr'])) {
 				$tfoottrAttributes = ' ' . attributes_to_string($attributes['tfoot_tr']);
 			}
 			$thAttributes = '';
-			if(! empty($attributes['tfoot_th'])){
+			if (!empty($attributes['tfoot_th'])) {
 				$thAttributes = ' ' . attributes_to_string($attributes['tfoot_th']);
 			}
-			$str .= '<tfoot' . $tfootAttributes .'>';
-				$str .= '<tr' . $tfoottrAttributes .'>';
+			$str .= '<tfoot' . $tfootAttributes . '>';
+				$str .= '<tr' . $tfoottrAttributes . '>';
 				foreach ($footers as $value) {
-					$str .= '<th' . $thAttributes .'>' .$value. '</th>';
+					$str .= '<th' . $thAttributes . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';

core/classes/Module.php

Indentation +284 added lines, -284 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
      * TNH Framework
      *
      * A simple PHP framework using HMVC architecture
@@ -22,308 +22,308 @@ 
      * 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 Module{
+    class Module{
 		
-		/**
-		 * list of loaded module
-		 * @var array
-		 */
-		private static $list = array();
+        /**
+         * list of loaded module
+         * @var array
+         */
+        private static $list = array();
 
-		/**
-		 * logger instance
-		 * @var Log
-		 */
-		private static $logger;
+        /**
+         * logger instance
+         * @var Log
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Module');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Module');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * Initialise the module list by scanning the directory MODULE_PATH
-		 */
-		public function init(){
-			$logger = self::getLogger();
-			$logger->debug('Check if the application contains the modules ...');
-			$moduleDir = opendir(MODULE_PATH);
-			if(is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
-						self::$list[] = $module;
-					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
-					}
-				}
-				closedir($moduleDir);
-			}
-			ksort(self::$list);
+        /**
+         * Initialise the module list by scanning the directory MODULE_PATH
+         */
+        public function init(){
+            $logger = self::getLogger();
+            $logger->debug('Check if the application contains the modules ...');
+            $moduleDir = opendir(MODULE_PATH);
+            if(is_resource($moduleDir)){
+                while(($module = readdir($moduleDir)) !== false){
+                    if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+                        self::$list[] = $module;
+                    }
+                    else{
+                        $logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+                    }
+                }
+                closedir($moduleDir);
+            }
+            ksort(self::$list);
 			
-			if(self::hasModule()){
-				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
-			}
-		}
+            if(self::hasModule()){
+                $logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
+            }
+        }
 		
-		/**
-		 * Get the list of the custom autoload configuration from module if exists
-		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
-		 */
-		public static function getModulesAutoloadConfig(){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$autoloads = array();
-			$autoloads['libraries'] = array();
-			$autoloads['config']    = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			$autoloads['languages'] = array();
+        /**
+         * Get the list of the custom autoload configuration from module if exists
+         * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
+         */
+        public static function getModulesAutoloadConfig(){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $autoloads = array();
+            $autoloads['libraries'] = array();
+            $autoloads['config']    = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            $autoloads['languages'] = array();
 			
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if(file_exists($file)){
-					$autoload = array();
-					require_once $file;
-					if(! empty($autoload) && is_array($autoload)){
-						$autoloads = array_merge_recursive($autoloads, $autoload);
-						unset($autoload);
-					}
-				}
-			}
-			return $autoloads;
-		}
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
+                if(file_exists($file)){
+                    $autoload = array();
+                    require_once $file;
+                    if(! empty($autoload) && is_array($autoload)){
+                        $autoloads = array_merge_recursive($autoloads, $autoload);
+                        unset($autoload);
+                    }
+                }
+            }
+            return $autoloads;
+        }
 
-		/**
-		 * Get the list of the custom routes configuration from module if exists
-		 * @return array|boolean the routes list or false if no module contains the routes configuration
-		 */
-		public static function getModulesRoutes(){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$routes = array();
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if(file_exists($file)){
-					$route = array();
-					require_once $file;
-					if(! empty($route) && is_array($route)){
-						$routes = array_merge($routes, $route);
-						unset($route);
-					}
-				}
-			}
-			return $routes;
-		}
+        /**
+         * Get the list of the custom routes configuration from module if exists
+         * @return array|boolean the routes list or false if no module contains the routes configuration
+         */
+        public static function getModulesRoutes(){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $routes = array();
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
+                if(file_exists($file)){
+                    $route = array();
+                    require_once $file;
+                    if(! empty($route) && is_array($route)){
+                        $routes = array_merge($routes, $route);
+                        unset($route);
+                    }
+                }
+            }
+            return $routes;
+        }
 
 
-		/**
-		 * Check if in module list can have this controller
-		 * @param  string $class the controller class
-		 * @param  string $module  the module name
-		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
-		 */
-		public static function findControllerFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this controller
+         * @param  string $class the controller class
+         * @param  string $module  the module name
+         * @return boolean|string  false or null if no module have this controller, path the full path of the controller
+         */
+        public static function findControllerFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $class = ucfirst($class);
+            $classFile = $class.'.php';
+            $logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
+            if(file_exists($filePath)){
+                $logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 
-		/**
-		 * Check if in module list can have this model
-		 * @param  string $class the model class
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this model, return the full path of this model
-		 */
-		public static function findModelFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this model
+         * @param  string $class the model class
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this model, return the full path of this model
+         */
+        public static function findModelFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $class = ucfirst($class);
+            $classFile = $class.'.php';
+            $logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
+            if(file_exists($filePath)){
+                $logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 		
-		/**
-		 * Check if in module list can have this config
-		 * @param  string $configuration the config name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
-		 */
-		public static function findConfigFullPath($configuration, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$configuration = str_ireplace('.php', '', $configuration);
-			$file = $configuration.'.php';
-			$logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this config
+         * @param  string $configuration the config name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
+         */
+        public static function findConfigFullPath($configuration, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $configuration = str_ireplace('.php', '', $configuration);
+            $file = $configuration.'.php';
+            $logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 
-		/**
-		 * Check if in module list can have this helper
-		 * @param  string $helper the helper name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
-		 */
-		public static function findFunctionFullPath($helper, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$helper = str_ireplace('.php', '', $helper);
-			$helper = str_ireplace('function_', '', $helper);
-			$file = 'function_'.$helper.'.php';
-			$logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
-			return false;
+        /**
+         * Check if in module list can have this helper
+         * @param  string $helper the helper name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
+         */
+        public static function findFunctionFullPath($helper, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $helper = str_ireplace('.php', '', $helper);
+            $helper = str_ireplace('function_', '', $helper);
+            $file = 'function_'.$helper.'.php';
+            $logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+            return false;
 			
-		}
+        }
 
 
-		/**
-		 * Check if in module list can have this library
-		 * @param  string $class the library name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
-		 */
-		public static function findLibraryFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$file = $class.'.php';
-			$logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this library
+         * @param  string $class the library name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this library,  return the full path of this library
+         */
+        public static function findLibraryFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $file = $class.'.php';
+            $logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 
 
-		/**
-		 * Check if in module list can have this view
-		 * @param  string $view the view path
-		 * @param string $module the module name to check
-		 * @return boolean|string  false or null if no module have this view, path the full path of the view
-		 */
-		public static function findViewFullPath($view, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$view = str_ireplace('.php', '', $view);
-			$view = trim($view, '/\\');
-			$view = str_ireplace('/', DS, $view);
-			$viewFile = $view . '.php';
-			$logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
-			if(file_exists($filePath)){
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this view
+         * @param  string $view the view path
+         * @param string $module the module name to check
+         * @return boolean|string  false or null if no module have this view, path the full path of the view
+         */
+        public static function findViewFullPath($view, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $view = str_ireplace('.php', '', $view);
+            $view = trim($view, '/\\');
+            $view = str_ireplace('/', DS, $view);
+            $viewFile = $view . '.php';
+            $logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
+            if(file_exists($filePath)){
+                $logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 
-		/**
-		 * Check if in module list can have this language
-		 * @param  string $language the language name
-		 * @param string $module the module name
-		 * @param string $appLang the application language like 'en', 'fr'
-		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
-		 */
-		public static function findLanguageFullPath($language, $module = null, $appLang){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$language = str_ireplace('.php', '', $language);
-			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
-			return false;
-		}
+        /**
+         * Check if in module list can have this language
+         * @param  string $language the language name
+         * @param string $module the module name
+         * @param string $appLang the application language like 'en', 'fr'
+         * @return boolean|string  false or null if no module have this language,  return the full path of this language
+         */
+        public static function findLanguageFullPath($language, $module = null, $appLang){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $language = str_ireplace('.php', '', $language);
+            $language = str_ireplace('lang_', '', $language);
+            $file = 'lang_'.$language.'.php';
+            $logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+            return false;
+        }
 
-		/**
-		 * Get the list of module loaded
-		 * @return array the module list
-		 */
-		public static function getModuleList(){
-			return self::$list;
-		}
+        /**
+         * Get the list of module loaded
+         * @return array the module list
+         */
+        public static function getModuleList(){
+            return self::$list;
+        }
 
-		/**
-		 * Check if the application has an module
-		 * @return boolean
-		 */
-		public static function hasModule(){
-			return !empty(self::$list);
-		}
+        /**
+         * Check if the application has an module
+         * @return boolean
+         */
+        public static function hasModule(){
+            return !empty(self::$list);
+        }
 
-	}
+    }

Spacing +69 added lines, -69 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     */
    
-	class Module{
+	class Module {
 		
 		/**
 		 * list of loaded module
@@ -42,9 +42,9 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Module');
 			}
 			return self::$logger[0];
@@ -53,24 +53,24 @@ 
 		/**
 		 * Initialise the module list by scanning the directory MODULE_PATH
 		 */
-		public function init(){
+		public function init() {
 			$logger = self::getLogger();
 			$logger->debug('Check if the application contains the modules ...');
 			$moduleDir = opendir(MODULE_PATH);
-			if(is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+			if (is_resource($moduleDir)) {
+				while (($module = readdir($moduleDir)) !== false) {
+					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)) {
 						self::$list[] = $module;
 					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+					else {
+						$logger->info('Skipping [' . $module . '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
 				closedir($moduleDir);
 			}
 			ksort(self::$list);
 			
-			if(self::hasModule()){
+			if (self::hasModule()) {
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
 			}
 		}
@@ -79,9 +79,9 @@ 
 		 * Get the list of the custom autoload configuration from module if exists
 		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
 		 */
-		public static function getModulesAutoloadConfig(){
+		public static function getModulesAutoloadConfig() {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
@@ -94,10 +94,10 @@ 
 			
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					$autoload = array();
 					require_once $file;
-					if(! empty($autoload) && is_array($autoload)){
+					if (!empty($autoload) && is_array($autoload)) {
 						$autoloads = array_merge_recursive($autoloads, $autoload);
 						unset($autoload);
 					}
@@ -110,19 +110,19 @@ 
 		 * Get the list of the custom routes configuration from module if exists
 		 * @return array|boolean the routes list or false if no module contains the routes configuration
 		 */
-		public static function getModulesRoutes(){
+		public static function getModulesRoutes() {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
 			$routes = array();
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if(file_exists($file)){
+				if (file_exists($file)) {
 					$route = array();
 					require_once $file;
-					if(! empty($route) && is_array($route)){
+					if (!empty($route) && is_array($route)) {
 						$routes = array_merge($routes, $route);
 						unset($route);
 					}
@@ -138,22 +138,22 @@ 
 		 * @param  string $module  the module name
 		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
 		 */
-		public static function findControllerFullPath($class, $module = null){
+		public static function findControllerFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking the controller [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found controller [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Controller [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -163,22 +163,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this model, return the full path of this model
 		 */
-		public static function findModelFullPath($class, $module = null){
+		public static function findModelFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
 			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
+			$classFile = $class . '.php';
+			$logger->debug('Checking model [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found model [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Model [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 		
@@ -188,21 +188,21 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
 		 */
-		public static function findConfigFullPath($configuration, $module = null){
+		public static function findConfigFullPath($configuration, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$configuration = str_ireplace('.php', '', $configuration);
-			$file = $configuration.'.php';
-			$logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
+			$file = $configuration . '.php';
+			$logger->debug('Checking configuration [' . $configuration . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found configuration [' . $configuration . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+			$logger->info('Configuration [' . $configuration . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -212,22 +212,22 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
 		 */
-		public static function findFunctionFullPath($helper, $module = null){
+		public static function findFunctionFullPath($helper, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$helper = str_ireplace('.php', '', $helper);
 			$helper = str_ireplace('function_', '', $helper);
-			$file = 'function_'.$helper.'.php';
-			$logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
+			$file = 'function_' . $helper . '.php';
+			$logger->debug('Checking helper [' . $helper . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found helper [' . $helper . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+			$logger->info('Helper [' . $helper . '] does not exist in the module [' . $module . ']');
 			return false;
 			
 		}
@@ -239,21 +239,21 @@ 
 		 * @param string $module the module name
 		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
 		 */
-		public static function findLibraryFullPath($class, $module = null){
+		public static function findLibraryFullPath($class, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$class = str_ireplace('.php', '', $class);
-			$file = $class.'.php';
-			$logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
+			$file = $class . '.php';
+			$logger->debug('Checking library [' . $class . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found library [' . $class . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+			$logger->info('Library [' . $class . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -264,9 +264,9 @@ 
 		 * @param string $module the module name to check
 		 * @return boolean|string  false or null if no module have this view, path the full path of the view
 		 */
-		public static function findViewFullPath($view, $module = null){
+		public static function findViewFullPath($view, $module = null) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
@@ -274,13 +274,13 @@ 
 			$view = trim($view, '/\\');
 			$view = str_ireplace('/', DS, $view);
 			$viewFile = $view . '.php';
-			$logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
+			$logger->debug('Checking view [' . $view . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
-			if(file_exists($filePath)){
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found view [' . $view . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+			$logger->info('View [' . $view . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -291,22 +291,22 @@ 
 		 * @param string $appLang the application language like 'en', 'fr'
 		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
 		 */
-		public static function findLanguageFullPath($language, $module = null, $appLang){
+		public static function findLanguageFullPath($language, $module = null, $appLang) {
 			$logger = self::getLogger();
-			if(! self::hasModule()){
+			if (!self::hasModule()) {
 				$logger->info('No module was loaded skiping.');
 				return false;
 			}
 			$language = str_ireplace('.php', '', $language);
 			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
+			$file = 'lang_' . $language . '.php';
+			$logger->debug('Checking language [' . $language . '] in module [' . $module . '] ...');
 			$filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+			if (file_exists($filePath)) {
+				$logger->info('Found language [' . $language . '] in module [' . $module . '], the file path is [' . $filePath . ']');
 				return $filePath;
 			}
-			$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+			$logger->info('Language [' . $language . '] does not exist in the module [' . $module . ']');
 			return false;
 		}
 
@@ -314,7 +314,7 @@ 
 		 * Get the list of module loaded
 		 * @return array the module list
 		 */
-		public static function getModuleList(){
+		public static function getModuleList() {
 			return self::$list;
 		}
 
@@ -322,7 +322,7 @@ 
 		 * Check if the application has an module
 		 * @return boolean
 		 */
-		public static function hasModule(){
+		public static function hasModule() {
 			return !empty(self::$list);
 		}
 

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 				while(($module = readdir($moduleDir)) !== false){
 					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
 						self::$list[] = $module;
-					}
-					else{
+					} else{
 						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}

core/classes/Response.php

Indentation +484 added lines, -484 removed lines

@@ -1,538 +1,538 @@
 <?php
-	defined('ROOT_PATH') or 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') or 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 Response{
+    class Response{
 
-		/**
-		 * The list of request header to send with response
-		 * @var array
-		 */
-		private static $headers = array();
+        /**
+         * The list of request header to send with response
+         * @var array
+         */
+        private static $headers = array();
 
-		/**
-		 * The logger instance
-		 * @var object
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var object
+         */
+        private static $logger;
 		
-		/**
-		 * The final page content to display to user
-		 * @var string
-		 */
-		private $_pageRender = null;
+        /**
+         * The final page content to display to user
+         * @var string
+         */
+        private $_pageRender = null;
 		
-		/**
-		 * The current request URL
-		 * @var string
-		 */
-		private $_currentUrl = null;
+        /**
+         * The current request URL
+         * @var string
+         */
+        private $_currentUrl = null;
 		
-		/**
-		 * The current request URL cache key
-		 * @var string
-		 */
-		private $_currentUrlCacheKey = null;
+        /**
+         * The current request URL cache key
+         * @var string
+         */
+        private $_currentUrlCacheKey = null;
 		
-		/**
-		* Whether we can compress the output using Gzip
-		* @var boolean
-		*/
-		private static $_canCompressOutput = false;
+        /**
+         * Whether we can compress the output using Gzip
+         * @var boolean
+         */
+        private static $_canCompressOutput = false;
 		
-		/**
-		 * Construct new response instance
-		 */
-		public function __construct(){
-			$currentUrl = '';
-			if (! empty($_SERVER['REQUEST_URI'])){
-				$currentUrl = $_SERVER['REQUEST_URI'];
-			}
-			if (! empty($_SERVER['QUERY_STRING'])){
-				$currentUrl .= '?' . $_SERVER['QUERY_STRING'];
-			}
-			$this->_currentUrl =  $currentUrl;
+        /**
+         * Construct new response instance
+         */
+        public function __construct(){
+            $currentUrl = '';
+            if (! empty($_SERVER['REQUEST_URI'])){
+                $currentUrl = $_SERVER['REQUEST_URI'];
+            }
+            if (! empty($_SERVER['QUERY_STRING'])){
+                $currentUrl .= '?' . $_SERVER['QUERY_STRING'];
+            }
+            $this->_currentUrl =  $currentUrl;
 					
-			$this->_currentUrlCacheKey = md5($this->_currentUrl);
+            $this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
-			self::$_canCompressOutput = get_config('compress_output')
-										  && isset($_SERVER['HTTP_ACCEPT_ENCODING']) 
-										  && stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false 
-										  && extension_loaded('zlib')
-										  && (bool) ini_get('zlib.output_compression') === false;
-		}
+            self::$_canCompressOutput = get_config('compress_output')
+                                          && isset($_SERVER['HTTP_ACCEPT_ENCODING']) 
+                                          && stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false 
+                                          && extension_loaded('zlib')
+                                          && (bool) ini_get('zlib.output_compression') === false;
+        }
 
 		
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		public static function getLogger(){
-			if(self::$logger == null){
-				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
-				$logger[0]->setLogger('Library::Response');
-				self::$logger = $logger[0];
-			}
-			return self::$logger;			
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        public static function getLogger(){
+            if(self::$logger == null){
+                $logger = array();
+                $logger[0] =& class_loader('Log', 'classes');
+                $logger[0]->setLogger('Library::Response');
+                self::$logger = $logger[0];
+            }
+            return self::$logger;			
+        }
 
-		/**
-		 * Set the log instance for future use
-		 * @param object $logger the log object
-		 * @return object the log instance
-		 */
-		public static function setLogger($logger){
-			self::$logger = $logger;
-			return self::$logger;
-		}
+        /**
+         * Set the log instance for future use
+         * @param object $logger the log object
+         * @return object the log instance
+         */
+        public static function setLogger($logger){
+            self::$logger = $logger;
+            return self::$logger;
+        }
 
 
-		/**
-		 * Send the HTTP Response headers
-		 * @param  integer $httpCode the HTTP status code
-		 * @param  array   $headers   the additional headers to add to the existing headers list
-		 */
-		public static function sendHeaders($httpCode = 200, array $headers = array()){
-			set_http_status_header($httpCode);
-			self::setHeaders($headers);
-			if(! headers_sent()){
-				foreach(self::getHeaders() as $key => $value){
-					header($key .': '.$value);
-				}
-			}
-		}
+        /**
+         * Send the HTTP Response headers
+         * @param  integer $httpCode the HTTP status code
+         * @param  array   $headers   the additional headers to add to the existing headers list
+         */
+        public static function sendHeaders($httpCode = 200, array $headers = array()){
+            set_http_status_header($httpCode);
+            self::setHeaders($headers);
+            if(! headers_sent()){
+                foreach(self::getHeaders() as $key => $value){
+                    header($key .': '.$value);
+                }
+            }
+        }
 
-		/**
-		 * Get the list of the headers
-		 * @return array the headers list
-		 */
-		public static function getHeaders(){
-			return self::$headers;
-		}
+        /**
+         * Get the list of the headers
+         * @return array the headers list
+         */
+        public static function getHeaders(){
+            return self::$headers;
+        }
 
-		/**
-		 * Get the header value for the given name
-		 * @param  string $name the header name
-		 * @return string|null       the header value
-		 */
-		public static function getHeader($name){
-			if(array_key_exists($name, self::$headers)){
-				return self::$headers[$name];
-			}
-			return null;
-		}
+        /**
+         * Get the header value for the given name
+         * @param  string $name the header name
+         * @return string|null       the header value
+         */
+        public static function getHeader($name){
+            if(array_key_exists($name, self::$headers)){
+                return self::$headers[$name];
+            }
+            return null;
+        }
 
 
-		/**
-		 * Set the header value for the specified name
-		 * @param string $name  the header name
-		 * @param string $value the header value to be set
-		 */
-		public static function setHeader($name, $value){
-			self::$headers[$name] = $value;
-		}
+        /**
+         * Set the header value for the specified name
+         * @param string $name  the header name
+         * @param string $value the header value to be set
+         */
+        public static function setHeader($name, $value){
+            self::$headers[$name] = $value;
+        }
 
-		/**
-		 * Set the headers using array
-		 * @param array $headers the list of the headers to set. 
-		 * Note: this will merge with the existing headers
-		 */
-		public static function setHeaders(array $headers){
-			self::$headers = array_merge(self::getHeaders(), $headers);
-		}
+        /**
+         * Set the headers using array
+         * @param array $headers the list of the headers to set. 
+         * Note: this will merge with the existing headers
+         */
+        public static function setHeaders(array $headers){
+            self::$headers = array_merge(self::getHeaders(), $headers);
+        }
 		
-		/**
-		 * Redirect user to the specified page
-		 * @param  string $path the URL or URI to be redirect to
-		 */
-		public static function redirect($path = ''){
-			$logger = self::getLogger();
-			$url = Url::site_url($path);
-			$logger->info('Redirect to URL [' .$url. ']');
-			if(! headers_sent()){
-				header('Location: '.$url);
-				exit;
-			}
-			echo '<script>
+        /**
+         * Redirect user to the specified page
+         * @param  string $path the URL or URI to be redirect to
+         */
+        public static function redirect($path = ''){
+            $logger = self::getLogger();
+            $url = Url::site_url($path);
+            $logger->info('Redirect to URL [' .$url. ']');
+            if(! headers_sent()){
+                header('Location: '.$url);
+                exit;
+            }
+            echo '<script>
 					location.href = "'.$url.'";
 				</script>';
-		}
+        }
 
-		/**
-		 * Render the view to display later or return the content
-		 * @param  string  $view   the view name or path
-		 * @param  array|object   $data   the variable data to use in the view
-		 * @param  boolean $return whether to return the view generated content or display it directly
-		 * @return void|string          if $return is true will return the view content otherwise
-		 * will display the view content.
-		 */
-		public function render($view, $data = null, $return = false){
-			$logger = self::getLogger();
-			//convert data to an array
-			$data = (array) $data;
-			$view = str_ireplace('.php', '', $view);
-			$view = trim($view, '/\\');
-			$viewFile = $view . '.php';
-			$path = APPS_VIEWS_PATH . $viewFile;
+        /**
+         * Render the view to display later or return the content
+         * @param  string  $view   the view name or path
+         * @param  array|object   $data   the variable data to use in the view
+         * @param  boolean $return whether to return the view generated content or display it directly
+         * @return void|string          if $return is true will return the view content otherwise
+         * will display the view content.
+         */
+        public function render($view, $data = null, $return = false){
+            $logger = self::getLogger();
+            //convert data to an array
+            $data = (array) $data;
+            $view = str_ireplace('.php', '', $view);
+            $view = trim($view, '/\\');
+            $viewFile = $view . '.php';
+            $path = APPS_VIEWS_PATH . $viewFile;
 			
-			//check in module first
-			$logger->debug('Checking the view [' . $view . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForView($view);
-			$module    = $moduleInfo['module'];
-			$view  = $moduleInfo['view'];
-			if(! empty($moduleInfo['viewFile'])){
-				$viewFile = $moduleInfo['viewFile'];
-			}
-			$moduleViewPath = Module::findViewFullPath($view, $module);
-			if($moduleViewPath){
-				$path = $moduleViewPath;
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$moduleViewPath. '] we will used it');
-			}
-			else{
-				$logger->info('Cannot find view [' . $view . '] in module [' .$module. '] using the default location');
-			}
+            //check in module first
+            $logger->debug('Checking the view [' . $view . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForView($view);
+            $module    = $moduleInfo['module'];
+            $view  = $moduleInfo['view'];
+            if(! empty($moduleInfo['viewFile'])){
+                $viewFile = $moduleInfo['viewFile'];
+            }
+            $moduleViewPath = Module::findViewFullPath($view, $module);
+            if($moduleViewPath){
+                $path = $moduleViewPath;
+                $logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$moduleViewPath. '] we will used it');
+            }
+            else{
+                $logger->info('Cannot find view [' . $view . '] in module [' .$module. '] using the default location');
+            }
 			
-			$logger->info('The view file path to be loaded is [' . $path . ']');
+            $logger->info('The view file path to be loaded is [' . $path . ']');
 			
-			/////////
-			if($return){
-				return $this->loadView($path, $data, true);
-			}
-			$this->loadView($path, $data, false);
-		}
+            /////////
+            if($return){
+                return $this->loadView($path, $data, true);
+            }
+            $this->loadView($path, $data, false);
+        }
 
 		
-		/**
-		* Send the final page output to user
-		*/
-		public function renderFinalPage(){
-			$logger = self::getLogger();
-			$obj = & get_instance();
-			$cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
-			$dispatcher = $obj->eventdispatcher;
-			$content = $this->_pageRender;
-			if(! $content){
-				$logger->warning('The final view content is empty.');
-				return;
-			}
-			//dispatch
-			$event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
-			$content = null;
-			if(! empty($event->payload)){
-				$content = $event->payload;
-			}
-			if(empty($content)){
-				$logger->warning('The view content is empty after dispatch to event listeners.');
-			}
+        /**
+         * Send the final page output to user
+         */
+        public function renderFinalPage(){
+            $logger = self::getLogger();
+            $obj = & get_instance();
+            $cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
+            $dispatcher = $obj->eventdispatcher;
+            $content = $this->_pageRender;
+            if(! $content){
+                $logger->warning('The final view content is empty.');
+                return;
+            }
+            //dispatch
+            $event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
+            $content = null;
+            if(! empty($event->payload)){
+                $content = $event->payload;
+            }
+            if(empty($content)){
+                $logger->warning('The view content is empty after dispatch to event listeners.');
+            }
 			
-			//check whether need save the page into cache.
-			if($cachePageStatus){
-				$this->savePageContentIntoCache($content);
-			}
+            //check whether need save the page into cache.
+            if($cachePageStatus){
+                $this->savePageContentIntoCache($content);
+            }
 			
-			// Parse out the elapsed time and memory usage,
-			// then swap the pseudo-variables with the data
-			$elapsedTime = $obj->benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END');
-			$memoryUsage	= round($obj->benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB';
-			$content = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content);
+            // Parse out the elapsed time and memory usage,
+            // then swap the pseudo-variables with the data
+            $elapsedTime = $obj->benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END');
+            $memoryUsage	= round($obj->benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB';
+            $content = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content);
 			
-			//compress the output if is available
-			$type = null;
-			if (self::$_canCompressOutput){
-				$type = 'ob_gzhandler';
-			}
-			ob_start($type);
-			self::sendHeaders(200);
-			echo $content;
-			ob_end_flush();
-		}
+            //compress the output if is available
+            $type = null;
+            if (self::$_canCompressOutput){
+                $type = 'ob_gzhandler';
+            }
+            ob_start($type);
+            self::sendHeaders(200);
+            echo $content;
+            ob_end_flush();
+        }
 
 		
-		/**
-		* Send the final page output to user if is cached
-		* @param object $cache the cache instance
-		*
-		* @return boolean whether the page content if available or not
-		*/
-		public function renderFinalPageFromCache(&$cache){
-			$logger = self::getLogger();
-			//the current page cache key for identification
-			$pageCacheKey = $this->_currentUrlCacheKey;
+        /**
+         * Send the final page output to user if is cached
+         * @param object $cache the cache instance
+         *
+         * @return boolean whether the page content if available or not
+         */
+        public function renderFinalPageFromCache(&$cache){
+            $logger = self::getLogger();
+            //the current page cache key for identification
+            $pageCacheKey = $this->_currentUrlCacheKey;
 			
-			$logger->debug('Checking if the page content for the URL [' . $this->_currentUrl . '] is cached ...');
-			//get the cache information to prepare header to send to browser
-			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
-				$status = $this->sendCacheNotYetExpireInfo($cacheInfo);
-				if($status === false){
-					return $this->sendPageContentToBrowser($cache);
-				}
-			}
-			return false;
-		}
+            $logger->debug('Checking if the page content for the URL [' . $this->_currentUrl . '] is cached ...');
+            //get the cache information to prepare header to send to browser
+            $cacheInfo = $cache->getInfo($pageCacheKey);
+            if($cacheInfo){
+                $status = $this->sendCacheNotYetExpireInfo($cacheInfo);
+                if($status === false){
+                    return $this->sendPageContentToBrowser($cache);
+                }
+            }
+            return false;
+        }
 	
 		
-		/**
-		* Get the final page to be rendered
-		* @return string
-		*/
-		public function getFinalPageRendered(){
-			return $this->_pageRender;
-		}
+        /**
+         * Get the final page to be rendered
+         * @return string
+         */
+        public function getFinalPageRendered(){
+            return $this->_pageRender;
+        }
 
-		/**
-		 * Send the HTTP 404 error if can not found the 
-		 * routing information for the current request
-		 */
-		public static function send404(){
-			/********* for logs **************/
-			//can't use $obj = & get_instance()  here because the global super object will be available until
-			//the main controller is loaded even for Loader::library('xxxx');
-			$logger = self::getLogger();
-			$request =& class_loader('Request', 'classes');
-			$userAgent =& class_loader('Browser');
-			$browser = $userAgent->getPlatform().', '.$userAgent->getBrowser().' '.$userAgent->getVersion();
+        /**
+         * Send the HTTP 404 error if can not found the 
+         * routing information for the current request
+         */
+        public static function send404(){
+            /********* for logs **************/
+            //can't use $obj = & get_instance()  here because the global super object will be available until
+            //the main controller is loaded even for Loader::library('xxxx');
+            $logger = self::getLogger();
+            $request =& class_loader('Request', 'classes');
+            $userAgent =& class_loader('Browser');
+            $browser = $userAgent->getPlatform().', '.$userAgent->getBrowser().' '.$userAgent->getVersion();
 			
-			//here can't use Loader::functions just include the helper manually
-			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
+            //here can't use Loader::functions just include the helper manually
+            require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 
-			$str = '[404 page not found] : ';
-			$str .= ' Unable to find the request page [' . $request->requestUri() . ']. The visitor IP address [' . get_ip() . '], browser [' . $browser . ']';
-			$logger->error($str);
-			/***********************************/
-			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
-				//compress the output if is available
-				$type = null;
-				if (self::$_canCompressOutput){
-					$type = 'ob_gzhandler';
-				}
-				ob_start($type);
-				require_once $path;
-				$output = ob_get_clean();
-				self::sendHeaders(404);
-				echo $output;
-			}
-			else{
-				show_error('The 404 view [' .$path. '] does not exist');
-			}
-		}
+            $str = '[404 page not found] : ';
+            $str .= ' Unable to find the request page [' . $request->requestUri() . ']. The visitor IP address [' . get_ip() . '], browser [' . $browser . ']';
+            $logger->error($str);
+            /***********************************/
+            $path = CORE_VIEWS_PATH . '404.php';
+            if(file_exists($path)){
+                //compress the output if is available
+                $type = null;
+                if (self::$_canCompressOutput){
+                    $type = 'ob_gzhandler';
+                }
+                ob_start($type);
+                require_once $path;
+                $output = ob_get_clean();
+                self::sendHeaders(404);
+                echo $output;
+            }
+            else{
+                show_error('The 404 view [' .$path. '] does not exist');
+            }
+        }
 
-		/**
-		 * Display the error to user
-		 * @param  array  $data the error information
-		 */
-		public static function sendError(array $data = array()){
-			$path = CORE_VIEWS_PATH . 'errors.php';
-			if(file_exists($path)){
-				//compress the output if is available
-				$type = null;
-				if (self::$_canCompressOutput){
-					$type = 'ob_gzhandler';
-				}
-				ob_start($type);
-				extract($data);
-				require_once $path;
-				$output = ob_get_clean();
-				self::sendHeaders(503);
-				echo $output;
-			}
-			else{
-				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
-				set_http_status_header(503);
-				echo 'The error view [' . $path . '] does not exist';
-			}
-		}
+        /**
+         * Display the error to user
+         * @param  array  $data the error information
+         */
+        public static function sendError(array $data = array()){
+            $path = CORE_VIEWS_PATH . 'errors.php';
+            if(file_exists($path)){
+                //compress the output if is available
+                $type = null;
+                if (self::$_canCompressOutput){
+                    $type = 'ob_gzhandler';
+                }
+                ob_start($type);
+                extract($data);
+                require_once $path;
+                $output = ob_get_clean();
+                self::sendHeaders(503);
+                echo $output;
+            }
+            else{
+                //can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
+                set_http_status_header(503);
+                echo 'The error view [' . $path . '] does not exist';
+            }
+        }
 
-		/**
-		 * Send the cache not yet expire to browser
-		 * @param  array $cacheInfo the cache information
-		 * @return boolean            true if the information is sent otherwise false
-		 */
-		protected function sendCacheNotYetExpireInfo($cacheInfo){
-			if(! empty($cacheInfo)){
-				$logger = self::getLogger();
-				$lastModified = $cacheInfo['mtime'];
-				$expire = $cacheInfo['expire'];
-				$maxAge = $expire - $_SERVER['REQUEST_TIME'];
-				self::setHeader('Pragma', 'public');
-				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
-				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
-					$logger->info('The cache page content is not yet expire for the URL [' . $this->_currentUrl . '] send 304 header to browser');
-					self::sendHeaders(304);
-					return true;
-				}
-			}
-			return false;
-		}
+        /**
+         * Send the cache not yet expire to browser
+         * @param  array $cacheInfo the cache information
+         * @return boolean            true if the information is sent otherwise false
+         */
+        protected function sendCacheNotYetExpireInfo($cacheInfo){
+            if(! empty($cacheInfo)){
+                $logger = self::getLogger();
+                $lastModified = $cacheInfo['mtime'];
+                $expire = $cacheInfo['expire'];
+                $maxAge = $expire - $_SERVER['REQUEST_TIME'];
+                self::setHeader('Pragma', 'public');
+                self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
+                self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
+                self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
+                if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+                    $logger->info('The cache page content is not yet expire for the URL [' . $this->_currentUrl . '] send 304 header to browser');
+                    self::sendHeaders(304);
+                    return true;
+                }
+            }
+            return false;
+        }
 
-		/**
-		 * Send the page content from cache to browser
-		 * @param object $cache the cache instance
-		 * @return boolean     the status of the operation
-		 */
-		protected function sendPageContentToBrowser(&$cache){
-			$logger = self::getLogger();
-			$logger->info('The cache page content is expired or the browser doesn\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] send cache headers to tell the browser');
-			self::sendHeaders(200);
-			//current page cache key
-			$pageCacheKey = $this->_currentUrlCacheKey;
-			//get the cache content
-			$content = $cache->get($pageCacheKey);
-			if($content){
-				$logger->info('The page content for the URL [' . $this->_currentUrl . '] already cached just display it');
-				//load benchmark class
-				$benchmark = & class_loader('Benchmark');
+        /**
+         * Send the page content from cache to browser
+         * @param object $cache the cache instance
+         * @return boolean     the status of the operation
+         */
+        protected function sendPageContentToBrowser(&$cache){
+            $logger = self::getLogger();
+            $logger->info('The cache page content is expired or the browser doesn\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] send cache headers to tell the browser');
+            self::sendHeaders(200);
+            //current page cache key
+            $pageCacheKey = $this->_currentUrlCacheKey;
+            //get the cache content
+            $content = $cache->get($pageCacheKey);
+            if($content){
+                $logger->info('The page content for the URL [' . $this->_currentUrl . '] already cached just display it');
+                //load benchmark class
+                $benchmark = & class_loader('Benchmark');
 				
-				// Parse out the elapsed time and memory usage,
-				// then swap the pseudo-variables with the data
-				$elapsedTime = $benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END');
-				$memoryUsage	= round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB';
-				$content = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content);
+                // Parse out the elapsed time and memory usage,
+                // then swap the pseudo-variables with the data
+                $elapsedTime = $benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END');
+                $memoryUsage	= round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB';
+                $content = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content);
 				
-				///display the final output
-				//compress the output if is available
-				$type = null;
-				if (self::$_canCompressOutput){
-					$type = 'ob_gzhandler';
-				}
-				ob_start($type);
-				echo $content;
-				ob_end_flush();
-				return true;
-			}
-			$logger->info('The page cache content for the URL [' . $this->_currentUrl . '] is not valid may be already expired');
-			$cache->delete($pageCacheKey);
-			return false;
-		}
+                ///display the final output
+                //compress the output if is available
+                $type = null;
+                if (self::$_canCompressOutput){
+                    $type = 'ob_gzhandler';
+                }
+                ob_start($type);
+                echo $content;
+                ob_end_flush();
+                return true;
+            }
+            $logger->info('The page cache content for the URL [' . $this->_currentUrl . '] is not valid may be already expired');
+            $cache->delete($pageCacheKey);
+            return false;
+        }
 
-		/**
-		 * Save the content of page into cache
-		 * @param  string $content the page content to be saved
-		 * @return void
-		 */
-		protected function savePageContentIntoCache($content){
-			$obj = & get_instance();
-			$logger = self::getLogger();
+        /**
+         * Save the content of page into cache
+         * @param  string $content the page content to be saved
+         * @return void
+         */
+        protected function savePageContentIntoCache($content){
+            $obj = & get_instance();
+            $logger = self::getLogger();
 
-			//current page URL
-			$url = $this->_currentUrl;
-			//Cache view Time to live in second
-			$viewCacheTtl = get_config('cache_ttl');
-			if (!empty($obj->view_cache_ttl)){
-				$viewCacheTtl = $obj->view_cache_ttl;
-			}
-			//the cache handler instance
-			$cacheInstance = $obj->cache;
-			//the current page cache key for identification
-			$cacheKey = $this->_currentUrlCacheKey;
+            //current page URL
+            $url = $this->_currentUrl;
+            //Cache view Time to live in second
+            $viewCacheTtl = get_config('cache_ttl');
+            if (!empty($obj->view_cache_ttl)){
+                $viewCacheTtl = $obj->view_cache_ttl;
+            }
+            //the cache handler instance
+            $cacheInstance = $obj->cache;
+            //the current page cache key for identification
+            $cacheKey = $this->_currentUrlCacheKey;
 			
-			$logger->debug('Save the page content for URL [' . $url . '] into the cache ...');
-			$cacheInstance->set($cacheKey, $content, $viewCacheTtl);
+            $logger->debug('Save the page content for URL [' . $url . '] into the cache ...');
+            $cacheInstance->set($cacheKey, $content, $viewCacheTtl);
 			
-			//get the cache information to prepare header to send to browser
-			$cacheInfo = $cacheInstance->getInfo($cacheKey);
-			if($cacheInfo){
-				$lastModified = $cacheInfo['mtime'];
-				$expire = $cacheInfo['expire'];
-				$maxAge = $expire - time();
-				self::setHeader('Pragma', 'public');
-				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');	
-			}
-		}
+            //get the cache information to prepare header to send to browser
+            $cacheInfo = $cacheInstance->getInfo($cacheKey);
+            if($cacheInfo){
+                $lastModified = $cacheInfo['mtime'];
+                $expire = $cacheInfo['expire'];
+                $maxAge = $expire - time();
+                self::setHeader('Pragma', 'public');
+                self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
+                self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
+                self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');	
+            }
+        }
 		
 
-		/**
-		 * Get the module information for the view to load
-		 * @param  string $view the view name like moduleName/viewName, viewName
-		 * 
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'view' => 'view_name'
-		 * 	'viewFile' => 'view_file'
-		 * )
-		 */
-		protected  function getModuleInfoForView($view){
-			$module = null;
-			$viewFile = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if(strpos($view, '/') !== false){
-				$viewPath = explode('/', $view);
-				if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
-					$module = $viewPath[0];
-					array_shift($viewPath);
-					$view = implode('/', $viewPath);
-					$viewFile = $view . '.php';
-				}
-			}
-			if(! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'view' => $view,
-						'module' => $module,
-						'viewFile' => $viewFile
-					);
-		}
+        /**
+         * Get the module information for the view to load
+         * @param  string $view the view name like moduleName/viewName, viewName
+         * 
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'view' => 'view_name'
+         * 	'viewFile' => 'view_file'
+         * )
+         */
+        protected  function getModuleInfoForView($view){
+            $module = null;
+            $viewFile = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if(strpos($view, '/') !== false){
+                $viewPath = explode('/', $view);
+                if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
+                    $module = $viewPath[0];
+                    array_shift($viewPath);
+                    $view = implode('/', $viewPath);
+                    $viewFile = $view . '.php';
+                }
+            }
+            if(! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'view' => $view,
+                        'module' => $module,
+                        'viewFile' => $viewFile
+                    );
+        }
 
-		/**
-		 * Render the view page
-		 * @see  Response::render
-		 * @return void|string
-		 */
-		protected  function loadView($path, array $data = array(), $return = false){
-			$found = false;
-			if(file_exists($path)){
-				//super instance
-				$obj = & get_instance();
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
-						$this->{$key} = & $obj->{$key};
-					}
-				}
-				ob_start();
-				extract($data);
-				//need use require() instead of require_once because can load this view many time
-				require $path;
-				$content = ob_get_clean();
-				if($return){
-					return $content;
-				}
-				$this->_pageRender .= $content;
-				$found = true;
-			}
-			if(! $found){
-				show_error('Unable to find view [' .$view . ']');
-			}
-		}
+        /**
+         * Render the view page
+         * @see  Response::render
+         * @return void|string
+         */
+        protected  function loadView($path, array $data = array(), $return = false){
+            $found = false;
+            if(file_exists($path)){
+                //super instance
+                $obj = & get_instance();
+                foreach(get_object_vars($obj) as $key => $value){
+                    if(! isset($this->{$key})){
+                        $this->{$key} = & $obj->{$key};
+                    }
+                }
+                ob_start();
+                extract($data);
+                //need use require() instead of require_once because can load this view many time
+                require $path;
+                $content = ob_get_clean();
+                if($return){
+                    return $content;
+                }
+                $this->_pageRender .= $content;
+                $found = true;
+            }
+            if(! $found){
+                show_error('Unable to find view [' .$view . ']');
+            }
+        }
 
-	}
+    }

Spacing +77 added lines, -77 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Response{
+	class Response {
 
 		/**
 		 * The list of request header to send with response
@@ -65,15 +65,15 @@ 
 		/**
 		 * Construct new response instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			$currentUrl = '';
-			if (! empty($_SERVER['REQUEST_URI'])){
+			if (!empty($_SERVER['REQUEST_URI'])) {
 				$currentUrl = $_SERVER['REQUEST_URI'];
 			}
-			if (! empty($_SERVER['QUERY_STRING'])){
+			if (!empty($_SERVER['QUERY_STRING'])) {
 				$currentUrl .= '?' . $_SERVER['QUERY_STRING'];
 			}
-			$this->_currentUrl =  $currentUrl;
+			$this->_currentUrl = $currentUrl;
 					
 			$this->_currentUrlCacheKey = md5($this->_currentUrl);
 			
@@ -89,10 +89,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		public static function getLogger(){
-			if(self::$logger == null){
+		public static function getLogger() {
+			if (self::$logger == null) {
 				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Response');
 				self::$logger = $logger[0];
 			}
@@ -104,7 +104,7 @@ 
 		 * @param object $logger the log object
 		 * @return object the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			self::$logger = $logger;
 			return self::$logger;
 		}
@@ -115,12 +115,12 @@ 
 		 * @param  integer $httpCode the HTTP status code
 		 * @param  array   $headers   the additional headers to add to the existing headers list
 		 */
-		public static function sendHeaders($httpCode = 200, array $headers = array()){
+		public static function sendHeaders($httpCode = 200, array $headers = array()) {
 			set_http_status_header($httpCode);
 			self::setHeaders($headers);
-			if(! headers_sent()){
-				foreach(self::getHeaders() as $key => $value){
-					header($key .': '.$value);
+			if (!headers_sent()) {
+				foreach (self::getHeaders() as $key => $value) {
+					header($key . ': ' . $value);
 				}
 			}
 		}
@@ -129,7 +129,7 @@ 
 		 * Get the list of the headers
 		 * @return array the headers list
 		 */
-		public static function getHeaders(){
+		public static function getHeaders() {
 			return self::$headers;
 		}
 
@@ -138,8 +138,8 @@ 
 		 * @param  string $name the header name
 		 * @return string|null       the header value
 		 */
-		public static function getHeader($name){
-			if(array_key_exists($name, self::$headers)){
+		public static function getHeader($name) {
+			if (array_key_exists($name, self::$headers)) {
 				return self::$headers[$name];
 			}
 			return null;
@@ -151,7 +151,7 @@ 
 		 * @param string $name  the header name
 		 * @param string $value the header value to be set
 		 */
-		public static function setHeader($name, $value){
+		public static function setHeader($name, $value) {
 			self::$headers[$name] = $value;
 		}
 
@@ -160,7 +160,7 @@ 
 		 * @param array $headers the list of the headers to set. 
 		 * Note: this will merge with the existing headers
 		 */
-		public static function setHeaders(array $headers){
+		public static function setHeaders(array $headers) {
 			self::$headers = array_merge(self::getHeaders(), $headers);
 		}
 		
@@ -168,16 +168,16 @@ 
 		 * Redirect user to the specified page
 		 * @param  string $path the URL or URI to be redirect to
 		 */
-		public static function redirect($path = ''){
+		public static function redirect($path = '') {
 			$logger = self::getLogger();
 			$url = Url::site_url($path);
-			$logger->info('Redirect to URL [' .$url. ']');
-			if(! headers_sent()){
-				header('Location: '.$url);
+			$logger->info('Redirect to URL [' . $url . ']');
+			if (!headers_sent()) {
+				header('Location: ' . $url);
 				exit;
 			}
 			echo '<script>
-					location.href = "'.$url.'";
+					location.href = "'.$url . '";
 				</script>';
 		}
 
@@ -189,7 +189,7 @@ 
 		 * @return void|string          if $return is true will return the view content otherwise
 		 * will display the view content.
 		 */
-		public function render($view, $data = null, $return = false){
+		public function render($view, $data = null, $return = false) {
 			$logger = self::getLogger();
 			//convert data to an array
 			$data = (array) $data;
@@ -202,23 +202,23 @@ 
 			$logger->debug('Checking the view [' . $view . '] from module list ...');
 			$moduleInfo = self::getModuleInfoForView($view);
 			$module    = $moduleInfo['module'];
-			$view  = $moduleInfo['view'];
-			if(! empty($moduleInfo['viewFile'])){
+			$view = $moduleInfo['view'];
+			if (!empty($moduleInfo['viewFile'])) {
 				$viewFile = $moduleInfo['viewFile'];
 			}
 			$moduleViewPath = Module::findViewFullPath($view, $module);
-			if($moduleViewPath){
+			if ($moduleViewPath) {
 				$path = $moduleViewPath;
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$moduleViewPath. '] we will used it');
+				$logger->info('Found view [' . $view . '] in module [' . $module . '], the file path is [' . $moduleViewPath . '] we will used it');
 			}
-			else{
-				$logger->info('Cannot find view [' . $view . '] in module [' .$module. '] using the default location');
+			else {
+				$logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location');
 			}
 			
 			$logger->info('The view file path to be loaded is [' . $path . ']');
 			
 			/////////
-			if($return){
+			if ($return) {
 				return $this->loadView($path, $data, true);
 			}
 			$this->loadView($path, $data, false);
@@ -228,28 +228,28 @@ 
 		/**
 		* Send the final page output to user
 		*/
-		public function renderFinalPage(){
+		public function renderFinalPage() {
 			$logger = self::getLogger();
 			$obj = & get_instance();
 			$cachePageStatus = get_config('cache_enable', false) && !empty($obj->view_cache_enable);
 			$dispatcher = $obj->eventdispatcher;
 			$content = $this->_pageRender;
-			if(! $content){
+			if (!$content) {
 				$logger->warning('The final view content is empty.');
 				return;
 			}
 			//dispatch
 			$event = $dispatcher->dispatch(new EventInfo('FINAL_VIEW_READY', $content, true));
 			$content = null;
-			if(! empty($event->payload)){
+			if (!empty($event->payload)) {
 				$content = $event->payload;
 			}
-			if(empty($content)){
+			if (empty($content)) {
 				$logger->warning('The view content is empty after dispatch to event listeners.');
 			}
 			
 			//check whether need save the page into cache.
-			if($cachePageStatus){
+			if ($cachePageStatus) {
 				$this->savePageContentIntoCache($content);
 			}
 			
@@ -261,7 +261,7 @@ 
 			
 			//compress the output if is available
 			$type = null;
-			if (self::$_canCompressOutput){
+			if (self::$_canCompressOutput) {
 				$type = 'ob_gzhandler';
 			}
 			ob_start($type);
@@ -277,7 +277,7 @@ 
 		*
 		* @return boolean whether the page content if available or not
 		*/
-		public function renderFinalPageFromCache(&$cache){
+		public function renderFinalPageFromCache(&$cache) {
 			$logger = self::getLogger();
 			//the current page cache key for identification
 			$pageCacheKey = $this->_currentUrlCacheKey;
@@ -285,9 +285,9 @@ 
 			$logger->debug('Checking if the page content for the URL [' . $this->_currentUrl . '] is cached ...');
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cache->getInfo($pageCacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$status = $this->sendCacheNotYetExpireInfo($cacheInfo);
-				if($status === false){
+				if ($status === false) {
 					return $this->sendPageContentToBrowser($cache);
 				}
 			}
@@ -299,7 +299,7 @@ 
 		* Get the final page to be rendered
 		* @return string
 		*/
-		public function getFinalPageRendered(){
+		public function getFinalPageRendered() {
 			return $this->_pageRender;
 		}
 
@@ -307,14 +307,14 @@ 
 		 * Send the HTTP 404 error if can not found the 
 		 * routing information for the current request
 		 */
-		public static function send404(){
+		public static function send404() {
 			/********* for logs **************/
 			//can't use $obj = & get_instance()  here because the global super object will be available until
 			//the main controller is loaded even for Loader::library('xxxx');
 			$logger = self::getLogger();
-			$request =& class_loader('Request', 'classes');
-			$userAgent =& class_loader('Browser');
-			$browser = $userAgent->getPlatform().', '.$userAgent->getBrowser().' '.$userAgent->getVersion();
+			$request = & class_loader('Request', 'classes');
+			$userAgent = & class_loader('Browser');
+			$browser = $userAgent->getPlatform() . ', ' . $userAgent->getBrowser() . ' ' . $userAgent->getVersion();
 			
 			//here can't use Loader::functions just include the helper manually
 			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
@@ -324,10 +324,10 @@ 
 			$logger->error($str);
 			/***********************************/
 			$path = CORE_VIEWS_PATH . '404.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -336,8 +336,8 @@ 
 				self::sendHeaders(404);
 				echo $output;
 			}
-			else{
-				show_error('The 404 view [' .$path. '] does not exist');
+			else {
+				show_error('The 404 view [' . $path . '] does not exist');
 			}
 		}
 
@@ -345,12 +345,12 @@ 
 		 * Display the error to user
 		 * @param  array  $data the error information
 		 */
-		public static function sendError(array $data = array()){
+		public static function sendError(array $data = array()) {
 			$path = CORE_VIEWS_PATH . 'errors.php';
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -360,7 +360,7 @@ 
 				self::sendHeaders(503);
 				echo $output;
 			}
-			else{
+			else {
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';
@@ -372,17 +372,17 @@ 
 		 * @param  array $cacheInfo the cache information
 		 * @return boolean            true if the information is sent otherwise false
 		 */
-		protected function sendCacheNotYetExpireInfo($cacheInfo){
-			if(! empty($cacheInfo)){
+		protected function sendCacheNotYetExpireInfo($cacheInfo) {
+			if (!empty($cacheInfo)) {
 				$logger = self::getLogger();
 				$lastModified = $cacheInfo['mtime'];
 				$expire = $cacheInfo['expire'];
 				$maxAge = $expire - $_SERVER['REQUEST_TIME'];
 				self::setHeader('Pragma', 'public');
 				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');
-				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
+				if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $lastModified <= strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 					$logger->info('The cache page content is not yet expire for the URL [' . $this->_currentUrl . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return true;
@@ -396,7 +396,7 @@ 
 		 * @param object $cache the cache instance
 		 * @return boolean     the status of the operation
 		 */
-		protected function sendPageContentToBrowser(&$cache){
+		protected function sendPageContentToBrowser(&$cache) {
 			$logger = self::getLogger();
 			$logger->info('The cache page content is expired or the browser doesn\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] send cache headers to tell the browser');
 			self::sendHeaders(200);
@@ -404,7 +404,7 @@ 
 			$pageCacheKey = $this->_currentUrlCacheKey;
 			//get the cache content
 			$content = $cache->get($pageCacheKey);
-			if($content){
+			if ($content) {
 				$logger->info('The page content for the URL [' . $this->_currentUrl . '] already cached just display it');
 				//load benchmark class
 				$benchmark = & class_loader('Benchmark');
@@ -418,7 +418,7 @@ 
 				///display the final output
 				//compress the output if is available
 				$type = null;
-				if (self::$_canCompressOutput){
+				if (self::$_canCompressOutput) {
 					$type = 'ob_gzhandler';
 				}
 				ob_start($type);
@@ -436,7 +436,7 @@ 
 		 * @param  string $content the page content to be saved
 		 * @return void
 		 */
-		protected function savePageContentIntoCache($content){
+		protected function savePageContentIntoCache($content) {
 			$obj = & get_instance();
 			$logger = self::getLogger();
 
@@ -444,7 +444,7 @@ 
 			$url = $this->_currentUrl;
 			//Cache view Time to live in second
 			$viewCacheTtl = get_config('cache_ttl');
-			if (!empty($obj->view_cache_ttl)){
+			if (!empty($obj->view_cache_ttl)) {
 				$viewCacheTtl = $obj->view_cache_ttl;
 			}
 			//the cache handler instance
@@ -457,14 +457,14 @@ 
 			
 			//get the cache information to prepare header to send to browser
 			$cacheInfo = $cacheInstance->getInfo($cacheKey);
-			if($cacheInfo){
+			if ($cacheInfo) {
 				$lastModified = $cacheInfo['mtime'];
 				$expire = $cacheInfo['expire'];
 				$maxAge = $expire - time();
 				self::setHeader('Pragma', 'public');
 				self::setHeader('Cache-Control', 'max-age=' . $maxAge . ', public');
-				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire).' GMT');
-				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified).' GMT');	
+				self::setHeader('Expires', gmdate('D, d M Y H:i:s', $expire) . ' GMT');
+				self::setHeader('Last-modified', gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');	
 			}
 		}
 		
@@ -480,21 +480,21 @@ 
 		 * 	'viewFile' => 'view_file'
 		 * )
 		 */
-		protected  function getModuleInfoForView($view){
+		protected  function getModuleInfoForView($view) {
 			$module = null;
 			$viewFile = null;
 			$obj = & get_instance();
 			//check if the request class contains module name
-			if(strpos($view, '/') !== false){
+			if (strpos($view, '/') !== false) {
 				$viewPath = explode('/', $view);
-				if(isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())){
+				if (isset($viewPath[0]) && in_array($viewPath[0], Module::getModuleList())) {
 					$module = $viewPath[0];
 					array_shift($viewPath);
 					$view = implode('/', $viewPath);
 					$viewFile = $view . '.php';
 				}
 			}
-			if(! $module && !empty($obj->moduleName)){
+			if (!$module && !empty($obj->moduleName)) {
 				$module = $obj->moduleName;
 			}
 			return array(
@@ -509,13 +509,13 @@ 
 		 * @see  Response::render
 		 * @return void|string
 		 */
-		protected  function loadView($path, array $data = array(), $return = false){
+		protected  function loadView($path, array $data = array(), $return = false) {
 			$found = false;
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				//super instance
 				$obj = & get_instance();
-				foreach(get_object_vars($obj) as $key => $value){
-					if(! isset($this->{$key})){
+				foreach (get_object_vars($obj) as $key => $value) {
+					if (!isset($this->{$key})) {
 						$this->{$key} = & $obj->{$key};
 					}
 				}
@@ -524,14 +524,14 @@ 
 				//need use require() instead of require_once because can load this view many time
 				require $path;
 				$content = ob_get_clean();
-				if($return){
+				if ($return) {
 					return $content;
 				}
 				$this->_pageRender .= $content;
 				$found = true;
 			}
-			if(! $found){
-				show_error('Unable to find view [' .$view . ']');
+			if (!$found) {
+				show_error('Unable to find view [' . $view . ']');
 			}
 		}
 

Braces +3 added lines, -6 removed lines

@@ -210,8 +210,7 @@ 
 			if($moduleViewPath){
 				$path = $moduleViewPath;
 				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$moduleViewPath. '] we will used it');
-			}
-			else{
+			} else{
 				$logger->info('Cannot find view [' . $view . '] in module [' .$module. '] using the default location');
 			}
 			
@@ -335,8 +334,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(404);
 				echo $output;
-			}
-			else{
+			} else{
 				show_error('The 404 view [' .$path. '] does not exist');
 			}
 		}
@@ -359,8 +357,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(503);
 				echo $output;
-			}
-			else{
+			} else{
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';