tnhfw / tnh-fw

tests/include/testsUtil.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 	/**
-	* Function to test private & protected method
-	*/
+	 * Function to test private & protected method
+	 */
 	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
 		$r = new ReflectionClass(get_class($object));
 		$m = $r->getMethod($method);

tests/tnhfw/libraries/FormValidationTest.php

Indentation +30 added lines, -30 removed lines

@@ -3,66 +3,66 @@ 
 class FormValidationTest extends TestCase
 {   
 	public static function setUpBeforeClass()
-    {
+	{
     
-    }
+	}
 	
 	public static function tearDownAfterClass()
-    {
+	{
         
-    }
+	}
 	
-    protected function setUp()
-    {
+	protected function setUp()
+	{
 		
-    }
+	}
 
-    protected function tearDown()
-    {
+	protected function tearDown()
+	{
 		
-    }
+	}
 	
 	
 
-    // tests
-    public function testValidationDataIsEmpty()
-    {
+	// tests
+	public function testValidationDataIsEmpty()
+	{
 		$fv = new FormValidation();
 		$this->assertEmpty($fv->getData());
-    }
+	}
 	
 	public function testValidationDataIsNotEmpty()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setData(array('name' => 'mike'));
 		$this->assertNotEmpty($fv->getData());
 		$this->assertArrayHasKey('name', $fv->getData());
-    }
+	}
 	
 	public function testCannotDoValidation()
-    {
+	{
 		$fv = new FormValidation();
 		$this->assertFalse($fv->canDoValidation());
-    }
+	}
 
 	public function testSettingErrorDelimiter()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setErrorDelimiter('<a>', '</b>');
 		$this->assertContains('<a>', $fv->getErrorDelimiter());
 		$this->assertContains('</b>', $fv->getErrorDelimiter());
-    }
+	}
 	
 	public function testSettingErrorsDelimiter()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setErrorsDelimiter('<foo>', '</bar>');
 		$this->assertContains('<foo>', $fv->getErrorsDelimiter());
 		$this->assertContains('</bar>', $fv->getErrorsDelimiter());
-    }
+	}
 	
 	public function testSettingErrorMessageOverride()
-    {
+	{
 		
 		//field specific message for the rule
 		$fv = new FormValidation();
@@ -82,10 +82,10 @@ 
 
 		$this->assertFalse($fv->run());
 		$this->assertContains('global required message error', $fv->returnErrors());
-    }
+	}
 	
 	public function testSettingCustomErrorMessage()
-    {
+	{
 		
 		$fv = new FormValidation();
 		$fv->setData(array('foo' => ''));
@@ -103,20 +103,20 @@ 
 		
 		$this->assertFalse($fv->run());
 		$this->assertContains('custom "bar" message error', $fv->returnErrors());	
-    }
+	}
 	
 	public function testReturnErrorsArray()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => ''));
 		$this->assertFalse($fv->run());
 		$this->assertNotEmpty($fv->returnErrors());
-    }
+	}
 	
 	
 	public function testRequiredRule()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => ''));
@@ -131,5 +131,5 @@ 
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => 'tony'));
 		$this->assertTrue($fv->run());
-    }
+	}
 }
\ No newline at end of file

core/common.php

Indentation +17 added lines, -17 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.
-	*/
+	 */
 
 	/**
 	 *  @file common.php
@@ -438,13 +438,13 @@ 
 
 
 	/**
-	* Function to stringfy PHP variable, useful in debug situation
-	*
-	* @param mixed $var the variable to stringfy
-	* @codeCoverageIgnore
-	*
-	* @return string the stringfy value
-	*/
+	 * Function to stringfy PHP variable, useful in debug situation
+	 *
+	 * @param mixed $var the variable to stringfy
+	 * @codeCoverageIgnore
+	 *
+	 * @return string the stringfy value
+	 */
 	function stringfy_vars($var){
 		return print_r($var, true);
 	}
@@ -586,15 +586,15 @@ 
 	}
 	
 	/**
-	* This function is very useful, it allows to recover the instance of the global controller.
-	* Note this function always returns the address of the super instance.
-	* For example :
-	* $obj = & get_instance();
-	* 
-	* @codeCoverageIgnore
-	*  
-	* @return object the instance of the "Controller" class
-	*/
+	 * This function is very useful, it allows to recover the instance of the global controller.
+	 * Note this function always returns the address of the super instance.
+	 * For example :
+	 * $obj = & get_instance();
+	 * 
+	 * @codeCoverageIgnore
+	 *  
+	 * @return object the instance of the "Controller" class
+	 */
 	function & get_instance(){
 		return Controller::get_instance();
 	}

core/classes/model/Model.php

Indentation +934 added lines, -934 removed lines

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

core/classes/Lang.php

Indentation +3 added lines, -3 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.
-	*/
+	 */
 
 	/**
 	 * For application languages management
@@ -68,8 +68,8 @@ 
 		 * Construct new Lang instance
 		 */
 		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Lang');
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
 			$this->logger->debug('Setting the supported languages');

tests/bootstrap.php

Indentation +126 added lines, -126 removed lines

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

core/classes/Database.php

Indentation +1238 added lines, -1238 removed lines

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

core/libraries/Upload.php

Indentation +791 added lines, -791 removed lines

@@ -1,797 +1,797 @@
 <?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        mixex
-        */
-        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;
-            } elseif (isset($HTTP_POST_FILES) && is_array($HTTP_POST_FILES)) {
-                $this->file_array = $HTTP_POST_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    boolean
-        *    @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    boolean
-        *    @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    boolean
-        *    @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     integer     $file_size
-        *    @return    boolean
-        *    @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(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    boolean
-        *    @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    boolean
-        *    @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    boolean
-        *    @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    boolean
-        *    @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    boolean
-        *    @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      $mime
-        *    @return    boolean
-        *    @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    boolean
-        *    @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    boolean
-        *    @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;
-                    if (substr($this->destination_directory, -1) != DIRECTORY_SEPARATOR) {
-                        $this->destination_directory .= DIRECTORY_SEPARATOR;
-                    }
-                    chdir($destination_directory);
-                } elseif ($create_if_not_exist === true) {
-                    if (mkdir($destination_directory, 0775, true)) {
-                        if ($this->dirExists($destination_directory)) {
-                            $this->destination_directory = $destination_directory;
-                            if (substr($this->destination_directory, -1) != DIRECTORY_SEPARATOR) {
-                                $this->destination_directory .= DIRECTORY_SEPARATOR;
-                            }
-                            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     boolean
-        *    @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;
-        }
-
-        public function isUploaded(){
-            return isset($this->file_array[$this->input])
-            &&
-            is_uploaded_file($this->file_array[$this->input]['tmp_name']);
-        }
-        /**
-        *    Upload file
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @return    boolean
-        *    @method    boolean    save
-        */
-        public function save(){
-            //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
-                $this->setError($this->error_messages['file_uploads']);
-                return false;
-            }
-            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));
-
-                    //check for php upload error
-                    if(is_numeric($this->file['error']) && $this->file['error'] > 0){
-                        $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
-                        return false;
-                    }
+	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        mixex
+		 */
+		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;
+			} elseif (isset($HTTP_POST_FILES) && is_array($HTTP_POST_FILES)) {
+				$this->file_array = $HTTP_POST_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    boolean
+		 *    @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    boolean
+		 *    @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    boolean
+		 *    @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     integer     $file_size
+		 *    @return    boolean
+		 *    @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(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    boolean
+		 *    @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    boolean
+		 *    @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    boolean
+		 *    @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    boolean
+		 *    @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    boolean
+		 *    @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      $mime
+		 *    @return    boolean
+		 *    @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    boolean
+		 *    @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    boolean
+		 *    @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;
+					if (substr($this->destination_directory, -1) != DIRECTORY_SEPARATOR) {
+						$this->destination_directory .= DIRECTORY_SEPARATOR;
+					}
+					chdir($destination_directory);
+				} elseif ($create_if_not_exist === true) {
+					if (mkdir($destination_directory, 0775, true)) {
+						if ($this->dirExists($destination_directory)) {
+							$this->destination_directory = $destination_directory;
+							if (substr($this->destination_directory, -1) != DIRECTORY_SEPARATOR) {
+								$this->destination_directory .= DIRECTORY_SEPARATOR;
+							}
+							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     boolean
+		 *    @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;
+		}
+
+		public function isUploaded(){
+			return isset($this->file_array[$this->input])
+			&&
+			is_uploaded_file($this->file_array[$this->input]['tmp_name']);
+		}
+		/**
+		 *    Upload file
+		 *
+		 *    @since     1.0
+		 *    @version   1.0.1
+		 *    @return    boolean
+		 *    @method    boolean    save
+		 */
+		public function save(){
+			//check if file upload is  allowed in the configuration
+			if(! ini_get('file_uploads')){
+				$this->setError($this->error_messages['file_uploads']);
+				return false;
+			}
+			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));
+
+					//check for php upload error
+					if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+						$this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
+						return false;
+					}
                     
-                    //check for mime type
-                    if (!$this->checkMimeType($this->file['mime'])) {
-                        $this->setError($this->error_messages['accept_file_types']);
-                        return false;
-                    }
-
-                     // 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 false;
-                        }
-                    }
-
-                    // Check if exists file
-                    if ($this->fileExists($this->destination_directory . $this->filename)) {
-                        // Check if overwrite file
-                        if ($this->overwrite_file === false) {
-                            $this->setError($this->error_messages['overwritten_not_allowed']);
-                            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 false;
+					}
+
+					 // 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 false;
+						}
+					}
+
+					// Check if exists file
+					if ($this->fileExists($this->destination_directory . $this->filename)) {
+						// Check if overwrite file
+						if ($this->overwrite_file === false) {
+							$this->setError($this->error_messages['overwritten_not_allowed']);
+							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    $size
-        *    @return     string
-        *    @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 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    $size
+		 *    @return     string
+		 *    @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 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;
+		}
+	}

core/classes/DBSessionHandler.php

Indentation +84 added lines, -84 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
@@ -76,27 +76,27 @@ 
 		private $logger;
 
 		/**
-         * Instance of the Loader class
-         * @var Loader
-         */
-        protected $loader = null;
+		 * Instance of the Loader class
+		 * @var Loader
+		 */
+		protected $loader = null;
 
 		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
 			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->setLogger($logger);
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::DBSessionHandler');
-	        }
-
-	        if(is_object($loader)){
-	          $this->setLoader($loader);
-	        }
-		    $this->OBJ = & get_instance();
+			 * instance of the Log class
+			 */
+			if(is_object($logger)){
+			  $this->setLogger($logger);
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
+				$this->logger->setLogger('Library::DBSessionHandler');
+			}
+
+			if(is_object($loader)){
+			  $this->setLoader($loader);
+			}
+			$this->OBJ = & get_instance();
 
 		    
 			if(is_object($modelInstance)){
@@ -199,9 +199,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
@@ -238,9 +238,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
@@ -324,75 +324,75 @@ 
 
 		
 		/**
-         * Return the loader instance
-         * @return object Loader the loader instance
-         */
-        public function getLoader(){
-            return $this->loader;
-        }
-
-        /**
-         * set the loader instance for future use
-         * @param object Loader $loader the loader object
-         */
-         public function setLoader($loader){
-            $this->loader = $loader;
-            return $this;
-        }
-
-        /**
-         * Return the model instance
-         * @return object DBSessionHandlerModel the model instance
-         */
-        public function getModelInstance(){
-            return $this->modelInstanceName;
-        }
-
-        /**
-         * set the model instance for future use
-         * @param DBSessionHandlerModel $modelInstance the model object
-         */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
-            $this->modelInstanceName = $modelInstance;
-            return $this;
-        }
-
-        /**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
-
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
-
-	    /**
-	     * Set the model instance using the configuration for session
-	     */
-	    private function setModelInstanceFromConfig(){
-	    	$modelName = get_config('session_save_path');
+		 * Return the loader instance
+		 * @return object Loader the loader instance
+		 */
+		public function getLoader(){
+			return $this->loader;
+		}
+
+		/**
+		 * set the loader instance for future use
+		 * @param object Loader $loader the loader object
+		 */
+		 public function setLoader($loader){
+			$this->loader = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the model instance
+		 * @return object DBSessionHandlerModel the model instance
+		 */
+		public function getModelInstance(){
+			return $this->modelInstanceName;
+		}
+
+		/**
+		 * set the model instance for future use
+		 * @param DBSessionHandlerModel $modelInstance the model object
+		 */
+		 public function setModelInstance(DBSessionHandlerModel $modelInstance){
+			$this->modelInstanceName = $modelInstance;
+			return $this;
+		}
+
+		/**
+		 * Return the Log instance
+		 * @return Log
+		 */
+		public function getLogger(){
+		  return $this->logger;
+		}
+
+		/**
+		 * Set the log instance
+		 * @param Log $logger the log object
+		 */
+		public function setLogger(Log $logger){
+		  $this->logger = $logger;
+		  return $this;
+		}
+
+		/**
+		 * Set the model instance using the configuration for session
+		 */
+		private function setModelInstanceFromConfig(){
+			$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
 			if($this->getLoader()){
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
 			else{
-            	Loader::model($modelName, 'dbsessionhandlerinstance'); 
-            }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
+				Loader::model($modelName, 'dbsessionhandlerinstance'); 
+			}
+			if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
 				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd
 			
 			//set model instance
 			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
+		}
 	}