tnhfw / tnh-fw

core/classes/DBSessionHandler.php

Indentation +84 added lines, -84 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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.
-	*/
+	 */
 	
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
@@ -76,27 +76,27 @@ 
 		private $logger;
 
 		/**
-         * Instance of the Loader class
-         * @var Loader
-         */
-        protected $loader = null;
+		 * Instance of the Loader class
+		 * @var Loader
+		 */
+		protected $loader = null;
 
 		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
 			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->setLogger($logger);
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::DBSessionHandler');
-	        }
-
-	        if(is_object($loader)){
-	          $this->setLoader($loader);
-	        }
-		    $this->OBJ = & get_instance();
+			 * instance of the Log class
+			 */
+			if(is_object($logger)){
+			  $this->setLogger($logger);
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
+				$this->logger->setLogger('Library::DBSessionHandler');
+			}
+
+			if(is_object($loader)){
+			  $this->setLoader($loader);
+			}
+			$this->OBJ = & get_instance();
 
 		    
 			if(is_object($modelInstance)){
@@ -199,9 +199,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 			
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
@@ -239,9 +239,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
@@ -325,75 +325,75 @@ 
 
 		
 		/**
-         * Return the loader instance
-         * @return Loader the loader instance
-         */
-        public function getLoader(){
-            return $this->loader;
-        }
-
-        /**
-         * set the loader instance for future use
-         * @param Loader $loader the loader object
-         */
-         public function setLoader($loader){
-            $this->loader = $loader;
-            return $this;
-        }
-
-        /**
-         * Return the model instance
-         * @return DBSessionHandlerModel the model instance
-         */
-        public function getModelInstance(){
-            return $this->modelInstanceName;
-        }
-
-        /**
-         * set the model instance for future use
-         * @param DBSessionHandlerModel $modelInstance the model object
-         */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
-            $this->modelInstanceName = $modelInstance;
-            return $this;
-        }
-
-        /**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
-
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
-
-	    /**
-	     * Set the model instance using the configuration for session
-	     */
-	    private function setModelInstanceFromConfig(){
-	    	$modelName = get_config('session_save_path');
+		 * Return the loader instance
+		 * @return Loader the loader instance
+		 */
+		public function getLoader(){
+			return $this->loader;
+		}
+
+		/**
+		 * set the loader instance for future use
+		 * @param Loader $loader the loader object
+		 */
+		 public function setLoader($loader){
+			$this->loader = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the model instance
+		 * @return DBSessionHandlerModel the model instance
+		 */
+		public function getModelInstance(){
+			return $this->modelInstanceName;
+		}
+
+		/**
+		 * set the model instance for future use
+		 * @param DBSessionHandlerModel $modelInstance the model object
+		 */
+		 public function setModelInstance(DBSessionHandlerModel $modelInstance){
+			$this->modelInstanceName = $modelInstance;
+			return $this;
+		}
+
+		/**
+		 * Return the Log instance
+		 * @return Log
+		 */
+		public function getLogger(){
+		  return $this->logger;
+		}
+
+		/**
+		 * Set the log instance
+		 * @param Log $logger the log object
+		 */
+		public function setLogger(Log $logger){
+		  $this->logger = $logger;
+		  return $this;
+		}
+
+		/**
+		 * Set the model instance using the configuration for session
+		 */
+		private function setModelInstanceFromConfig(){
+			$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
 			if($this->getLoader()){
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
 			else{
-            	Loader::model($modelName, 'dbsessionhandlerinstance'); 
-            }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
+				Loader::model($modelName, 'dbsessionhandlerinstance'); 
+			}
+			if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
 				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd
 			
 			//set model instance
 			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
+		}
 	}

Spacing +45 added lines, -45 removed lines

@@ -27,11 +27,11 @@ 
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
 	 */
-	if( !interface_exists('SessionHandlerInterface')){
+	if (!interface_exists('SessionHandlerInterface')) {
 		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
 	}
 
-	class DBSessionHandler implements SessionHandlerInterface{
+	class DBSessionHandler implements SessionHandlerInterface {
 		
 		/**
 		 * The encryption method to use to encrypt session data in database
@@ -81,25 +81,25 @@ 
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null) {
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->setLogger($logger);
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
 
-	        if(is_object($loader)){
+	        if (is_object($loader)) {
 	          $this->setLoader($loader);
 	        }
 		    $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
+			if (is_object($modelInstance)) {
 				$this->setModelInstance($modelInstance);
 			}
 		}
@@ -108,7 +108,7 @@ 
 		 * Set the session secret used to encrypt the data in database 
 		 * @param string $secret the base64 string secret
 		 */
-		public function setSessionSecret($secret){
+		public function setSessionSecret($secret) {
 			$this->sessionSecret = $secret;
 			return $this;
 		}
@@ -117,7 +117,7 @@ 
 		 * Return the session secret
 		 * @return string 
 		 */
-		public function getSessionSecret(){
+		public function getSessionSecret() {
 			return $this->sessionSecret;
 		}
 
@@ -126,7 +126,7 @@ 
 		 * Set the initializer vector for openssl 
 		 * @param string $key the session secret used
 		 */
-		public function setInitializerVector($key){
+		public function setInitializerVector($key) {
 			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
 			$key = base64_decode($key);
 			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
@@ -137,7 +137,7 @@ 
 		 * Return the initializer vector
 		 * @return string 
 		 */
-		public function getInitializerVector(){
+		public function getInitializerVector() {
 			return $this->iv;
 		}
 
@@ -147,16 +147,16 @@ 
 		 * @param  string $sessionName the session name
 		 * @return boolean 
 		 */
-		public function open($savePath, $sessionName){
+		public function open($savePath, $sessionName) {
 			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
 			//try to check if session secret is set before
-			if(! $this->getSessionSecret()){
+			if (!$this->getSessionSecret()) {
 				$secret = get_config('session_secret', false);
 				$this->setSessionSecret($secret);
 			}
 			$this->logger->info('Session secret: ' . $this->getSessionSecret());
 
-			if(! $this->getModelInstance()){
+			if (!$this->getModelInstance()) {
 				$this->setModelInstanceFromConfig();
 			}
 			$this->setInitializerVector($this->getSessionSecret());
@@ -164,7 +164,7 @@ 
 			//set session tables columns
 			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
 
-			if(empty($this->sessionTableColumns)){
+			if (empty($this->sessionTableColumns)) {
 				show_error('The session handler is "database" but the table columns not set');
 			}
 			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
@@ -180,7 +180,7 @@ 
 		 * Close the session
 		 * @return boolean
 		 */
-		public function close(){
+		public function close() {
 			$this->logger->debug('Closing database session handler');
 			return true;
 		}
@@ -190,15 +190,15 @@ 
 		 * @param  string $sid the session id to use
 		 * @return mixed      the session data in serialiaze format
 		 */
-		public function read($sid){
+		public function read($sid) {
 			$this->logger->debug('Reading database session data for SID: ' . $sid);
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -206,13 +206,13 @@ 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			
 			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
+			if ($data && isset($data->{$columns['sdata']})) {
 				//checking inactivity 
 				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
+				if ($data->{$columns['stime']} < $timeInactivity) {
 					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
 					$this->destroy($sid);
 					return false;
@@ -229,16 +229,16 @@ 
 		 * @param  mixed $data the session data to save in serialize format
 		 * @return boolean 
 		 */
-		public function write($sid, $data){
+		public function write($sid, $data) {
 			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
 
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -246,7 +246,7 @@ 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			$data = $this->encode($data);
 			$params = array(
 							$columns['sid'] => $sid,
@@ -259,13 +259,13 @@ 
 						);
 			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
 			$exists = $instance->get($sid);
-			if($exists){
+			if ($exists) {
 				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
 			}
-			else{
+			else {
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}
@@ -278,7 +278,7 @@ 
 		 * @param  string $sid the session id value
 		 * @return boolean
 		 */
-		public function destroy($sid){
+		public function destroy($sid) {
 			$this->logger->debug('Destroy of session data for SID: ' . $sid);
 			$instance = $this->modelInstanceName;
 			$instance->delete($sid);
@@ -290,7 +290,7 @@ 
 		 * @param  ineteger $maxLifetime the max lifetime
 		 * @return boolean
 		 */
-		public function gc($maxLifetime){
+		public function gc($maxLifetime) {
 			$instance = $this->modelInstanceName;
 			$time = time() - $maxLifetime;
 			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
@@ -303,9 +303,9 @@ 
 		 * @param  mixed $data the session data to encode
 		 * @return mixed the encoded session data
 		 */
-		public function encode($data){
+		public function encode($data) {
 			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+			$dataEncrypted = openssl_encrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
 			$output = base64_encode($dataEncrypted);
 			return $output;
 		}
@@ -316,7 +316,7 @@ 
 		 * @param  mixed $data the data to decode
 		 * @return mixed       the decoded data
 		 */
-		public function decode($data){
+		public function decode($data) {
 			$key = base64_decode($this->sessionSecret);
 			$data = base64_decode($data);
 			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
@@ -328,7 +328,7 @@ 
          * Return the loader instance
          * @return Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loader;
         }
 
@@ -336,7 +336,7 @@ 
          * set the loader instance for future use
          * @param Loader $loader the loader object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loader = $loader;
             return $this;
         }
@@ -345,7 +345,7 @@ 
          * Return the model instance
          * @return DBSessionHandlerModel the model instance
          */
-        public function getModelInstance(){
+        public function getModelInstance() {
             return $this->modelInstanceName;
         }
 
@@ -353,7 +353,7 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+         public function setModelInstance(DBSessionHandlerModel $modelInstance) {
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
@@ -362,7 +362,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -370,7 +370,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -378,18 +378,18 @@ 
 	    /**
 	     * Set the model instance using the configuration for session
 	     */
-	    private function setModelInstanceFromConfig(){
+	    private function setModelInstanceFromConfig() {
 	    	$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
-			else{
+			else {
             	Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            if (isset($this->OBJ->dbsessionhandlerinstance) && !$this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel) {
+				show_error('To use database session handler, your class model "' . get_class($this->OBJ->dbsessionhandlerinstance) . '" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd
 			

Braces +4 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->setLogger($logger);
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
@@ -197,8 +196,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -237,8 +235,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -264,8 +261,7 @@ 
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
-			}
-			else{
+			} else{
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}

core/classes/model/Model.php

Indentation +934 added lines, -934 removed lines

@@ -1,595 +1,595 @@ 
 <?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.
-    */
-
-
-    /**
-     * A base model with a series of CRUD functions (powered by CI's query builder),
-     * validation-in-model support, event callbacks and more.
-     *
-     * @link http://github.com/jamierumbelow/codeigniter-base-model
-     * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
-     */
-
-    class Model{
-
-        /* --------------------------------------------------------------
+	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.
+	 */
+
+
+	/**
+	 * A base model with a series of CRUD functions (powered by CI's query builder),
+	 * validation-in-model support, event callbacks and more.
+	 *
+	 * @link http://github.com/jamierumbelow/codeigniter-base-model
+	 * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
+	 */
+
+	class Model{
+
+		/* --------------------------------------------------------------
          * VARIABLES
          * ------------------------------------------------------------ */
 
-        /**
-         * This model's default database table. Automatically
-         * guessed by pluralising the model name.
-         */
-        protected $_table;
-
-        /**
-         * The database connection object. Will be set to the default
-         * connection. This allows individual models to use different DBs
-         * without overwriting the global database connection.
-         */
-        protected $_database;
-
-        /**
-         * This model's default primary key or unique identifier.
-         * Used by the get(), update() and delete() functions.
-         */
-        protected $primary_key = 'id';
-
-        /**
-         * Support for soft deletes and this model's 'deleted' key
-         */
-        protected $soft_delete = false;
-        protected $soft_delete_key = 'is_deleted';
-        protected $_temporary_with_deleted = FALSE;
-        protected $_temporary_only_deleted = FALSE;
-
-        /**
-         * The various callbacks available to the model. Each are
-         * simple lists of method names (methods will be run on $this).
-         */
-        protected $before_create = array();
-        protected $after_create = array();
-        protected $before_update = array();
-        protected $after_update = array();
-        protected $before_get = array();
-        protected $after_get = array();
-        protected $before_delete = array();
-        protected $after_delete = array();
-
-        protected $callback_parameters = array();
-
-        /**
-         * Protected, non-modifiable attributes
-         */
-        protected $protected_attributes = array();
-
-        /**
-         * Relationship arrays. Use flat strings for defaults or string
-         * => array to customise the class name and primary key
-         */
-        protected $belongs_to = array();
-        protected $has_many = array();
-
-        protected $_with = array();
-
-        /**
-         * An array of validation rules. This needs to be the same format
-         * as validation rules passed to the FormValidation library.
-         */
-        protected $validate = array();
-
-        /**
-         * Optionally skip the validation. Used in conjunction with
-         * skip_validation() to skip data validation for any future calls.
-         */
-        protected $skip_validation = FALSE;
-
-        /**
-         * By default we return our results as objects. If we need to override
-         * this, we can, or, we could use the `as_array()` and `as_object()` scopes.
-         */
-        protected $return_type = 'object';
-        protected $_temporary_return_type = NULL;
+		/**
+		 * This model's default database table. Automatically
+		 * guessed by pluralising the model name.
+		 */
+		protected $_table;
+
+		/**
+		 * The database connection object. Will be set to the default
+		 * connection. This allows individual models to use different DBs
+		 * without overwriting the global database connection.
+		 */
+		protected $_database;
+
+		/**
+		 * This model's default primary key or unique identifier.
+		 * Used by the get(), update() and delete() functions.
+		 */
+		protected $primary_key = 'id';
+
+		/**
+		 * Support for soft deletes and this model's 'deleted' key
+		 */
+		protected $soft_delete = false;
+		protected $soft_delete_key = 'is_deleted';
+		protected $_temporary_with_deleted = FALSE;
+		protected $_temporary_only_deleted = FALSE;
+
+		/**
+		 * The various callbacks available to the model. Each are
+		 * simple lists of method names (methods will be run on $this).
+		 */
+		protected $before_create = array();
+		protected $after_create = array();
+		protected $before_update = array();
+		protected $after_update = array();
+		protected $before_get = array();
+		protected $after_get = array();
+		protected $before_delete = array();
+		protected $after_delete = array();
+
+		protected $callback_parameters = array();
+
+		/**
+		 * Protected, non-modifiable attributes
+		 */
+		protected $protected_attributes = array();
+
+		/**
+		 * Relationship arrays. Use flat strings for defaults or string
+		 * => array to customise the class name and primary key
+		 */
+		protected $belongs_to = array();
+		protected $has_many = array();
+
+		protected $_with = array();
+
+		/**
+		 * An array of validation rules. This needs to be the same format
+		 * as validation rules passed to the FormValidation library.
+		 */
+		protected $validate = array();
+
+		/**
+		 * Optionally skip the validation. Used in conjunction with
+		 * skip_validation() to skip data validation for any future calls.
+		 */
+		protected $skip_validation = FALSE;
+
+		/**
+		 * By default we return our results as objects. If we need to override
+		 * this, we can, or, we could use the `as_array()` and `as_object()` scopes.
+		 */
+		protected $return_type = 'object';
+		protected $_temporary_return_type = NULL;
     	
     	
-    	/**
+		/**
     		The database cache time 
-    	*/
-    	protected $dbCacheTime = 0;
-
-        /**
-         * Instance of the Loader class
-         * @var Loader
-         */
-        protected $loaderInstance = null;
-
-        /**
-         * Instance of the FormValidation library
-         * @var FormValidation
-         */
-        protected $formValidationInstance = null;
-
-        /* --------------------------------------------------------------
+		 */
+		protected $dbCacheTime = 0;
+
+		/**
+		 * Instance of the Loader class
+		 * @var Loader
+		 */
+		protected $loaderInstance = null;
+
+		/**
+		 * Instance of the FormValidation library
+		 * @var FormValidation
+		 */
+		protected $formValidationInstance = null;
+
+		/* --------------------------------------------------------------
          * GENERIC METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Initialise the model, tie into the CodeIgniter superobject and
-         * try our best to guess the table name.
-         */
-        public function __construct(Database $db = null){
-            if(is_object($db)){
-                $this->setDatabaseInstance($db);
-            }
-            else{
-                $obj = & get_instance();
-        		if(isset($obj->database) && is_object($obj->database)){
-                    /**
-                    * NOTE: Need use "clone" because some Model need have the personal instance of the database library
-                    * to prevent duplication
-                    */
-        			$this->setDatabaseInstance(clone $obj->database);
-                }
-            }
-
-            array_unshift($this->before_create, 'protect_attributes');
-            array_unshift($this->before_update, 'protect_attributes');
-            $this->_temporary_return_type = $this->return_type;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * Initialise the model, tie into the CodeIgniter superobject and
+		 * try our best to guess the table name.
+		 */
+		public function __construct(Database $db = null){
+			if(is_object($db)){
+				$this->setDatabaseInstance($db);
+			}
+			else{
+				$obj = & get_instance();
+				if(isset($obj->database) && is_object($obj->database)){
+					/**
+					 * NOTE: Need use "clone" because some Model need have the personal instance of the database library
+					 * to prevent duplication
+					 */
+					$this->setDatabaseInstance(clone $obj->database);
+				}
+			}
+
+			array_unshift($this->before_create, 'protect_attributes');
+			array_unshift($this->before_update, 'protect_attributes');
+			$this->_temporary_return_type = $this->return_type;
+		}
+
+		/* --------------------------------------------------------------
          * CRUD INTERFACE
          * ------------------------------------------------------------ */
 
-        /**
-         * Fetch a single record based on the primary key. Returns an object.
-         */
-        public function get($primary_value)
-        {
-    		return $this->get_by($this->primary_key, $primary_value);
-        }
-
-        /**
-         * Fetch a single record based on an arbitrary WHERE call. Can be
-         * any valid value to $this->_database->where().
-         */
-        public function get_by()
-        {
-            $where = func_get_args();
-
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-
-    		$this->_set_where($where);
-
-            $this->trigger('before_get');
+		/**
+		 * Fetch a single record based on the primary key. Returns an object.
+		 */
+		public function get($primary_value)
+		{
+			return $this->get_by($this->primary_key, $primary_value);
+		}
+
+		/**
+		 * Fetch a single record based on an arbitrary WHERE call. Can be
+		 * any valid value to $this->_database->where().
+		 */
+		public function get_by()
+		{
+			$where = func_get_args();
+
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+
+			$this->_set_where($where);
+
+			$this->trigger('before_get');
 			$type = $this->_temporary_return_type == 'array' ? 'array':false;
-            $row = $this->_database->from($this->_table)->get($type);
-            $this->_temporary_return_type = $this->return_type;
-            $row = $this->trigger('after_get', $row);
-            $this->_with = array();
-            return $row;
-        }
-
-        /**
-         * Fetch an array of records based on an array of primary values.
-         */
-        public function get_many($values)
-        {
-            $this->_database->in($this->primary_key, $values);
-            return $this->get_all();
-        }
-
-        /**
-         * Fetch an array of records based on an arbitrary WHERE call.
-         */
-        public function get_many_by()
-        {
-            $where = func_get_args();
-            $this->_set_where($where);
-            return $this->get_all();
-        }
-
-        /**
-         * Fetch all the records in the table. Can be used as a generic call
-         * to $this->_database->get() with scoped methods.
-         */
-        public function get_all()
-        {
-            $this->trigger('before_get');
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
+			$row = $this->_database->from($this->_table)->get($type);
+			$this->_temporary_return_type = $this->return_type;
+			$row = $this->trigger('after_get', $row);
+			$this->_with = array();
+			return $row;
+		}
+
+		/**
+		 * Fetch an array of records based on an array of primary values.
+		 */
+		public function get_many($values)
+		{
+			$this->_database->in($this->primary_key, $values);
+			return $this->get_all();
+		}
+
+		/**
+		 * Fetch an array of records based on an arbitrary WHERE call.
+		 */
+		public function get_many_by()
+		{
+			$where = func_get_args();
+			$this->_set_where($where);
+			return $this->get_all();
+		}
+
+		/**
+		 * Fetch all the records in the table. Can be used as a generic call
+		 * to $this->_database->get() with scoped methods.
+		 */
+		public function get_all()
+		{
+			$this->trigger('before_get');
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
 			$type = $this->_temporary_return_type == 'array' ? 'array':false;
-            $result = $this->_database->from($this->_table)->getAll($type);
-            $this->_temporary_return_type = $this->return_type;
-
-            foreach ($result as $key => &$row)
-            {
-                $row = $this->trigger('after_get', $row, ($key == count($result) - 1));
-            }
-            $this->_with = array();
-            return $result;
-        }
-
-        /**
-         * Insert a new row into the table. $data should be an associative array
-         * of data to be inserted. Returns newly created ID.
-         */
-        public function insert($data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-
-            if ($data !== FALSE)
-            {
-                $data = $this->trigger('before_create', $data);
-                $this->_database->from($this->_table)->insert($data, $escape);
-                $insert_id = $this->_database->insertId();
-                $this->trigger('after_create', $insert_id);
-                return $insert_id;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Insert multiple rows into the table. Returns an array of multiple IDs.
-         */
-        public function insert_many($data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $ids = array();
-            foreach ($data as $key => $row)
-            {
-                $ids[] = $this->insert($row, $skip_validation, $escape);
-            }
-            return $ids;
-        }
-
-        /**
-         * Updated a record based on the primary value.
-         */
-        public function update($primary_value, $data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-
-            if ($data !== FALSE)
-            {
-                $result = $this->_database->where($this->primary_key, $primary_value)
-                                   ->from($this->_table)
-                                   ->update($data, $escape);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Update many records, based on an array of primary values.
-         */
-        public function update_many($primary_values, $data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-            if ($data !== FALSE)
-            {
-                $result = $this->_database->in($this->primary_key, $primary_values)
-                                   ->from($this->_table)
-                                   ->update($data, $escape);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Updated a record based on an arbitrary WHERE clause.
-         */
-        public function update_by()
-        {
-            $args = func_get_args();
-            $data = array();
-            if(count($args) == 2){
-                if(is_array($args[1])){
-                    $data = array_pop($args);
-                }
-            }
-            else if(count($args) == 3){
-                if(is_array($args[2])){
-                    $data = array_pop($args);
-                }
-            }
-            $data = $this->trigger('before_update', $data);
-            if ($this->validate($data) !== FALSE)
-            {
-                $this->_set_where($args);
-                $result = $this->_database->from($this->_table)->update($data);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Update all records
-         */
-        public function update_all($data = array(), $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            $result = $this->_database->from($this->_table)->update($data, $escape);
-            $this->trigger('after_update', array($data, $result));
-            return $result;
-        }
-
-        /**
-         * Delete a row from the table by the primary value
-         */
-        public function delete($id)
-        {
-            $this->trigger('before_delete', $id);
-            $this->_database->where($this->primary_key, $id);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-        /**
-         * Delete a row from the database table by an arbitrary WHERE clause
-         */
-        public function delete_by()
-        {
-            $where = func_get_args();
-    	    $where = $this->trigger('before_delete', $where);
-            $this->_set_where($where);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-        /**
-         * Delete many rows from the database table by multiple primary values
-         */
-        public function delete_many($primary_values)
-        {
-            $primary_values = $this->trigger('before_delete', $primary_values);
-            $this->_database->in($this->primary_key, $primary_values);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-
-        /**
-         * Truncates the table
-         */
-        public function truncate()
-        {
-            $result = $this->_database->from($this->_table)->delete();
-            return $result;
-        }
-
-        /* --------------------------------------------------------------
+			$result = $this->_database->from($this->_table)->getAll($type);
+			$this->_temporary_return_type = $this->return_type;
+
+			foreach ($result as $key => &$row)
+			{
+				$row = $this->trigger('after_get', $row, ($key == count($result) - 1));
+			}
+			$this->_with = array();
+			return $result;
+		}
+
+		/**
+		 * Insert a new row into the table. $data should be an associative array
+		 * of data to be inserted. Returns newly created ID.
+		 */
+		public function insert($data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+
+			if ($data !== FALSE)
+			{
+				$data = $this->trigger('before_create', $data);
+				$this->_database->from($this->_table)->insert($data, $escape);
+				$insert_id = $this->_database->insertId();
+				$this->trigger('after_create', $insert_id);
+				return $insert_id;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Insert multiple rows into the table. Returns an array of multiple IDs.
+		 */
+		public function insert_many($data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$ids = array();
+			foreach ($data as $key => $row)
+			{
+				$ids[] = $this->insert($row, $skip_validation, $escape);
+			}
+			return $ids;
+		}
+
+		/**
+		 * Updated a record based on the primary value.
+		 */
+		public function update($primary_value, $data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+
+			if ($data !== FALSE)
+			{
+				$result = $this->_database->where($this->primary_key, $primary_value)
+								   ->from($this->_table)
+								   ->update($data, $escape);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Update many records, based on an array of primary values.
+		 */
+		public function update_many($primary_values, $data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+			if ($data !== FALSE)
+			{
+				$result = $this->_database->in($this->primary_key, $primary_values)
+								   ->from($this->_table)
+								   ->update($data, $escape);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Updated a record based on an arbitrary WHERE clause.
+		 */
+		public function update_by()
+		{
+			$args = func_get_args();
+			$data = array();
+			if(count($args) == 2){
+				if(is_array($args[1])){
+					$data = array_pop($args);
+				}
+			}
+			else if(count($args) == 3){
+				if(is_array($args[2])){
+					$data = array_pop($args);
+				}
+			}
+			$data = $this->trigger('before_update', $data);
+			if ($this->validate($data) !== FALSE)
+			{
+				$this->_set_where($args);
+				$result = $this->_database->from($this->_table)->update($data);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Update all records
+		 */
+		public function update_all($data = array(), $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			$result = $this->_database->from($this->_table)->update($data, $escape);
+			$this->trigger('after_update', array($data, $result));
+			return $result;
+		}
+
+		/**
+		 * Delete a row from the table by the primary value
+		 */
+		public function delete($id)
+		{
+			$this->trigger('before_delete', $id);
+			$this->_database->where($this->primary_key, $id);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+		/**
+		 * Delete a row from the database table by an arbitrary WHERE clause
+		 */
+		public function delete_by()
+		{
+			$where = func_get_args();
+			$where = $this->trigger('before_delete', $where);
+			$this->_set_where($where);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+		/**
+		 * Delete many rows from the database table by multiple primary values
+		 */
+		public function delete_many($primary_values)
+		{
+			$primary_values = $this->trigger('before_delete', $primary_values);
+			$this->_database->in($this->primary_key, $primary_values);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+
+		/**
+		 * Truncates the table
+		 */
+		public function truncate()
+		{
+			$result = $this->_database->from($this->_table)->delete();
+			return $result;
+		}
+
+		/* --------------------------------------------------------------
          * RELATIONSHIPS
          * ------------------------------------------------------------ */
 
-        public function with($relationship)
-        {
-            $this->_with[] = $relationship;
-            if (!in_array('relate', $this->after_get))
-            {
-                $this->after_get[] = 'relate';
-            }
-            return $this;
-        }
-
-        public function relate($row)
-        {
-    		if (empty($row))
-            {
-    		    return $row;
-            }
-
-            foreach ($this->belongs_to as $key => $value)
-            {
-                if (is_string($value))
-                {
-                    $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
-                {
-                    $relationship = $key;
-                    $options = $value;
-                }
-
-                if (in_array($relationship, $this->_with))
-                {
-                    if(is_object($this->loaderInstance)){
-                        $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
-                        Loader::model($options['model'], $relationship . '_model');    
-                    }
-                    if (is_object($row))
-                    {
-                        $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
-                    {
-                        $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
-                    }
-                }
-            }
-
-            foreach ($this->has_many as $key => $value)
-            {
-                if (is_string($value))
-                {
-                    $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
-                {
-                    $relationship = $key;
-                    $options = $value;
-                }
-
-                if (in_array($relationship, $this->_with))
-                {
-                    if(is_object($this->loaderInstance)){
-                        $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
-                        Loader::model($options['model'], $relationship . '_model');    
-                    }
-                    if (is_object($row))
-                    {
-                        $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
-                    {
-                        $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
-                    }
-                }
-            }
-            return $row;
-        }
-
-        /* --------------------------------------------------------------
+		public function with($relationship)
+		{
+			$this->_with[] = $relationship;
+			if (!in_array('relate', $this->after_get))
+			{
+				$this->after_get[] = 'relate';
+			}
+			return $this;
+		}
+
+		public function relate($row)
+		{
+			if (empty($row))
+			{
+				return $row;
+			}
+
+			foreach ($this->belongs_to as $key => $value)
+			{
+				if (is_string($value))
+				{
+					$relationship = $value;
+					$options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+				}
+				else
+				{
+					$relationship = $key;
+					$options = $value;
+				}
+
+				if (in_array($relationship, $this->_with))
+				{
+					if(is_object($this->loaderInstance)){
+						$this->loaderInstance->model($options['model'], $relationship . '_model');
+					}
+					else{
+						Loader::model($options['model'], $relationship . '_model');    
+					}
+					if (is_object($row))
+					{
+						$row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
+					}
+					else
+					{
+						$row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
+					}
+				}
+			}
+
+			foreach ($this->has_many as $key => $value)
+			{
+				if (is_string($value))
+				{
+					$relationship = $value;
+					$options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+				}
+				else
+				{
+					$relationship = $key;
+					$options = $value;
+				}
+
+				if (in_array($relationship, $this->_with))
+				{
+					if(is_object($this->loaderInstance)){
+						$this->loaderInstance->model($options['model'], $relationship . '_model');
+					}
+					else{
+						Loader::model($options['model'], $relationship . '_model');    
+					}
+					if (is_object($row))
+					{
+						$row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
+					}
+					else
+					{
+						$row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
+					}
+				}
+			}
+			return $row;
+		}
+
+		/* --------------------------------------------------------------
          * UTILITY METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Retrieve and generate a form_dropdown friendly array
-         */
-        public function dropdown()
-        {
-            $args = func_get_args();
-            if(count($args) == 2)
-            {
-                list($key, $value) = $args;
-            }
-            else
-            {
-                $key = $this->primary_key;
-                $value = $args[0];
-            }
-            $this->trigger('before_dropdown', array( $key, $value ));
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, FALSE);
-            }
-            $result = $this->_database->select(array($key, $value))
-                               ->from($this->_table)
-                               ->getAll();
-            $options = array();
-            foreach ($result as $row)
-            {
-                $options[$row->{$key}] = $row->{$value};
-            }
-            $options = $this->trigger('after_dropdown', $options);
-            return $options;
-        }
-
-        /**
-         * Fetch a count of rows based on an arbitrary WHERE call.
-         */
-        public function count_by()
-        {
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-            $where = func_get_args();
-            $this->_set_where($where);
-            $this->_database->from($this->_table)->getAll();
-            return $this->_database->numRows();
-        }
-
-        /**
-         * Fetch a total count of rows, disregarding any previous conditions
-         */
-        public function count_all()
-        {
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-            $this->_database->from($this->_table)->getAll();
-            return $this->_database->numRows();
-        }
+		/**
+		 * Retrieve and generate a form_dropdown friendly array
+		 */
+		public function dropdown()
+		{
+			$args = func_get_args();
+			if(count($args) == 2)
+			{
+				list($key, $value) = $args;
+			}
+			else
+			{
+				$key = $this->primary_key;
+				$value = $args[0];
+			}
+			$this->trigger('before_dropdown', array( $key, $value ));
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, FALSE);
+			}
+			$result = $this->_database->select(array($key, $value))
+							   ->from($this->_table)
+							   ->getAll();
+			$options = array();
+			foreach ($result as $row)
+			{
+				$options[$row->{$key}] = $row->{$value};
+			}
+			$options = $this->trigger('after_dropdown', $options);
+			return $options;
+		}
+
+		/**
+		 * Fetch a count of rows based on an arbitrary WHERE call.
+		 */
+		public function count_by()
+		{
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+			$where = func_get_args();
+			$this->_set_where($where);
+			$this->_database->from($this->_table)->getAll();
+			return $this->_database->numRows();
+		}
+
+		/**
+		 * Fetch a total count of rows, disregarding any previous conditions
+		 */
+		public function count_all()
+		{
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+			$this->_database->from($this->_table)->getAll();
+			return $this->_database->numRows();
+		}
 		
 		/**
-		* Enabled cache temporary
-		*/
+		 * Enabled cache temporary
+		 */
 		public function cached($ttl = 0){
 		  if($ttl > 0){
 			$this->_database = $this->_database->cached($ttl);
@@ -597,390 +597,390 @@ 
 		  return $this;
 		}
 
-        /**
-         * Tell the class to skip the insert validation
-         */
-        public function skip_validation()
-        {
-            $this->skip_validation = TRUE;
-            return $this;
-        }
-
-        /**
-         * Get the skip validation status
-         */
-        public function get_skip_validation()
-        {
-            return $this->skip_validation;
-        }
-
-        /**
-         * Return the next auto increment of the table. Only tested on MySQL.
-         */
-        public function get_next_id()
-        {
-            return (int) $this->_database->select('AUTO_INCREMENT')
-                ->from('information_schema.TABLES')
-                ->where('TABLE_NAME', $this->_table)
-                ->where('TABLE_SCHEMA', $this->_database->getDatabaseName())->get()->AUTO_INCREMENT;
-        }
-
-        /**
-         * Getter for the table name
-         */
-        public function table()
-        {
-            return $this->_table;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * Tell the class to skip the insert validation
+		 */
+		public function skip_validation()
+		{
+			$this->skip_validation = TRUE;
+			return $this;
+		}
+
+		/**
+		 * Get the skip validation status
+		 */
+		public function get_skip_validation()
+		{
+			return $this->skip_validation;
+		}
+
+		/**
+		 * Return the next auto increment of the table. Only tested on MySQL.
+		 */
+		public function get_next_id()
+		{
+			return (int) $this->_database->select('AUTO_INCREMENT')
+				->from('information_schema.TABLES')
+				->where('TABLE_NAME', $this->_table)
+				->where('TABLE_SCHEMA', $this->_database->getDatabaseName())->get()->AUTO_INCREMENT;
+		}
+
+		/**
+		 * Getter for the table name
+		 */
+		public function table()
+		{
+			return $this->_table;
+		}
+
+		/* --------------------------------------------------------------
          * GLOBAL SCOPES
          * ------------------------------------------------------------ */
 
-        /**
-         * Return the next call as an array rather than an object
-         */
-        public function as_array()
-        {
-            $this->_temporary_return_type = 'array';
-            return $this;
-        }
-
-        /**
-         * Return the next call as an object rather than an array
-         */
-        public function as_object()
-        {
-            $this->_temporary_return_type = 'object';
-            return $this;
-        }
-
-        /**
-         * Don't care about soft deleted rows on the next call
-         */
-        public function with_deleted()
-        {
-            $this->_temporary_with_deleted = TRUE;
-            return $this;
-        }
-
-        /**
-         * Only get deleted rows on the next call
-         */
-        public function only_deleted()
-        {
-            $this->_temporary_only_deleted = TRUE;
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * Return the next call as an array rather than an object
+		 */
+		public function as_array()
+		{
+			$this->_temporary_return_type = 'array';
+			return $this;
+		}
+
+		/**
+		 * Return the next call as an object rather than an array
+		 */
+		public function as_object()
+		{
+			$this->_temporary_return_type = 'object';
+			return $this;
+		}
+
+		/**
+		 * Don't care about soft deleted rows on the next call
+		 */
+		public function with_deleted()
+		{
+			$this->_temporary_with_deleted = TRUE;
+			return $this;
+		}
+
+		/**
+		 * Only get deleted rows on the next call
+		 */
+		public function only_deleted()
+		{
+			$this->_temporary_only_deleted = TRUE;
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * OBSERVERS
          * ------------------------------------------------------------ */
 
-        /**
-         * MySQL DATETIME created_at and updated_at
-         */
-        public function created_at($row)
-        {
-            if (is_object($row))
-            {
-                $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
-            {
-                $row['created_at'] = date('Y-m-d H:i:s');
-            }
-
-            return $row;
-        }
-
-        public function updated_at($row)
-        {
-            if (is_object($row))
-            {
-                $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
-            {
-                $row['updated_at'] = date('Y-m-d H:i:s');
-            }
-            return $row;
-        }
-
-        /**
-         * Serialises data for you automatically, allowing you to pass
-         * through objects and let it handle the serialisation in the background
-         */
-        public function serialize($row)
-        {
-            foreach ($this->callback_parameters as $column)
-            {
-                $row[$column] = serialize($row[$column]);
-            }
-            return $row;
-        }
-
-        public function unserialize($row)
-        {
-            foreach ($this->callback_parameters as $column)
-            {
-                if (is_array($row))
-                {
-                    $row[$column] = unserialize($row[$column]);
-                }
-                else
-                {
-                    $row->$column = unserialize($row->$column);
-                }
-            }
-            return $row;
-        }
-
-        /**
-         * Protect attributes by removing them from $row array
-         */
-        public function protect_attributes($row)
-        {
-            foreach ($this->protected_attributes as $attr)
-            {
-                if (is_object($row))
-                {
+		/**
+		 * MySQL DATETIME created_at and updated_at
+		 */
+		public function created_at($row)
+		{
+			if (is_object($row))
+			{
+				$row->created_at = date('Y-m-d H:i:s');
+			}
+			else
+			{
+				$row['created_at'] = date('Y-m-d H:i:s');
+			}
+
+			return $row;
+		}
+
+		public function updated_at($row)
+		{
+			if (is_object($row))
+			{
+				$row->updated_at = date('Y-m-d H:i:s');
+			}
+			else
+			{
+				$row['updated_at'] = date('Y-m-d H:i:s');
+			}
+			return $row;
+		}
+
+		/**
+		 * Serialises data for you automatically, allowing you to pass
+		 * through objects and let it handle the serialisation in the background
+		 */
+		public function serialize($row)
+		{
+			foreach ($this->callback_parameters as $column)
+			{
+				$row[$column] = serialize($row[$column]);
+			}
+			return $row;
+		}
+
+		public function unserialize($row)
+		{
+			foreach ($this->callback_parameters as $column)
+			{
+				if (is_array($row))
+				{
+					$row[$column] = unserialize($row[$column]);
+				}
+				else
+				{
+					$row->$column = unserialize($row->$column);
+				}
+			}
+			return $row;
+		}
+
+		/**
+		 * Protect attributes by removing them from $row array
+		 */
+		public function protect_attributes($row)
+		{
+			foreach ($this->protected_attributes as $attr)
+			{
+				if (is_object($row))
+				{
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
-                {
+				}
+				else
+				{
 					if(isset($row[$attr])){
 						unset($row[$attr]);
 					}
-                }
-            }
-            return $row;
-        }
+				}
+			}
+			return $row;
+		}
 		
 		 /**
-         * Return the database instance
-         * @return Database the database instance
-         */
-        public function getDatabaseInstance(){
-            return $this->_database;
-        }
-
-        /**
-         * set the Database instance for future use
-         * @param Database $db the database object
-         */
-         public function setDatabaseInstance($db){
-            $this->_database = $db;
-            if($this->dbCacheTime > 0){
-                $this->_database->setCache($this->dbCacheTime);
-            }
-            return $this;
-        }
-
-        /**
-         * Return the loader instance
-         * @return Loader the loader instance
-         */
-        public function getLoader(){
-            return $this->loaderInstance;
-        }
-
-        /**
-         * set the loader instance for future use
-         * @param Loader $loader the loader object
-         */
-         public function setLoader($loader){
-            $this->loaderInstance = $loader;
-            return $this;
-        }
-
-        /**
-         * Return the FormValidation instance
-         * @return FormValidation the form validation instance
-         */
-        public function getFormValidation(){
-            return $this->formValidationInstance;
-        }
-
-        /**
-         * set the form validation instance for future use
-         * @param FormValidation $fv the form validation object
-         */
-         public function setFormValidation($fv){
-            $this->formValidationInstance = $fv;
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		  * Return the database instance
+		  * @return Database the database instance
+		  */
+		public function getDatabaseInstance(){
+			return $this->_database;
+		}
+
+		/**
+		 * set the Database instance for future use
+		 * @param Database $db the database object
+		 */
+		 public function setDatabaseInstance($db){
+			$this->_database = $db;
+			if($this->dbCacheTime > 0){
+				$this->_database->setCache($this->dbCacheTime);
+			}
+			return $this;
+		}
+
+		/**
+		 * Return the loader instance
+		 * @return Loader the loader instance
+		 */
+		public function getLoader(){
+			return $this->loaderInstance;
+		}
+
+		/**
+		 * set the loader instance for future use
+		 * @param Loader $loader the loader object
+		 */
+		 public function setLoader($loader){
+			$this->loaderInstance = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the FormValidation instance
+		 * @return FormValidation the form validation instance
+		 */
+		public function getFormValidation(){
+			return $this->formValidationInstance;
+		}
+
+		/**
+		 * set the form validation instance for future use
+		 * @param FormValidation $fv the form validation object
+		 */
+		 public function setFormValidation($fv){
+			$this->formValidationInstance = $fv;
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * QUERY BUILDER DIRECT ACCESS METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * A wrapper to $this->_database->orderBy()
-         */
-        public function order_by($criteria, $order = 'ASC')
-        {
-            if ( is_array($criteria) )
-            {
-                foreach ($criteria as $key => $value)
-                {
-                    $this->_database->orderBy($key, $value);
-                }
-            }
-            else
-            {
-                $this->_database->orderBy($criteria, $order);
-            }
-            return $this;
-        }
-
-        /**
-         * A wrapper to $this->_database->limit()
-         */
-        public function limit($offset = 0, $limit = 10)
-        {
-            $this->_database->limit($offset, $limit);
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * A wrapper to $this->_database->orderBy()
+		 */
+		public function order_by($criteria, $order = 'ASC')
+		{
+			if ( is_array($criteria) )
+			{
+				foreach ($criteria as $key => $value)
+				{
+					$this->_database->orderBy($key, $value);
+				}
+			}
+			else
+			{
+				$this->_database->orderBy($criteria, $order);
+			}
+			return $this;
+		}
+
+		/**
+		 * A wrapper to $this->_database->limit()
+		 */
+		public function limit($offset = 0, $limit = 10)
+		{
+			$this->_database->limit($offset, $limit);
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * INTERNAL METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Trigger an event and call its observers. Pass through the event name
-         * (which looks for an instance variable $this->event_name), an array of
-         * parameters to pass through and an optional 'last in interation' boolean
-         */
-        protected function trigger($event, $data = FALSE, $last = TRUE)
-        {
-            if (isset($this->$event) && is_array($this->$event))
-            {
-                foreach ($this->$event as $method)
-                {
-                    if (strpos($method, '('))
-                    {
-                        preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
-
-                        $method = $matches[1];
-                        $this->callback_parameters = explode(',', $matches[3]);
-                    }
-                    $data = call_user_func_array(array($this, $method), array($data, $last));
-                }
-            }
-            return $data;
-        }
-
-        /**
-         * Run validation on the passed data
-         */
-        protected function validate(array $data)
-        {
-            if($this->skip_validation)
-            {
-                return $data;
-            }
-            if(!empty($this->validate))
-            {
-                $fv = null;
-                if(is_object($this->formValidationInstance)){
-                    $fv = $this->formValidationInstance;
-                }
-                else{
-                    Loader::library('FormValidation');
-                    $fv = $this->formvalidation;
-                    $this->setFormValidation($fv);
-                }
-                if(is_array($this->validate))
-                {
-                    $fv->setData($data);
-                    $fv->setRules($this->validate);
-
-                    if ($fv->run())
-                    {
-                        return $data;
-                    }
-                    else
-                    {
-                        return FALSE;
-                    }
-                }
-                else {
-                    return $data;
-                }
-            }
-            else
-            {
-                return $data;
-            }
-        }
-
-
-        /**
-         * Set WHERE parameters, cleverly
-         */
-        protected function _set_where($params)
-        {
-            if (count($params) == 1 && is_array($params[0]))
-            {
-                foreach ($params[0] as $field => $filter)
-                {
-                    if (is_array($filter))
-                    {
-                        $this->_database->in($field, $filter);
-                    }
-                    else
-                    {
-                        if (is_int($field))
-                        {
-                            $this->_database->where($filter);
-                        }
-                        else
-                        {
-                            $this->_database->where($field, $filter);
-                        }
-                    }
-                }
-            }
-            else if (count($params) == 1)
-            {
-                $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
-    		{
-                if (is_array($params[1]))
-                {
-                    $this->_database->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->_database->where($params[0], $params[1]);
-                }
-    		}
-    		else if(count($params) == 3)
-    		{
-    			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
-            {
-                if (is_array($params[1]))
-                {
-                    $this->_database->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->_database->where($params[0], $params[1]);
-                }
-            }
-        }
-
-        /**
+		/**
+		 * Trigger an event and call its observers. Pass through the event name
+		 * (which looks for an instance variable $this->event_name), an array of
+		 * parameters to pass through and an optional 'last in interation' boolean
+		 */
+		protected function trigger($event, $data = FALSE, $last = TRUE)
+		{
+			if (isset($this->$event) && is_array($this->$event))
+			{
+				foreach ($this->$event as $method)
+				{
+					if (strpos($method, '('))
+					{
+						preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
+
+						$method = $matches[1];
+						$this->callback_parameters = explode(',', $matches[3]);
+					}
+					$data = call_user_func_array(array($this, $method), array($data, $last));
+				}
+			}
+			return $data;
+		}
+
+		/**
+		 * Run validation on the passed data
+		 */
+		protected function validate(array $data)
+		{
+			if($this->skip_validation)
+			{
+				return $data;
+			}
+			if(!empty($this->validate))
+			{
+				$fv = null;
+				if(is_object($this->formValidationInstance)){
+					$fv = $this->formValidationInstance;
+				}
+				else{
+					Loader::library('FormValidation');
+					$fv = $this->formvalidation;
+					$this->setFormValidation($fv);
+				}
+				if(is_array($this->validate))
+				{
+					$fv->setData($data);
+					$fv->setRules($this->validate);
+
+					if ($fv->run())
+					{
+						return $data;
+					}
+					else
+					{
+						return FALSE;
+					}
+				}
+				else {
+					return $data;
+				}
+			}
+			else
+			{
+				return $data;
+			}
+		}
+
+
+		/**
+		 * Set WHERE parameters, cleverly
+		 */
+		protected function _set_where($params)
+		{
+			if (count($params) == 1 && is_array($params[0]))
+			{
+				foreach ($params[0] as $field => $filter)
+				{
+					if (is_array($filter))
+					{
+						$this->_database->in($field, $filter);
+					}
+					else
+					{
+						if (is_int($field))
+						{
+							$this->_database->where($filter);
+						}
+						else
+						{
+							$this->_database->where($field, $filter);
+						}
+					}
+				}
+			}
+			else if (count($params) == 1)
+			{
+				$this->_database->where($params[0]);
+			}
+			else if(count($params) == 2)
+			{
+				if (is_array($params[1]))
+				{
+					$this->_database->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->_database->where($params[0], $params[1]);
+				}
+			}
+			else if(count($params) == 3)
+			{
+				$this->_database->where($params[0], $params[1], $params[2]);
+			}
+			else
+			{
+				if (is_array($params[1]))
+				{
+					$this->_database->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->_database->where($params[0], $params[1]);
+				}
+			}
+		}
+
+		/**
             Shortcut to controller
-        */
-        public function __get($key){
-            return get_instance()->{$key};
-        }
+		 */
+		public function __get($key){
+			return get_instance()->{$key};
+		}
 
-    }
+	}

Spacing +46 added lines, -46 removed lines

@@ -33,7 +33,7 @@ 
      * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
      */
 
-    class Model{
+    class Model {
 
         /* --------------------------------------------------------------
          * VARIABLES
@@ -140,13 +140,13 @@ 
          * Initialise the model, tie into the CodeIgniter superobject and
          * try our best to guess the table name.
          */
-        public function __construct(Database $db = null){
-            if(is_object($db)){
+        public function __construct(Database $db = null) {
+            if (is_object($db)) {
                 $this->setDatabaseInstance($db);
             }
-            else{
+            else {
                 $obj = & get_instance();
-        		if(isset($obj->database) && is_object($obj->database)){
+        		if (isset($obj->database) && is_object($obj->database)) {
                     /**
                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                     * to prevent duplication
@@ -182,13 +182,13 @@ 
 
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
 
     		$this->_set_where($where);
 
             $this->trigger('before_get');
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $row = $this->_database->from($this->_table)->get($type);
             $this->_temporary_return_type = $this->return_type;
             $row = $this->trigger('after_get', $row);
@@ -224,9 +224,9 @@ 
             $this->trigger('before_get');
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $result = $this->_database->from($this->_table)->getAll($type);
             $this->_temporary_return_type = $this->return_type;
 
@@ -332,13 +332,13 @@ 
         {
             $args = func_get_args();
             $data = array();
-            if(count($args) == 2){
-                if(is_array($args[1])){
+            if (count($args) == 2) {
+                if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
             }
-            else if(count($args) == 3){
-                if(is_array($args[2])){
+            else if (count($args) == 3) {
+                if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
             }
@@ -376,7 +376,7 @@ 
             $this->_database->where($this->primary_key, $id);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -397,7 +397,7 @@ 
             $this->_set_where($where);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -416,7 +416,7 @@ 
             $this->_database->in($this->primary_key, $primary_values);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -462,7 +462,7 @@ 
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $value . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -472,10 +472,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if(is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -494,7 +494,7 @@ 
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $this->_table . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -504,10 +504,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if(is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -533,7 +533,7 @@ 
         public function dropdown()
         {
             $args = func_get_args();
-            if(count($args) == 2)
+            if (count($args) == 2)
             {
                 list($key, $value) = $args;
             }
@@ -542,7 +542,7 @@ 
                 $key = $this->primary_key;
                 $value = $args[0];
             }
-            $this->trigger('before_dropdown', array( $key, $value ));
+            $this->trigger('before_dropdown', array($key, $value));
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
                 $this->_database->where($this->soft_delete_key, FALSE);
@@ -566,7 +566,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $where = func_get_args();
             $this->_set_where($where);
@@ -581,7 +581,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $this->_database->from($this->_table)->getAll();
             return $this->_database->numRows();
@@ -590,8 +590,8 @@ 
 		/**
 		* Enabled cache temporary
 		*/
-		public function cached($ttl = 0){
-		  if($ttl > 0){
+		public function cached($ttl = 0) {
+		  if ($ttl > 0) {
 			$this->_database = $this->_database->cached($ttl);
 		  }
 		  return $this;
@@ -745,13 +745,13 @@ 
             {
                 if (is_object($row))
                 {
-					if(isset($row->$attr)){
+					if (isset($row->$attr)) {
 						unset($row->$attr);
 					}
                 }
                 else
                 {
-					if(isset($row[$attr])){
+					if (isset($row[$attr])) {
 						unset($row[$attr]);
 					}
                 }
@@ -763,7 +763,7 @@ 
          * Return the database instance
          * @return Database the database instance
          */
-        public function getDatabaseInstance(){
+        public function getDatabaseInstance() {
             return $this->_database;
         }
 
@@ -771,9 +771,9 @@ 
          * set the Database instance for future use
          * @param Database $db the database object
          */
-         public function setDatabaseInstance($db){
+         public function setDatabaseInstance($db) {
             $this->_database = $db;
-            if($this->dbCacheTime > 0){
+            if ($this->dbCacheTime > 0) {
                 $this->_database->setCache($this->dbCacheTime);
             }
             return $this;
@@ -783,7 +783,7 @@ 
          * Return the loader instance
          * @return Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loaderInstance;
         }
 
@@ -791,7 +791,7 @@ 
          * set the loader instance for future use
          * @param Loader $loader the loader object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loaderInstance = $loader;
             return $this;
         }
@@ -800,7 +800,7 @@ 
          * Return the FormValidation instance
          * @return FormValidation the form validation instance
          */
-        public function getFormValidation(){
+        public function getFormValidation() {
             return $this->formValidationInstance;
         }
 
@@ -808,7 +808,7 @@ 
          * set the form validation instance for future use
          * @param FormValidation $fv the form validation object
          */
-         public function setFormValidation($fv){
+         public function setFormValidation($fv) {
             $this->formValidationInstance = $fv;
             return $this;
         }
@@ -822,7 +822,7 @@ 
          */
         public function order_by($criteria, $order = 'ASC')
         {
-            if ( is_array($criteria) )
+            if (is_array($criteria))
             {
                 foreach ($criteria as $key => $value)
                 {
@@ -878,22 +878,22 @@ 
          */
         protected function validate(array $data)
         {
-            if($this->skip_validation)
+            if ($this->skip_validation)
             {
                 return $data;
             }
-            if(!empty($this->validate))
+            if (!empty($this->validate))
             {
                 $fv = null;
-                if(is_object($this->formValidationInstance)){
+                if (is_object($this->formValidationInstance)) {
                     $fv = $this->formValidationInstance;
                 }
-                else{
+                else {
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
                 }
-                if(is_array($this->validate))
+                if (is_array($this->validate))
                 {
                     $fv->setData($data);
                     $fv->setRules($this->validate);
@@ -948,7 +948,7 @@ 
             {
                 $this->_database->where($params[0]);
             }
-        	else if(count($params) == 2)
+        	else if (count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
@@ -959,7 +959,7 @@ 
                     $this->_database->where($params[0], $params[1]);
                 }
     		}
-    		else if(count($params) == 3)
+    		else if (count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
     		}
@@ -979,7 +979,7 @@ 
         /**
             Shortcut to controller
         */
-        public function __get($key){
+        public function __get($key) {
             return get_instance()->{$key};
         }
 

Braces +33 added lines, -66 removed lines

@@ -143,8 +143,7 @@ 
         public function __construct(Database $db = null){
             if(is_object($db)){
                 $this->setDatabaseInstance($db);
-            }
-            else{
+            } else{
                 $obj = & get_instance();
         		if(isset($obj->database) && is_object($obj->database)){
                     /**
@@ -256,8 +255,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
                 return $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -294,8 +292,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -318,8 +315,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -336,8 +332,7 @@ 
                 if(is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if(count($args) == 3){
+            } else if(count($args) == 3){
                 if(is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -349,8 +344,7 @@ 
                 $result = $this->_database->from($this->_table)->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -377,8 +371,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -398,8 +391,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -417,8 +409,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -463,8 +454,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -474,15 +464,13 @@ 
                 {
                     if(is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -495,8 +483,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -506,15 +493,13 @@ 
                 {
                     if(is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -536,8 +521,7 @@ 
             if(count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -685,8 +669,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -699,8 +682,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -727,8 +709,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -748,8 +729,7 @@ 
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if(isset($row[$attr])){
 						unset($row[$attr]);
@@ -828,8 +808,7 @@ 
                 {
                     $this->_database->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->_database->orderBy($criteria, $order);
             }
@@ -887,8 +866,7 @@ 
                 $fv = null;
                 if(is_object($this->formValidationInstance)){
                     $fv = $this->formValidationInstance;
-                }
-                else{
+                } else{
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -901,17 +879,14 @@ 
                     if ($fv->run())
                     {
                         return $data;
-                    }
-                    else
+                    } else
                     {
                         return FALSE;
                     }
-                }
-                else {
+                } else {
                     return $data;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -930,46 +905,38 @@ 
                     if (is_array($filter))
                     {
                         $this->_database->in($field, $filter);
-                    }
-                    else
+                    } else
                     {
                         if (is_int($field))
                         {
                             $this->_database->where($filter);
-                        }
-                        else
+                        } else
                         {
                             $this->_database->where($field, $filter);
                         }
                     }
                 }
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
+            } else if(count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }
-    		}
-    		else if(count($params) == 3)
+    		} else if(count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }

core/classes/cache/FileCache.php

Indentation +86 added lines, -86 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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 FileCache implements CacheInterface{
 		
@@ -44,15 +44,15 @@ 
 				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
 			}
 			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::FileCache');
-	        }
+			 * instance of the Log class
+			 */
+			if(is_object($logger)){
+			  $this->logger = $logger;
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
+				$this->logger->setLogger('Library::FileCache');
+			}
 			
 			//if Zlib extension is not loaded set compressCacheData to false
 			if(! extension_loaded('zlib')){
@@ -80,26 +80,26 @@ 
 				return false;
 			}
 			// Getting a shared lock 
-		    flock($handle, LOCK_SH);
-		    $data = file_get_contents($filePath);
-      		fclose($handle);
-      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
-		         // If unserializing somehow didn't work out, we'll delete the file
-		         unlink($filePath);
-		         return false;
-	      	}
-	      	if (time() > $data['expire']) {
-	      		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
-		        // Unlinking when the file was expired
-		        unlink($filePath);
-		        return false;
-		     }
-		     else{
-		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
-		     	return $data['data'];
-		     }
+			flock($handle, LOCK_SH);
+			$data = file_get_contents($filePath);
+	  		fclose($handle);
+	  		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+	  		if (! $data) {
+	  			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+				 // If unserializing somehow didn't work out, we'll delete the file
+				 unlink($filePath);
+				 return false;
+		  	}
+		  	if (time() > $data['expire']) {
+		  		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+				// Unlinking when the file was expired
+				unlink($filePath);
+				return false;
+			 }
+			 else{
+			 	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+			 	return $data['data'];
+			 }
 			return false;
 		}
 
@@ -122,25 +122,25 @@ 
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
 			//Serializing along with the TTL
-		    $cacheData = serialize(array(
+			$cacheData = serialize(array(
 									'mtime' => time(),
 									'expire' => $expire,
 									'data' => $data,
 									'ttl' => $ttl
 									)
 								);		   
-		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
-		    	fclose($handle);
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
-		    	fclose($handle);
+			$result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
+			if(! $result){
+				$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+				fclose($handle);
+				return false;
+			}
+			else{
+				$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+				fclose($handle);
 				chmod($filePath, 0640);
 				return true;
-		    }
+			}
 		}	
 
 
@@ -160,7 +160,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
-	      		@unlink($filePath);
+		  		@unlink($filePath);
 				return true;
 			}
 		}
@@ -183,7 +183,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
-	      		$data = file_get_contents($filePath);
+		  		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
@@ -223,17 +223,17 @@ 
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
-		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
-		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
-		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
-		      			@unlink($file);
-		      		}
-		      		else{
-		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
-		      		}
+			  		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+			  		if(! $data){
+			  			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
+			  		}
+			  		else if(time() > $data['expire']){
+			  			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
+			  			@unlink($file);
+			  		}
+			  		else{
+			  			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
+			  		}
 				}
 			}
 		}	
@@ -256,19 +256,19 @@ 
 			}
 		}
 	
-	    /**
-	     * @return boolean
-	     */
-	    public function isCompressCacheData(){
-	        return $this->compressCacheData;
-	    }
+		/**
+		 * @return boolean
+		 */
+		public function isCompressCacheData(){
+			return $this->compressCacheData;
+		}
 
-	    /**
-	     * @param boolean $compressCacheData
-	     *
-	     * @return self
-	     */
-	    public function setCompressCacheData($status = true){
+		/**
+		 * @param boolean $compressCacheData
+		 *
+		 * @return self
+		 */
+		public function setCompressCacheData($status = true){
 			//if Zlib extension is not loaded set compressCacheData to false
 			if($status === true && ! extension_loaded('zlib')){
 				
@@ -279,7 +279,7 @@ 
 				$this->compressCacheData = $status;
 			}
 			return $this;
-	    }
+		}
 		
 		/**
 		 * Check whether the cache feature for the handle is supported
@@ -291,28 +291,28 @@ 
 		}
 
 		/**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+		 * Return the Log instance
+		 * @return Log
+		 */
+		public function getLogger(){
+		  return $this->logger;
+		}
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+		/**
+		 * Set the log instance
+		 * @param Log $logger the log object
+		 */
+		public function setLogger(Log $logger){
+		  $this->logger = $logger;
+		  return $this;
+		}
 		
 		/**
-		* Get the cache file full path for the given key
-		*
-		* @param $key the cache item key
-		* @return string the full cache file path for this key
-		*/
+		 * Get the cache file full path for the given key
+		 *
+		 * @param $key the cache item key
+		 * @return string the full cache file path for this key
+		 */
 		private function getFilePath($key){
 			return CACHE_PATH . md5($key) . '.cache';
 		}

Spacing +62 added lines, -62 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class FileCache implements CacheInterface{
+	class FileCache implements CacheInterface {
 		
 		/**
 		 * Whether to enable compression of the cache data file.
@@ -39,23 +39,23 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
 			}
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
 			
 			//if Zlib extension is not loaded set compressCacheData to false
-			if(! extension_loaded('zlib')){
+			if (!extension_loaded('zlib')) {
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
@@ -66,17 +66,17 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			if(! file_exists($filePath)){
-				$this->logger->info('No cache file found for the key ['. $key .'], return false');
+			if (!file_exists($filePath)) {
+				$this->logger->info('No cache file found for the key [' . $key . '], return false');
 				return false;
 			}
-			$this->logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
-			$handle = fopen($filePath,'r');
-			if( ! $handle){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$this->logger->info('The cache file [' . $filePath . '] for the key [' . $key . '] exists, check if the cache data is valid');
+			$handle = fopen($filePath, 'r');
+			if (!$handle) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			// Getting a shared lock 
@@ -84,20 +84,20 @@ 
 		    $data = file_get_contents($filePath);
       		fclose($handle);
       		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$this->logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+      		if (!$data) {
+      			$this->logger->error('Can not unserialize the cache data for the key [' . $key . '], return false');
 		         // If unserializing somehow didn't work out, we'll delete the file
 		         unlink($filePath);
 		         return false;
 	      	}
 	      	if (time() > $data['expire']) {
-	      		$this->logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+	      		$this->logger->info('The cache data for the key [' . $key . '] already expired delete the cache file [' . $filePath . ']');
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
 		     }
-		     else{
-		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+		     else {
+		     	$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
 			return false;
@@ -111,13 +111,13 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$filePath = $this->getFilePath($key);
-			$handle = fopen($filePath,'w');
-			if( ! $handle){
-				$this->logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$handle = fopen($filePath, 'w');
+			if (!$handle) {
+				$this->logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -130,13 +130,13 @@ 
 									)
 								);		   
 		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+		    if (!$result) {
+		    	$this->logger->error('Can not write cache data into file [' . $filePath . '] for the key [' . $key . '], return false');
 		    	fclose($handle);
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved into file [' . $filePath . '] for the key [' . $key . ']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
 				return true;
@@ -150,16 +150,16 @@ 
 		 * @return boolean      true if the cache is delete, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] remove it');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] remove it');
 	      		@unlink($filePath);
 				return true;
 			}
@@ -173,25 +173,25 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$filePath = $this->getFilePath($key);
-			$this->logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$this->logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
+			else {
+				$this->logger->info('Found cache file [' . $filePath . '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-				if(! $data){
+				if (!$data) {
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
 				}
-				else{
+				else {
 					$this->logger->info('This cache data is OK check for expire');
-					if(isset($data['expire']) && $data['expire'] > time()){
+					if (isset($data['expire']) && $data['expire'] > time()) {
 						$this->logger->info('This cache not yet expired return cache informations');
 						$info = array(
 							'mtime' => $data['mtime'],
@@ -200,7 +200,7 @@ 
 							);
 						return $info;
 					}
-					else{
+					else {
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -212,26 +212,26 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			$this->logger->debug('Deleting of expired cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
+		      		if (!$data) {
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
 		      		}
-		      		else if(time() > $data['expire']){
+		      		else if (time() > $data['expire']) {
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			@unlink($file);
 		      		}
-		      		else{
+		      		else {
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -241,13 +241,13 @@ 
 		/**
 		 * Remove all file from cache folder
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$this->logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -259,7 +259,7 @@ 
 	    /**
 	     * @return boolean
 	     */
-	    public function isCompressCacheData(){
+	    public function isCompressCacheData() {
 	        return $this->compressCacheData;
 	    }
 
@@ -268,14 +268,14 @@ 
 	     *
 	     * @return self
 	     */
-	    public function setCompressCacheData($status = true){
+	    public function setCompressCacheData($status = true) {
 			//if Zlib extension is not loaded set compressCacheData to false
-			if($status === true && ! extension_loaded('zlib')){
+			if ($status === true && !extension_loaded('zlib')) {
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
-			else{
+			else {
 				$this->compressCacheData = $status;
 			}
 			return $this;
@@ -286,7 +286,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
 		}
 
@@ -294,7 +294,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -302,7 +302,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -313,7 +313,7 @@ 
 		* @param $key the cache item key
 		* @return string the full cache file path for this key
 		*/
-		private function getFilePath($key){
+		private function getFilePath($key) {
 			return CACHE_PATH . md5($key) . '.cache';
 		}
 	}

Braces +12 added lines, -24 removed lines

@@ -48,8 +48,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
@@ -95,8 +94,7 @@ 
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
-		     }
-		     else{
+		     } else{
 		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
@@ -134,8 +132,7 @@ 
 		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
 		    	fclose($handle);
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
@@ -157,8 +154,7 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
 	      		@unlink($filePath);
 				return true;
@@ -180,16 +176,14 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
-				}
-				else{
+				} else{
 					$this->logger->info('This cache data is OK check for expire');
 					if(isset($data['expire']) && $data['expire'] > time()){
 						$this->logger->info('This cache not yet expired return cache informations');
@@ -199,8 +193,7 @@ 
 							'ttl' => $data['ttl']
 							);
 						return $info;
-					}
-					else{
+					} else{
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -217,8 +210,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -226,12 +218,10 @@ 
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 		      		if(! $data){
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
+		      		} else if(time() > $data['expire']){
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			@unlink($file);
-		      		}
-		      		else{
+		      		} else{
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -246,8 +236,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -274,8 +263,7 @@ 
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
-			}
-			else{
+			} else{
 				$this->compressCacheData = $status;
 			}
 			return $this;

core/classes/cache/ApcCache.php

Indentation +37 added lines, -37 removed lines

@@ -22,7 +22,7 @@ 
 	 * 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 ApcCache implements CacheInterface{
 
@@ -39,15 +39,15 @@ 
 			}
 
 			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::ApcCache');
-	        }
+			 * instance of the Log class
+			 */
+			if(is_object($logger)){
+			  $this->logger = $logger;
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
+				$this->logger->setLogger('Library::ApcCache');
+			}
 		}
 
 		/**
@@ -87,13 +87,13 @@ 
 			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
 			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
-		    	return true;
-		    }
+				$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+				return false;
+			}
+			else{
+				$this->logger->info('Cache data saved for the key ['. $key .']');
+				return true;
+			}
 		}
 
 
@@ -112,7 +112,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key);
+		  		return apc_delete($key);
 			}
 			return false;
 		}
@@ -178,28 +178,28 @@ 
 		}
 
 		/**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+		 * Return the Log instance
+		 * @return Log
+		 */
+		public function getLogger(){
+		  return $this->logger;
+		}
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+		/**
+		 * Set the log instance
+		 * @param Log $logger the log object
+		 */
+		public function setLogger(Log $logger){
+		  $this->logger = $logger;
+		  return $this;
+		}
 		
 		/**
-		* Return the array of cache information
-		*
-		* @param string $key the cache key to get the cache information 
-		* @return array
-		*/
+		 * Return the array of cache information
+		 *
+		 * @param string $key the cache key to get the cache information 
+		 * @return array
+		 */
 		private function _getCacheInfo($key){
 			$caches = apc_cache_info('user');
 			if(! empty($caches['cache_list'])){

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,19 +33,19 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
 		}
@@ -55,21 +55,21 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$this->logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -82,16 +82,16 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$this->logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -103,15 +103,15 @@ 
 		 * @return boolean      true if the cache is deleted, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$this->logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key);
 			}
 			return false;
@@ -125,10 +125,10 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -136,7 +136,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -146,7 +146,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -154,14 +154,14 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$this->logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -173,7 +173,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 
@@ -181,7 +181,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -189,7 +189,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -200,12 +200,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,7 @@ 
 			if($success === false){
 				$this->logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -89,8 +87,7 @@ 
 			if($result === false){
 		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -109,8 +106,7 @@ 
 			if($cacheInfo === false){
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key);
 			}
@@ -135,8 +131,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -160,8 +155,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$this->logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

tests/hmvc/models/DBSessionModel.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	class DBSessionModel extends DBSessionHandlerModel{
+	class DBSessionModel extends DBSessionHandlerModel {
 		
 		protected $_table = 'ses';
 		protected $primary_key = 's_id';
@@ -14,14 +14,14 @@ 
 			'skey' => 'test_id' //VARCHAR(255) 
 		);
 		
-		public function deleteByTime($time){
+		public function deleteByTime($time) {
 			$this->_database->from($this->_table)
 						->where('s_time', '<', $time)
 						->delete();
 		}
 
 		
-		public function getKeyValue(){
+		public function getKeyValue() {
 			$user_id = 0;
 			return $user_id;
 		}

tests/test.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
  <?php
            
-            $pdo = new PDO('sqlite:D:\wamp\www\tnh-fw\tests\assets\db_tests.db', '', '');
-            $pdo->exec("SET NAMES 'UTF8' COLLATE 'utf8_general_ci'");
-            $pdo->exec("SET CHARACTER SET 'UTF8'");
-            $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-            $pdo->setAttribute(PDO::ATTR_CURSOR, PDO::CURSOR_FWDONLY);
+			$pdo = new PDO('sqlite:D:\wamp\www\tnh-fw\tests\assets\db_tests.db', '', '');
+			$pdo->exec("SET NAMES 'UTF8' COLLATE 'utf8_general_ci'");
+			$pdo->exec("SET CHARACTER SET 'UTF8'");
+			$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+			$pdo->setAttribute(PDO::ATTR_CURSOR, PDO::CURSOR_FWDONLY);
 			$r = $pdo->query("SELECT * FROM ses WHERE s_id = 'tony' LIMIT 1");
 			
 			$nb = $r->rowCount();

tests/bootstrap.php

Indentation +126 added lines, -126 removed lines

@@ -21,21 +21,21 @@ 
 	 * 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.
-	*/
+	 */
 	
 	error_reporting(E_ALL | E_STRICT);
 	ini_set('display_errors', 1);
 
 	/**
-	* the directory separator, under windows it is \ and unix, linux /
-	*/
+	 * the directory separator, under windows it is \ and unix, linux /
+	 */
 	define('DS', DIRECTORY_SEPARATOR);
 
 	/**
-	* The root directory of the application.
-	*
-	* you can place this directory outside of your web directory, for example "/home/your_app", etc.
-	*/
+	 * The root directory of the application.
+	 *
+	 * you can place this directory outside of your web directory, for example "/home/your_app", etc.
+	 */
 	define('ROOT_PATH', dirname(realpath(__FILE__)) . DS . '..' . DS);
 	
 	//tests dir path
@@ -43,176 +43,176 @@ 
 
 
 	/**
-	* The path to the directory.
-	*
-	* That contains your static files (javascript, css, images, etc.)
-	* Note: the path must be relative to the file index.php (the front-end controller).
-	*/
+	 * The path to the directory.
+	 *
+	 * That contains your static files (javascript, css, images, etc.)
+	 * Note: the path must be relative to the file index.php (the front-end controller).
+	 */
 	define('ASSETS_PATH', 'assets/');
 
 	/**
-	* The path to the directory of your cache files.
-	*
-	* This feature is available currently for database and views.
-	*/
+	 * The path to the directory of your cache files.
+	 *
+	 * This feature is available currently for database and views.
+	 */
 	define('CACHE_PATH', ROOT_PATH . 'cache' . DS);
 
 	/**
-	* Custom application path for tests 
-	*/
+	 * Custom application path for tests 
+	 */
 	define('APPS_PATH', TESTS_PATH .'hmvc' . DS);
 
 	/**
-	* The path to the controller directory of your application.
-	*
-	* If you already know the MVC architecture you know what a controller means; 
-	* it is he who makes the business logic of your application in general.
-	*/
+	 * The path to the controller directory of your application.
+	 *
+	 * If you already know the MVC architecture you know what a controller means; 
+	 * it is he who makes the business logic of your application in general.
+	 */
 	define('APPS_CONTROLLER_PATH', APPS_PATH . 'controllers' . DS);
 
 	/**
-	* The path to the directory of your model classes of your application. 
-	*
-	* If you already know the MVC architecture you know what a model means; 
-	* it's the one who interacts with the database, in one word persistent data from your application.
-	*/
+	 * The path to the directory of your model classes of your application. 
+	 *
+	 * If you already know the MVC architecture you know what a model means; 
+	 * it's the one who interacts with the database, in one word persistent data from your application.
+	 */
 	define('APPS_MODEL_PATH', APPS_PATH . 'models' . DS);
 
 	/**
-	* The path to the directory of your views.
-	*
-	* If you already know the MVC architecture you know what a view means, 
-	* a view is just a user interface (html page, form, etc.) that is to say 
-	* everything displayed in the browser interface, etc.
-	*/
+	 * The path to the directory of your views.
+	 *
+	 * If you already know the MVC architecture you know what a view means, 
+	 * a view is just a user interface (html page, form, etc.) that is to say 
+	 * everything displayed in the browser interface, etc.
+	 */
 	define('APPS_VIEWS_PATH', APPS_PATH . 'views' . DS);
 
 	/**
-	* The path to the configuration directory.
-	*
-	* That contains most of the configuration files for your 
-	* application (database, class loading file, functions, etc.)
-	*/
+	 * The path to the configuration directory.
+	 *
+	 * That contains most of the configuration files for your 
+	 * application (database, class loading file, functions, etc.)
+	 */
 	define('CONFIG_PATH', ROOT_PATH . 'config' . DS);
 
 	/** 
-	* The core directory
-	*
-	* It is recommended to put this folder out of the web directory of your server and 
-	* you should not change its content because in case of update you could lose the modified files.
-	*/
+	 * The core directory
+	 *
+	 * It is recommended to put this folder out of the web directory of your server and 
+	 * you should not change its content because in case of update you could lose the modified files.
+	 */
 	define('CORE_PATH', ROOT_PATH . 'core' . DS);
 	
 	/**
-	* The path to the directory of core classes that used by the system.
-	*
-	* It contains PHP classes that are used by the framework internally.
-	*/
+	 * The path to the directory of core classes that used by the system.
+	 *
+	 * It contains PHP classes that are used by the framework internally.
+	 */
 	define('CORE_CLASSES_PATH', CORE_PATH . 'classes' . DS);
 	
 	/**
-	* The path to the directory of core classes for the cache used by the system.
-	*
-	* It contains PHP classes for the cache drivers.
-	*/
+	 * The path to the directory of core classes for the cache used by the system.
+	 *
+	 * It contains PHP classes for the cache drivers.
+	 */
 	define('CORE_CLASSES_CACHE_PATH', CORE_CLASSES_PATH . 'cache' . DS);
 	
 	/**
-	* The path to the directory of core classes for the model used by the system.
-	*
-	* It contains PHP classes for the models.
-	*/
+	 * The path to the directory of core classes for the model used by the system.
+	 *
+	 * It contains PHP classes for the models.
+	 */
 	define('CORE_CLASSES_MODEL_PATH', CORE_CLASSES_PATH . 'model' . DS);
 
 	/**
-	* The path to the directory of functions or helper systems.
-	*
-	* It contains PHP functions that perform a particular task: character string processing, URL, etc.
-	*/
+	 * The path to the directory of functions or helper systems.
+	 *
+	 * It contains PHP functions that perform a particular task: character string processing, URL, etc.
+	 */
 	define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . DS);
 
 	/**
-	* The path to the core directory of languages files. 
-	*
-	*/
+	 * The path to the core directory of languages files. 
+	 *
+	 */
 	define('CORE_LANG_PATH', CORE_PATH . 'lang' . DS);
 
 	/**
-	* The path to the system library directory.
-	*
-	* Which contains the libraries most often used in your web application, as for the 
-	* core directory it is advisable to put it out of the root directory of your application.
-	*/
+	 * The path to the system library directory.
+	 *
+	 * Which contains the libraries most often used in your web application, as for the 
+	 * core directory it is advisable to put it out of the root directory of your application.
+	 */
 	define('CORE_LIBRARY_PATH', CORE_PATH . 'libraries' . DS);
 
 	/**
-	* The path to the system view directory.
-	*
-	* That contains the views used for the system, such as error messages, and so on.
-	*/
+	 * The path to the system view directory.
+	 *
+	 * That contains the views used for the system, such as error messages, and so on.
+	 */
 	define('CORE_VIEWS_PATH', CORE_PATH . 'views' . DS);
 	
 	/**
-	* The path to the directory of your PHP personal functions or helper.
-	*
-	* It contains your PHP functions that perform a particular task: utilities, etc.
-	* Note: Do not put your personal functions or helpers in the system functions directory, 
-	* because if you update the system you may lose them.
-	*/
+	 * The path to the directory of your PHP personal functions or helper.
+	 *
+	 * It contains your PHP functions that perform a particular task: utilities, etc.
+	 * Note: Do not put your personal functions or helpers in the system functions directory, 
+	 * because if you update the system you may lose them.
+	 */
 	define('FUNCTIONS_PATH', ROOT_PATH . 'functions' . DS);
 
 	/**
-	* The path to the app directory of personal language. 
-	*
-	* This feature is not yet available. 
-	* You can help us do this if you are nice or wish to see the developed framework.
-	*/
+	 * The path to the app directory of personal language. 
+	 *
+	 * This feature is not yet available. 
+	 * You can help us do this if you are nice or wish to see the developed framework.
+	 */
 	define('APP_LANG_PATH', ROOT_PATH . 'lang' . DS);
 
 	/**
-	* The path to the directory of your personal libraries
-	*
-	* It contains your PHP classes, package, etc.
-	* Note: you should not put your personal libraries in the system library directory, 
-	* because it is recalled in case of updating the system you might have surprises.
-	*/
+	 * The path to the directory of your personal libraries
+	 *
+	 * It contains your PHP classes, package, etc.
+	 * Note: you should not put your personal libraries in the system library directory, 
+	 * because it is recalled in case of updating the system you might have surprises.
+	 */
 	define('LIBRARY_PATH', ROOT_PATH . 'libraries' . DS);
 
 	/**
-	* The path to the directory that contains the log files.
-	*
-	* Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
-	* under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
-	* details see the documentation of your web server.
-	* Example for Unix or linux with apache web server:
-	* # chmod -R 700 /path/to/your/logs/directory/
-	* # chown -R www-data:www-data /path/to/your/logs/directory/
-	*/
+	 * The path to the directory that contains the log files.
+	 *
+	 * Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
+	 * under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
+	 * details see the documentation of your web server.
+	 * Example for Unix or linux with apache web server:
+	 * # chmod -R 700 /path/to/your/logs/directory/
+	 * # chown -R www-data:www-data /path/to/your/logs/directory/
+	 */
 	define('LOGS_PATH', ROOT_PATH . 'logs' . DS);
 
 	/**
-	* The path to the modules directory. 
-	*
-	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
-	* in HMVC architecture (hierichical, controllers, models, views).
-	*/
+	 * The path to the modules directory. 
+	 *
+	 * It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
+	 * in HMVC architecture (hierichical, controllers, models, views).
+	 */
 	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS .'hmvc' . DS . 'modules' . DS);
 
 	/**
-	* The path to the directory of sources external to your application.
-	*
-	* If you have already used "composer" you know what that means.
-	*/
+	 * The path to the directory of sources external to your application.
+	 *
+	 * If you have already used "composer" you know what that means.
+	 */
 	define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
 
 	/**
-	* The front controller of your application.
-	*
-	* "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
-	* your application by using the rewrite module URL of your web server .
-	* For example, under apache web server, there is a configuration example file that is located at the root 
-	* of your framework folder : "htaccess.txt" rename it to ".htaccess".
-	*/
+	 * The front controller of your application.
+	 *
+	 * "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
+	 * your application by using the rewrite module URL of your web server .
+	 * For example, under apache web server, there is a configuration example file that is located at the root 
+	 * of your framework folder : "htaccess.txt" rename it to ".htaccess".
+	 */
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 	
 	/**
@@ -221,14 +221,14 @@ 
 	define('IS_CLI', stripos('cli', php_sapi_name()) !== false);
 
 	/**
-	* The environment of your application (production, test, development). 
-	*
-	* if your application is still in development you use the value "development" 
-	* so you will have the display of the error messages, etc. 
-	* Once you finish the development of your application that is to put it online 
-	* you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
-	* the loading of the system, will be fast.
-	*/
+	 * The environment of your application (production, test, development). 
+	 *
+	 * if your application is still in development you use the value "development" 
+	 * so you will have the display of the error messages, etc. 
+	 * Once you finish the development of your application that is to put it online 
+	 * you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
+	 * the loading of the system, will be fast.
+	 */
 	define('ENVIRONMENT', 'testing');
 	
 	
@@ -259,13 +259,13 @@ 
 	require_once  'include/testsUtil.php';
 	
 	/**
-	* Setting of the PHP error message handling function
-	*/
+	 * Setting of the PHP error message handling function
+	 */
 	set_error_handler('php_error_handler');
 
 	/**
-	* Setting of the PHP error exception handling function
-	*/
+	 * Setting of the PHP error exception handling function
+	 */
 	set_exception_handler('php_exception_handler');
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	* Custom application path for tests 
 	*/
-	define('APPS_PATH', TESTS_PATH .'hmvc' . DS);
+	define('APPS_PATH', TESTS_PATH . 'hmvc' . DS);
 
 	/**
 	* The path to the controller directory of your application.
@@ -196,7 +196,7 @@ 
 	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
 	* in HMVC architecture (hierichical, controllers, models, views).
 	*/
-	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS .'hmvc' . DS . 'modules' . DS);
+	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS . 'hmvc' . DS . 'modules' . DS);
 
 	/**
 	* The path to the directory of sources external to your application.
@@ -235,7 +235,7 @@ 
 	//Fix to allow test as if application is running in CLI mode $_SESSION global variable is not available
 	$_SESSION = array();
 	
-	if(! isset($_SERVER['REMOTE_ADDR'])){ 
+	if (!isset($_SERVER['REMOTE_ADDR'])) { 
 		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 	}
 
@@ -243,7 +243,7 @@ 
 	require_once  'include/autoloader.php';
 	
 	//check for composer autoload file if exists include it
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		require_once VENDOR_PATH . 'autoload.php';
 		
 		//define the class alias for vstream

tests/tnhfw/CommonTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,20 +24,20 @@
 		}
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
+		public function testFunctionGetConfigKeyNotExist() {
 			$key = 'foo';
 			$cfg = get_config($key);
 			$this->assertNull($cfg);
 		}
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+		public function testFunctionGetConfigKeyNotExistUsingDefaultValue() {
 			$key = 'foo';
 			$expected = 'bar';
 			$cfg = get_config($key, $expected);
 			$this->assertEquals($cfg, $expected);
 		}
 		
-		public function testFunctionGetConfigAfterSet(){
+		public function testFunctionGetConfigAfterSet() {
 			$key = 'foo';
 			$expected = 'bar';
 			$c = new Config();

core/classes/Database.php

Indentation +1238 added lines, -1238 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
   /**
    * TNH Framework
    *
@@ -22,188 +22,188 @@ 
    * 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
-	*/
-    private $pdo                 = null;
+	 */
+	private $pdo                 = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
-	*/
+	 */
 	private $databaseName        = null;
     
 	/**
 	 * The SQL SELECT statment
 	 * @var string
-	*/
+	 */
 	private $select              = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
-	*/
-    private $from                = null;
+	 */
+	private $from                = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
-	*/
-    private $where               = null;
+	 */
+	private $where               = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
-	*/
-    private $limit               = null;
+	 */
+	private $limit               = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
-	*/
-    private $join                = null;
+	 */
+	private $join                = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
-	*/
-    private $orderBy             = null;
+	 */
+	private $orderBy             = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
-	*/
-    private $groupBy             = null;
+	 */
+	private $groupBy             = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
-	*/
-    private $having              = null;
+	 */
+	private $having              = 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 error returned for the last query
 	 * @var string
-	*/
-    private $error               = null;
+	 */
+	private $error               = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
-	*/
-    private $result              = array();
+	 */
+	private $result              = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
-	*/
-    private $prefix              = null;
+	 */
+	private $prefix              = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
-	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+	 */
+	private $operatorList        = 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 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 Log
 	 */
-    private $logger              = null;
-
-
-    /**
-    * The cache instance
-    * @var CacheInterface
-    */
-    private $cacheInstance       = null;
-
-     /**
-    * The benchmark instance
-    * @var Benchmark
-    */
-    private $benchmarkInstance   = null;
-
-
-    /**
-     * Construct new database
-     * @param array $overwriteConfig the config to overwrite with the config set in database.php
-     * @param object $logger the log instance
-     */
-    public function __construct($overwriteConfig = array(), Log $logger = null){
-        /**
-         * instance of the Log class
-         */
-        if(is_object($logger)){
-          $this->logger = $logger;
-        }
-        else{
-            $this->logger =& class_loader('Log', 'classes');
-            $this->logger->setLogger('Library::Database');
-        }
-
-        $db = array();
-      	if(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';
-        }
+	private $logger              = null;
+
+
+	/**
+	 * The cache instance
+	 * @var CacheInterface
+	 */
+	private $cacheInstance       = null;
+
+	 /**
+	  * The benchmark instance
+	  * @var Benchmark
+	  */
+	private $benchmarkInstance   = null;
+
+
+	/**
+	 * Construct new database
+	 * @param array $overwriteConfig the config to overwrite with the config set in database.php
+	 * @param object $logger the log instance
+	 */
+	public function __construct($overwriteConfig = array(), Log $logger = null){
+		/**
+		 * instance of the Log class
+		 */
+		if(is_object($logger)){
+		  $this->logger = $logger;
+		}
+		else{
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Database');
+		}
+
+		$db = array();
+	  	if(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';
+		}
           
 				if(! empty($overwriteConfig)){
 				  $db = array_merge($db, $overwriteConfig);
 				}
-        $config = array();
+		$config = array();
 				$config['driver']    = isset($db['driver']) ? $db['driver'] : 'mysql';
 				$config['username']  = isset($db['username']) ? $db['username'] : 'root';
 				$config['password']  = isset($db['password']) ? $db['password'] : '';
@@ -212,1031 +212,1031 @@ 
 				$config['charset']   = isset($db['charset']) ? $db['charset'] : 'utf8';
 				$config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
 				$config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
-        $port = '';
-        if(strstr($config['hostname'], ':')){
-          $p = explode(':', $config['hostname']);
-          $port = isset($p[1]) ? $p[1] : '';
-          $config['hostname'] = isset($p[0]) ? $p[0] : '';
-        }
+		$port = '';
+		if(strstr($config['hostname'], ':')){
+		  $p = explode(':', $config['hostname']);
+		  $port = isset($p[1]) ? $p[1] : '';
+		  $config['hostname'] = isset($p[0]) ? $p[0] : '';
+		}
 				$config['port']      = $port;
 				
 		  	$this->setDatabaseConfiguration($config);
-    		$this->temporaryCacheTtl = $this->cacheTtl;
-    }
-
-    /**
-     * This is used to connect to database
-     * @return bool 
-     */
-    public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
-        try{
-            $driverDsnMap = array(
-              'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
-                          . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
-                          . 'dbname=' . $config['database'],
-              'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
-                          . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
-                          . 'dbname=' . $config['database'],
-              'sqlite' => 'sqlite:' . $config['database'],
-              'oracle' => 'oci:dbname=' . $config['hostname'] 
-                          . (($config['port']) != '' ? ':' . $config['port'] : '')
-                          . '/' . $config['database']
-            );
-            $dsn = isset($driverDsnMap[$config['driver']]) ? $driverDsnMap[$config['driver']] : '';
+			$this->temporaryCacheTtl = $this->cacheTtl;
+	}
+
+	/**
+	 * This is used to connect to database
+	 * @return bool 
+	 */
+	public function connect(){
+	  $config = $this->getDatabaseConfiguration();
+	  if(! empty($config)){
+		try{
+			$driverDsnMap = array(
+			  'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
+						  . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
+						  . 'dbname=' . $config['database'],
+			  'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
+						  . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
+						  . 'dbname=' . $config['database'],
+			  'sqlite' => 'sqlite:' . $config['database'],
+			  'oracle' => 'oci:dbname=' . $config['hostname'] 
+						  . (($config['port']) != '' ? ':' . $config['port'] : '')
+						  . '/' . $config['database']
+			);
+			$dsn = isset($driverDsnMap[$config['driver']]) ? $driverDsnMap[$config['driver']] : '';
             
-            $this->pdo = new PDO($dsn, $config['username'], $config['password']);
-            $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
-            $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
-            $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-            return true;
-          }
-          catch (PDOException $e){
-            $this->logger->fatal($e->getMessage());
-            show_error('Cannot connect to Database.');
-            return false;
-          }
-      }
-      else{
-        show_error('Database configuration is not set.');
-        return false;
-      }
-    }
-
-    /**
-     * Set the SQL FROM statment
-     * @param  string|array $table the table name or array of table list
-     * @return object        the current Database instance
-     */
-    public function from($table){
-      if(is_array($table)){
-        $froms = '';
-        foreach($table as $key){
-          $froms .= $this->prefix . $key . ', ';
-        }
-        $this->from = rtrim($froms, ', ');
-      }
-      else{
-        $this->from = $this->prefix . $table;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL SELECT statment
-     * @param  string|array $fields the field name or array of field list
-     * @return object        the current Database instance
-     */
-    public function select($fields){
-      $select = (is_array($fields) ? implode(', ', $fields) : $fields);
-      $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
-      return $this;
-    }
-
-    /**
-     * Set the SQL SELECT DISTINCT statment
-     * @param  string $field the field name to distinct
-     * @return object        the current Database instance
-     */
-    public function distinct($field){
-      $distinct = ' DISTINCT ' . $field;
-      $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
-
-      return $this;
-    }
-
-    /**
-     * Set the SQL function MAX in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function max($field, $name = null){
-      $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function MIN in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function min($field, $name = null){
-      $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function SUM in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function sum($field, $name = null){
-      $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function COUNT in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function count($field = '*', $name = null){
-      $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function AVG in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function avg($field, $name = null){
-      $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL JOIN statment
-     * @param  string $table  the join table name
-     * @param  string $field1 the first field for join conditions	
-     * @param  string $op     the join condition operator. If is null the default will be "="
-     * @param  string $field2 the second field for join conditions
-     * @param  string $type   the type of join (INNER, LEFT, RIGHT)
-     * @return object        the current Database instance
-     */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
-      $on = $field1;
-      $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
-      }
-      if (is_null($this->join)){
-        $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
-        $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL INNER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'INNER ');
-    }
-
-    /**
-     * Set the SQL LEFT JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'LEFT ');
-	}
-
-	/**
-     * Set the SQL RIGHT JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'RIGHT ');
-    }
-
-    /**
-     * Set the SQL FULL OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
-    	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
-    }
-
-    /**
-     * Set the SQL LEFT OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
-    }
-
-    /**
-     * Set the SQL RIGHT OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE for IS NULL
-     * @param  string|array $field  the field name or array of field list
-     * @param  string $andOr the separator type used 'AND', 'OR', etc.
-     * @return object        the current Database instance
-     */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
-        	$this->whereIsNull($f, $andOr);
-        }
-      }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
-        }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
-          }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE for IS NOT NULL
-     * @param  string|array $field  the field name or array of field list
-     * @param  string $andOr the separator type used 'AND', 'OR', etc.
-     * @return object        the current Database instance
-     */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
-          $this->whereIsNotNull($f, $andOr);
-        }
-      }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
-        }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
-          }
-      }
-      return $this;
-    }
+			$this->pdo = new PDO($dsn, $config['username'], $config['password']);
+			$this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
+			$this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
+			$this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+			return true;
+		  }
+		  catch (PDOException $e){
+			$this->logger->fatal($e->getMessage());
+			show_error('Cannot connect to Database.');
+			return false;
+		  }
+	  }
+	  else{
+		show_error('Database configuration is not set.');
+		return false;
+	  }
+	}
+
+	/**
+	 * Set the SQL FROM statment
+	 * @param  string|array $table the table name or array of table list
+	 * @return object        the current Database instance
+	 */
+	public function from($table){
+	  if(is_array($table)){
+		$froms = '';
+		foreach($table as $key){
+		  $froms .= $this->prefix . $key . ', ';
+		}
+		$this->from = rtrim($froms, ', ');
+	  }
+	  else{
+		$this->from = $this->prefix . $table;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL SELECT statment
+	 * @param  string|array $fields the field name or array of field list
+	 * @return object        the current Database instance
+	 */
+	public function select($fields){
+	  $select = (is_array($fields) ? implode(', ', $fields) : $fields);
+	  $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL SELECT DISTINCT statment
+	 * @param  string $field the field name to distinct
+	 * @return object        the current Database instance
+	 */
+	public function distinct($field){
+	  $distinct = ' DISTINCT ' . $field;
+	  $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
+
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function MAX in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function max($field, $name = null){
+	  $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function MIN in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function min($field, $name = null){
+	  $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function SUM in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function sum($field, $name = null){
+	  $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function COUNT in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function count($field = '*', $name = null){
+	  $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function AVG in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function avg($field, $name = null){
+	  $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL JOIN statment
+	 * @param  string $table  the join table name
+	 * @param  string $field1 the first field for join conditions	
+	 * @param  string $op     the join condition operator. If is null the default will be "="
+	 * @param  string $field2 the second field for join conditions
+	 * @param  string $type   the type of join (INNER, LEFT, RIGHT)
+	 * @return object        the current Database instance
+	 */
+	public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+	  $on = $field1;
+	  $table = $this->prefix . $table;
+	  if(! is_null($op)){
+		$on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+	  }
+	  if (is_null($this->join)){
+		$this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
+	  }
+	  else{
+		$this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL INNER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function innerJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'INNER ');
+	}
+
+	/**
+	 * Set the SQL LEFT JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function leftJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'LEFT ');
+	}
+
+	/**
+	 * Set the SQL RIGHT JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function rightJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'RIGHT ');
+	}
+
+	/**
+	 * Set the SQL FULL OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+		return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
+	}
+
+	/**
+	 * Set the SQL LEFT OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
+	}
+
+	/**
+	 * Set the SQL RIGHT OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE for IS NULL
+	 * @param  string|array $field  the field name or array of field list
+	 * @param  string $andOr the separator type used 'AND', 'OR', etc.
+	 * @return object        the current Database instance
+	 */
+	public function whereIsNull($field, $andOr = 'AND'){
+	  if(is_array($field)){
+		foreach($field as $f){
+			$this->whereIsNull($f, $andOr);
+		}
+	  }
+	  else{
+		if (! $this->where){
+		  $this->where = $field.' IS NULL ';
+		}
+		else{
+			$this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+		  }
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE for IS NOT NULL
+	 * @param  string|array $field  the field name or array of field list
+	 * @param  string $andOr the separator type used 'AND', 'OR', etc.
+	 * @return object        the current Database instance
+	 */
+	public function whereIsNotNull($field, $andOr = 'AND'){
+	  if(is_array($field)){
+		foreach($field as $f){
+		  $this->whereIsNotNull($f, $andOr);
+		}
+	  }
+	  else{
+		if (! $this->where){
+		  $this->where = $field.' IS NOT NULL ';
+		}
+		else{
+			$this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+		  }
+	  }
+	  return $this;
+	}
     
-    /**
-     * Set the SQL WHERE CLAUSE statment
-     * @param  string|array  $where the where field or array of field list
-     * @param  string  $op     the condition operator. If is null the default will be "="
-     * @param  mixed  $val    the where value
-     * @param  string  $type   the type used for this where clause (NOT, etc.)
-     * @param  string  $andOr the separator type used 'AND', 'OR', etc.
-     * @param  boolean $escape whether to escape or not the $val
-     * @return object        the current Database instance
-     */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($where)){
-        $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
-            $data = '';
-          }
-          $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
-        }
-        $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
-        if(is_array($op)){
-          $x = explode('?', $where);
-          $w = '';
-          foreach($x as $k => $v){
-            if(! empty($v)){
-                if(isset($op[$k]) && is_null($op[$k])){
-                  $op[$k] = '';
-                }
-                $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
-            }
-          }
-          $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
-            $op = '';
-          }
-        	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
-          if(is_null($val)){
-            $val = '';
-          }
-        	$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
-        }
-      }
-      if (is_null($this->where)){
-        $this->where = $where;
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $where;
-        }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $where;
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using OR
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
-      return $this->where($where, $op, $val, '', 'OR', $escape);
-    }
-
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using AND and NOT
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
-      return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using OR and NOT
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
-    	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query
-     * @param  string $type   the type of this grouped (NOT, etc.)
-     * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
-     * @return object        the current Database instance
-     */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (is_null($this->where)){
-        $this->where = $type . ' (';
-      }
-      else{
-          if(substr($this->where, -1) == '('){
-            $this->where .= $type . ' (';
-          }
-          else{
-          	$this->where .= $andOr . ' ' . $type . ' (';
-          }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query using NOT type
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function notGroupStart(){
-      return $this->groupStart('NOT');
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query using OR for separator
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function orGroupStart(){
-      return $this->groupStart('', ' OR');
-    }
-
-     /**
-     * Set the opened parenthesis for the complex SQL query using OR for separator and NOT for type
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function orNotGroupStart(){
-      return $this->groupStart('NOT', ' OR');
-    }
-
-    /**
-     * Close the parenthesis for the grouped SQL
-     * @return object        the current Database instance
-     */
-    public function groupEnd(){
-      $this->where .= ')';
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for IN
-     * @param  string  $field  the field name for IN statment
-     * @param  array   $keys   the list of values used
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($keys)){
-        $_keys = array();
-        foreach ($keys as $k => $v){
-          if(is_null($v)){
-            $v = '';
-          }
-          $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
-        }
-        $keys = implode(', ', $_keys);
-        if (is_null($this->where)){
-          $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-        }
-        else{
-          if(substr($this->where, -1) == '('){
-            $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-          else{
-            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function notIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for IN with OR separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function orIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for NOT IN with OR separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function orNotIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN
-     * @param  string  $field  the field used for the BETWEEN statment
-     * @param  mixed  $value1 the BETWEEN begin value
-     * @param  mixed  $value2 the BETWEEN end value
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
-        $value1 = '';
-      }
-      if(is_null($value2)){
-        $value2 = '';
-      }
-      if (is_null($this->where)){
-      	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
-          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function notBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with OR separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function orBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and OR separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE
-     * @param  string  $field  the field name used in LIKE statment
-     * @param  string  $data   the LIKE value for this field including the '%', and '_' part
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($data)){
-        $data = '';
-      }
-      $like = $escape ? $this->escape($data) : $data;
-      if (is_null($this->where)){
-        $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function orLike($field, $data, $escape = true){
-      return $this->like($field, $data, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and AND separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function notLike($field, $data, $escape = true){
-      return $this->like($field, $data, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and OR separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function orNotLike($field, $data, $escape = true){
-      return $this->like($field, $data, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL LIMIT statment
-     * @param  int $limit    the limit offset. If $limitEnd is null this will be the limit count
-     * like LIMIT n;
-     * @param  int $limitEnd the limit count
-     * @return object        the current Database instance
-     */
-    public function limit($limit, $limitEnd = null){
-      if(is_null($limit)){
-        return;
-      }
-      if (! is_null($limitEnd)){
-        $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
-        $this->limit = $limit;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL ORDER BY CLAUSE statment
-     * @param  string $orderBy   the field name used for order
-     * @param  string $orderDir the order direction (ASC or DESC)
-     * @return object        the current Database instance
-     */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! is_null($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL GROUP BY CLAUSE statment
-     * @param  string|array $field the field name used or array of field list
-     * @return object        the current Database instance
-     */
-    public function groupBy($field){
-      if(is_array($field)){
-        $this->groupBy = implode(', ', $field);
-      }
-      else{
-        $this->groupBy = $field;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL HAVING CLAUSE statment
-     * @param  string  $field  the field name used for HAVING statment
-     * @param  string|array  $op     the operator used or array
-     * @param  mixed  $val    the value for HAVING comparaison
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
-        $x = explode('?', $field);
-        $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
-              $op[$k] = '';
-            }
-  	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
-  	      }
-      	}
-        $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
-          $op = '';
-        }
-        $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
-        if(is_null($val)){
-          $val = '';
-        }
-        $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
-      }
-      return $this;
-    }
-
-    /**
-     * Return the number of rows returned by the current query
-     * @return int
-     */
-    public function numRows(){
-      return $this->numRows;
-    }
-
-    /**
-     * Return the last insert id value
-     * @return mixed
-     */
-    public function insertId(){
-      return $this->insertId;
-    }
-
-    /**
-     * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
-     */
-    public function error(){
+	/**
+	 * Set the SQL WHERE CLAUSE statment
+	 * @param  string|array  $where the where field or array of field list
+	 * @param  string  $op     the condition operator. If is null the default will be "="
+	 * @param  mixed  $val    the where value
+	 * @param  string  $type   the type used for this where clause (NOT, etc.)
+	 * @param  string  $andOr the separator type used 'AND', 'OR', etc.
+	 * @param  boolean $escape whether to escape or not the $val
+	 * @return object        the current Database instance
+	 */
+	public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+	  if (is_array($where)){
+		$_where = array();
+		foreach ($where as $column => $data){
+		  if(is_null($data)){
+			$data = '';
+		  }
+		  $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
+		}
+		$where = implode(' '.$andOr.' ', $_where);
+	  }
+	  else{
+		if(is_array($op)){
+		  $x = explode('?', $where);
+		  $w = '';
+		  foreach($x as $k => $v){
+			if(! empty($v)){
+				if(isset($op[$k]) && is_null($op[$k])){
+				  $op[$k] = '';
+				}
+				$w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
+			}
+		  }
+		  $where = $w;
+		}
+		else if (! in_array((string)$op, $this->operatorList)){
+		  if(is_null($op)){
+			$op = '';
+		  }
+			$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
+		}
+		else{
+		  if(is_null($val)){
+			$val = '';
+		  }
+			$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
+		}
+	  }
+	  if (is_null($this->where)){
+		$this->where = $where;
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $where;
+		}
+		else{
+		  $this->where = $this->where . ' '.$andOr.' ' . $where;
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using OR
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function orWhere($where, $op = null, $val = null, $escape = true){
+	  return $this->where($where, $op, $val, '', 'OR', $escape);
+	}
+
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using AND and NOT
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function notWhere($where, $op = null, $val = null, $escape = true){
+	  return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using OR and NOT
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function orNotWhere($where, $op = null, $val = null, $escape = true){
+		return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query
+	 * @param  string $type   the type of this grouped (NOT, etc.)
+	 * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
+	 * @return object        the current Database instance
+	 */
+	public function groupStart($type = '', $andOr = ' AND'){
+	  if (is_null($this->where)){
+		$this->where = $type . ' (';
+	  }
+	  else{
+		  if(substr($this->where, -1) == '('){
+			$this->where .= $type . ' (';
+		  }
+		  else{
+		  	$this->where .= $andOr . ' ' . $type . ' (';
+		  }
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query using NOT type
+	 * @see  Database::groupStart()
+	 * @return object        the current Database instance
+	 */
+	public function notGroupStart(){
+	  return $this->groupStart('NOT');
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query using OR for separator
+	 * @see  Database::groupStart()
+	 * @return object        the current Database instance
+	 */
+	public function orGroupStart(){
+	  return $this->groupStart('', ' OR');
+	}
+
+	 /**
+	  * Set the opened parenthesis for the complex SQL query using OR for separator and NOT for type
+	  * @see  Database::groupStart()
+	  * @return object        the current Database instance
+	  */
+	public function orNotGroupStart(){
+	  return $this->groupStart('NOT', ' OR');
+	}
+
+	/**
+	 * Close the parenthesis for the grouped SQL
+	 * @return object        the current Database instance
+	 */
+	public function groupEnd(){
+	  $this->where .= ')';
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for IN
+	 * @param  string  $field  the field name for IN statment
+	 * @param  array   $keys   the list of values used
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+	  if (is_array($keys)){
+		$_keys = array();
+		foreach ($keys as $k => $v){
+		  if(is_null($v)){
+			$v = '';
+		  }
+		  $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
+		}
+		$keys = implode(', ', $_keys);
+		if (is_null($this->where)){
+		  $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
+		}
+		else{
+		  if(substr($this->where, -1) == '('){
+			$this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+		  }
+		  else{
+			$this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+		  }
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function notIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for IN with OR separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function orIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for NOT IN with OR separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function orNotIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN
+	 * @param  string  $field  the field used for the BETWEEN statment
+	 * @param  mixed  $value1 the BETWEEN begin value
+	 * @param  mixed  $value2 the BETWEEN end value
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
+	  if(is_null($value1)){
+		$value1 = '';
+	  }
+	  if(is_null($value2)){
+		$value2 = '';
+	  }
+	  if (is_null($this->where)){
+	  	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+		}
+		else{
+		  $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function notBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with OR separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function orBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and OR separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function orNotBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE
+	 * @param  string  $field  the field name used in LIKE statment
+	 * @param  string  $data   the LIKE value for this field including the '%', and '_' part
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
+	  if(is_null($data)){
+		$data = '';
+	  }
+	  $like = $escape ? $this->escape($data) : $data;
+	  if (is_null($this->where)){
+		$this->where = $field . ' ' . $type . 'LIKE ' . $like;
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
+		}
+		else{
+		  $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function orLike($field, $data, $escape = true){
+	  return $this->like($field, $data, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and AND separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function notLike($field, $data, $escape = true){
+	  return $this->like($field, $data, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and OR separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function orNotLike($field, $data, $escape = true){
+	  return $this->like($field, $data, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL LIMIT statment
+	 * @param  int $limit    the limit offset. If $limitEnd is null this will be the limit count
+	 * like LIMIT n;
+	 * @param  int $limitEnd the limit count
+	 * @return object        the current Database instance
+	 */
+	public function limit($limit, $limitEnd = null){
+	  if(is_null($limit)){
+		return;
+	  }
+	  if (! is_null($limitEnd)){
+		$this->limit = $limit . ', ' . $limitEnd;
+	  }
+	  else{
+		$this->limit = $limit;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL ORDER BY CLAUSE statment
+	 * @param  string $orderBy   the field name used for order
+	 * @param  string $orderDir the order direction (ASC or DESC)
+	 * @return object        the current Database instance
+	 */
+	public function orderBy($orderBy, $orderDir = ' ASC'){
+	  if (! is_null($orderDir)){
+		$this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+	  }
+	  else{
+		if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
+		  $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+		}
+		else{
+		  $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL GROUP BY CLAUSE statment
+	 * @param  string|array $field the field name used or array of field list
+	 * @return object        the current Database instance
+	 */
+	public function groupBy($field){
+	  if(is_array($field)){
+		$this->groupBy = implode(', ', $field);
+	  }
+	  else{
+		$this->groupBy = $field;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL HAVING CLAUSE statment
+	 * @param  string  $field  the field name used for HAVING statment
+	 * @param  string|array  $op     the operator used or array
+	 * @param  mixed  $val    the value for HAVING comparaison
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function having($field, $op = null, $val = null, $escape = true){
+	  if(is_array($op)){
+		$x = explode('?', $field);
+		$w = '';
+		foreach($x as $k => $v){
+  		  if(!empty($v)){
+			if(isset($op[$k]) && is_null($op[$k])){
+			  $op[$k] = '';
+			}
+  		  	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
+  		  }
+	  	}
+		$this->having = $w;
+	  }
+	  else if (! in_array($op, $this->operatorList)){
+		if(is_null($op)){
+		  $op = '';
+		}
+		$this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
+	  }
+	  else{
+		if(is_null($val)){
+		  $val = '';
+		}
+		$this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Return the number of rows returned by the current query
+	 * @return int
+	 */
+	public function numRows(){
+	  return $this->numRows;
+	}
+
+	/**
+	 * Return the last insert id value
+	 * @return mixed
+	 */
+	public function insertId(){
+	  return $this->insertId;
+	}
+
+	/**
+	 * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
+	 */
+	public function error(){
   		if($this->error){
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
-    }
-
-    /**
-     * Get the result of one record rows returned by the current query
-     * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * 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){
-      $this->limit = 1;
-      $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
-        return $query;
-      }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
-      }
-    }
-
-    /**
-     * Get the result of record rows list returned by the current query
-     * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * 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){
-      $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! is_null($this->join)){
-        $query .= $this->join;
-      }
+	}
+
+	/**
+	 * Get the result of one record rows returned by the current query
+	 * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * 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){
+	  $this->limit = 1;
+	  $query = $this->getAll(true);
+	  if($returnSQLQueryOrResultType === true){
+		return $query;
+	  }
+	  else{
+		return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+	  }
+	}
+
+	/**
+	 * Get the result of record rows list returned by the current query
+	 * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * 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){
+	  $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
+	  if (! is_null($this->join)){
+		$query .= $this->join;
+	  }
 	  
-      if (! is_null($this->where)){
-        $query .= ' WHERE ' . $this->where;
-      }
+	  if (! is_null($this->where)){
+		$query .= ' WHERE ' . $this->where;
+	  }
 
-      if (! is_null($this->groupBy)){
-        $query .= ' GROUP BY ' . $this->groupBy;
-      }
+	  if (! is_null($this->groupBy)){
+		$query .= ' GROUP BY ' . $this->groupBy;
+	  }
 
-      if (! is_null($this->having)){
-        $query .= ' HAVING ' . $this->having;
-      }
+	  if (! is_null($this->having)){
+		$query .= ' HAVING ' . $this->having;
+	  }
 
-      if (! is_null($this->orderBy)){
-          $query .= ' ORDER BY ' . $this->orderBy;
-      }
+	  if (! is_null($this->orderBy)){
+		  $query .= ' ORDER BY ' . $this->orderBy;
+	  }
 
-      if(! is_null($this->limit)){
-      	$query .= ' LIMIT ' . $this->limit;
-      }
+	  if(! is_null($this->limit)){
+	  	$query .= ' LIMIT ' . $this->limit;
+	  }
 	  
 	  if($returnSQLQueryOrResultType === true){
-    	return $query;
-      }
-      else{
-    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
-      }
-    }
-
-    /**
-     * Insert new record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @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){
-      $column = array();
-      $val = array();
-      if(! $data && $this->getData()){
-        $columns = array_keys($this->getData());
-        $column = implode(',', $columns);
-        $val = implode(', ', $this->getData());
-      }
-      else{
-        $columns = array_keys($data);
-        $column = implode(',', $columns);
-        $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
-      }
-
-      $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
-      $query = $this->query($query);
-
-      if ($query){
-        if(! $this->pdo){
-          $this->connect();
-        }
-        $this->insertId = $this->pdo->lastInsertId();
-        return $this->insertId();
-      }
-      else{
+		return $query;
+	  }
+	  else{
+		return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+	  }
+	}
+
+	/**
+	 * Insert new record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @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){
+	  $column = array();
+	  $val = array();
+	  if(! $data && $this->getData()){
+		$columns = array_keys($this->getData());
+		$column = implode(',', $columns);
+		$val = implode(', ', $this->getData());
+	  }
+	  else{
+		$columns = array_keys($data);
+		$column = implode(',', $columns);
+		$val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
+	  }
+
+	  $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
+	  $query = $this->query($query);
+
+	  if ($query){
+		if(! $this->pdo){
+		  $this->connect();
+		}
+		$this->insertId = $this->pdo->lastInsertId();
+		return $this->insertId();
+	  }
+	  else{
 		  return false;
-      }
-    }
-
-    /**
-     * Update record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @param  boolean $escape  whether to escape or not the values
-     * @return mixed          the update status
-     */
-    public function update($data = array(), $escape = true){
-      $query = 'UPDATE ' . $this->from . ' SET ';
-      $values = array();
-      if(! $data && $this->getData()){
-        foreach ($this->getData() as $column => $val){
-          $values[] = $column . ' = ' . $val;
-        }
-      }
-      else{
-        foreach ($data as $column => $val){
-          $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
-        }
-      }
-      $query .= (is_array($data) ? implode(', ', $values) : $data);
-      if (! is_null($this->where)){
-        $query .= ' WHERE ' . $this->where;
-      }
-
-      if (! is_null($this->orderBy)){
-        $query .= ' ORDER BY ' . $this->orderBy;
-      }
-
-      if (! is_null($this->limit)){
-        $query .= ' LIMIT ' . $this->limit;
-      }
-      return $this->query($query);
-    }
-
-    /**
-     * Delete the record in database
-     * @return mixed the delete status
-     */
-    public function delete(){
-    	$query = 'DELETE FROM ' . $this->from;
-
-    	if (! is_null($this->where)){
-    		$query .= ' WHERE ' . $this->where;
-      	}
-
-    	if (! is_null($this->orderBy)){
-    	  $query .= ' ORDER BY ' . $this->orderBy;
-      	}
-
-    	if (! is_null($this->limit)){
-    		$query .= ' LIMIT ' . $this->limit;
-      	}
-
-    	if($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite'){  
-    		$query = 'TRUNCATE TABLE ' . $this->from;
-      }
-    	return $this->query($query);
-    }
-
-    /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean $all   whether to return all record or not
-     * @param  boolean $array return the result as array
-     * @return mixed         the query result
-     */
-    public function query($query, $all = true, $array = false){
-      $this->reset();
-      if(is_array($all)){
-        $x = explode('?', $query);
-        $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
-            $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
-          }
-        }
-        $query = $q;
-      }
-
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
-      $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
-      //cache expire time
+	  }
+	}
+
+	/**
+	 * Update record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return mixed          the update status
+	 */
+	public function update($data = array(), $escape = true){
+	  $query = 'UPDATE ' . $this->from . ' SET ';
+	  $values = array();
+	  if(! $data && $this->getData()){
+		foreach ($this->getData() as $column => $val){
+		  $values[] = $column . ' = ' . $val;
+		}
+	  }
+	  else{
+		foreach ($data as $column => $val){
+		  $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
+		}
+	  }
+	  $query .= (is_array($data) ? implode(', ', $values) : $data);
+	  if (! is_null($this->where)){
+		$query .= ' WHERE ' . $this->where;
+	  }
+
+	  if (! is_null($this->orderBy)){
+		$query .= ' ORDER BY ' . $this->orderBy;
+	  }
+
+	  if (! is_null($this->limit)){
+		$query .= ' LIMIT ' . $this->limit;
+	  }
+	  return $this->query($query);
+	}
+
+	/**
+	 * Delete the record in database
+	 * @return mixed the delete status
+	 */
+	public function delete(){
+		$query = 'DELETE FROM ' . $this->from;
+
+		if (! is_null($this->where)){
+			$query .= ' WHERE ' . $this->where;
+	  	}
+
+		if (! is_null($this->orderBy)){
+		  $query .= ' ORDER BY ' . $this->orderBy;
+	  	}
+
+		if (! is_null($this->limit)){
+			$query .= ' LIMIT ' . $this->limit;
+	  	}
+
+		if($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite'){  
+			$query = 'TRUNCATE TABLE ' . $this->from;
+	  }
+		return $this->query($query);
+	}
+
+	/**
+	 * Execute an SQL query
+	 * @param  string  $query the query SQL string
+	 * @param  boolean $all   whether to return all record or not
+	 * @param  boolean $array return the result as array
+	 * @return mixed         the query result
+	 */
+	public function query($query, $all = true, $array = false){
+	  $this->reset();
+	  if(is_array($all)){
+		$x = explode('?', $query);
+		$q = '';
+		foreach($x as $k => $v){
+		  if(! empty($v)){
+			$q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
+		  }
+		}
+		$query = $q;
+	  }
+
+	  $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+	  $sqlSELECTQuery = stristr($this->query, 'SELECT');
+	  $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+	  //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
   	  //return to the initial cache time
   	  $this->temporaryCacheTtl = $this->cacheTtl;
   	  
   	  //config for cache
-        $cacheEnable = get_config('cache_enable');
+		$cacheEnable = get_config('cache_enable');
   	  
   	  //the database cache content
-        $cacheContent = null;
+		$cacheContent = null;
   	  
   	  //this database query cache key
-        $cacheKey = null;
+		$cacheKey = null;
   	  
   	  //the cache manager instance
-      $cacheInstance = null;
+	  $cacheInstance = null;
   	  
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
-        $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-        $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
-          $cacheInstance = $this->cacheInstance;
-        }
-        else{
-          $obj = & get_instance();
-          $cacheInstance = $obj->cache;  
-        }
-        $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+	  if ($dbCacheStatus && $sqlSELECTQuery){
+		$this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+		$cacheKey = md5($query . $all . $array);
+		if(is_object($this->cacheInstance)){
+		  $cacheInstance = $this->cacheInstance;
+		}
+		else{
+		  $obj = & get_instance();
+		  $cacheInstance = $obj->cache;  
+		}
+		$cacheContent = $cacheInstance->get($cacheKey);        
+	  }
+	  else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
-      }
+	  }
 
-      if(! $this->pdo){
-        $this->connect();
-      }
+	  if(! $this->pdo){
+		$this->connect();
+	  }
       
-      if (! $cacheContent && $sqlSELECTQuery){
-		    //for database query execution time
-        $benchmarkMarkerKey = md5($query . $all . $array);
-        $bench = null;
-        if(is_object($this->benchmarkInstance)){
-          $bench = $this->benchmarkInstance;
-        }
-        else{
-          $obj = & get_instance();
-          $bench = $obj->benchmark;  
-        }
-        $bench->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
-        //Now execute the query
-		    $sqlQuery = $this->pdo->query($this->query);
+	  if (! $cacheContent && $sqlSELECTQuery){
+			//for database query execution time
+		$benchmarkMarkerKey = md5($query . $all . $array);
+		$bench = null;
+		if(is_object($this->benchmarkInstance)){
+		  $bench = $this->benchmarkInstance;
+		}
+		else{
+		  $obj = & get_instance();
+		  $bench = $obj->benchmark;  
+		}
+		$bench->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
+		//Now execute the query
+			$sqlQuery = $this->pdo->query($this->query);
         
-    		//get response time for this query
-        $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
-	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
-        }
-        if ($sqlQuery){
-            //if need return all result like list of record
-            if ($all){
-    				    $this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
-				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
-            }
-            //Sqlite and pgsql always return 0 when using rowCount()
-            if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
-              $this->numRows = count($this->result);  
-            }
-            else{
-              $this->numRows = $sqlQuery->rowCount(); 
-            }
-
-          if ($dbCacheStatus && $sqlSELECTQuery){
-              $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
-              $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
-          }
-        }
-        else{
-          $error = $this->pdo->errorInfo();
-          $this->error = isset($error[2]) ? $error[2] : '';
-          $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
-          $this->error();
-        }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
-    		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
-          //Sqlite and pgsql always return 0 when using rowCount()
-          if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
-            $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
-            $this->numRows = 1;  
-          }
-          else{
-              $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
-              $this->numRows = $queryStr->rowCount(); 
-          }
-    		}
-        if (! $this->result){
-          $error = $this->pdo->errorInfo();
-          $this->error = isset($error[2]) ? $error[2] : '';
-          $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
-          $this->error();
-        }
-      }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-        $this->result = $cacheContent;
-	     	$this->numRows = count($this->result);
-      }
-      $this->queryCount++;
-      if(! $this->result){
-        $this->logger->info('No result where found for the query [' . $query . ']');
-      }
-      return $this->result;
-    }
-
-    /**
-     * Set database cache time to live
-     * @param integer $ttl the cache time to live in second
-     * @return object        the current Database instance
-     */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
-        $this->cacheTtl = $ttl;
-		    $this->temporaryCacheTtl = $ttl;
-      }
-      return $this;
-    }
+			//get response time for this query
+		$responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
+		 	//TODO use the configuration value for the high response time currently is 1 second
+		if($responseTime >= 1 ){
+			$this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+		}
+		if ($sqlQuery){
+			//if need return all result like list of record
+			if ($all){
+						$this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
+				}
+			else{
+						$this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
+			}
+			//Sqlite and pgsql always return 0 when using rowCount()
+			if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+			  $this->numRows = count($this->result);  
+			}
+			else{
+			  $this->numRows = $sqlQuery->rowCount(); 
+			}
+
+		  if ($dbCacheStatus && $sqlSELECTQuery){
+			  $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+			  $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
+		  }
+		}
+		else{
+		  $error = $this->pdo->errorInfo();
+		  $this->error = isset($error[2]) ? $error[2] : '';
+		  $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
+		  $this->error();
+		}
+	  }
+	  else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+			$queryStr = $this->pdo->query($this->query);
+			if($queryStr){
+		  //Sqlite and pgsql always return 0 when using rowCount()
+		  if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+			$this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
+			$this->numRows = 1;  
+		  }
+		  else{
+			  $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
+			  $this->numRows = $queryStr->rowCount(); 
+		  }
+			}
+		if (! $this->result){
+		  $error = $this->pdo->errorInfo();
+		  $this->error = isset($error[2]) ? $error[2] : '';
+		  $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
+		  $this->error();
+		}
+	  }
+	  else{
+		$this->logger->info('The result for query [' .$this->query. '] already cached use it');
+		$this->result = $cacheContent;
+		 	$this->numRows = count($this->result);
+	  }
+	  $this->queryCount++;
+	  if(! $this->result){
+		$this->logger->info('No result where found for the query [' . $query . ']');
+	  }
+	  return $this->result;
+	}
+
+	/**
+	 * Set database cache time to live
+	 * @param integer $ttl the cache time to live in second
+	 * @return object        the current Database instance
+	 */
+	public function setCache($ttl = 0){
+	  if($ttl > 0){
+		$this->cacheTtl = $ttl;
+			$this->temporaryCacheTtl = $ttl;
+	  }
+	  return $this;
+	}
 	
 	/**
 	 * Enabled cache temporary for the current query not globally	
@@ -1244,186 +1244,186 @@ 
 	 * @return object        the current Database instance
 	 */
 	public function cached($ttl = 0){
-      if($ttl > 0){
-        $this->temporaryCacheTtl = $ttl;
-      }
+	  if($ttl > 0){
+		$this->temporaryCacheTtl = $ttl;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Escape the data before execute query useful for security.
+	 * @param  mixed $data the data to be escaped
+	 * @return mixed       the data after escaped
+	 */
+	public function escape($data){
+	  if(is_null($data)){
+		return null;
+	  }
+	  if(! $this->pdo){
+		$this->connect();
+	  }
+	  return $this->pdo->quote(trim($data));
+	}
+
+	/**
+	 * Return the number query executed count for the current request
+	 * @return int
+	 */
+	public function queryCount(){
+	  return $this->queryCount;
+	}
+
+	/**
+	 * Return the current query SQL string
+	 * @return string
+	 */
+	public function getQuery(){
+	  return $this->query;
+	}
+
+	/**
+	 * Return the application database name
+	 * @return string
+	 */
+	public function getDatabaseName(){
+	  return $this->databaseName;
+	}
+
+	 /**
+	  * Return the database configuration
+	  * @return array
+	  */
+	public  function getDatabaseConfiguration(){
+	  return $this->config;
+	}
+
+	/**
+	 * set the database configuration
+	 * @param array $config the configuration
+	 */
+	public function setDatabaseConfiguration(array $config){
+	  $this->config = array_merge($this->config, $config);
+	  $this->prefix = $this->config['prefix'];
+	  $this->databaseName = $this->config['database'];
+	  $this->logger->info('The database configuration are listed below: ' . stringfy_vars(array_merge($this->config, array('password' => string_hidden($this->config['password'])))));
+	  return $this;
+	}
+
+	/**
+	 * Return the PDO instance
+	 * @return PDO
+	 */
+	public function getPdo(){
+	  return $this->pdo;
+	}
+
+	/**
+	 * Set the PDO instance
+	 * @param PDO $pdo the pdo object
+	 */
+	public function setPdo(PDO $pdo){
+	  $this->pdo = $pdo;
+	  return $this;
+	}
+
+
+	/**
+	 * Return the Log instance
+	 * @return Log
+	 */
+	public function getLogger(){
+	  return $this->logger;
+	}
+
+	/**
+	 * Set the log instance
+	 * @param Log $logger the log object
+	 */
+	public function setLogger($logger){
+	  $this->logger = $logger;
+	  return $this;
+	}
+
+	 /**
+	  * Return the cache instance
+	  * @return CacheInterface
+	  */
+	public function getCacheInstance(){
+	  return $this->cacheInstance;
+	}
+
+	/**
+	 * Set the cache instance
+	 * @param CacheInterface $cache the cache object
+	 */
+	public function setCacheInstance($cache){
+	  $this->cacheInstance = $cache;
+	  return $this;
+	}
+
+	/**
+	 * Return the benchmark instance
+	 * @return Benchmark
+	 */
+	public function getBenchmark(){
+	  return $this->benchmarkInstance;
+	}
+
+	/**
+	 * Set the benchmark instance
+	 * @param Benchmark $cache the cache object
+	 */
+	public function setBenchmark($benchmark){
+	  $this->benchmarkInstance = $benchmark;
+	  return $this;
+	}
+
+	/**
+	 * Return the data to be used for insert, update, etc.
+	 * @return array
+	 */
+	public function getData(){
+	  return $this->data;
+	}
+
+	/**
+	 * Set the data to be used for insert, update, etc.
+	 * @param string $key the data key identified
+	 * @param mixed $value the data value
+	 * @param boolean $escape whether to escape or not the $value
+	 * @return object        the current Database instance
+	 */
+	public function setData($key, $value, $escape = true){
+	  $this->data[$key] = $escape ? $this->escape($value) : $value;
 	  return $this;
-    }
-
-    /**
-     * Escape the data before execute query useful for security.
-     * @param  mixed $data the data to be escaped
-     * @return mixed       the data after escaped
-     */
-    public function escape($data){
-      if(is_null($data)){
-        return null;
-      }
-      if(! $this->pdo){
-        $this->connect();
-      }
-      return $this->pdo->quote(trim($data));
-    }
-
-    /**
-     * Return the number query executed count for the current request
-     * @return int
-     */
-    public function queryCount(){
-      return $this->queryCount;
-    }
-
-    /**
-     * Return the current query SQL string
-     * @return string
-     */
-    public function getQuery(){
-      return $this->query;
-    }
-
-    /**
-     * Return the application database name
-     * @return string
-     */
-    public function getDatabaseName(){
-      return $this->databaseName;
-    }
-
-     /**
-     * Return the database configuration
-     * @return array
-     */
-    public  function getDatabaseConfiguration(){
-      return $this->config;
-    }
-
-    /**
-     * set the database configuration
-     * @param array $config the configuration
-     */
-    public function setDatabaseConfiguration(array $config){
-      $this->config = array_merge($this->config, $config);
-      $this->prefix = $this->config['prefix'];
-      $this->databaseName = $this->config['database'];
-      $this->logger->info('The database configuration are listed below: ' . stringfy_vars(array_merge($this->config, array('password' => string_hidden($this->config['password'])))));
-      return $this;
-    }
-
-    /**
-     * Return the PDO instance
-     * @return PDO
-     */
-    public function getPdo(){
-      return $this->pdo;
-    }
-
-    /**
-     * Set the PDO instance
-     * @param PDO $pdo the pdo object
-     */
-    public function setPdo(PDO $pdo){
-      $this->pdo = $pdo;
-      return $this;
-    }
-
-
-    /**
-     * Return the Log instance
-     * @return Log
-     */
-    public function getLogger(){
-      return $this->logger;
-    }
-
-    /**
-     * Set the log instance
-     * @param Log $logger the log object
-     */
-    public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
-    }
-
-     /**
-     * Return the cache instance
-     * @return CacheInterface
-     */
-    public function getCacheInstance(){
-      return $this->cacheInstance;
-    }
-
-    /**
-     * Set the cache instance
-     * @param CacheInterface $cache the cache object
-     */
-    public function setCacheInstance($cache){
-      $this->cacheInstance = $cache;
-      return $this;
-    }
-
-    /**
-     * Return the benchmark instance
-     * @return Benchmark
-     */
-    public function getBenchmark(){
-      return $this->benchmarkInstance;
-    }
-
-    /**
-     * Set the benchmark instance
-     * @param Benchmark $cache the cache object
-     */
-    public function setBenchmark($benchmark){
-      $this->benchmarkInstance = $benchmark;
-      return $this;
-    }
-
-    /**
-     * Return the data to be used for insert, update, etc.
-     * @return array
-     */
-    public function getData(){
-      return $this->data;
-    }
-
-    /**
-     * Set the data to be used for insert, update, etc.
-     * @param string $key the data key identified
-     * @param mixed $value the data value
-     * @param boolean $escape whether to escape or not the $value
-     * @return object        the current Database instance
-     */
-    public function setData($key, $value, $escape = true){
-      $this->data[$key] = $escape ? $this->escape($value) : $value;
-      return $this;
-    }
+	}
 
 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
   private function reset(){
-    $this->select   = '*';
-    $this->from     = null;
-    $this->where    = null;
-    $this->limit    = null;
-    $this->orderBy  = null;
-    $this->groupBy  = null;
-    $this->having   = null;
-    $this->join     = null;
-    $this->numRows  = 0;
-    $this->insertId = null;
-    $this->query    = null;
-    $this->error    = null;
-    $this->result   = array();
-    $this->data     = array();
+	$this->select   = '*';
+	$this->from     = null;
+	$this->where    = null;
+	$this->limit    = null;
+	$this->orderBy  = null;
+	$this->groupBy  = null;
+	$this->having   = null;
+	$this->join     = null;
+	$this->numRows  = 0;
+	$this->insertId = null;
+	$this->query    = null;
+	$this->error    = null;
+	$this->result   = array();
+	$this->data     = array();
   }
 
   /**
    * The class destructor
    */
   function __destruct(){
-    $this->pdo = null;
+	$this->pdo = null;
   }
 
 }

Spacing +257 added lines, -257 removed lines

@@ -23,158 +23,158 @@ 
    * 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 SQL SELECT statment
 	 * @var string
 	*/
-	private $select              = '*';
+	private $select = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
 	*/
-    private $from                = null;
+    private $from = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
 	*/
-    private $where               = null;
+    private $where = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
 	*/
-    private $limit               = null;
+    private $limit = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
 	*/
-    private $join                = null;
+    private $join = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
 	*/
-    private $orderBy             = null;
+    private $orderBy = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
 	*/
-    private $groupBy             = null;
+    private $groupBy = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
 	*/
-    private $having              = null;
+    private $having = 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 error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
 	*/
-    private $prefix              = null;
+    private $prefix = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
 	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = 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 Log
 	 */
-    private $logger              = null;
+    private $logger = null;
 
 
     /**
     * The cache instance
     * @var CacheInterface
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
      /**
     * The benchmark instance
     * @var Benchmark
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 
 
     /**
@@ -182,25 +182,25 @@ 
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      * @param object $logger the log instance
      */
-    public function __construct($overwriteConfig = array(), Log $logger = null){
+    public function __construct($overwriteConfig = array(), Log $logger = null) {
         /**
          * instance of the Log class
          */
-        if(is_object($logger)){
+        if (is_object($logger)) {
           $this->logger = $logger;
         }
-        else{
-            $this->logger =& class_loader('Log', 'classes');
+        else {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
 
         $db = array();
-      	if(file_exists(CONFIG_PATH . 'database.php')){
+      	if (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';
         }
           
-				if(! empty($overwriteConfig)){
+				if (!empty($overwriteConfig)) {
 				  $db = array_merge($db, $overwriteConfig);
 				}
         $config = array();
@@ -213,12 +213,12 @@ 
 				$config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
 				$config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
         $port = '';
-        if(strstr($config['hostname'], ':')){
+        if (strstr($config['hostname'], ':')) {
           $p = explode(':', $config['hostname']);
           $port = isset($p[1]) ? $p[1] : '';
           $config['hostname'] = isset($p[0]) ? $p[0] : '';
         }
-				$config['port']      = $port;
+				$config['port'] = $port;
 				
 		  	$this->setDatabaseConfiguration($config);
     		$this->temporaryCacheTtl = $this->cacheTtl;
@@ -228,10 +228,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 {
             $driverDsnMap = array(
               'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
                           . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
@@ -252,13 +252,13 @@ 
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
       }
-      else{
+      else {
         show_error('Database configuration is not set.');
         return false;
       }
@@ -269,15 +269,15 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current Database instance
      */
-    public function from($table){
-      if(is_array($table)){
+    public function from($table) {
+      if (is_array($table)) {
         $froms = '';
-        foreach($table as $key){
+        foreach ($table as $key) {
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
       }
-      else{
+      else {
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -288,7 +288,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current Database instance
      */
-    public function select($fields){
+    public function select($fields) {
       $select = (is_array($fields) ? implode(', ', $fields) : $fields);
       $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
       return $this;
@@ -299,7 +299,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current Database instance
      */
-    public function distinct($field){
+    public function distinct($field) {
       $distinct = ' DISTINCT ' . $field;
       $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
 
@@ -312,7 +312,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
       $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -324,7 +324,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
       $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -336,7 +336,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
       $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -348,7 +348,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
       $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -360,7 +360,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
       $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -375,16 +375,16 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current Database instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
       $on = $field1;
       $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
       }
-      if (is_null($this->join)){
+      if (is_null($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
-      else{
+      else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -395,7 +395,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
+    public function innerJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'INNER ');
     }
 
@@ -404,7 +404,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT ');
 	}
 
@@ -413,7 +413,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT ');
     }
 
@@ -422,7 +422,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function fullOuterJoin($table, $field1, $op = null, $field2 = '') {
     	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
     }
 
@@ -431,7 +431,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
     }
 
@@ -440,7 +440,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
     }
 
@@ -450,18 +450,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
         	$this->whereIsNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NULL ';
           }
       }
       return $this;
@@ -473,18 +473,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNotNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
           $this->whereIsNotNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NOT NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NOT NULL ';
           }
       }
       return $this;
@@ -500,24 +500,24 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current Database instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($where)){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($where)) {
         $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
+        foreach ($where as $column => $data) {
+          if (is_null($data)) {
             $data = '';
           }
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
-        $where = implode(' '.$andOr.' ', $_where);
+        $where = implode(' ' . $andOr . ' ', $_where);
       }
-      else{
-        if(is_array($op)){
+      else {
+        if (is_array($op)) {
           $x = explode('?', $where);
           $w = '';
-          foreach($x as $k => $v){
-            if(! empty($v)){
-                if(isset($op[$k]) && is_null($op[$k])){
+          foreach ($x as $k => $v) {
+            if (!empty($v)) {
+                if (isset($op[$k]) && is_null($op[$k])) {
                   $op[$k] = '';
                 }
                 $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -525,28 +525,28 @@ 
           }
           $where = $w;
         }
-        else if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
+        else if (!in_array((string) $op, $this->operatorList)) {
+          if (is_null($op)) {
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
         }
-        else{
-          if(is_null($val)){
+        else {
+          if (is_null($val)) {
             $val = '';
           }
         	$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
         }
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $where;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $where;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $where;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $where;
         }
       }
       return $this;
@@ -557,7 +557,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
+    public function orWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, '', 'OR', $escape);
     }
 
@@ -567,7 +567,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
+    public function notWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
     }
 
@@ -576,7 +576,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
+    public function orNotWhere($where, $op = null, $val = null, $escape = true) {
     	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
     }
 
@@ -586,15 +586,15 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current Database instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (is_null($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+      if (is_null($this->where)) {
         $this->where = $type . ' (';
       }
-      else{
-          if(substr($this->where, -1) == '('){
+      else {
+          if (substr($this->where, -1) == '(') {
             $this->where .= $type . ' (';
           }
-          else{
+          else {
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -606,7 +606,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
       return $this->groupStart('NOT');
     }
 
@@ -615,7 +615,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
       return $this->groupStart('', ' OR');
     }
 
@@ -624,7 +624,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
       return $this->groupStart('NOT', ' OR');
     }
 
@@ -632,7 +632,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current Database instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
       $this->where .= ')';
       return $this;
     }
@@ -646,25 +646,25 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($keys)){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($keys)) {
         $_keys = array();
-        foreach ($keys as $k => $v){
-          if(is_null($v)){
+        foreach ($keys as $k => $v) {
+          if (is_null($v)) {
             $v = '';
           }
           $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
         }
         $keys = implode(', ', $_keys);
-        if (is_null($this->where)){
+        if (is_null($this->where)) {
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
         }
-        else{
-          if(substr($this->where, -1) == '('){
-            $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+        else {
+          if (substr($this->where, -1) == '(') {
+            $this->where = $this->where . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
-          else{
-            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+          else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
         }
       }
@@ -676,7 +676,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function notIn($field, array $keys, $escape = true){
+    public function notIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'AND', $escape);
     }
 
@@ -685,7 +685,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -694,7 +694,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orNotIn($field, array $keys, $escape = true){
+    public function orNotIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'OR', $escape);
     }
 
@@ -708,21 +708,21 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
+    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($value1)) {
         $value1 = '';
       }
-      if(is_null($value2)){
+      if (is_null($value2)) {
         $value2 = '';
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
-        else{
+        else {
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -734,7 +734,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function notBetween($field, $value1, $value2, $escape = true){
+    public function notBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
     }
 
@@ -743,7 +743,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orBetween($field, $value1, $value2, $escape = true){
+    public function orBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, '', 'OR', $escape);
     }
 
@@ -752,7 +752,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
+    public function orNotBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
     }
 
@@ -765,20 +765,20 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($data)) {
         $data = '';
       }
       $like = $escape ? $this->escape($data) : $data;
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
       return $this;
@@ -789,7 +789,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
       return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -798,7 +798,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -807,7 +807,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -818,14 +818,14 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current Database instance
      */
-    public function limit($limit, $limitEnd = null){
-      if(is_null($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (is_null($limit)) {
         return;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
       }
-      else{
+      else {
         $this->limit = $limit;
       }
       return $this;
@@ -837,16 +837,16 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current Database instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! is_null($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (!is_null($orderDir)) {
+        $this->orderBy = !$this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
       }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+      else {
+        if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
+          $this->orderBy = !$this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
         }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+        else {
+          $this->orderBy = !$this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
       return $this;
@@ -857,11 +857,11 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current Database instance
      */
-    public function groupBy($field){
-      if(is_array($field)){
+    public function groupBy($field) {
+      if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
       }
-      else{
+      else {
         $this->groupBy = $field;
       }
       return $this;
@@ -875,13 +875,13 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+      if (is_array($op)) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
+        foreach ($x as $k => $v) {
+  	      if (!empty($v)) {
+            if (isset($op[$k]) && is_null($op[$k])) {
               $op[$k] = '';
             }
   	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -889,14 +889,14 @@ 
       	}
         $this->having = $w;
       }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
+      else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
       }
-      else{
-        if(is_null($val)){
+      else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
@@ -908,7 +908,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -916,15 +916,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -935,14 +935,14 @@ 
      * 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->limit = 1;
       $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+        return $this->query($query, false, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -952,37 +952,37 @@ 
      * 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 = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! is_null($this->join)){
+      if (!is_null($this->join)) {
         $query .= $this->join;
       }
 	  
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->groupBy)){
+      if (!is_null($this->groupBy)) {
         $query .= ' GROUP BY ' . $this->groupBy;
       }
 
-      if (! is_null($this->having)){
+      if (!is_null($this->having)) {
         $query .= ' HAVING ' . $this->having;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
           $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if(! is_null($this->limit)){
+      if (!is_null($this->limit)) {
       	$query .= ' LIMIT ' . $this->limit;
       }
 	  
-	  if($returnSQLQueryOrResultType === true){
+	  if ($returnSQLQueryOrResultType === true) {
     	return $query;
       }
-      else{
-    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -992,15 +992,15 @@ 
      * @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){
+    public function insert($data = array(), $escape = true) {
       $column = array();
       $val = array();
-      if(! $data && $this->getData()){
+      if (!$data && $this->getData()) {
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
       }
-      else{
+      else {
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1009,14 +1009,14 @@ 
       $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
       $query = $this->query($query);
 
-      if ($query){
-        if(! $this->pdo){
+      if ($query) {
+        if (!$this->pdo) {
           $this->connect();
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
       }
-      else{
+      else {
 		  return false;
       }
     }
@@ -1027,29 +1027,29 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
       $query = 'UPDATE ' . $this->from . ' SET ';
       $values = array();
-      if(! $data && $this->getData()){
-        foreach ($this->getData() as $column => $val){
+      if (!$data && $this->getData()) {
+        foreach ($this->getData() as $column => $val) {
           $values[] = $column . ' = ' . $val;
         }
       }
-      else{
-        foreach ($data as $column => $val){
+      else {
+        foreach ($data as $column => $val) {
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
       }
       $query .= (is_array($data) ? implode(', ', $values) : $data);
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if (! is_null($this->limit)){
+      if (!is_null($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
       }
       return $this->query($query);
@@ -1059,22 +1059,22 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
     	$query = 'DELETE FROM ' . $this->from;
 
-    	if (! is_null($this->where)){
+    	if (!is_null($this->where)) {
     		$query .= ' WHERE ' . $this->where;
       	}
 
-    	if (! is_null($this->orderBy)){
+    	if (!is_null($this->orderBy)) {
     	  $query .= ' ORDER BY ' . $this->orderBy;
       	}
 
-    	if (! is_null($this->limit)){
+    	if (!is_null($this->limit)) {
     		$query .= ' LIMIT ' . $this->limit;
       	}
 
-    	if($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite'){  
+    	if ($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite') {  
     		$query = 'TRUNCATE TABLE ' . $this->from;
       }
     	return $this->query($query);
@@ -1087,13 +1087,13 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
-      if(is_array($all)){
+      if (is_array($all)) {
         $x = explode('?', $query);
         $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
+        foreach ($x as $k => $v) {
+          if (!empty($v)) {
             $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
           }
         }
@@ -1102,7 +1102,7 @@ 
 
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+      $this->logger->info('Execute SQL query [' . $this->query . '], return type: ' . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' . ($all ? 'YES' : 'NO'));
       //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
@@ -1124,34 +1124,34 @@ 
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
+      if ($dbCacheStatus && $sqlSELECTQuery) {
         $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
         $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
+        if (is_object($this->cacheInstance)) {
           $cacheInstance = $this->cacheInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
       }
-      else{
+      else {
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       
-      if (! $cacheContent && $sqlSELECTQuery){
+      if (!$cacheContent && $sqlSELECTQuery) {
 		    //for database query execution time
         $benchmarkMarkerKey = md5($query . $all . $array);
         $bench = null;
-        if(is_object($this->benchmarkInstance)){
+        if (is_object($this->benchmarkInstance)) {
           $bench = $this->benchmarkInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1162,64 +1162,64 @@ 
     		//get response time for this query
         $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
-        if ($sqlQuery){
+        if ($sqlQuery) {
             //if need return all result like list of record
-            if ($all){
+            if ($all) {
     				    $this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
     		    }
-            else{
+            else {
 				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
-            if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+            if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
               $this->numRows = count($this->result);  
             }
-            else{
+            else {
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
-          if ($dbCacheStatus && $sqlSELECTQuery){
-              $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+          if ($dbCacheStatus && $sqlSELECTQuery) {
+              $this->logger->info('Save the result for query [' . $this->query . '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
         }
-        else{
+        else {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      else if ((!$cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)) {
     		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
+    		if ($queryStr) {
           //Sqlite and pgsql always return 0 when using rowCount()
-          if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+          if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
           }
-          else{
+          else {
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
     		}
-        if (! $this->result){
+        if (!$this->result) {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      else {
+        $this->logger->info('The result for query [' . $this->query . '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
       }
       $this->queryCount++;
-      if(! $this->result){
+      if (!$this->result) {
         $this->logger->info('No result where found for the query [' . $query . ']');
       }
       return $this->result;
@@ -1230,8 +1230,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
 		    $this->temporaryCacheTtl = $ttl;
       }
@@ -1243,8 +1243,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-	public function cached($ttl = 0){
-      if($ttl > 0){
+	public function cached($ttl = 0) {
+      if ($ttl > 0) {
         $this->temporaryCacheTtl = $ttl;
       }
 	  return $this;
@@ -1255,11 +1255,11 @@ 
      * @param  mixed $data the data to be escaped
      * @return mixed       the data after escaped
      */
-    public function escape($data){
-      if(is_null($data)){
+    public function escape($data) {
+      if (is_null($data)) {
         return null;
       }
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       return $this->pdo->quote(trim($data));
@@ -1269,7 +1269,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -1277,7 +1277,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -1285,7 +1285,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -1293,7 +1293,7 @@ 
      * Return the database configuration
      * @return array
      */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
       return $this->config;
     }
 
@@ -1301,7 +1301,7 @@ 
      * set the database configuration
      * @param array $config the configuration
      */
-    public function setDatabaseConfiguration(array $config){
+    public function setDatabaseConfiguration(array $config) {
       $this->config = array_merge($this->config, $config);
       $this->prefix = $this->config['prefix'];
       $this->databaseName = $this->config['database'];
@@ -1313,7 +1313,7 @@ 
      * Return the PDO instance
      * @return PDO
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -1321,7 +1321,7 @@ 
      * Set the PDO instance
      * @param PDO $pdo the pdo object
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -1331,7 +1331,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -1339,7 +1339,7 @@ 
      * Set the log instance
      * @param Log $logger the log object
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -1348,7 +1348,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -1356,7 +1356,7 @@ 
      * Set the cache instance
      * @param CacheInterface $cache the cache object
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -1365,7 +1365,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -1373,7 +1373,7 @@ 
      * Set the benchmark instance
      * @param Benchmark $cache the cache object
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -1382,7 +1382,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -1393,7 +1393,7 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value, $escape = true){
+    public function setData($key, $value, $escape = true) {
       $this->data[$key] = $escape ? $this->escape($value) : $value;
       return $this;
     }
@@ -1402,7 +1402,7 @@ 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
-  private function reset(){
+  private function reset() {
     $this->select   = '*';
     $this->from     = null;
     $this->where    = null;
@@ -1422,7 +1422,7 @@ 
   /**
    * The class destructor
    */
-  function __destruct(){
+  function __destruct() {
     $this->pdo = null;
   }
 

Braces +42 added lines, -84 removed lines

@@ -188,8 +188,7 @@ 
          */
         if(is_object($logger)){
           $this->logger = $logger;
-        }
-        else{
+        } else{
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
@@ -251,14 +250,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+          } catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
-      }
-      else{
+      } else{
         show_error('Database configuration is not set.');
         return false;
       }
@@ -276,8 +273,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -383,8 +379,7 @@ 
       }
       if (is_null($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -455,12 +450,10 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
           }
       }
@@ -478,12 +471,10 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NOT NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
           }
       }
@@ -510,8 +501,7 @@ 
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
         $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
+      } else{
         if(is_array($op)){
           $x = explode('?', $where);
           $w = '';
@@ -524,14 +514,12 @@ 
             }
           }
           $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
+        } else if (! in_array((string)$op, $this->operatorList)){
           if(is_null($op)){
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -540,12 +528,10 @@ 
       }
       if (is_null($this->where)){
         $this->where = $where;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $where;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $where;
         }
       }
@@ -589,12 +575,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (is_null($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if(substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -658,12 +642,10 @@ 
         $keys = implode(', ', $_keys);
         if (is_null($this->where)){
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-        }
-        else{
+        } else{
           if(substr($this->where, -1) == '('){
             $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-          else{
+          } else{
             $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
           }
         }
@@ -717,12 +699,10 @@ 
       }
       if (is_null($this->where)){
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
+        } else{
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -772,12 +752,10 @@ 
       $like = $escape ? $this->escape($data) : $data;
       if (is_null($this->where)){
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
@@ -824,8 +802,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -840,12 +817,10 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (! is_null($orderDir)){
         $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
+      } else{
         if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
           $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
+        } else{
           $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
@@ -860,8 +835,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -888,14 +862,12 @@ 
   	      }
       	}
         $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if(is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
+      } else{
         if(is_null($val)){
           $val = '';
         }
@@ -940,8 +912,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -980,8 +951,7 @@ 
 	  
 	  if($returnSQLQueryOrResultType === true){
     	return $query;
-      }
-      else{
+      } else{
     	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -999,8 +969,7 @@ 
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
-      }
-      else{
+      } else{
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1015,8 +984,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -1034,8 +1002,7 @@ 
         foreach ($this->getData() as $column => $val){
           $values[] = $column . ' = ' . $val;
         }
-      }
-      else{
+      } else{
         foreach ($data as $column => $val){
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
@@ -1129,14 +1096,12 @@ 
         $cacheKey = md5($query . $all . $array);
         if(is_object($this->cacheInstance)){
           $cacheInstance = $this->cacheInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+      } else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
@@ -1150,8 +1115,7 @@ 
         $bench = null;
         if(is_object($this->benchmarkInstance)){
           $bench = $this->benchmarkInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1169,15 +1133,13 @@ 
             //if need return all result like list of record
             if ($all){
     				    $this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
+    		    } else{
 				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
             if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
               $this->numRows = count($this->result);  
-            }
-            else{
+            } else{
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
@@ -1185,23 +1147,20 @@ 
               $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
-        }
-        else{
+        } else{
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      } else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
     		$queryStr = $this->pdo->query($this->query);
     		if($queryStr){
           //Sqlite and pgsql always return 0 when using rowCount()
           if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
-          }
-          else{
+          } else{
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
@@ -1212,8 +1171,7 @@ 
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else{
+      } else{
         $this->logger->info('The result for query [' .$this->query. '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);