tnhfw / tnh-fw

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'];
+			 }
 		}
 
 
@@ -121,25 +121,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;
-		    }
+			}
 		}	
 
 
@@ -159,7 +159,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
-	      		unlink($filePath);
+		  		unlink($filePath);
 				return true;
 			}
 		}
@@ -182,7 +182,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 . ']');
@@ -222,17 +222,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');
+			  		}
 				}
 			}
 		}	
@@ -255,19 +255,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')){
 				
@@ -278,7 +278,7 @@ 
 				$this->compressCacheData = $status;
 			}
 			return $this;
-	    }
+		}
 		
 		/**
 		 * Check whether the cache feature for the handle is supported
@@ -290,28 +290,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';
 		}

core/classes/model/Model.php

Indentation +920 added lines, -920 removed lines

@@ -1,561 +1,561 @@ 
 <?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';
-
-        /**
-         * Set return type array or object
-         * @var string
-         */
-        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';
+
+		/**
+		 * Set return type array or object
+		 * @var string
+		 */
+		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 DatabaseQueryBuilder->where().
-         */
-        public function get_by()
-        {
-            $where = func_get_args();
-
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->getQueryBuilder()->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 DatabaseQueryBuilder->where().
+		 */
+		public function get_by()
+		{
+			$where = func_get_args();
+
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->getQueryBuilder()->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;
-            $this->getQueryBuilder()->from($this->_table);
+			$this->getQueryBuilder()->from($this->_table);
 			$row = $this->_database->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->getQueryBuilder()->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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
+			$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->getQueryBuilder()->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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
 			$type = $this->_temporary_return_type == 'array' ? 'array':false;
-            $this->getQueryBuilder()->from($this->_table);
+			$this->getQueryBuilder()->from($this->_table);
 			$result = $this->_database->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.
+			$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.
 		 * @see Database::insert
-         */
-        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->getQueryBuilder()->from($this->_table);
+		 */
+		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->getQueryBuilder()->from($this->_table);
 				$this->_database->insert($data, $escape);
-                $insert_id = $this->_database->insertId();
-                $this->trigger('after_create', $insert_id);
+				$insert_id = $this->_database->insertId();
+				$this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
 				return ! $insert_id ? true : $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)
-            {
-                $this->getQueryBuilder()->where($this->primary_key, $primary_value)
-                                        ->from($this->_table);
-                $result = $this->_database->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)
-            {
-                $this->getQueryBuilder()->in($this->primary_key, $primary_values)
-                                        ->from($this->_table);
+			}
+			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)
+			{
+				$this->getQueryBuilder()->where($this->primary_key, $primary_value)
+										->from($this->_table);
+				$result = $this->_database->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)
+			{
+				$this->getQueryBuilder()->in($this->primary_key, $primary_values)
+										->from($this->_table);
 				$result = $this->_database->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);
-                $this->getQueryBuilder()->from($this->_table);
+				$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);
+				$this->getQueryBuilder()->from($this->_table);
 				$result = $this->_database->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);
-            $this->getQueryBuilder()->from($this->_table);
+				$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);
+			$this->getQueryBuilder()->from($this->_table);
 			$result = $this->_database->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->getQueryBuilder()->where($this->primary_key, $id);
+			$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->getQueryBuilder()->where($this->primary_key, $id);
 			$result = false;
-            if ($this->soft_delete)
-            {
-                $this->getQueryBuilder()->from($this->_table);	
+			if ($this->soft_delete)
+			{
+				$this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $this->getQueryBuilder()->from($this->_table); 
+			}
+			else
+			{
+				$this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->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);
+			}
+
+			$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);
 			$result = false;
-            if ($this->soft_delete)
-            {
-                $this->getQueryBuilder()->from($this->_table);	
+			if ($this->soft_delete)
+			{
+				$this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $this->getQueryBuilder()->from($this->_table); 
+			}
+			else
+			{
+				$this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->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->getQueryBuilder()->in($this->primary_key, $primary_values);
+			}
+			$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->getQueryBuilder()->in($this->primary_key, $primary_values);
 			$result = false;
-            if ($this->soft_delete)
-            {
-                $this->getQueryBuilder()->from($this->_table);	
+			if ($this->soft_delete)
+			{
+				$this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $this->getQueryBuilder()->from($this->_table); 
+			}
+			else
+			{
+				$this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
-            }
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
+			}
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
 
 
-        /**
-         * Truncates the table
-         */
-        public function truncate()
-        {
+		/**
+		 * Truncates the table
+		 */
+		public function truncate()
+		{
 			$this->getQueryBuilder()->from($this->_table); 
 			$result = $this->_database->delete();
-            return $result;
-        }
+			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 with($relationship)
+		{
+			$this->_with[] = $relationship;
+			if (!in_array('relate', $this->after_get))
+			{
+				$this->after_get[] = 'relate';
+			}
+			return $this;
+		}
 		
 		/**
-		* Relationship
-		*/
-        public function relate($row)
-        {
-    		if (empty($row))
-            {
-    		    return $row;
-            }
-
-            $row = $this->relateBelongsTo($row);
-            $row = $this->relateHasMany($row);
-            return $row;
-        }
-
-        /* --------------------------------------------------------------
+		 * Relationship
+		 */
+		public function relate($row)
+		{
+			if (empty($row))
+			{
+				return $row;
+			}
+
+			$row = $this->relateBelongsTo($row);
+			$row = $this->relateHasMany($row);
+			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->getQueryBuilder()->where($this->soft_delete_key, FALSE);
-            }
-            $this->getQueryBuilder()
+		/**
+		 * 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->getQueryBuilder()->where($this->soft_delete_key, FALSE);
+			}
+			$this->getQueryBuilder()
 									 ->select(array($key, $value))
 									 ->from($this->_table);
 			$result = $this->_database->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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-            $where = func_get_args();
-            $this->_set_where($where);
-            $this->getQueryBuilder()->from($this->_table);
+			$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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+			$where = func_get_args();
+			$this->_set_where($where);
+			$this->getQueryBuilder()->from($this->_table);
 			$this->_database->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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
+			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->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
 			$this->getQueryBuilder()->from($this->_table);
 			$this->_database->getAll();
-            return $this->_database->numRows();
-        }
+			return $this->_database->numRows();
+		}
 		
 		/**
-		* Enabled cache temporary
-		*/
+		 * Enabled cache temporary
+		 */
 		public function cached($ttl = 0){
 		  if ($ttl > 0){
 			$this->_database = $this->_database->cached($ttl);
@@ -563,424 +563,424 @@ 
 		  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()
-        {
+		/**
+		 * 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()
+		{
 			$this->getQueryBuilder()->select('AUTO_INCREMENT')
 									->from('information_schema.TABLES')
 									->where('TABLE_NAME', $this->_table)
 									->where('TABLE_SCHEMA', $this->_database->getDatabaseName());
-            return (int) $this->_database->get()->AUTO_INCREMENT;
-        }
-
-        /**
-         * Getter for the table name
-         */
-        public function table()
-        {
-            return $this->_table;
-        }
-
-        /* --------------------------------------------------------------
+			return (int) $this->_database->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
+		  * 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
 		 * @return object
-         */
-         public function setLoader($loader){
-            $this->loaderInstance = $loader;
-            return $this;
-        }
+		 */
+		 public function setLoader($loader){
+			$this->loaderInstance = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the queryBuilder instance this is the shortcut to database queryBuilder
+		 * @return object the DatabaseQueryBuilder instance
+		 */
+		public function getQueryBuilder(){
+			return $this->_database->getQueryBuilder();
+		}
 
 		/**
-         * Return the queryBuilder instance this is the shortcut to database queryBuilder
-         * @return object the DatabaseQueryBuilder instance
-         */
-        public function getQueryBuilder(){
-            return $this->_database->getQueryBuilder();
-        }
-
-        /**
-         * Set the DatabaseQueryBuilder instance for future use
-         * @param object $queryBuilder the DatabaseQueryBuilder object
+		 * Set the DatabaseQueryBuilder instance for future use
+		 * @param object $queryBuilder the DatabaseQueryBuilder object
 		 * @return object
-         */
-         public function setQueryBuilder($queryBuilder){
-            $this->_database->setQueryBuilder($queryBuilder);
-            return $this;
-        }
+		 */
+		 public function setQueryBuilder($queryBuilder){
+			$this->_database->setQueryBuilder($queryBuilder);
+			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
+		/**
+		 * 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
 		 * @return object
-         */
-         public function setFormValidation($fv){
-            $this->formValidationInstance = $fv;
-            return $this;
-        }
+		 */
+		 public function setFormValidation($fv){
+			$this->formValidationInstance = $fv;
+			return $this;
+		}
 
-        /* --------------------------------------------------------------
+		/* --------------------------------------------------------------
          * QUERY BUILDER DIRECT ACCESS METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * A wrapper to $this->getQueryBuilder()->orderBy()
-         */
-        public function order_by($criteria, $order = 'ASC')
-        {
-            if ( is_array($criteria) )
-            {
-                foreach ($criteria as $key => $value)
-                {
-                    $this->getQueryBuilder()->orderBy($key, $value);
-                }
-            }
-            else
-            {
-                $this->getQueryBuilder()->orderBy($criteria, $order);
-            }
-            return $this;
-        }
-
-        /**
-         * A wrapper to $this->getQueryBuilder()->limit()
-         */
-        public function limit($offset = 0, $limit = 10)
-        {
-            $this->getQueryBuilder()->limit($offset, $limit);
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * A wrapper to $this->getQueryBuilder()->orderBy()
+		 */
+		public function order_by($criteria, $order = 'ASC')
+		{
+			if ( is_array($criteria) )
+			{
+				foreach ($criteria as $key => $value)
+				{
+					$this->getQueryBuilder()->orderBy($key, $value);
+				}
+			}
+			else
+			{
+				$this->getQueryBuilder()->orderBy($criteria, $order);
+			}
+			return $this;
+		}
+
+		/**
+		 * A wrapper to $this->getQueryBuilder()->limit()
+		 */
+		public function limit($offset = 0, $limit = 10)
+		{
+			$this->getQueryBuilder()->limit($offset, $limit);
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * INTERNAL METHODS
          * ------------------------------------------------------------ */
 
 		/**
-		* relate for the relation "belongs_to"
-		* @return mixed
-		*/
+		 * relate for the relation "belongs_to"
+		 * @return mixed
+		 */
 		protected function relateBelongsTo($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']]);
-                    }
-                }
-            }
+			{
+				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']]);
+					}
+				}
+			}
 			return $row;
 		}
 
 		/**
-		* relate for the relation "has_many"
-		* @return mixed
-		*/
+		 * relate for the relation "has_many"
+		 * @return mixed
+		 */
 		protected function relateHasMany($row){
 			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]);
-                    }
-                }
-            }
+			{
+				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;
 		}
 		
-        /**
-         * 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);
-                }
+		/**
+		 * 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);
+				}
                
-                $fv->setData($data);
-                $fv->setRules($this->validate);
-
-                if ($fv->run())
-                {
-                    return $data;
-                }
-                else
-                {
-                    return FALSE;
-                }
-            }
-            else
-            {
-                return $data;
-            }
-        }
+				$fv->setData($data);
+				$fv->setRules($this->validate);
+
+				if ($fv->run())
+				{
+					return $data;
+				}
+				else
+				{
+					return FALSE;
+				}
+			}
+			else
+			{
+				return $data;
+			}
+		}
 		
 		
 		/**
-		* Set WHERE parameters, when is array
-		* @param array $params
-		*/
+		 * Set WHERE parameters, when is array
+		 * @param array $params
+		 */
 		protected function _set_where_array(array $params){
 			foreach ($params as $field => $filter)
 			{
@@ -1003,52 +1003,52 @@ 
 		}
 
 
-        /**
-         * Set WHERE parameters, cleverly
-         */
-        protected function _set_where($params)
-        {
-            if (count($params) == 1 && is_array($params[0]))
-            {
-                $this->_set_where_array($params[0]);
-            }
-            else if (count($params) == 1)
-            {
-                $this->getQueryBuilder()->where($params[0]);
-            }
-        	else if (count($params) == 2)
-    		{
-                if (is_array($params[1]))
-                {
-                    $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->getQueryBuilder()->where($params[0], $params[1]);
-                }
-    		}
-    		else if (count($params) == 3)
-    		{
-    			$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-    		}
-            else
-            {
-                if (is_array($params[1]))
-                {
-                    $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->getQueryBuilder()->where($params[0], $params[1]);
-                }
-            }
-        }
-
-        /**
+		/**
+		 * Set WHERE parameters, cleverly
+		 */
+		protected function _set_where($params)
+		{
+			if (count($params) == 1 && is_array($params[0]))
+			{
+				$this->_set_where_array($params[0]);
+			}
+			else if (count($params) == 1)
+			{
+				$this->getQueryBuilder()->where($params[0]);
+			}
+			else if (count($params) == 2)
+			{
+				if (is_array($params[1]))
+				{
+					$this->getQueryBuilder()->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->getQueryBuilder()->where($params[0], $params[1]);
+				}
+			}
+			else if (count($params) == 3)
+			{
+				$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
+			}
+			else
+			{
+				if (is_array($params[1]))
+				{
+					$this->getQueryBuilder()->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->getQueryBuilder()->where($params[0], $params[1]);
+				}
+			}
+		}
+
+		/**
             Shortcut to controller
-        */
-        public function __get($key){
-            return get_instance()->{$key};
-        }
+		 */
+		public function __get($key){
+			return get_instance()->{$key};
+		}
 
-    }
+	}

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -22,23 +22,23 @@ 
 	 * 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 Router {
 		
 		/**
-		* @var array $pattern: The list of URIs to validate against
-		*/
+		 * @var array $pattern: The list of URIs to validate against
+		 */
 		private $pattern = array();
 
 		/**
-		* @var array $callback: The list of callback to call
-		*/
+		 * @var array $callback: The list of callback to call
+		 */
 		private $callback = array();
 
 		/**
-		* @var string $uriTrim: The char to remove from the URIs
-		*/
+		 * @var string $uriTrim: The char to remove from the URIs
+		 */
 		protected $uriTrim = '/\^$';
 
 		/**
@@ -94,9 +94,9 @@ 
 		 */
 		public function __construct(){
 			$this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Router');
-	        $routesPath = CONFIG_PATH . 'routes.php';
-	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
+			$this->logger->setLogger('Library::Router');
+			$routesPath = CONFIG_PATH . 'routes.php';
+			$this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
 			if(file_exists($routesPath)){
 				$this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
 				$route = array();
@@ -145,11 +145,11 @@ 
 		}
 
 		/**
-		* Add the URI and callback to the list of URIs to validate
-		*
-		* @param string $uri the request URI
-		* @param object $callback the callback function
-		*/
+		 * Add the URI and callback to the list of URIs to validate
+		 *
+		 * @param string $uri the request URI
+		 * @param object $callback the callback function
+		 */
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
 			if(in_array($uri, $this->pattern)){

core/classes/Database.php

Indentation +626 added lines, -626 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
   /**
    * TNH Framework
    *
@@ -22,266 +22,266 @@ 
    * 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 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 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 object
 	 */
-    private $logger              = null;
+	private $logger              = null;
 
-    /**
-    * The cache instance
-    * @var object
-    */
-    private $cacheInstance       = null;
+	/**
+	 * The cache instance
+	 * @var object
+	 */
+	private $cacheInstance       = null;
 
-    /**
-    * The benchmark instance
-    * @var object
-    */
-    private $benchmarkInstance   = null;
+	/**
+	 * The benchmark instance
+	 * @var object
+	 */
+	private $benchmarkInstance   = null;
 	
 	/**
-    * The DatabaseQueryBuilder instance
-    * @var object
-    */
-    private $queryBuilder        = null;
+	 * The DatabaseQueryBuilder instance
+	 * @var object
+	 */
+	private $queryBuilder        = null;
 
 
-    /**
-     * Construct new database
-     * @param array $overwriteConfig the config to overwrite with the config set in database.php
-     */
-    public function __construct($overwriteConfig = array()){
-        //Set Log instance to use
-        $this->setLoggerFromParamOrCreateNewInstance(null);
+	/**
+	 * Construct new database
+	 * @param array $overwriteConfig the config to overwrite with the config set in database.php
+	 */
+	public function __construct($overwriteConfig = array()){
+		//Set Log instance to use
+		$this->setLoggerFromParamOrCreateNewInstance(null);
 		
-		    //Set DatabaseQueryBuilder instance to use
-		    $this->setQueryBuilderFromParamOrCreateNewInstance(null);
+			//Set DatabaseQueryBuilder instance to use
+			$this->setQueryBuilderFromParamOrCreateNewInstance(null);
 
-        //Set database configuration
-        $this->setDatabaseConfiguration($overwriteConfig);
+		//Set database configuration
+		$this->setDatabaseConfiguration($overwriteConfig);
 	
-		    //cache time to live
-    	  $this->temporaryCacheTtl = $this->cacheTtl;
-    }
-
-    /**
-     * This is used to connect to database
-     * @return bool 
-     */
-    public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
-            $this->pdo = new PDO($this->getDsnFromDriver(), $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;
-      }
-    }
-
-
-    /**
-     * 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(){
+			//cache time to live
+		  $this->temporaryCacheTtl = $this->cacheTtl;
+	}
+
+	/**
+	 * This is used to connect to database
+	 * @return bool 
+	 */
+	public function connect(){
+	  $config = $this->getDatabaseConfiguration();
+	  if (! empty($config)){
+		try{
+			$this->pdo = new PDO($this->getDsnFromDriver(), $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;
+	  }
+	}
+
+
+	/**
+	 * 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->getQueryBuilder()->limit(1);
-      $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
-        return $query;
-      }
-      else{
-        return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
-      }
-    }
-
-    /**
-     * Get the result of record rows list returned by the current query
-     * @param  boolean|string $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){
+	}
+
+	/**
+	 * 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->getQueryBuilder()->limit(1);
+	  $query = $this->getAll(true);
+	  if ($returnSQLQueryOrResultType === true){
+		return $query;
+	  }
+	  else{
+		return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
+	  }
+	}
+
+	/**
+	 * Get the result of record rows list returned by the current query
+	 * @param  boolean|string $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 = $this->getQueryBuilder()->getQuery();
 	   if ($returnSQLQueryOrResultType === true){
-      	return $query;
-      }
-      return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
-    }
-
-    /**
-     * 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){
-      if (empty($data) && $this->getData()){
-        //as when using $this->setData() may be the data already escaped
-        $escape = false;
-        $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
-      $result = $this->query($query);
-      if ($result){
-        $this->insertId = $this->pdo->lastInsertId();
+	  	return $query;
+	  }
+	  return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
+	}
+
+	/**
+	 * 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){
+	  if (empty($data) && $this->getData()){
+		//as when using $this->setData() may be the data already escaped
+		$escape = false;
+		$data = $this->getData();
+	  }
+	  $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
+	  $result = $this->query($query);
+	  if ($result){
+		$this->insertId = $this->pdo->lastInsertId();
 		//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! $this->insertId() ? true : $this->insertId();
-      }
-      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){
-      if (empty($data) && $this->getData()){
-        //as when using $this->setData() may be the data already escaped
-        $escape = false;
-        $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
-      return $this->query($query);
-    }
-
-    /**
-     * Delete the record in database
-     * @return mixed the delete status
-     */
-    public function delete(){
+		return ! $this->insertId() ? true : $this->insertId();
+	  }
+	  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){
+	  if (empty($data) && $this->getData()){
+		//as when using $this->setData() may be the data already escaped
+		$escape = false;
+		$data = $this->getData();
+	  }
+	  $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
+	  return $this->query($query);
+	}
+
+	/**
+	 * Delete the record in database
+	 * @return mixed the delete status
+	 */
+	public function delete(){
 		$query = $this->getQueryBuilder()->delete()->getQuery();
-    	return $this->query($query);
-    }
-
-    /**
-     * 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;
-    }
+		return $this->query($query);
+	}
+
+	/**
+	 * 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	
@@ -289,272 +289,272 @@ 
 	 * @return object        the current Database instance
 	 */
   	public function cached($ttl = 0){
-        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
-     * @param boolean $escaped whether we can do escape of not 
-     * @return mixed       the data after escaped or the same data if not
-     */
-    public function escape($data, $escaped = true){
-      return $escaped ? 
-                      $this->getPdo()->quote(trim($data)) 
-                      : $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 PDO instance
-     * @return object
-     */
-    public function getPdo(){
-      return $this->pdo;
-    }
-
-    /**
-     * Set the PDO instance
-     * @param object $pdo the pdo object
+		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
+	 * @param boolean $escaped whether we can do escape of not 
+	 * @return mixed       the data after escaped or the same data if not
+	 */
+	public function escape($data, $escaped = true){
+	  return $escaped ? 
+					  $this->getPdo()->quote(trim($data)) 
+					  : $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 PDO instance
+	 * @return object
+	 */
+	public function getPdo(){
+	  return $this->pdo;
+	}
+
+	/**
+	 * Set the PDO instance
+	 * @param object $pdo the pdo object
 	 * @return object Database
-     */
-    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 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
 	 * @return object Database
-     */
-    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 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
 	 * @return object Database
-     */
-    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 $benchmark the benchmark 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 $benchmark the benchmark object
 	 * @return object Database
-     */
-    public function setBenchmark($benchmark){
-      $this->benchmarkInstance = $benchmark;
-      return $this;
-    }
+	 */
+	public function setBenchmark($benchmark){
+	  $this->benchmarkInstance = $benchmark;
+	  return $this;
+	}
 	
 	
 	/**
-     * Return the DatabaseQueryBuilder instance
-     * @return object DatabaseQueryBuilder
-     */
-    public function getQueryBuilder(){
-      return $this->queryBuilder;
-    }
-
-    /**
-     * Set the DatabaseQueryBuilder instance
-     * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
-     */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
-      $this->queryBuilder = $queryBuilder;
-      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|array $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 = null, $escape = true){
+	 * Return the DatabaseQueryBuilder instance
+	 * @return object DatabaseQueryBuilder
+	 */
+	public function getQueryBuilder(){
+	  return $this->queryBuilder;
+	}
+
+	/**
+	 * Set the DatabaseQueryBuilder instance
+	 * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
+	 */
+	public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+	  $this->queryBuilder = $queryBuilder;
+	  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|array $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 = null, $escape = true){
   	  if(is_array($key)){
-    		foreach($key as $k => $v){
-    			$this->setData($k, $v, $escape);
-    		}	
+			foreach($key as $k => $v){
+				$this->setData($k, $v, $escape);
+			}	
   	  } else {
-        $this->data[$key] = $this->escape($value, $escape);
+		$this->data[$key] = $this->escape($value, $escape);
   	  }
-      return $this;
-    }
-
-     /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean|array $all  if boolean this indicate whether to return all record or not, if array 
-     * will 
-     * @param  boolean $array return the result as array
-     * @return mixed         the query result
-     */
-    public function query($query, $all = true, $array = false){
-      $this->reset();
-      $query = $this->getPreparedQuery($query, $all);
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+	  return $this;
+	}
+
+	 /**
+	  * Execute an SQL query
+	  * @param  string  $query the query SQL string
+	  * @param  boolean|array $all  if boolean this indicate whether to return all record or not, if array 
+	  * will 
+	  * @param  boolean $array return the result as array
+	  * @return mixed         the query result
+	  */
+	public function query($query, $all = true, $array = false){
+	  $this->reset();
+	  $query = $this->getPreparedQuery($query, $all);
+	  $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       
-      $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
-
-      $this->logger->info(
-                          'Execute SQL query ['.$this->query.'], return type: ' 
-                          . ($array?'ARRAY':'OBJECT') .', return as list: ' 
-                          . (is_bool($all) && $all ? 'YES':'NO')
-                        );
-      //cache expire time
-      $cacheExpire = $this->temporaryCacheTtl;
+	  $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
+
+	  $this->logger->info(
+						  'Execute SQL query ['.$this->query.'], return type: ' 
+						  . ($array?'ARRAY':'OBJECT') .', return as list: ' 
+						  . (is_bool($all) && $all ? 'YES':'NO')
+						);
+	  //cache expire time
+	  $cacheExpire = $this->temporaryCacheTtl;
       
-      //return to the initial cache time
-      $this->temporaryCacheTtl = $this->cacheTtl;
+	  //return to the initial cache time
+	  $this->temporaryCacheTtl = $this->cacheTtl;
       
-      //config for cache
-      $cacheEnable = get_config('cache_enable');
+	  //config for cache
+	  $cacheEnable = get_config('cache_enable');
       
-      //the database cache content
-      $cacheContent = null;
+	  //the database cache content
+	  $cacheContent = null;
 
-      //if can use cache feature for this query
-      $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
+	  //if can use cache feature for this query
+	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
-          $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-          $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
-      }
+	  if ($dbCacheStatus && $isSqlSELECTQuery){
+		  $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+		  $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
+	  }
       
-      if ( !$cacheContent){
-        $sqlQuery = $this->runSqlQuery($query, $all, $array);
-        if (is_object($sqlQuery)){
-          if ($isSqlSELECTQuery){
-            $this->setQueryResultForSelect($sqlQuery, $all, $array);
-            $this->setCacheContentForQuery(
-                                            $this->query, 
-                                            $this->getCacheBenchmarkKeyForQuery($this->query, $all, $array), 
-                                            $this->result, 
-                                            $dbCacheStatus && $isSqlSELECTQuery, 
-                                            $cacheExpire
-                                          );
-            if (! $this->result){
-              $this->logger->info('No result where found for the query [' . $query . ']');
-            }
-          } else {
-              $this->setQueryResultForNonSelect($sqlQuery);
-          }
-        }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-          $this->result = $cacheContent;
-          $this->numRows = count($this->result);
-      }
-      return $this->result;
-    }
+	  if ( !$cacheContent){
+		$sqlQuery = $this->runSqlQuery($query, $all, $array);
+		if (is_object($sqlQuery)){
+		  if ($isSqlSELECTQuery){
+			$this->setQueryResultForSelect($sqlQuery, $all, $array);
+			$this->setCacheContentForQuery(
+											$this->query, 
+											$this->getCacheBenchmarkKeyForQuery($this->query, $all, $array), 
+											$this->result, 
+											$dbCacheStatus && $isSqlSELECTQuery, 
+											$cacheExpire
+										  );
+			if (! $this->result){
+			  $this->logger->info('No result where found for the query [' . $query . ']');
+			}
+		  } else {
+			  $this->setQueryResultForNonSelect($sqlQuery);
+		  }
+		}
+	  } else if ($isSqlSELECTQuery){
+		  $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+		  $this->result = $cacheContent;
+		  $this->numRows = count($this->result);
+	  }
+	  return $this->result;
+	}
 	
 	/**
-     * Run the database SQL query and return the PDOStatment object
-     * @see Database::query
-     * 
-     * @return object|void
-     */
-    public function runSqlQuery($query, $all, $array){
-       //for database query execution time
-        $benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        $benchmarkInstance = $this->getBenchmark();
-        if (! is_object($benchmarkInstance)){
-          $obj = & get_instance();
-          $benchmarkInstance = $obj->benchmark; 
-          $this->setBenchmark($benchmarkInstance);
-        }
+	 * Run the database SQL query and return the PDOStatment object
+	 * @see Database::query
+	 * 
+	 * @return object|void
+	 */
+	public function runSqlQuery($query, $all, $array){
+	   //for database query execution time
+		$benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
+		$benchmarkInstance = $this->getBenchmark();
+		if (! is_object($benchmarkInstance)){
+		  $obj = & get_instance();
+		  $benchmarkInstance = $obj->benchmark; 
+		  $this->setBenchmark($benchmarkInstance);
+		}
         
-        $benchmarkInstance->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
-        //Now execute the query
-        $sqlQuery = $this->pdo->query($query);
+		$benchmarkInstance->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
+		//Now execute the query
+		$sqlQuery = $this->pdo->query($query);
         
-        //get response time for this query
-        $responseTime = $benchmarkInstance->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.');
-        }
-		    //count the number of query execution to server
-        $this->queryCount++;
+		//get response time for this query
+		$responseTime = $benchmarkInstance->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.');
+		}
+			//count the number of query execution to server
+		$this->queryCount++;
 		
-        if ($sqlQuery !== false){
-          return $sqlQuery;
-        }
-        $this->setQueryError();
-    }
+		if ($sqlQuery !== false){
+		  return $sqlQuery;
+		}
+		$this->setQueryError();
+	}
 	
 	
 	 /**
-	 * Return the database configuration
-	 * @return array
-	 */
+	  * Return the database configuration
+	  * @return array
+	  */
 	public  function getDatabaseConfiguration(){
 	  return $this->config;
 	}
@@ -563,39 +563,39 @@ 
     * Setting the database configuration using the configuration file and additional configuration from param
     * @param array $overwriteConfig the additional configuration to overwrite with the existing one
     * @param boolean $useConfigFile whether to use database configuration file
-	  * @return object Database
+    * @return object Database
     */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
-        $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
-            //here don't use require_once because somewhere user can create database instance directly
-            require CONFIG_PATH . 'database.php';
-        }
+	public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+		$db = array();
+		if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+			//here don't use require_once because somewhere user can create database instance directly
+			require CONFIG_PATH . 'database.php';
+		}
         
-        //merge with the parameter  
-        $db = array_merge($db, $overwriteConfig);
+		//merge with the parameter  
+		$db = array_merge($db, $overwriteConfig);
         
-        //default configuration
-        $config = array(
-          'driver' => 'mysql',
-          'username' => 'root',
-          'password' => '',
-          'database' => '',
-          'hostname' => 'localhost',
-          'charset' => 'utf8',
-          'collation' => 'utf8_general_ci',
-          'prefix' => '',
-          'port' => ''
-        );
+		//default configuration
+		$config = array(
+		  'driver' => 'mysql',
+		  'username' => 'root',
+		  'password' => '',
+		  'database' => '',
+		  'hostname' => 'localhost',
+		  'charset' => 'utf8',
+		  'collation' => 'utf8_general_ci',
+		  'prefix' => '',
+		  'port' => ''
+		);
 		
-    		$config = array_merge($config, $db);
-    		//determine the port using the hostname like localhost:3307
-        //hostname will be "localhost", and port "3307"
-        $p = explode(':', $config['hostname']);
-    	  if (count($p) >= 2){
-    		  $config['hostname'] = $p[0];
-    		  $config['port'] = $p[1];
-    		}
+			$config = array_merge($config, $db);
+			//determine the port using the hostname like localhost:3307
+		//hostname will be "localhost", and port "3307"
+		$p = explode(':', $config['hostname']);
+		  if (count($p) >= 2){
+			  $config['hostname'] = $p[0];
+			  $config['port'] = $p[1];
+			}
 		
 		 $this->databaseName = $config['database'];
 		 $this->config = $config;
@@ -620,77 +620,77 @@ 
   }
 	
    /**
-   * Set the result for SELECT query using PDOStatment
-   * @see Database::query
-   */
-    protected function setQueryResultForSelect($pdoStatment, $all, $array){
-      //if need return all result like list of record
-      if (is_bool($all) && $all){
-          $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
-      }
-      else{
-          $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->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 = $pdoStatment->rowCount(); 
-      }
-    }
-
-    /**
-     * Set the result for other command than SELECT query using PDOStatment
-     * @see Database::query
-     */
-    protected function setQueryResultForNonSelect($pdoStatment){
-      //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
-        $this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
-        $this->numRows = 1; //TODO use the correct method to get the exact affected row
-      }
-      else{
-          $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
-          $this->numRows = $pdoStatment->rowCount(); 
-      }
-    }
+    * Set the result for SELECT query using PDOStatment
+    * @see Database::query
+    */
+	protected function setQueryResultForSelect($pdoStatment, $all, $array){
+	  //if need return all result like list of record
+	  if (is_bool($all) && $all){
+		  $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
+	  }
+	  else{
+		  $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->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 = $pdoStatment->rowCount(); 
+	  }
+	}
+
+	/**
+	 * Set the result for other command than SELECT query using PDOStatment
+	 * @see Database::query
+	 */
+	protected function setQueryResultForNonSelect($pdoStatment){
+	  //Sqlite and pgsql always return 0 when using rowCount()
+	  if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+		$this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
+		$this->numRows = 1; //TODO use the correct method to get the exact affected row
+	  }
+	  else{
+		  $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
+		  $this->numRows = $pdoStatment->rowCount(); 
+	  }
+	}
 
 	
 
-    /**
-     * This method is used to get the PDO DSN string using the configured driver
-     * @return string the DSN string
-     */
-    protected function getDsnFromDriver(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        $driver = $config['driver'];
-        $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']
-                              );
-        return isset($driverDsnMap[$driver]) ? $driverDsnMap[$driver] : '';
-      }                   
-      return null;
-    }
-
-     /**
-     * Transform the prepared query like (?, ?, ?) into string format
-     * @see Database::query
-     *
-     * @return string
-     */
-    protected function getPreparedQuery($query, $data){
-      if (is_array($data)){
+	/**
+	 * This method is used to get the PDO DSN string using the configured driver
+	 * @return string the DSN string
+	 */
+	protected function getDsnFromDriver(){
+	  $config = $this->getDatabaseConfiguration();
+	  if (! empty($config)){
+		$driver = $config['driver'];
+		$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']
+							  );
+		return isset($driverDsnMap[$driver]) ? $driverDsnMap[$driver] : '';
+	  }                   
+	  return null;
+	}
+
+	 /**
+	  * Transform the prepared query like (?, ?, ?) into string format
+	  * @see Database::query
+	  *
+	  * @return string
+	  */
+	protected function getPreparedQuery($query, $data){
+	  if (is_array($data)){
   			$x = explode('?', $query);
   			$q = '';
   			foreach($x as $k => $v){
@@ -699,121 +699,121 @@ 
   			  }
   			}
   			return $q;
-      }
-      return $query;
-    }
-
-    /**
-     * Get the cache content for this query
-     * @see Database::query
-     *      
-     * @return mixed
-     */
-    protected function getCacheContentForQuery($query, $all, $array){
-        $cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        if (! is_object($this->getCacheInstance())){
-    			//can not call method with reference in argument
-    			//like $this->setCacheInstance(& get_instance()->cache);
-    			//use temporary variable
-    			$instance = & get_instance()->cache;
-    			$this->setCacheInstance($instance);
-        }
-        return $this->getCacheInstance()->get($cacheKey);
-    }
-
-    /**
-     * Save the result of query into cache
-     * @param string $query  the SQL query
-     * @param string $key    the cache key
-     * @param mixed $result the query result to save
-     * @param boolean $status whether can save the query result into cache
-     * @param int $expire the cache TTL
-     */
-     protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
-        if ($status){
-            $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-            if (! is_object($this->getCacheInstance())){
-      				//can not call method with reference in argument
-      				//like $this->setCacheInstance(& get_instance()->cache);
-      				//use temporary variable
-      				$instance = & get_instance()->cache;
-      				$this->setCacheInstance($instance);
-      			}
-            $this->getCacheInstance()->set($key, $result, $expire);
-        }
-     }
+	  }
+	  return $query;
+	}
+
+	/**
+	 * Get the cache content for this query
+	 * @see Database::query
+	 *      
+	 * @return mixed
+	 */
+	protected function getCacheContentForQuery($query, $all, $array){
+		$cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
+		if (! is_object($this->getCacheInstance())){
+				//can not call method with reference in argument
+				//like $this->setCacheInstance(& get_instance()->cache);
+				//use temporary variable
+				$instance = & get_instance()->cache;
+				$this->setCacheInstance($instance);
+		}
+		return $this->getCacheInstance()->get($cacheKey);
+	}
+
+	/**
+	 * Save the result of query into cache
+	 * @param string $query  the SQL query
+	 * @param string $key    the cache key
+	 * @param mixed $result the query result to save
+	 * @param boolean $status whether can save the query result into cache
+	 * @param int $expire the cache TTL
+	 */
+	 protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
+		if ($status){
+			$this->logger->info('Save the result for query [' .$query. '] into cache for future use');
+			if (! is_object($this->getCacheInstance())){
+	  				//can not call method with reference in argument
+	  				//like $this->setCacheInstance(& get_instance()->cache);
+	  				//use temporary variable
+	  				$instance = & get_instance()->cache;
+	  				$this->setCacheInstance($instance);
+	  			}
+			$this->getCacheInstance()->set($key, $result, $expire);
+		}
+	 }
 
     
-    /**
-     * Set error for database query execution
-     */
-    protected function setQueryError(){
-      $error = $this->pdo->errorInfo();
-      $this->error = isset($error[2]) ? $error[2] : '';
-      $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
-	    //show error message
-      $this->error();
-    }
+	/**
+	 * Set error for database query execution
+	 */
+	protected function setQueryError(){
+	  $error = $this->pdo->errorInfo();
+	  $this->error = isset($error[2]) ? $error[2] : '';
+	  $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
+		//show error message
+	  $this->error();
+	}
 
 	  /**
-     * Return the cache key for the given query
-     * @see Database::query
-     * 
-     *  @return string
-     */
-    protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
-      if (is_array($all)){
-        $all = 'array';
-      }
-      return md5($query . $all . $array);
-    }
+	   * Return the cache key for the given query
+	   * @see Database::query
+	   * 
+	   *  @return string
+	   */
+	protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
+	  if (is_array($all)){
+		$all = 'array';
+	  }
+	  return md5($query . $all . $array);
+	}
     
 	   /**
-     * Set the Log instance using argument or create new instance
-     * @param object $logger the Log instance if not null
-     */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
-        $this->setLogger($logger);
-      }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
-          $this->logger->setLogger('Library::Database');
-      }
-    }
+	    * Set the Log instance using argument or create new instance
+	    * @param object $logger the Log instance if not null
+	    */
+	protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
+	  if ($logger !== null){
+		$this->setLogger($logger);
+	  }
+	  else{
+		  $this->logger =& class_loader('Log', 'classes');
+		  $this->logger->setLogger('Library::Database');
+	  }
+	}
 	
    /**
-   * Set the DatabaseQueryBuilder instance using argument or create new instance
-   * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
-   */
+    * Set the DatabaseQueryBuilder instance using argument or create new instance
+    * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
+    */
 	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
 	  if ($queryBuilder !== null){
-      $this->setQueryBuilder($queryBuilder);
+	  $this->setQueryBuilder($queryBuilder);
 	  }
 	  else{
 		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes');
 	  }
 	}
 
-    /**
-     * Reset the database class attributs to the initail values before each query.
-     */
-    private function reset(){
+	/**
+	 * Reset the database class attributs to the initail values before each query.
+	 */
+	private function reset(){
 	   //query builder reset
-      $this->getQueryBuilder()->reset();
-      $this->numRows  = 0;
-      $this->insertId = null;
-      $this->query    = null;
-      $this->error    = null;
-      $this->result   = array();
-      $this->data     = array();
-    }
-
-    /**
-     * The class destructor
-     */
-    public function __destruct(){
-      $this->pdo = null;
-    }
+	  $this->getQueryBuilder()->reset();
+	  $this->numRows  = 0;
+	  $this->insertId = null;
+	  $this->query    = null;
+	  $this->error    = null;
+	  $this->result   = array();
+	  $this->data     = array();
+	}
+
+	/**
+	 * The class destructor
+	 */
+	public function __destruct(){
+	  $this->pdo = null;
+	}
 
 }

core/libraries/Upload.php

Indentation +795 added lines, -795 removed lines

@@ -1,801 +1,801 @@
 <?php
-    defined('ROOT_PATH') or exit('Access denied');
-    /**
-     * TNH Framework
-     *
-     * A simple PHP framework using HMVC architecture
-     *
-     * This content is released under the GNU GPL License (GPL)
-     *
-     * Copyright (C) 2017 Tony NGUEREZA
-     *
-     * This program is free software; you can redistribute it and/or
-     * modify it under the terms of the GNU General Public License
-     * as published by the Free Software Foundation; either version 3
-     * of the License, or (at your option) any later version.
-     *
-     * This program is distributed in the hope that it will be useful,
-     * but WITHOUT ANY WARRANTY; without even the implied warranty of
-     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     * GNU General Public License for more details.
-     *
-     * You should have received a copy of the GNU General Public License
-     * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-    */
-
-
-
-    /**
-    *    Upload
-    *
-    *    A complete class to upload files with php 5 or higher, but the best: very simple to use.
-    *
-    *    @author Olaf Erlandsen <info@webdevfreelance.com>
-    *    @author http://www.webdevfreelance.com/
-    *
-    *    @package FileUpload
-    *    @version 1.5
-    */
-    class Upload{
-
-        /**
-        *   Version
-        *
-        *   @since      1.5
-        *   @version    1.0
-        */
-        const VERSION = '1.5';
-
-        /**
-        *    Upload function name
-        *    Remember:
-        *        Default function: move_uploaded_file
-        *        Native options:
-        *            - move_uploaded_file (Default and best option)
-        *            - copy
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
-        private $upload_function = 'move_uploaded_file';
-
-        /**
-        *    Array with the information obtained from the
-        *    variable $_FILES or $HTTP_POST_FILES.
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
-        private $file_array    = array();
-
-        /**
-        *    If the file you are trying to upload already exists it will
-        *    be overwritten if you set the variable to true.
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        boolean
-        */
-        private $overwrite_file = false;
-
-        /**
-        *    Input element
-        *    Example:
-        *        <input type="file" name="file" />
-        *    Result:
-        *        FileUpload::$input = file
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
-        private $input;
-
-        /**
-        *    Path output
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
-        private $destination_directory;
-
-        /**
-        *    Output filename
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
-        private $filename;
-
-        /**
-        *    Max file size
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        float
-        */
-        private $max_file_size= 0.0;
-
-        /**
-        *    List of allowed mime types
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
-        private $allowed_mime_types = array();
-
-        /**
-        *    Callbacks
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
-        private $callbacks = array('before' => null, 'after' => null);
-
-        /**
-        *    File object
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        object
-        */
-        private $file;
-
-        /**
-        *    Helping mime types
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
-        private $mime_helping = array(
-            'text'      =>    array('text/plain',),
-            'image'     =>    array(
-                'image/jpeg',
-                'image/jpg',
-                'image/pjpeg',
-                'image/png',
-                'image/gif',
-            ),
-            'document'  =>    array(
-                'application/pdf',
-                'application/msword',
-                'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-                'application/vnd.ms-powerpoint',
-                'application/vnd.ms-excel',
-                'application/vnd.oasis.opendocument.spreadsheet',
-                'application/vnd.oasis.opendocument.presentation',
-            ),
-            'video'    =>    array(
-                'video/3gpp',
-                'video/3gpp',
-                'video/x-msvideo',
-                'video/avi',
-                'video/mpeg4',
-                'video/mp4',
-                'video/mpeg',
-                'video/mpg',
-                'video/quicktime',
-                'video/x-sgi-movie',
-                'video/x-ms-wmv',
-                'video/x-flv',
-            ),
-        );
-
-        /**
-         * The upload error message
-         * @var array
-         */
-        public $error_messages = array();
-
-        /**
-         * The upload error message
-         * @var string
-         */
-        protected $error = null;
-
-        /**
-         * The logger instance
-         * @var Log
-         */
-        private $logger;
-
-
-        /**
-        *    Construct
-        *
-        *    @since     0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    object    __construct
-        */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
-            $this->logger->setLogger('Library::Upload');
-
-            Loader::lang('file_upload');
-            $obj =& get_instance();
-
-            $this->error_messages = array(
-                'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
-                'upload_err_form_size' => $obj->lang->get('fu_upload_err_form_size'),
-                'upload_err_partial' => $obj->lang->get('fu_upload_err_partial'),
-                'upload_err_no_file' => $obj->lang->get('fu_upload_err_no_file'),
-                'upload_err_no_tmp_dir' => $obj->lang->get('fu_upload_err_no_tmp_dir'),
-                'upload_err_cant_write' => $obj->lang->get('fu_upload_err_cant_write'),
-                'upload_err_extension' => $obj->lang->get('fu_upload_err_extension'),
-                'accept_file_types' => $obj->lang->get('fu_accept_file_types'),
-                'file_uploads' => $obj->lang->get('fu_file_uploads_disabled'),
-                'max_file_size' => $obj->lang->get('fu_max_file_size'),
-                'overwritten_not_allowed' => $obj->lang->get('fu_overwritten_not_allowed'),
-            );
-
-            $this->file = array(
-                'status'                =>    false,    // True: success upload
-                'mime'                  =>    '',       // Empty string
-                'filename'              =>    '',       // Empty string
-                'original'              =>    '',       // Empty string
-                'size'                  =>    0,        // 0 Bytes
-                'sizeFormated'          =>    '0B',     // 0 Bytes
-                'destination'           =>    './',     // Default: ./
-                'allowed_mime_types'    =>    array(),  // Allowed mime types
-                'error'                 =>    null,        // File error
-            );
-
-            // Change dir to current dir
-            $this->destination_directory = dirname(__FILE__) . DIRECTORY_SEPARATOR;
-
-            // Set file array
-            if (isset($_FILES) && is_array($_FILES)) {
-                $this->file_array = $_FILES;
-            }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
-        }
-        /**
-        *    Set input.
-        *    If you have $_FILES["file"], you must use the key "file"
-        *    Example:
-        *        $object->setInput("file");
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $input
-        *    @return    object
-        *    @method    boolean     setInput
-        */
-        public function setInput($input)
-        {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
-                $this->input = $input;
-            }
-            return $this;
-        }
-        /**
-        *    Set new filename
-        *    Example:
-        *        FileUpload::setFilename("new file.txt")
-        *    Remember:
-        *        Use %s to retrive file extension
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $filename
-        *    @return    object
-        *    @method    boolean     setFilename
-        */
-        public function setFilename($filename)
-        {
-            if ($this->isFilename($filename)) {
-                $this->filename = $filename;
-            }
-            return $this;
-        }
-        /**
-        *    Set automatic filename
-        *
-        *    @since     1.0
-        *    @version   1.5
-        *    @param     string      $extension
-        *    @return    object
-        *    @method    boolean     setAutoFilename
-        */
-        public function setAutoFilename()
-        {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
-            $this->filename .= time();
-            return $this;
-        }
-        /**
-        *    Set file size limit
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     double     $file_size
-        *    @return    object
-        *    @method    boolean     setMaxFileSize
-        */
-        public function setMaxFileSize($file_size)
-        {
-            $file_size = $this->sizeInBytes($file_size);
-            if (is_numeric($file_size) && $file_size > -1) {
-                // Get php config
-                $php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
-                // Calculate difference
-                if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
-                }
-                $this->max_file_size = $file_size;
-            }
-            return $this;
-        }
-        /**
-        *    Set array mime types
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     array       $mimes
-        *    @return    object
-        *    @method    boolean     setAllowedMimeTypes
-        */
-        public function setAllowedMimeTypes(array $mimes)
-        {
-            if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
-            }
-            return $this;
-        }
-        /**
-        *    Set input callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackInput
-        */
-        public function setCallbackInput($callback)
-        {
-            if (is_callable($callback, false)) {
-                $this->callbacks['input'] = $callback;
-            }
-            return $this;
-        }
-        /**
-        *    Set output callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackOutput
-        */
-        public function setCallbackOutput($callback)
-        {
-            if (is_callable($callback, false)) {
-                $this->callbacks['output'] = $callback;
-            }
-            return $this;
-        }
-        /**
-        *    Append a mime type to allowed mime types
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @param     string      $mime
-        *    @return    object
-        *    @method    boolean     setAllowMimeType
-        */
-        public function setAllowMimeType($mime)
-        {
-            if (!empty($mime) && is_string($mime)) {
-                $this->allowed_mime_types[] = strtolower($mime);
-                $this->file['allowed_mime_types'][] = strtolower($mime);
-            } 
-            return $this;
-        }
-        /**
-        *    Set allowed mime types from mime helping
-        *
-        *    @since     1.0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    boolean    setMimeHelping
-        */
-        public function setMimeHelping($name)
-        {
-            if (!empty($name) && is_string($name)) {
-                if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
-                }
-            }
-            return $this;
-        }
-        /**
-        *    Set function to upload file
-        *    Examples:
-        *        1.- FileUpload::setUploadFunction("move_uploaded_file");
-        *        2.- FileUpload::setUploadFunction("copy");
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $function
-        *    @return    object
-        *    @method    boolean     setUploadFunction
-        */
-        public function setUploadFunction($function)
-        {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
-                    $this->upload_function = $function;
-                }
-            }
-            return $this;
-        }
-        /**
-        *    Clear allowed mime types cache
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    object
-        *    @method    boolean    clearAllowedMimeTypes
-        */
-        public function clearAllowedMimeTypes()
-        {
-            $this->allowed_mime_types = array();
-            $this->file['allowed_mime_types'] = array();
-            return $this;
-        }
-        /**
-        *    Set destination output
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $destination_directory      Destination path
-        *    @param     boolean     $create_if_not_exist
-        *    @return    object
-        *    @method    boolean     setDestinationDirectory
-        */
-        public function setDestinationDirectory($destination_directory, $create_if_not_exist = false) {
-            $destination_directory = realpath($destination_directory);
-            if (substr($destination_directory, -1) != DIRECTORY_SEPARATOR) {
-                $destination_directory .= DIRECTORY_SEPARATOR;
-            }
-
-            if ($this->isDirpath($destination_directory)) {
-                if ($this->dirExists($destination_directory)) {
-                    $this->destination_directory = $destination_directory;
-                    chdir($destination_directory);
-                } else if ($create_if_not_exist === true) {
-                    if (mkdir($destination_directory, 0775, true)) {
-                        $this->destination_directory = $destination_directory;
-                        chdir($destination_directory);
-                    }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
-                    }
-                }
-            }
-            return $this;
-        }
-        /**
-        *    Check file exists
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      string     $file_destination
-        *    @return     boolean
-        *    @method     boolean    fileExists
-        */
-        public function fileExists($file_destination)
-        {
-            if ($this->isFilename($file_destination)) {
-                return (file_exists($file_destination) && is_file($file_destination));
-            }
-            return false;
-        }
-        /**
-        *    Check dir exists
-        *
-        *    @since        1.0
-        *    @version    1.0.1
-        *    @param      string     $path
-        *    @return     boolean
-        *    @method     boolean    dirExists
-        */
-        public function dirExists($path)
-        {
-            if ($this->isDirpath($path)) {
-                return (file_exists($path) && is_dir($path));
-            }
-            return false;
-        }
-        /**
-        *    Check valid filename
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @param     string      $filename
-        *    @return    boolean
-        *    @method    boolean     isFilename
-        */
-        public function isFilename($filename)
-        {
-            $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
-        }
-        /**
-        *    Validate mime type with allowed mime types,
-        *    but if allowed mime types is empty, this method return true
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     string      $mime
-        *    @return    boolean
-        *    @method    boolean     checkMimeType
-        */
-        public function checkMimeType($mime)
-        {
-            if (count($this->allowed_mime_types) == 0) {
-                return true;
-            }
-            return in_array(strtolower($mime), $this->allowed_mime_types);
-        }
-        /**
-        *    Retrive status of upload
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    boolean
-        *    @method    boolean    getStatus
-        */
-        public function getStatus()
-        {
-            return $this->file['status'];
-        }
-        /**
-        *    Check valid path
-        *
-        *    @since        1.0
-        *    @version    1.0.1
-        *    @param        string    $filename
-        *    @return     boolean
-        *    @method     boolean    isDirpath
-        */
-        public function isDirpath($path)
-        {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
-                if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
-                } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
-                }
-            }
-            return false;
-        }
-        /**
-        *    Allow overwriting files
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @return     object
-        *    @method     boolean    allowOverwriting
-        */
-        public function allowOverwriting()
-        {
-            $this->overwrite_file = true;
-            return $this;
-        }
-        /**
-        *    File info
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @return     object
-        *    @method     object    getInfo
-        */
-        public function getInfo()
-        {
-            return (object)$this->file;
-        }
-
-
-        /**
-         * Check if the file is uploaded
-         * @return boolean
-         */
-        public function isUploaded(){
-            return isset($this->file_array[$this->input])
-            && is_uploaded_file($this->file_array[$this->input]['tmp_name']);
-        }
-
-        /**
-         * Check if file upload has error
-         * @return boolean
-         */
-        protected function uploadHasError(){
-            //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
-                $this->setError($this->error_messages['file_uploads']);
-                return true;
-            }
-
-             //check for php upload error
-            if(is_numeric($this->file['error']) && $this->file['error'] > 0){
-                $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
-                return true;
-            }
+	defined('ROOT_PATH') or exit('Access denied');
+	/**
+	 * TNH Framework
+	 *
+	 * A simple PHP framework using HMVC architecture
+	 *
+	 * This content is released under the GNU GPL License (GPL)
+	 *
+	 * Copyright (C) 2017 Tony NGUEREZA
+	 *
+	 * This program is free software; you can redistribute it and/or
+	 * modify it under the terms of the GNU General Public License
+	 * as published by the Free Software Foundation; either version 3
+	 * of the License, or (at your option) any later version.
+	 *
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 *
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+	 */
+
+
+
+	/**
+	 *    Upload
+	 *
+	 *    A complete class to upload files with php 5 or higher, but the best: very simple to use.
+	 *
+	 *    @author Olaf Erlandsen <info@webdevfreelance.com>
+	 *    @author http://www.webdevfreelance.com/
+	 *
+	 *    @package FileUpload
+	 *    @version 1.5
+	 */
+	class Upload{
+
+		/**
+		 *   Version
+		 *
+		 *   @since      1.5
+		 *   @version    1.0
+		 */
+		const VERSION = '1.5';
+
+		/**
+		 *    Upload function name
+		 *    Remember:
+		 *        Default function: move_uploaded_file
+		 *        Native options:
+		 *            - move_uploaded_file (Default and best option)
+		 *            - copy
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        string
+		 */
+		private $upload_function = 'move_uploaded_file';
+
+		/**
+		 *    Array with the information obtained from the
+		 *    variable $_FILES or $HTTP_POST_FILES.
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        array
+		 */
+		private $file_array    = array();
+
+		/**
+		 *    If the file you are trying to upload already exists it will
+		 *    be overwritten if you set the variable to true.
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        boolean
+		 */
+		private $overwrite_file = false;
+
+		/**
+		 *    Input element
+		 *    Example:
+		 *        <input type="file" name="file" />
+		 *    Result:
+		 *        FileUpload::$input = file
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        string
+		 */
+		private $input;
+
+		/**
+		 *    Path output
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        string
+		 */
+		private $destination_directory;
+
+		/**
+		 *    Output filename
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        string
+		 */
+		private $filename;
+
+		/**
+		 *    Max file size
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        float
+		 */
+		private $max_file_size= 0.0;
+
+		/**
+		 *    List of allowed mime types
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        array
+		 */
+		private $allowed_mime_types = array();
+
+		/**
+		 *    Callbacks
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        array
+		 */
+		private $callbacks = array('before' => null, 'after' => null);
+
+		/**
+		 *    File object
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        object
+		 */
+		private $file;
+
+		/**
+		 *    Helping mime types
+		 *
+		 *    @since        1.0
+		 *    @version    1.0
+		 *    @var        array
+		 */
+		private $mime_helping = array(
+			'text'      =>    array('text/plain',),
+			'image'     =>    array(
+				'image/jpeg',
+				'image/jpg',
+				'image/pjpeg',
+				'image/png',
+				'image/gif',
+			),
+			'document'  =>    array(
+				'application/pdf',
+				'application/msword',
+				'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+				'application/vnd.ms-powerpoint',
+				'application/vnd.ms-excel',
+				'application/vnd.oasis.opendocument.spreadsheet',
+				'application/vnd.oasis.opendocument.presentation',
+			),
+			'video'    =>    array(
+				'video/3gpp',
+				'video/3gpp',
+				'video/x-msvideo',
+				'video/avi',
+				'video/mpeg4',
+				'video/mp4',
+				'video/mpeg',
+				'video/mpg',
+				'video/quicktime',
+				'video/x-sgi-movie',
+				'video/x-ms-wmv',
+				'video/x-flv',
+			),
+		);
+
+		/**
+		 * The upload error message
+		 * @var array
+		 */
+		public $error_messages = array();
+
+		/**
+		 * The upload error message
+		 * @var string
+		 */
+		protected $error = null;
+
+		/**
+		 * The logger instance
+		 * @var Log
+		 */
+		private $logger;
+
+
+		/**
+		 *    Construct
+		 *
+		 *    @since     0.1
+		 *    @version   1.0.1
+		 *    @return    object
+		 *    @method    object    __construct
+		 */
+		public function __construct(){
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Upload');
+
+			Loader::lang('file_upload');
+			$obj =& get_instance();
+
+			$this->error_messages = array(
+				'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
+				'upload_err_form_size' => $obj->lang->get('fu_upload_err_form_size'),
+				'upload_err_partial' => $obj->lang->get('fu_upload_err_partial'),
+				'upload_err_no_file' => $obj->lang->get('fu_upload_err_no_file'),
+				'upload_err_no_tmp_dir' => $obj->lang->get('fu_upload_err_no_tmp_dir'),
+				'upload_err_cant_write' => $obj->lang->get('fu_upload_err_cant_write'),
+				'upload_err_extension' => $obj->lang->get('fu_upload_err_extension'),
+				'accept_file_types' => $obj->lang->get('fu_accept_file_types'),
+				'file_uploads' => $obj->lang->get('fu_file_uploads_disabled'),
+				'max_file_size' => $obj->lang->get('fu_max_file_size'),
+				'overwritten_not_allowed' => $obj->lang->get('fu_overwritten_not_allowed'),
+			);
+
+			$this->file = array(
+				'status'                =>    false,    // True: success upload
+				'mime'                  =>    '',       // Empty string
+				'filename'              =>    '',       // Empty string
+				'original'              =>    '',       // Empty string
+				'size'                  =>    0,        // 0 Bytes
+				'sizeFormated'          =>    '0B',     // 0 Bytes
+				'destination'           =>    './',     // Default: ./
+				'allowed_mime_types'    =>    array(),  // Allowed mime types
+				'error'                 =>    null,        // File error
+			);
+
+			// Change dir to current dir
+			$this->destination_directory = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+
+			// Set file array
+			if (isset($_FILES) && is_array($_FILES)) {
+				$this->file_array = $_FILES;
+			}
+			$this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+		}
+		/**
+		 *    Set input.
+		 *    If you have $_FILES["file"], you must use the key "file"
+		 *    Example:
+		 *        $object->setInput("file");
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     string      $input
+		 *    @return    object
+		 *    @method    boolean     setInput
+		 */
+		public function setInput($input)
+		{
+			if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+				$this->input = $input;
+			}
+			return $this;
+		}
+		/**
+		 *    Set new filename
+		 *    Example:
+		 *        FileUpload::setFilename("new file.txt")
+		 *    Remember:
+		 *        Use %s to retrive file extension
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     string      $filename
+		 *    @return    object
+		 *    @method    boolean     setFilename
+		 */
+		public function setFilename($filename)
+		{
+			if ($this->isFilename($filename)) {
+				$this->filename = $filename;
+			}
+			return $this;
+		}
+		/**
+		 *    Set automatic filename
+		 *
+		 *    @since     1.0
+		 *    @version   1.5
+		 *    @param     string      $extension
+		 *    @return    object
+		 *    @method    boolean     setAutoFilename
+		 */
+		public function setAutoFilename()
+		{
+			$this->filename = sha1(mt_rand(1, 9999).uniqid());
+			$this->filename .= time();
+			return $this;
+		}
+		/**
+		 *    Set file size limit
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     double     $file_size
+		 *    @return    object
+		 *    @method    boolean     setMaxFileSize
+		 */
+		public function setMaxFileSize($file_size)
+		{
+			$file_size = $this->sizeInBytes($file_size);
+			if (is_numeric($file_size) && $file_size > -1) {
+				// Get php config
+				$php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
+				// Calculate difference
+				if ($php_size < $file_size) {
+					$this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+				}
+				$this->max_file_size = $file_size;
+			}
+			return $this;
+		}
+		/**
+		 *    Set array mime types
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     array       $mimes
+		 *    @return    object
+		 *    @method    boolean     setAllowedMimeTypes
+		 */
+		public function setAllowedMimeTypes(array $mimes)
+		{
+			if (count($mimes) > 0) {
+				array_map(array($this , 'setAllowMimeType'), $mimes);
+			}
+			return $this;
+		}
+		/**
+		 *    Set input callback
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     mixed       $callback
+		 *    @return    object
+		 *    @method    boolean     setCallbackInput
+		 */
+		public function setCallbackInput($callback)
+		{
+			if (is_callable($callback, false)) {
+				$this->callbacks['input'] = $callback;
+			}
+			return $this;
+		}
+		/**
+		 *    Set output callback
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     mixed       $callback
+		 *    @return    object
+		 *    @method    boolean     setCallbackOutput
+		 */
+		public function setCallbackOutput($callback)
+		{
+			if (is_callable($callback, false)) {
+				$this->callbacks['output'] = $callback;
+			}
+			return $this;
+		}
+		/**
+		 *    Append a mime type to allowed mime types
+		 *
+		 *    @since     1.0
+		 *    @version   1.0.1
+		 *    @param     string      $mime
+		 *    @return    object
+		 *    @method    boolean     setAllowMimeType
+		 */
+		public function setAllowMimeType($mime)
+		{
+			if (!empty($mime) && is_string($mime)) {
+				$this->allowed_mime_types[] = strtolower($mime);
+				$this->file['allowed_mime_types'][] = strtolower($mime);
+			} 
+			return $this;
+		}
+		/**
+		 *    Set allowed mime types from mime helping
+		 *
+		 *    @since     1.0.1
+		 *    @version   1.0.1
+		 *    @return    object
+		 *    @method    boolean    setMimeHelping
+		 */
+		public function setMimeHelping($name)
+		{
+			if (!empty($name) && is_string($name)) {
+				if (array_key_exists($name, $this->mime_helping)) {
+					return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+				}
+			}
+			return $this;
+		}
+		/**
+		 *    Set function to upload file
+		 *    Examples:
+		 *        1.- FileUpload::setUploadFunction("move_uploaded_file");
+		 *        2.- FileUpload::setUploadFunction("copy");
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     string      $function
+		 *    @return    object
+		 *    @method    boolean     setUploadFunction
+		 */
+		public function setUploadFunction($function)
+		{
+			if (!empty($function) && (is_array($function) || is_string($function) )) {
+				if (is_callable( $function)) {
+					$this->upload_function = $function;
+				}
+			}
+			return $this;
+		}
+		/**
+		 *    Clear allowed mime types cache
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @return    object
+		 *    @method    boolean    clearAllowedMimeTypes
+		 */
+		public function clearAllowedMimeTypes()
+		{
+			$this->allowed_mime_types = array();
+			$this->file['allowed_mime_types'] = array();
+			return $this;
+		}
+		/**
+		 *    Set destination output
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     string      $destination_directory      Destination path
+		 *    @param     boolean     $create_if_not_exist
+		 *    @return    object
+		 *    @method    boolean     setDestinationDirectory
+		 */
+		public function setDestinationDirectory($destination_directory, $create_if_not_exist = false) {
+			$destination_directory = realpath($destination_directory);
+			if (substr($destination_directory, -1) != DIRECTORY_SEPARATOR) {
+				$destination_directory .= DIRECTORY_SEPARATOR;
+			}
+
+			if ($this->isDirpath($destination_directory)) {
+				if ($this->dirExists($destination_directory)) {
+					$this->destination_directory = $destination_directory;
+					chdir($destination_directory);
+				} else if ($create_if_not_exist === true) {
+					if (mkdir($destination_directory, 0775, true)) {
+						$this->destination_directory = $destination_directory;
+						chdir($destination_directory);
+					}
+					else{
+						$this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+					}
+				}
+			}
+			return $this;
+		}
+		/**
+		 *    Check file exists
+		 *
+		 *    @since      1.0
+		 *    @version    1.0.1
+		 *    @param      string     $file_destination
+		 *    @return     boolean
+		 *    @method     boolean    fileExists
+		 */
+		public function fileExists($file_destination)
+		{
+			if ($this->isFilename($file_destination)) {
+				return (file_exists($file_destination) && is_file($file_destination));
+			}
+			return false;
+		}
+		/**
+		 *    Check dir exists
+		 *
+		 *    @since        1.0
+		 *    @version    1.0.1
+		 *    @param      string     $path
+		 *    @return     boolean
+		 *    @method     boolean    dirExists
+		 */
+		public function dirExists($path)
+		{
+			if ($this->isDirpath($path)) {
+				return (file_exists($path) && is_dir($path));
+			}
+			return false;
+		}
+		/**
+		 *    Check valid filename
+		 *
+		 *    @since     1.0
+		 *    @version   1.0.1
+		 *    @param     string      $filename
+		 *    @return    boolean
+		 *    @method    boolean     isFilename
+		 */
+		public function isFilename($filename)
+		{
+			$filename = basename($filename);
+			return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+		}
+		/**
+		 *    Validate mime type with allowed mime types,
+		 *    but if allowed mime types is empty, this method return true
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @param     string      $mime
+		 *    @return    boolean
+		 *    @method    boolean     checkMimeType
+		 */
+		public function checkMimeType($mime)
+		{
+			if (count($this->allowed_mime_types) == 0) {
+				return true;
+			}
+			return in_array(strtolower($mime), $this->allowed_mime_types);
+		}
+		/**
+		 *    Retrive status of upload
+		 *
+		 *    @since     1.0
+		 *    @version   1.0
+		 *    @return    boolean
+		 *    @method    boolean    getStatus
+		 */
+		public function getStatus()
+		{
+			return $this->file['status'];
+		}
+		/**
+		 *    Check valid path
+		 *
+		 *    @since        1.0
+		 *    @version    1.0.1
+		 *    @param        string    $filename
+		 *    @return     boolean
+		 *    @method     boolean    isDirpath
+		 */
+		public function isDirpath($path)
+		{
+			if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+				if (DIRECTORY_SEPARATOR == '/') {
+					return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+				} else {
+					return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+				}
+			}
+			return false;
+		}
+		/**
+		 *    Allow overwriting files
+		 *
+		 *    @since      1.0
+		 *    @version    1.0
+		 *    @return     object
+		 *    @method     boolean    allowOverwriting
+		 */
+		public function allowOverwriting()
+		{
+			$this->overwrite_file = true;
+			return $this;
+		}
+		/**
+		 *    File info
+		 *
+		 *    @since      1.0
+		 *    @version    1.0
+		 *    @return     object
+		 *    @method     object    getInfo
+		 */
+		public function getInfo()
+		{
+			return (object)$this->file;
+		}
+
+
+		/**
+		 * Check if the file is uploaded
+		 * @return boolean
+		 */
+		public function isUploaded(){
+			return isset($this->file_array[$this->input])
+			&& is_uploaded_file($this->file_array[$this->input]['tmp_name']);
+		}
+
+		/**
+		 * Check if file upload has error
+		 * @return boolean
+		 */
+		protected function uploadHasError(){
+			//check if file upload is  allowed in the configuration
+			if(! ini_get('file_uploads')){
+				$this->setError($this->error_messages['file_uploads']);
+				return true;
+			}
+
+			 //check for php upload error
+			if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+				$this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
+				return true;
+			}
             
-            //check for mime type
-            if (!$this->checkMimeType($this->file['mime'])) {
-                $this->setError($this->error_messages['accept_file_types']);
-                return true;
-            }
-
-             // Check file size
-            if ($this->max_file_size > 0) {
-                if ($this->max_file_size < $this->file['size']) {
-                    $this->setError(sprintf($this->error_messages['max_file_size'], $this->sizeFormat($this->max_file_size)));
-                    return true;
-                }
-            }
-
-            // Check if exists file
-            if ($this->fileExists($this->destination_directory . $this->filename) && $this->overwrite_file === false) {
-                $this->setError($this->error_messages['overwritten_not_allowed']);
-                return true;
-            }
-
-            return false;
-        }
-        /**
-        *    Upload file
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @return    boolean
-        *    @method    boolean    save
-        */
-        public function save(){
-            if (count($this->file_array) > 0) {
-                if (array_key_exists($this->input, $this->file_array)) {
-                    // set original filename if not have a new name
-                    if (empty($this->filename)) {
-                        $this->filename = $this->file_array[$this->input]['name'];
-                    }
-                    else{
-                        // Replace %s for extension in filename
-                        // Before: /[\w\d]*(.[\d\w]+)$/i
-                        // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
-                        // Support unicode(utf-8) characters
-                        // Example: "русские.jpeg" is valid; "Zhōngguó.jpeg" is valid; "Tønsberg.jpeg" is valid
-                        $extension = preg_replace(
-                            '/^[\p{L}\d\s\-\_\.\(\)]*\.([\d\w]+)$/iu',
-                            '$1',
-                            $this->file_array[$this->input]['name']
-                        );
-                        $this->filename = $this->filename . '.' . $extension;
-                    }
-
-                    // set file info
-                    $this->file['mime']         = $this->file_array[$this->input]['type'];
-                    $this->file['tmp']          = $this->file_array[$this->input]['tmp_name'];
-                    $this->file['original']     = $this->file_array[$this->input]['name'];
-                    $this->file['size']         = $this->file_array[$this->input]['size'];
-                    $this->file['sizeFormated'] = $this->sizeFormat($this->file['size']);
-                    $this->file['destination']  = $this->destination_directory . $this->filename;
-                    $this->file['filename']     = $this->filename;
-                    $this->file['error']        = $this->file_array[$this->input]['error'];
-
-                    $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
-
-                    $error = $this->uploadHasError();
-                    if($error){
-                        return false;
-                    }
-                    // Execute input callback
-                    if (!empty( $this->callbacks['input'])) {
-                        call_user_func($this->callbacks['input'], (object)$this->file);
-                    }
+			//check for mime type
+			if (!$this->checkMimeType($this->file['mime'])) {
+				$this->setError($this->error_messages['accept_file_types']);
+				return true;
+			}
+
+			 // Check file size
+			if ($this->max_file_size > 0) {
+				if ($this->max_file_size < $this->file['size']) {
+					$this->setError(sprintf($this->error_messages['max_file_size'], $this->sizeFormat($this->max_file_size)));
+					return true;
+				}
+			}
+
+			// Check if exists file
+			if ($this->fileExists($this->destination_directory . $this->filename) && $this->overwrite_file === false) {
+				$this->setError($this->error_messages['overwritten_not_allowed']);
+				return true;
+			}
+
+			return false;
+		}
+		/**
+		 *    Upload file
+		 *
+		 *    @since     1.0
+		 *    @version   1.0.1
+		 *    @return    boolean
+		 *    @method    boolean    save
+		 */
+		public function save(){
+			if (count($this->file_array) > 0) {
+				if (array_key_exists($this->input, $this->file_array)) {
+					// set original filename if not have a new name
+					if (empty($this->filename)) {
+						$this->filename = $this->file_array[$this->input]['name'];
+					}
+					else{
+						// Replace %s for extension in filename
+						// Before: /[\w\d]*(.[\d\w]+)$/i
+						// After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
+						// Support unicode(utf-8) characters
+						// Example: "русские.jpeg" is valid; "Zhōngguó.jpeg" is valid; "Tønsberg.jpeg" is valid
+						$extension = preg_replace(
+							'/^[\p{L}\d\s\-\_\.\(\)]*\.([\d\w]+)$/iu',
+							'$1',
+							$this->file_array[$this->input]['name']
+						);
+						$this->filename = $this->filename . '.' . $extension;
+					}
+
+					// set file info
+					$this->file['mime']         = $this->file_array[$this->input]['type'];
+					$this->file['tmp']          = $this->file_array[$this->input]['tmp_name'];
+					$this->file['original']     = $this->file_array[$this->input]['name'];
+					$this->file['size']         = $this->file_array[$this->input]['size'];
+					$this->file['sizeFormated'] = $this->sizeFormat($this->file['size']);
+					$this->file['destination']  = $this->destination_directory . $this->filename;
+					$this->file['filename']     = $this->filename;
+					$this->file['error']        = $this->file_array[$this->input]['error'];
+
+					$this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+
+					$error = $this->uploadHasError();
+					if($error){
+						return false;
+					}
+					// Execute input callback
+					if (!empty( $this->callbacks['input'])) {
+						call_user_func($this->callbacks['input'], (object)$this->file);
+					}
                    
 
-                    $this->file['status'] = call_user_func_array(
-                        $this->upload_function, array(
-                            $this->file_array[$this->input]['tmp_name'],
-                            $this->destination_directory . $this->filename
-                        )
-                    );
-
-                    // Execute output callback
-                    if (!empty( $this->callbacks['output'])) {
-                        call_user_func($this->callbacks['output'], (object)$this->file);
-                    }
-                    return $this->file['status'];
-                }
-            }
-        }
-
-        /**
-        *    File size for humans.
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @param      integer    $bytes
-        *    @param      integer    $precision
-        *    @return     string
-        *    @method     string     sizeFormat
-        */
-        public function sizeFormat($size, $precision = 2)
-        {
-            if($size > 0){
-                $base       = log($size) / log(1024);
-                $suffixes   = array('B', 'K', 'M', 'G', 'T');
-                return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
-            }
-            return null;
-        }
+					$this->file['status'] = call_user_func_array(
+						$this->upload_function, array(
+							$this->file_array[$this->input]['tmp_name'],
+							$this->destination_directory . $this->filename
+						)
+					);
+
+					// Execute output callback
+					if (!empty( $this->callbacks['output'])) {
+						call_user_func($this->callbacks['output'], (object)$this->file);
+					}
+					return $this->file['status'];
+				}
+			}
+		}
+
+		/**
+		 *    File size for humans.
+		 *
+		 *    @since      1.0
+		 *    @version    1.0
+		 *    @param      integer    $bytes
+		 *    @param      integer    $precision
+		 *    @return     string
+		 *    @method     string     sizeFormat
+		 */
+		public function sizeFormat($size, $precision = 2)
+		{
+			if($size > 0){
+				$base       = log($size) / log(1024);
+				$suffixes   = array('B', 'K', 'M', 'G', 'T');
+				return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
+			}
+			return null;
+		}
 
         
-        /**
-        *    Convert human file size to bytes
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      integer|double    $size
-        *    @return     integer|double
-        *    @method     string     sizeInBytes
-        */
-        public function sizeInBytes($size)
-        {
-            $unit = 'B';
-            $units = array('B' => 0, 'K' => 1, 'M' => 2, 'G' => 3, 'T' => 4);
-            $matches = array();
-            preg_match('/(?<size>[\d\.]+)\s*(?<unit>b|k|m|g|t)?/i', $size, $matches);
-            if (array_key_exists('unit', $matches)) {
-                $unit = strtoupper($matches['unit']);
-            }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
-        }
-
-        /**
-         * Get the upload error message
-         * @return string
-         */
-        public function getError(){
-            return $this->error;
-        }
-
-        /**
-         * Set the upload error message
-         * @param string $message the upload error message to set
-         */
-        public function setError($message){
-            $this->logger->info('The file upload got error : ' . $message);
-            $this->error = $message;
-        }
-
-        /**
-         * Get the PHP upload error message for the given code
-         * @param  int $code the error code
-         * @return string the error message
-         */
-        private function getPhpUploadErrorMessageByCode($code){
-            $codeMessageMaps = array(
-                1 => $this->error_messages['upload_err_ini_size'],
-                2 => $this->error_messages['upload_err_form_size'],
-                3 => $this->error_messages['upload_err_partial'],
-                4 => $this->error_messages['upload_err_no_file'],
-                6 => $this->error_messages['upload_err_no_tmp_dir'],
-                7 => $this->error_messages['upload_err_cant_write'],
-                8 => $this->error_messages['upload_err_extension'],
-            );
-            return isset($codeMessageMaps[$code]) ? $codeMessageMaps[$code] : null;
-        }
-    }
+		/**
+		 *    Convert human file size to bytes
+		 *
+		 *    @since      1.0
+		 *    @version    1.0.1
+		 *    @param      integer|double    $size
+		 *    @return     integer|double
+		 *    @method     string     sizeInBytes
+		 */
+		public function sizeInBytes($size)
+		{
+			$unit = 'B';
+			$units = array('B' => 0, 'K' => 1, 'M' => 2, 'G' => 3, 'T' => 4);
+			$matches = array();
+			preg_match('/(?<size>[\d\.]+)\s*(?<unit>b|k|m|g|t)?/i', $size, $matches);
+			if (array_key_exists('unit', $matches)) {
+				$unit = strtoupper($matches['unit']);
+			}
+			return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+		}
+
+		/**
+		 * Get the upload error message
+		 * @return string
+		 */
+		public function getError(){
+			return $this->error;
+		}
+
+		/**
+		 * Set the upload error message
+		 * @param string $message the upload error message to set
+		 */
+		public function setError($message){
+			$this->logger->info('The file upload got error : ' . $message);
+			$this->error = $message;
+		}
+
+		/**
+		 * Get the PHP upload error message for the given code
+		 * @param  int $code the error code
+		 * @return string the error message
+		 */
+		private function getPhpUploadErrorMessageByCode($code){
+			$codeMessageMaps = array(
+				1 => $this->error_messages['upload_err_ini_size'],
+				2 => $this->error_messages['upload_err_form_size'],
+				3 => $this->error_messages['upload_err_partial'],
+				4 => $this->error_messages['upload_err_no_file'],
+				6 => $this->error_messages['upload_err_no_tmp_dir'],
+				7 => $this->error_messages['upload_err_cant_write'],
+				8 => $this->error_messages['upload_err_extension'],
+			);
+			return isset($codeMessageMaps[$code]) ? $codeMessageMaps[$code] : null;
+		}
+	}