tnhfw / tnh-fw

core/libraries/FormValidation.php

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
                 //first check for CSRF
                 if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && ! Security::validateCSRF()){
                     show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
-                }
-                else{
+                } else{
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -231,8 +230,7 @@ 
             foreach ($this->getData() as $inputName => $inputVal) {
     			if(is_array($this->data[$inputName])){
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
-    			}
-    			else{
+    			} else{
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -600,8 +598,7 @@ 
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
-            } 
-			else if($inputVal == '') {
+            } else if($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -660,8 +657,7 @@ 
                         $this->_setError($inputName, $ruleName . ',post:key', array($this->_getLabel($inputName), $this->_getLabel(str_replace('post:', '', $doNotEqual))));
                         continue;
                     }
-                } 
-				else{
+                } else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;

Indentation +880 added lines, -880 removed lines

@@ -1,922 +1,922 @@
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
-    /**
-     * TNH Framework
-     *
-     * A simple PHP framework using HMVC architecture
-     *
-     * This content is released under the GNU GPL License (GPL)
-     *
-     * Copyright (C) 2017 Tony NGUEREZA
-     *
-     * This program is free software; you can redistribute it and/or
-     * modify it under the terms of the GNU General Public License
-     * as published by the Free Software Foundation; either version 3
-     * of the License, or (at your option) any later version.
-     *
-     * This program is distributed in the hope that it will be useful,
-     * but WITHOUT ANY WARRANTY; without even the implied warranty of
-     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     * GNU General Public License for more details.
-     *
-     * You should have received a copy of the GNU General Public License
-     * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-    */
-
-
-     class FormValidation{
+	defined('ROOT_PATH') || exit('Access denied');
+	/**
+	 * TNH Framework
+	 *
+	 * A simple PHP framework using HMVC architecture
+	 *
+	 * This content is released under the GNU GPL License (GPL)
+	 *
+	 * Copyright (C) 2017 Tony NGUEREZA
+	 *
+	 * This program is free software; you can redistribute it and/or
+	 * modify it under the terms of the GNU General Public License
+	 * as published by the Free Software Foundation; either version 3
+	 * of the License, or (at your option) any later version.
+	 *
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 *
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+	 */
+
+
+	 class FormValidation{
 		 
-        /**
-         * The form validation status
-         * @var boolean
-         */
-        protected $_success  = false;
-
-        /**
-         * The list of errors messages
-         * @var array
-         */
-        protected $_errorsMessages = array();
+		/**
+		 * The form validation status
+		 * @var boolean
+		 */
+		protected $_success  = false;
+
+		/**
+		 * The list of errors messages
+		 * @var array
+		 */
+		protected $_errorsMessages = array();
         
-        // Array of rule sets, fieldName => PIPE seperated ruleString
-        protected $_rules             = array();
+		// Array of rule sets, fieldName => PIPE seperated ruleString
+		protected $_rules             = array();
         
-        // Array of errors, niceName => Error Message
-        protected $_errors             = array();
+		// Array of errors, niceName => Error Message
+		protected $_errors             = array();
         
-        // Array of post Key => Nice name labels
-        protected $_labels          = array();
+		// Array of post Key => Nice name labels
+		protected $_labels          = array();
         
-        /**
-         * The errors delimiters
-         * @var array
-         */
-        protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
-
-        /**
-         * The each error delimiter
-         * @var array
-         */
-        protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
+		/**
+		 * The errors delimiters
+		 * @var array
+		 */
+		protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
+
+		/**
+		 * The each error delimiter
+		 * @var array
+		 */
+		protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
         
 		/**
-         * Indicated if need force the validation to be failed
-         * @var boolean
-         */
-        protected $_forceFail            = false;
-
-        /**
-         * The list of the error messages overrides by the original
-         * @var array
-         */
-        protected $_errorPhraseOverrides = array();
-
-        /**
-         * The logger instance
-         * @var Log
-         */
-        private $logger;
-
-        /**
-         * The data to be validated, the default is to use $_POST
-         * @var array
-         */
-        private $data = array();
-
-        /**
-         * Whether to check the CSRF. This attribute is just a way to allow custom change of the 
+		 * Indicated if need force the validation to be failed
+		 * @var boolean
+		 */
+		protected $_forceFail            = false;
+
+		/**
+		 * The list of the error messages overrides by the original
+		 * @var array
+		 */
+		protected $_errorPhraseOverrides = array();
+
+		/**
+		 * The logger instance
+		 * @var Log
+		 */
+		private $logger;
+
+		/**
+		 * The data to be validated, the default is to use $_POST
+		 * @var array
+		 */
+		private $data = array();
+
+		/**
+		 * Whether to check the CSRF. This attribute is just a way to allow custom change of the 
 		 * CSRF global configuration
 		 *
-         * @var boolean
-         */
-        public $enableCsrfCheck = false;
-
-        /**
-         * Set all errors and rule sets empty, and sets success to false.
-         *
-         * @return void
-         */
-        public function __construct() {
-            $this->logger =& class_loader('Log', 'classes');
-            $this->logger->setLogger('Library::FormValidation');
+		 * @var boolean
+		 */
+		public $enableCsrfCheck = false;
+
+		/**
+		 * Set all errors and rule sets empty, and sets success to false.
+		 *
+		 * @return void
+		 */
+		public function __construct() {
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::FormValidation');
            
 		   //Load form validation language message
-            Loader::lang('form_validation');
-            $obj = & get_instance();
-            $this->_errorsMessages  = array(
-                        'required'         => $obj->lang->get('fv_required'),
-                        'min_length'       => $obj->lang->get('fv_min_length'),
-                        'max_length'       => $obj->lang->get('fv_max_length'),
-                        'exact_length'     => $obj->lang->get('fv_exact_length'),
-                        'less_than'        => $obj->lang->get('fv_less_than'),
-                        'greater_than'     => $obj->lang->get('fv_greater_than'),
-                        'matches'          => $obj->lang->get('fv_matches'),
-                        'valid_email'      => $obj->lang->get('fv_valid_email'),
-                        'not_equal'        => array(
-                                                'post:key' => $obj->lang->get('fv_not_equal_post_key'),
-                                                'string'   => $obj->lang->get('fv_not_equal_string')
-                                            ),
-                        'depends'          => $obj->lang->get('fv_depends'),
-                        'is_unique'        => $obj->lang->get('fv_is_unique'),
-                        'is_unique_update' => $obj->lang->get('fv_is_unique_update'),
-                        'exists'           => $obj->lang->get('fv_exists'),
-                        'regex'            => $obj->lang->get('fv_regex'),
-                        'in_list'          => $obj->lang->get('fv_in_list'),
-                        'numeric'          => $obj->lang->get('fv_numeric'),
-                        'callback'         => $obj->lang->get('fv_callback'),
-                    );
-            $this->_resetValidation();
-            $this->setData($obj->request->post(null));
-        }
-
-        /**
-         * Reset the form validation instance
-         */
-        protected function _resetValidation() {
-            $this->_rules                = array();
-            $this->_labels               = array();
-            $this->_errorPhraseOverrides = array();
-            $this->_errors               = array();
-            $this->_success              = false;
-            $this->_forceFail            = false;
-            $this->data                  = array();
+			Loader::lang('form_validation');
+			$obj = & get_instance();
+			$this->_errorsMessages  = array(
+						'required'         => $obj->lang->get('fv_required'),
+						'min_length'       => $obj->lang->get('fv_min_length'),
+						'max_length'       => $obj->lang->get('fv_max_length'),
+						'exact_length'     => $obj->lang->get('fv_exact_length'),
+						'less_than'        => $obj->lang->get('fv_less_than'),
+						'greater_than'     => $obj->lang->get('fv_greater_than'),
+						'matches'          => $obj->lang->get('fv_matches'),
+						'valid_email'      => $obj->lang->get('fv_valid_email'),
+						'not_equal'        => array(
+												'post:key' => $obj->lang->get('fv_not_equal_post_key'),
+												'string'   => $obj->lang->get('fv_not_equal_string')
+											),
+						'depends'          => $obj->lang->get('fv_depends'),
+						'is_unique'        => $obj->lang->get('fv_is_unique'),
+						'is_unique_update' => $obj->lang->get('fv_is_unique_update'),
+						'exists'           => $obj->lang->get('fv_exists'),
+						'regex'            => $obj->lang->get('fv_regex'),
+						'in_list'          => $obj->lang->get('fv_in_list'),
+						'numeric'          => $obj->lang->get('fv_numeric'),
+						'callback'         => $obj->lang->get('fv_callback'),
+					);
+			$this->_resetValidation();
+			$this->setData($obj->request->post(null));
+		}
+
+		/**
+		 * Reset the form validation instance
+		 */
+		protected function _resetValidation() {
+			$this->_rules                = array();
+			$this->_labels               = array();
+			$this->_errorPhraseOverrides = array();
+			$this->_errors               = array();
+			$this->_success              = false;
+			$this->_forceFail            = false;
+			$this->data                  = array();
 			$this->enableCsrfCheck       = false;
-        }
+		}
 
-        /**
-         * Set the form validation data
-         * @param array $data the values to be validated
+		/**
+		 * Set the form validation data
+		 * @param array $data the values to be validated
 		 *
-         * @return FormValidation Current instance of object.
-         */
-        public function setData(array $data){
-            $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
-            $this->data = $data;
+		 * @return FormValidation Current instance of object.
+		 */
+		public function setData(array $data){
+			$this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
+			$this->data = $data;
 			return $this;
-        }
-
-        /**
-         * Get the form validation data
-         * @return array the form validation data to be validated
-         */
-        public function getData(){
-            return $this->data;
-        }
-
-		/**
-		* Get the validation function name to validate a rule
-		*
-		* @return string the function name
-		*/
-        protected function _toCallCase($funcName, $prefix='_validate') {
-            $funcName = strtolower($funcName);
-            $finalFuncName = $prefix;
-            foreach (explode('_', $funcName) as $funcNamePart) {
-                $finalFuncName .= strtoupper($funcNamePart[0]) . substr($funcNamePart, 1);
-            }
-            return $finalFuncName;
-        }
-
-        /**
-         * Returns the boolean of the data status success. It goes by the simple
-         *
-         * @return boolean Whether or not the data validation has succeeded
-         */
-        public function isSuccess() {
-            return $this->_success;
-        }
-
-        /**
-         * Checks if the request method is POST or the Data to be validated is set
-         *
-         * @return boolean Whether or not the form has been submitted or the data is available for validation.
-         */
-        public function canDoValidation() {
-            return get_instance()->request->method() === 'POST' || ! empty($this->data);
-        }
-
-        /**
-         * Runs _run once POST data has been submitted or data is set manually.
-         *
-         * @return boolean
-         */
-        public function run() {
-            if ($this->canDoValidation()) {
-                $this->logger->info('The data to validate are listed below: ' . stringfy_vars($this->getData()));
-                $this->_run();
-            }
-            return $this->isSuccess();
-        }
-
-        /**
-         * Validate the CSRF 
-         * @return void 
-         */
-        protected function validateCSRF(){
-            if(get_instance()->request->method() == 'POST' || $this->enableCsrfCheck){
-                $this->logger->debug('Check if CSRF is enabled in configuration');
-                //first check for CSRF
-                if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && ! Security::validateCSRF()){
-                    show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
-                }
-                else{
-                    $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
-                }
-            }
-        }
-        /**
-         * Takes and trims each data, if it has any rules, we parse the rule string and run
-         * each rule against the data value. Sets _success to true if there are no errors
-         * afterwards.
-         */
-        protected function _run() {
-            //validate CSRF
-            $this->validateCSRF();
-            /////////////////////////////////////////////
-            $this->_forceFail = false;
-
-            foreach ($this->getData() as $inputName => $inputVal) {
-    			if(is_array($this->data[$inputName])){
-    				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
-    			}
-    			else{
-    				$this->data[$inputName] = trim($this->data[$inputName]);
-    			}
-
-                if (array_key_exists($inputName, $this->_rules)) {
-                    foreach ($this->_parseRuleString($this->_rules[$inputName]) as $eachRule) {
-                        $this->_validateRule($inputName, $this->data[$inputName], $eachRule);
-                    }
-                }
-            }
-
-            if (empty($this->_errors) && $this->_forceFail === false) {
-                $this->_success = true;
-            }
-        }
-
-        /**
-         * Adds a rule to a form data validation field.
-         *
-         * @param string $inputField Name of the field or the data key to add a rule to
-         * @param string $ruleSets PIPE seperated string of rules
-		 *
-         * @return FormValidation Current instance of object.
-         */
-        public function setRule($inputField, $inputLabel, $ruleSets) {
-            $this->_rules[$inputField] = $ruleSets;
-            $this->_labels[$inputField] = $inputLabel;
-            $this->logger->info('Set the field rule: name [' .$inputField. '], label [' .$inputLabel. '], rules [' .$ruleSets. ']');
-            return $this;
-        }
-
-        /**
-         * Takes an array of rules and uses setRule() to set them, accepts an array
-         * of rule names rather than a pipe-delimited string as well.
-         * @param array $ruleSets
+		}
+
+		/**
+		 * Get the form validation data
+		 * @return array the form validation data to be validated
+		 */
+		public function getData(){
+			return $this->data;
+		}
+
+		/**
+		 * Get the validation function name to validate a rule
+		 *
+		 * @return string the function name
+		 */
+		protected function _toCallCase($funcName, $prefix='_validate') {
+			$funcName = strtolower($funcName);
+			$finalFuncName = $prefix;
+			foreach (explode('_', $funcName) as $funcNamePart) {
+				$finalFuncName .= strtoupper($funcNamePart[0]) . substr($funcNamePart, 1);
+			}
+			return $finalFuncName;
+		}
+
+		/**
+		 * Returns the boolean of the data status success. It goes by the simple
+		 *
+		 * @return boolean Whether or not the data validation has succeeded
+		 */
+		public function isSuccess() {
+			return $this->_success;
+		}
+
+		/**
+		 * Checks if the request method is POST or the Data to be validated is set
+		 *
+		 * @return boolean Whether or not the form has been submitted or the data is available for validation.
+		 */
+		public function canDoValidation() {
+			return get_instance()->request->method() === 'POST' || ! empty($this->data);
+		}
+
+		/**
+		 * Runs _run once POST data has been submitted or data is set manually.
+		 *
+		 * @return boolean
+		 */
+		public function run() {
+			if ($this->canDoValidation()) {
+				$this->logger->info('The data to validate are listed below: ' . stringfy_vars($this->getData()));
+				$this->_run();
+			}
+			return $this->isSuccess();
+		}
+
+		/**
+		 * Validate the CSRF 
+		 * @return void 
+		 */
+		protected function validateCSRF(){
+			if(get_instance()->request->method() == 'POST' || $this->enableCsrfCheck){
+				$this->logger->debug('Check if CSRF is enabled in configuration');
+				//first check for CSRF
+				if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && ! Security::validateCSRF()){
+					show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
+				}
+				else{
+					$this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
+				}
+			}
+		}
+		/**
+		 * Takes and trims each data, if it has any rules, we parse the rule string and run
+		 * each rule against the data value. Sets _success to true if there are no errors
+		 * afterwards.
+		 */
+		protected function _run() {
+			//validate CSRF
+			$this->validateCSRF();
+			/////////////////////////////////////////////
+			$this->_forceFail = false;
+
+			foreach ($this->getData() as $inputName => $inputVal) {
+				if(is_array($this->data[$inputName])){
+					$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
+				}
+				else{
+					$this->data[$inputName] = trim($this->data[$inputName]);
+				}
+
+				if (array_key_exists($inputName, $this->_rules)) {
+					foreach ($this->_parseRuleString($this->_rules[$inputName]) as $eachRule) {
+						$this->_validateRule($inputName, $this->data[$inputName], $eachRule);
+					}
+				}
+			}
+
+			if (empty($this->_errors) && $this->_forceFail === false) {
+				$this->_success = true;
+			}
+		}
+
+		/**
+		 * Adds a rule to a form data validation field.
+		 *
+		 * @param string $inputField Name of the field or the data key to add a rule to
+		 * @param string $ruleSets PIPE seperated string of rules
 		 *
 		 * @return FormValidation Current instance of object.
-         */
-        public function setRules(array $ruleSets) {
-            foreach ($ruleSets as $ruleSet) {
-                $pipeDelimitedRules = null;
-                if (is_array($ruleSet['rules'])) {
-                    $pipeDelimitedRules = implode('|', $ruleSet['rules']);
-                } else {
-                    $pipeDelimitedRules = $ruleSet['rules'];
-                }
-                $this->setRule($ruleSet['name'], $ruleSet['label'], $pipeDelimitedRules);
-            }
-            return $this;
-        }
-
-        /**
-         * This method creates the global errors delimiter, each argument occurs once, at the beginning, and
-         * end of the errors block respectively.
-         *
-         * @param string $start Before block of errors gets displayed, HTML allowed.
-         * @param string $end After the block of errors gets displayed, HTML allowed.
-         *
+		 */
+		public function setRule($inputField, $inputLabel, $ruleSets) {
+			$this->_rules[$inputField] = $ruleSets;
+			$this->_labels[$inputField] = $inputLabel;
+			$this->logger->info('Set the field rule: name [' .$inputField. '], label [' .$inputLabel. '], rules [' .$ruleSets. ']');
+			return $this;
+		}
+
+		/**
+		 * Takes an array of rules and uses setRule() to set them, accepts an array
+		 * of rule names rather than a pipe-delimited string as well.
+		 * @param array $ruleSets
+		 *
 		 * @return FormValidation Current instance of object.
-         */
-        public function setErrorsDelimiter($start, $end) {
-            $this->_allErrorsDelimiter[0] = $start;
-            $this->_allErrorsDelimiter[1] = $end;
-            return $this;
-        }
-
-        /**
-         * This is the individual error delimiter, each argument occurs once before and after
-         * each individual error listed.
-         *
-         * @param string $start Displayed before each error.
-         * @param string $end Displayed after each error.
-         * 
+		 */
+		public function setRules(array $ruleSets) {
+			foreach ($ruleSets as $ruleSet) {
+				$pipeDelimitedRules = null;
+				if (is_array($ruleSet['rules'])) {
+					$pipeDelimitedRules = implode('|', $ruleSet['rules']);
+				} else {
+					$pipeDelimitedRules = $ruleSet['rules'];
+				}
+				$this->setRule($ruleSet['name'], $ruleSet['label'], $pipeDelimitedRules);
+			}
+			return $this;
+		}
+
+		/**
+		 * This method creates the global errors delimiter, each argument occurs once, at the beginning, and
+		 * end of the errors block respectively.
+		 *
+		 * @param string $start Before block of errors gets displayed, HTML allowed.
+		 * @param string $end After the block of errors gets displayed, HTML allowed.
+		 *
 		 * @return FormValidation Current instance of object.
-         */
-        public function setErrorDelimiter($start, $end) {
-            $this->_eachErrorDelimiter[0] = $start;
-            $this->_eachErrorDelimiter[1] = $end;
-            return $this;
-        }
-
-		/**
-		* Get the each errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorDelimiter() {
-            return $this->_eachErrorDelimiter;
-        }
-
-		/**
-		* Get the all errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorsDelimiter() {
-            return $this->_allErrorsDelimiter;
-        }
-
-        /**
-         * This sets a custom error message that can override the default error phrase provided
-         * by FormValidation, it can be used in the format of setMessage('rule', 'error phrase')
-         * which will globally change the error phrase of that rule, or in the format of:
-         * setMessage('rule', 'fieldname', 'error phrase') - which will only change the error phrase for
-         * that rule, applied on that field.
-         *
-         * @return boolean True on success, false on failure.
-         */
-        public function setMessage() {
-            $numArgs = func_num_args();
-            switch ($numArgs) {
-                default:
-                    return false;
-                // A global rule error message
-                case 2:
-                    foreach ($this->post(null) as $key => $val) {
-                        $this->_errorPhraseOverrides[$key][func_get_arg(0)] = func_get_arg(1);
-                    }
-                    break;
-                // Field specific rule error message
-                case 3:
-                    $this->_errorPhraseOverrides[func_get_arg(1)][func_get_arg(0)] = func_get_arg(2);
-                    break;
-            }
-            return true;
-        }
-
-        /**
-         * Adds a custom error message in the errorSet array, that will
-         * forcibly display it.
-         *
-         * @param string $inputName The form input name or data key
-         * @param string $errorMessage Error to display
-		 *
-         * @return formValidation Current instance of the object
-         */
-        public function setCustomError($inputName, $errorMessage) {
-            $errorMessage = str_replace('%1', $this->_labels[$inputName], $errorMessage);
-            $this->_errors[$inputName] = $errorMessage;
-            return $this;
-        }
-
-        /**
-         * Allows for an accesor to any/all post values, if a value of null is passed as the key, it
-         * will recursively find all keys/values of the $_POST array or data array. It also automatically trims
-         * all values.
-         *
-         * @param string $key Key of $this->data to be found, pass null for all Key => Val pairs.
-         * @param boolean $trim Defaults to true, trims all $this->data values.
-         * @return string|array Array of post or data values if null is passed as key, string if only one key is desired.
-         */
-        public function post($key = null, $trim = true) {
-            $returnValue = null;
-            if (is_null($key)) {
-                $returnValue = array();
-                foreach ($this->getData()  as $key => $val) {
-                    $returnValue[$key] = $this->post($key, $trim);
-                }
-            } else {
-                $returnValue = (array_key_exists($key, $this->getData())) ? (($trim) ? trim($this->data[$key]) : $this->data[$key]) : null;
-            }
-            return $returnValue;
-        }
-
-        /**
-         * Gets all errors from errorSet and displays them, can be echo out from the
-         * function or just returned.
-         *
-         * @param boolean $limit number of error to display or return
-         * @param boolean $echo Whether or not the values are to be returned or displayed
-		 *
-         * @return string Errors formatted for output
-         */
-        public function displayErrors($limit = null, $echo = true) {
-            list($errorsStart, $errorsEnd) = $this->_allErrorsDelimiter;
-            list($errorStart, $errorEnd) = $this->_eachErrorDelimiter;
-            $errorOutput = $errorsStart;
-    		$i = 0;
-            if (!empty($this->_errors)) {
-                foreach ($this->_errors as $fieldName => $error) {
-        	    	if ($i === $limit) { 
-                        break; 
-                    }
-                    $errorOutput .= $errorStart;
-                    $errorOutput .= $error;
-                    $errorOutput .= $errorEnd;
-                    $i++;
-                }
-            }
-            $errorOutput .= $errorsEnd;
-            echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
-        }
-
-        /**
-         * Returns raw array of errors in no format instead of displaying them
-         * formatted.
-         *
-         * @return array
-         */
-        public function returnErrors() {
-            return $this->_errors;
-        }
-
-        /**
-         * Breaks up a PIPE seperated string of rules, and puts them into an array.
-         *
-         * @param string $ruleString String to be parsed.
-		 *
-         * @return array Array of each value in original string.
-         */
-        protected function _parseRuleString($ruleString) {
-            $ruleSets = array();
-            /*
+		 */
+		public function setErrorsDelimiter($start, $end) {
+			$this->_allErrorsDelimiter[0] = $start;
+			$this->_allErrorsDelimiter[1] = $end;
+			return $this;
+		}
+
+		/**
+		 * This is the individual error delimiter, each argument occurs once before and after
+		 * each individual error listed.
+		 *
+		 * @param string $start Displayed before each error.
+		 * @param string $end Displayed after each error.
+		 * 
+		 * @return FormValidation Current instance of object.
+		 */
+		public function setErrorDelimiter($start, $end) {
+			$this->_eachErrorDelimiter[0] = $start;
+			$this->_eachErrorDelimiter[1] = $end;
+			return $this;
+		}
+
+		/**
+		 * Get the each errors delimiters
+		 *
+		 * @return array
+		 */
+		public function getErrorDelimiter() {
+			return $this->_eachErrorDelimiter;
+		}
+
+		/**
+		 * Get the all errors delimiters
+		 *
+		 * @return array
+		 */
+		public function getErrorsDelimiter() {
+			return $this->_allErrorsDelimiter;
+		}
+
+		/**
+		 * This sets a custom error message that can override the default error phrase provided
+		 * by FormValidation, it can be used in the format of setMessage('rule', 'error phrase')
+		 * which will globally change the error phrase of that rule, or in the format of:
+		 * setMessage('rule', 'fieldname', 'error phrase') - which will only change the error phrase for
+		 * that rule, applied on that field.
+		 *
+		 * @return boolean True on success, false on failure.
+		 */
+		public function setMessage() {
+			$numArgs = func_num_args();
+			switch ($numArgs) {
+				default:
+					return false;
+				// A global rule error message
+				case 2:
+					foreach ($this->post(null) as $key => $val) {
+						$this->_errorPhraseOverrides[$key][func_get_arg(0)] = func_get_arg(1);
+					}
+					break;
+				// Field specific rule error message
+				case 3:
+					$this->_errorPhraseOverrides[func_get_arg(1)][func_get_arg(0)] = func_get_arg(2);
+					break;
+			}
+			return true;
+		}
+
+		/**
+		 * Adds a custom error message in the errorSet array, that will
+		 * forcibly display it.
+		 *
+		 * @param string $inputName The form input name or data key
+		 * @param string $errorMessage Error to display
+		 *
+		 * @return formValidation Current instance of the object
+		 */
+		public function setCustomError($inputName, $errorMessage) {
+			$errorMessage = str_replace('%1', $this->_labels[$inputName], $errorMessage);
+			$this->_errors[$inputName] = $errorMessage;
+			return $this;
+		}
+
+		/**
+		 * Allows for an accesor to any/all post values, if a value of null is passed as the key, it
+		 * will recursively find all keys/values of the $_POST array or data array. It also automatically trims
+		 * all values.
+		 *
+		 * @param string $key Key of $this->data to be found, pass null for all Key => Val pairs.
+		 * @param boolean $trim Defaults to true, trims all $this->data values.
+		 * @return string|array Array of post or data values if null is passed as key, string if only one key is desired.
+		 */
+		public function post($key = null, $trim = true) {
+			$returnValue = null;
+			if (is_null($key)) {
+				$returnValue = array();
+				foreach ($this->getData()  as $key => $val) {
+					$returnValue[$key] = $this->post($key, $trim);
+				}
+			} else {
+				$returnValue = (array_key_exists($key, $this->getData())) ? (($trim) ? trim($this->data[$key]) : $this->data[$key]) : null;
+			}
+			return $returnValue;
+		}
+
+		/**
+		 * Gets all errors from errorSet and displays them, can be echo out from the
+		 * function or just returned.
+		 *
+		 * @param boolean $limit number of error to display or return
+		 * @param boolean $echo Whether or not the values are to be returned or displayed
+		 *
+		 * @return string Errors formatted for output
+		 */
+		public function displayErrors($limit = null, $echo = true) {
+			list($errorsStart, $errorsEnd) = $this->_allErrorsDelimiter;
+			list($errorStart, $errorEnd) = $this->_eachErrorDelimiter;
+			$errorOutput = $errorsStart;
+			$i = 0;
+			if (!empty($this->_errors)) {
+				foreach ($this->_errors as $fieldName => $error) {
+					if ($i === $limit) { 
+						break; 
+					}
+					$errorOutput .= $errorStart;
+					$errorOutput .= $error;
+					$errorOutput .= $errorEnd;
+					$i++;
+				}
+			}
+			$errorOutput .= $errorsEnd;
+			echo ($echo) ? $errorOutput : '';
+			return (! $echo) ? $errorOutput : null;
+		}
+
+		/**
+		 * Returns raw array of errors in no format instead of displaying them
+		 * formatted.
+		 *
+		 * @return array
+		 */
+		public function returnErrors() {
+			return $this->_errors;
+		}
+
+		/**
+		 * Breaks up a PIPE seperated string of rules, and puts them into an array.
+		 *
+		 * @param string $ruleString String to be parsed.
+		 *
+		 * @return array Array of each value in original string.
+		 */
+		protected function _parseRuleString($ruleString) {
+			$ruleSets = array();
+			/*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
-                $regexRule = array();
-                $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
-                preg_match($rule, $ruleString, $regexRule);
-                $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
-                     $ruleSets[] = $regexRule[0];
-                 }
-                 $ruleStringRegex = explode('|', $ruleStringTemp);
-                foreach ($ruleStringRegex as $rule) {
-                    $rule = trim($rule);
-                    if($rule){
-                        $ruleSets[] = $rule;
-                    }
-                }
+			if(strpos($ruleString, 'regex') !== false){
+				$regexRule = array();
+				$rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
+				preg_match($rule, $ruleString, $regexRule);
+				$ruleStringTemp = preg_replace($rule, '', $ruleString);
+				 if(!empty($regexRule[0])){
+					 $ruleSets[] = $regexRule[0];
+				 }
+				 $ruleStringRegex = explode('|', $ruleStringTemp);
+				foreach ($ruleStringRegex as $rule) {
+					$rule = trim($rule);
+					if($rule){
+						$ruleSets[] = $rule;
+					}
+				}
                  
-            }
-            /***********************************/
-            else{
-                if (strpos($ruleString, '|') !== FALSE) {
-                    $ruleSets = explode('|', $ruleString);
-                } else {
-                    $ruleSets[] = $ruleString;
-                }
-             }
-            return $ruleSets;
-        }
-
-        /**
-         * Returns whether or not a field obtains the rule "required".
-         *
-         * @param string $fieldName Field to check if required.
-		 *
-         * @return boolean Whether or not the field is required.
-         */
-        protected function _fieldIsRequired($fieldName) {
-            $rules = $this->_parseRuleString($this->_rules[$fieldName]);
-            return (in_array('required', $rules));
-        }
-
-        /**
-         * Takes a data input name, it's value, and the rule it's being validated against (ex: max_length[16])
-         * and adds an error to the errorSet if it fails validation of the rule.
-         *
-         * @param string $inputName Name or key of the validation data
-         * @param string $inputVal Value of the validation data
-         * @param string $ruleName Rule to be validated against, including args (exact_length[5])
-         * @return void
-         */
-        protected function _validateRule($inputName, $inputVal, $ruleName) {
-            $this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
-            // Array to store args
-            $ruleArgs = array();
-
-            preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
-
-            // Get the rule arguments, realRule is just the base rule name
-            // Like min_length instead of min_length[3]
-            $ruleName = preg_replace('/\[(.*)\]/', '', $ruleName);
+			}
+			/***********************************/
+			else{
+				if (strpos($ruleString, '|') !== FALSE) {
+					$ruleSets = explode('|', $ruleString);
+				} else {
+					$ruleSets[] = $ruleString;
+				}
+			 }
+			return $ruleSets;
+		}
+
+		/**
+		 * Returns whether or not a field obtains the rule "required".
+		 *
+		 * @param string $fieldName Field to check if required.
+		 *
+		 * @return boolean Whether or not the field is required.
+		 */
+		protected function _fieldIsRequired($fieldName) {
+			$rules = $this->_parseRuleString($this->_rules[$fieldName]);
+			return (in_array('required', $rules));
+		}
+
+		/**
+		 * Takes a data input name, it's value, and the rule it's being validated against (ex: max_length[16])
+		 * and adds an error to the errorSet if it fails validation of the rule.
+		 *
+		 * @param string $inputName Name or key of the validation data
+		 * @param string $inputVal Value of the validation data
+		 * @param string $ruleName Rule to be validated against, including args (exact_length[5])
+		 * @return void
+		 */
+		protected function _validateRule($inputName, $inputVal, $ruleName) {
+			$this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
+			// Array to store args
+			$ruleArgs = array();
+
+			preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
+
+			// Get the rule arguments, realRule is just the base rule name
+			// Like min_length instead of min_length[3]
+			$ruleName = preg_replace('/\[(.*)\]/', '', $ruleName);
             
-            if (method_exists($this, $this->_toCallCase($ruleName))) {
-                $methodToCall = $this->_toCallCase($ruleName);
-                call_user_func(array($this, $methodToCall), $inputName, $ruleName, $ruleArgs);
-            }
-            return;
-        }
-
-		/**
-		* Set error for the given field or key
-		*
-		* @param string $inputName the input or key name
-		* @param string $ruleName the rule name
-		* @param array|string $replacements
-		*/
-        protected function _setError($inputName, $ruleName, $replacements = array()) {
-            $rulePhraseKeyParts = explode(',', $ruleName);
-            $rulePhrase = null;
-            foreach ($rulePhraseKeyParts as $rulePhraseKeyPart) {
-                if (array_key_exists($rulePhraseKeyPart, $this->_errorsMessages)) {
-                    $rulePhrase = $this->_errorsMessages[$rulePhraseKeyPart];
-                } else {
-                    $rulePhrase = $rulePhrase[$rulePhraseKeyPart];
-                }
-            }
-            // Any overrides?
-            if (array_key_exists($inputName, $this->_errorPhraseOverrides) && array_key_exists($ruleName, $this->_errorPhraseOverrides[$inputName])) {
-                $rulePhrase = $this->_errorPhraseOverrides[$inputName][$ruleName];
-            }
-            // Type cast to array in case it's a string
-            $replacements = (array) $replacements;
+			if (method_exists($this, $this->_toCallCase($ruleName))) {
+				$methodToCall = $this->_toCallCase($ruleName);
+				call_user_func(array($this, $methodToCall), $inputName, $ruleName, $ruleArgs);
+			}
+			return;
+		}
+
+		/**
+		 * Set error for the given field or key
+		 *
+		 * @param string $inputName the input or key name
+		 * @param string $ruleName the rule name
+		 * @param array|string $replacements
+		 */
+		protected function _setError($inputName, $ruleName, $replacements = array()) {
+			$rulePhraseKeyParts = explode(',', $ruleName);
+			$rulePhrase = null;
+			foreach ($rulePhraseKeyParts as $rulePhraseKeyPart) {
+				if (array_key_exists($rulePhraseKeyPart, $this->_errorsMessages)) {
+					$rulePhrase = $this->_errorsMessages[$rulePhraseKeyPart];
+				} else {
+					$rulePhrase = $rulePhrase[$rulePhraseKeyPart];
+				}
+			}
+			// Any overrides?
+			if (array_key_exists($inputName, $this->_errorPhraseOverrides) && array_key_exists($ruleName, $this->_errorPhraseOverrides[$inputName])) {
+				$rulePhrase = $this->_errorPhraseOverrides[$inputName][$ruleName];
+			}
+			// Type cast to array in case it's a string
+			$replacements = (array) $replacements;
 			$replacementCount = count($replacements);
-            for ($i = 1; $i <= $replacementCount; $i++) {
-                $key = $i - 1;
-                $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
-            }
-            if (! array_key_exists($inputName, $this->_errors)) {
-                $this->_errors[$inputName] = $rulePhrase;
-            }
-        }
-
-        /**
-         * Used to run a callback for the callback rule, as well as pass in a default
-         * argument of the post value. For example the username field having a rule:
-         * callback[userExists] will eval userExists(data[username]) - Note the use
-         * of eval over call_user_func is in case the function is not user defined.
-         *
-         * @param type $inputArg
-         * @param string $callbackFunc
-		 *
-         * @return mixed
-         */
-        protected function _runCallback($inputArg, $callbackFunc) {
+			for ($i = 1; $i <= $replacementCount; $i++) {
+				$key = $i - 1;
+				$rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
+			}
+			if (! array_key_exists($inputName, $this->_errors)) {
+				$this->_errors[$inputName] = $rulePhrase;
+			}
+		}
+
+		/**
+		 * Used to run a callback for the callback rule, as well as pass in a default
+		 * argument of the post value. For example the username field having a rule:
+		 * callback[userExists] will eval userExists(data[username]) - Note the use
+		 * of eval over call_user_func is in case the function is not user defined.
+		 *
+		 * @param type $inputArg
+		 * @param string $callbackFunc
+		 *
+		 * @return mixed
+		 */
+		protected function _runCallback($inputArg, $callbackFunc) {
 			return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
-        }
-
-        /**
-         * Used for applying a rule only if the empty callback evaluates to true,
-         * for example required[funcName] - This runs funcName without passing any
-         * arguments.
-         *
-         * @param string $callbackFunc
-		 *
-         * @return mixed
-         */
-        protected function _runEmptyCallback($callbackFunc) {
-            return eval('return ' . $callbackFunc . '();');
-        }
-
-        /**
-         * Gets a specific label of a specific field input name.
-         *
-         * @param string $inputName
-		 *
-         * @return string
-         */
-        protected function _getLabel($inputName) {
-            return (array_key_exists($inputName, $this->_labels)) ? $this->_labels[$inputName] : $inputName;
-        }
+		}
+
+		/**
+		 * Used for applying a rule only if the empty callback evaluates to true,
+		 * for example required[funcName] - This runs funcName without passing any
+		 * arguments.
+		 *
+		 * @param string $callbackFunc
+		 *
+		 * @return mixed
+		 */
+		protected function _runEmptyCallback($callbackFunc) {
+			return eval('return ' . $callbackFunc . '();');
+		}
+
+		/**
+		 * Gets a specific label of a specific field input name.
+		 *
+		 * @param string $inputName
+		 *
+		 * @return string
+		 */
+		protected function _getLabel($inputName) {
+			return (array_key_exists($inputName, $this->_labels)) ? $this->_labels[$inputName] : $inputName;
+		}
 		
-        /**
-         * Peform validation for the rule "required"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("required")
-         * @param  array  $ruleArgs  the rules argument
-         */
+		/**
+		 * Peform validation for the rule "required"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("required")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
 		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
-                $callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
-                if ($inputVal == '' && $callbackReturn == true) {
-                    $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
-                }
-            } 
+			$inputVal = $this->post($inputName);
+			if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
+				$callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
+				if ($inputVal == '' && $callbackReturn == true) {
+					$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
+				}
+			} 
 			else if($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
-            }
-        }
-
-        /**
-         * Perform validation for the honey pot so means for the validation to be failed
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateHoneypot($inputName, $ruleName, array $ruleArgs) {
-            if ($this->data[$inputName] != '') {
-                $this->_forceFail = true;
-            }
-        }
-
-        /**
-         * Peform validation for the rule "callback"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("callback")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
-            if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
+			}
+		}
+
+		/**
+		 * Perform validation for the honey pot so means for the validation to be failed
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateHoneypot($inputName, $ruleName, array $ruleArgs) {
+			if ($this->data[$inputName] != '') {
+				$this->_forceFail = true;
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "callback"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("callback")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
+			if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
 				$result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
 				if(! $result){
 					$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
 				}
-            }
-        }
-
-        /**
-         * Peform validation for the rule "depends"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("depends")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateDepends($inputName, $ruleName, array $ruleArgs) {
-            if (array_key_exists($ruleArgs[1], $this->_errors)) {
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "not_equal"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("not_equal")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateNotEqual($inputName, $ruleName, array $ruleArgs) {
-            $canNotEqual = explode(',', $ruleArgs[1]);
-            foreach ($canNotEqual as $doNotEqual) {
-                $inputVal = $this->post($inputName);
-                if (preg_match('/post:(.*)/', $doNotEqual)) {
-                    if ($inputVal == $this->data[str_replace('post:', '', $doNotEqual)]) {
-                        $this->_setError($inputName, $ruleName . ',post:key', array($this->_getLabel($inputName), $this->_getLabel(str_replace('post:', '', $doNotEqual))));
-                        continue;
-                    }
-                } 
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "depends"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("depends")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateDepends($inputName, $ruleName, array $ruleArgs) {
+			if (array_key_exists($ruleArgs[1], $this->_errors)) {
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "not_equal"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("not_equal")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateNotEqual($inputName, $ruleName, array $ruleArgs) {
+			$canNotEqual = explode(',', $ruleArgs[1]);
+			foreach ($canNotEqual as $doNotEqual) {
+				$inputVal = $this->post($inputName);
+				if (preg_match('/post:(.*)/', $doNotEqual)) {
+					if ($inputVal == $this->data[str_replace('post:', '', $doNotEqual)]) {
+						$this->_setError($inputName, $ruleName . ',post:key', array($this->_getLabel($inputName), $this->_getLabel(str_replace('post:', '', $doNotEqual))));
+						continue;
+					}
+				} 
 				else{
-                    if ($inputVal == $doNotEqual) {
-                        $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
-                        continue;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Peform validation for the rule "matches"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("matches")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateMatches($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if ($inputVal != $this->data[$ruleArgs[1]]) {
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "valid_email"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("valid_email")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateValidEmail($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if (! preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "exact_length"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("exact_length")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateExactLength($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if (strlen($inputVal) != $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "max_length"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("max_length")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateMaxLength($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if (strlen($inputVal) > $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "min_length"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("min_length")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateMinLength($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if (strlen($inputVal) < $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
+					if ($inputVal == $doNotEqual) {
+						$this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
+						continue;
+					}
+				}
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "matches"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("matches")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateMatches($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if ($inputVal != $this->data[$ruleArgs[1]]) {
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "valid_email"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("valid_email")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateValidEmail($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if (! preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "exact_length"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("exact_length")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateExactLength($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if (strlen($inputVal) != $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "max_length"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("max_length")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateMaxLength($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if (strlen($inputVal) > $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "min_length"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("min_length")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateMinLength($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if (strlen($inputVal) < $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
     	
-        /**
-         * Peform validation for the rule "less_than"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("less_than")
-         * @param  array  $ruleArgs  the rules argument
-         */
-    	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if ($inputVal >= $ruleArgs[1]) { 
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
+		/**
+		 * Peform validation for the rule "less_than"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("less_than")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if ($inputVal >= $ruleArgs[1]) { 
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
     	
-        /**
-         * Peform validation for the rule "greater_than"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("greater_than")
-         * @param  array  $ruleArgs  the rules argument
-         */
-    	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if ($inputVal <= $ruleArgs[1]) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
+		/**
+		 * Peform validation for the rule "greater_than"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("greater_than")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if ($inputVal <= $ruleArgs[1]) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
     	
-        /**
-         * Peform validation for the rule "numeric"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("numeric")
-         * @param  array  $ruleArgs  the rules argument
-         */
-    	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-            if (! is_numeric($inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-            }
-        }
+		/**
+		 * Peform validation for the rule "numeric"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("numeric")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			if (! is_numeric($inputVal)) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+			}
+		}
 		
-        /**
-         * Peform validation for the rule "exists"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("exists")
-         * @param  array  $ruleArgs  the rules argument
-         */
+		/**
+		 * Peform validation for the rule "exists"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("exists")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
 		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-    		$obj = & get_instance();
-    		if(! isset($obj->database)){
-    			return;
-    		}
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$obj->database->from($table)
-    			          ->where($column, $inputVal)
-    			          ->get();
-    		$nb = $obj->database->numRows();
-            if ($nb == 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "is_unique"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("is_unique")
-         * @param  array  $ruleArgs  the rules argument
-         */
-    	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-    		$obj = & get_instance();
-    		if(! isset($obj->database)){
-    			return;
-    		}
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$obj->database->from($table)
-    			          ->where($column, $inputVal)
-    			          ->get();
-    		$nb = $obj->database->numRows();
-            if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-            }
-        }
+			$inputVal = $this->post($inputName);
+			$obj = & get_instance();
+			if(! isset($obj->database)){
+				return;
+			}
+			list($table, $column) = explode('.', $ruleArgs[1]);
+			$obj->database->from($table)
+						  ->where($column, $inputVal)
+						  ->get();
+			$nb = $obj->database->numRows();
+			if ($nb == 0) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "is_unique"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("is_unique")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			$obj = & get_instance();
+			if(! isset($obj->database)){
+				return;
+			}
+			list($table, $column) = explode('.', $ruleArgs[1]);
+			$obj->database->from($table)
+						  ->where($column, $inputVal)
+						  ->get();
+			$nb = $obj->database->numRows();
+			if ($nb != 0) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+			}
+		}
     	
-        /**
-         * Peform validation for the rule "is_unique_update"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("is_unique_update")
-         * @param  array  $ruleArgs  the rules argument
-         */
-    	protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-    		$obj = & get_instance();
-    		if(! isset($obj->database)){
-    			return;
-    		}
-    		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
-    			return;
-    		}
-    		list($table, $column) = explode('.', $data[0]);
-    		list($field, $val) = explode('=', $data[1]);
-    		$obj->database->from($table)
-    			          ->where($column, $inputVal)
-                		  ->where($field, '!=', trim($val))
-                		  ->get();
-    		$nb = $obj->database->numRows();
-            if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "in_list"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("in_list")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateInList($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-    		$list = explode(',', $ruleArgs[1]);
-            $list = array_map('trim', $list);
-            if (! in_array($inputVal, $list)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
-            }
-        }
-
-        /**
-         * Peform validation for the rule "regex"
-         * @param  string $inputName the form field or data key name used
-         * @param  string $ruleName  the rule name for this validation ("regex")
-         * @param  array  $ruleArgs  the rules argument
-         */
-        protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
-            $inputVal = $this->post($inputName);
-    		$regex = $ruleArgs[1];
-            if (! preg_match($regex, $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
-                    return;
-                }
-                $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
-            }
-        }
+		/**
+		 * Peform validation for the rule "is_unique_update"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("is_unique_update")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			$obj = & get_instance();
+			if(! isset($obj->database)){
+				return;
+			}
+			$data = explode(',', $ruleArgs[1]);
+			if(count($data) < 2){
+				return;
+			}
+			list($table, $column) = explode('.', $data[0]);
+			list($field, $val) = explode('=', $data[1]);
+			$obj->database->from($table)
+						  ->where($column, $inputVal)
+						  ->where($field, '!=', trim($val))
+						  ->get();
+			$nb = $obj->database->numRows();
+			if ($nb != 0) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "in_list"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("in_list")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateInList($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			$list = explode(',', $ruleArgs[1]);
+			$list = array_map('trim', $list);
+			if (! in_array($inputVal, $list)) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
+			}
+		}
+
+		/**
+		 * Peform validation for the rule "regex"
+		 * @param  string $inputName the form field or data key name used
+		 * @param  string $ruleName  the rule name for this validation ("regex")
+		 * @param  array  $ruleArgs  the rules argument
+		 */
+		protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
+			$inputVal = $this->post($inputName);
+			$regex = $ruleArgs[1];
+			if (! preg_match($regex, $inputVal)) {
+				if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+					return;
+				}
+				$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+			}
+		}
         
-    }
+	}

Spacing +53 added lines, -53 removed lines

@@ -25,13 +25,13 @@ 
     */
 
 
-     class FormValidation{
+     class FormValidation {
 		 
         /**
          * The form validation status
          * @var boolean
          */
-        protected $_success  = false;
+        protected $_success = false;
 
         /**
          * The list of errors messages
@@ -40,31 +40,31 @@ 
         protected $_errorsMessages = array();
         
         // Array of rule sets, fieldName => PIPE seperated ruleString
-        protected $_rules             = array();
+        protected $_rules = array();
         
         // Array of errors, niceName => Error Message
-        protected $_errors             = array();
+        protected $_errors = array();
         
         // Array of post Key => Nice name labels
-        protected $_labels          = array();
+        protected $_labels = array();
         
         /**
          * The errors delimiters
          * @var array
          */
-        protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
+        protected $_allErrorsDelimiter = array('<div class="error">', '</div>');
 
         /**
          * The each error delimiter
          * @var array
          */
-        protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
+        protected $_eachErrorDelimiter = array('<p class="error">', '</p>');
         
 		/**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
-        protected $_forceFail            = false;
+        protected $_forceFail = false;
 
         /**
          * The list of the error messages overrides by the original
@@ -98,13 +98,13 @@ 
          * @return void
          */
         public function __construct() {
-            $this->logger =& class_loader('Log', 'classes');
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
 		   //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
-            $this->_errorsMessages  = array(
+            $this->_errorsMessages = array(
                         'required'         => $obj->lang->get('fv_required'),
                         'min_length'       => $obj->lang->get('fv_min_length'),
                         'max_length'       => $obj->lang->get('fv_max_length'),
@@ -141,7 +141,7 @@ 
             $this->_success              = false;
             $this->_forceFail            = false;
             $this->data                  = array();
-			$this->enableCsrfCheck       = false;
+			$this->enableCsrfCheck = false;
         }
 
         /**
@@ -150,7 +150,7 @@ 
 		 *
          * @return FormValidation Current instance of object.
          */
-        public function setData(array $data){
+        public function setData(array $data) {
             $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
             $this->data = $data;
 			return $this;
@@ -160,7 +160,7 @@ 
          * Get the form validation data
          * @return array the form validation data to be validated
          */
-        public function getData(){
+        public function getData() {
             return $this->data;
         }
 
@@ -169,7 +169,7 @@ 
 		*
 		* @return string the function name
 		*/
-        protected function _toCallCase($funcName, $prefix='_validate') {
+        protected function _toCallCase($funcName, $prefix = '_validate') {
             $funcName = strtolower($funcName);
             $finalFuncName = $prefix;
             foreach (explode('_', $funcName) as $funcNamePart) {
@@ -193,7 +193,7 @@ 
          * @return boolean Whether or not the form has been submitted or the data is available for validation.
          */
         public function canDoValidation() {
-            return get_instance()->request->method() === 'POST' || ! empty($this->data);
+            return get_instance()->request->method() === 'POST' || !empty($this->data);
         }
 
         /**
@@ -213,14 +213,14 @@ 
          * Validate the CSRF 
          * @return void 
          */
-        protected function validateCSRF(){
-            if(get_instance()->request->method() == 'POST' || $this->enableCsrfCheck){
+        protected function validateCSRF() {
+            if (get_instance()->request->method() == 'POST' || $this->enableCsrfCheck) {
                 $this->logger->debug('Check if CSRF is enabled in configuration');
                 //first check for CSRF
-                if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && ! Security::validateCSRF()){
+                if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && !Security::validateCSRF()) {
                     show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
                 }
-                else{
+                else {
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -237,10 +237,10 @@ 
             $this->_forceFail = false;
 
             foreach ($this->getData() as $inputName => $inputVal) {
-    			if(is_array($this->data[$inputName])){
+    			if (is_array($this->data[$inputName])) {
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
     			}
-    			else{
+    			else {
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -267,7 +267,7 @@ 
         public function setRule($inputField, $inputLabel, $ruleSets) {
             $this->_rules[$inputField] = $ruleSets;
             $this->_labels[$inputField] = $inputLabel;
-            $this->logger->info('Set the field rule: name [' .$inputField. '], label [' .$inputLabel. '], rules [' .$ruleSets. ']');
+            $this->logger->info('Set the field rule: name [' . $inputField . '], label [' . $inputLabel . '], rules [' . $ruleSets . ']');
             return $this;
         }
 
@@ -431,7 +431,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -456,25 +456,25 @@ 
             /*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
+            if (strpos($ruleString, 'regex') !== false) {
                 $regexRule = array();
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
+                 if (!empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
-                    if($rule){
+                    if ($rule) {
                         $ruleSets[] = $rule;
                     }
                 }
                  
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -506,7 +506,7 @@ 
          * @return void
          */
         protected function _validateRule($inputName, $inputVal, $ruleName) {
-            $this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
+            $this->logger->debug('Rule validation of field [' . $inputName . '], value [' . $inputVal . '], rule [' . $ruleName . ']');
             // Array to store args
             $ruleArgs = array();
 
@@ -551,7 +551,7 @@ 
                 $key = $i - 1;
                 $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
             }
-            if (! array_key_exists($inputName, $this->_errors)) {
+            if (!array_key_exists($inputName, $this->_errors)) {
                 $this->_errors[$inputName] = $rulePhrase;
             }
         }
@@ -603,13 +603,13 @@ 
          */
 		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if(array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
+            if (array_key_exists(1, $ruleArgs) && function_exists($ruleArgs[1])) {
                 $callbackReturn = $this->_runEmptyCallback($ruleArgs[1]);
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
             } 
-			else if($inputVal == '') {
+			else if ($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -635,7 +635,7 @@ 
         protected function _validateCallback($inputName, $ruleName, array $ruleArgs) {
             if (function_exists($ruleArgs[1]) && !empty($this->data[$inputName])) {
 				$result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
-				if(! $result){
+				if (!$result) {
 					$this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
 				}
             }
@@ -669,7 +669,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -699,8 +699,8 @@ 
          */
         protected function _validateValidEmail($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match("/^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i", $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
@@ -716,7 +716,7 @@ 
         protected function _validateExactLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) != $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -732,7 +732,7 @@ 
         protected function _validateMaxLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) > $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -748,7 +748,7 @@ 
         protected function _validateMinLength($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (strlen($inputVal) < $ruleArgs[1]) { // $ruleArgs[0] is [length] $rulesArgs[1] is just length
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -764,7 +764,7 @@ 
     	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal >= $ruleArgs[1]) { 
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -780,7 +780,7 @@ 
     	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal <= $ruleArgs[1]) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -795,8 +795,8 @@ 
          */
     	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-            if (! is_numeric($inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!is_numeric($inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -812,7 +812,7 @@ 
 		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		list($table, $column) = explode('.', $ruleArgs[1]);
@@ -821,7 +821,7 @@ 
     			          ->get();
     		$nb = $obj->database->numRows();
             if ($nb == 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -837,7 +837,7 @@ 
     	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		list($table, $column) = explode('.', $ruleArgs[1]);
@@ -846,7 +846,7 @@ 
     			          ->get();
     		$nb = $obj->database->numRows();
             if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -862,11 +862,11 @@ 
     	protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$obj = & get_instance();
-    		if(! isset($obj->database)){
+    		if (!isset($obj->database)) {
     			return;
     		}
     		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
+    		if (count($data) < 2) {
     			return;
     		}
     		list($table, $column) = explode('.', $data[0]);
@@ -877,7 +877,7 @@ 
                 		  ->get();
     		$nb = $obj->database->numRows();
             if ($nb != 0) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
@@ -894,8 +894,8 @@ 
             $inputVal = $this->post($inputName);
     		$list = explode(',', $ruleArgs[1]);
             $list = array_map('trim', $list);
-            if (! in_array($inputVal, $list)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!in_array($inputVal, $list)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName), $this->_getLabel($ruleArgs[1])));
@@ -911,8 +911,8 @@ 
         protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
     		$regex = $ruleArgs[1];
-            if (! preg_match($regex, $inputVal)) {
-                if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
+            if (!preg_match($regex, $inputVal)) {
+                if (!$this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
                 $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));

tests/tnhfw/classes/DBSessionHandlerTest.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 		
 		private static $config = null;
 		
-		public function __construct(){
+		public function __construct() {
 			$this->db = new Database(array(
 								'driver'    =>  'sqlite',
 								'database'  =>  TESTS_PATH . 'assets/db_tests.db',
@@ -49,7 +49,7 @@ 
 
 		
 		
-		public function testUsingSessionConfiguration(){
+		public function testUsingSessionConfiguration() {
 			//using value in the configuration
 			self::$config->set('session_save_path', 'DBSessionModel');
 			self::$config->set('session_secret', $this->secret);
@@ -75,7 +75,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenDataIsExpired(){
+		public function testWhenDataIsExpired() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -88,7 +88,7 @@ 
 			$this->assertNull($dbsh->read('foo'));
 		}
 		
-		public function testWhenDataAlreadyExistDoUpdate(){
+		public function testWhenDataAlreadyExistDoUpdate() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -101,7 +101,7 @@ 
 			$this->assertEquals($dbsh->read('foo'), '445');	
 		}
 		
-		public function testUsingCustomModelInstance(){
+		public function testUsingCustomModelInstance() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -129,7 +129,7 @@ 
 		}
 			
 			
-		public function testUsingCustomLogInstance(){
+		public function testUsingCustomLogInstance() {
 			$dbsh = new DBSessionHandler($this->model, new Log());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -156,7 +156,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testUsingCustomLoaderInstance(){
+		public function testUsingCustomLoaderInstance() {
 			$dbsh = new DBSessionHandler($this->model, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -184,7 +184,7 @@ 
 		}
 		
 		
-		public function testWhenModelInsanceIsNotSet(){
+		public function testWhenModelInsanceIsNotSet() {
 			$dbsh = new DBSessionHandler(null, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -212,7 +212,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenModelTableColumnsIsNotSet(){
+		public function testWhenModelTableColumnsIsNotSet() {
 			//session table is empty
 			$this->model->setSessionTableColumns(array());
 			$dbsh = new DBSessionHandler($this->model);

tests/bootstrap.php

Indentation +128 added lines, -128 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');
 	
 	
@@ -262,13 +262,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');
 
 	/**
@@ -277,8 +277,8 @@ 
 	register_shutdown_function('php_shudown_handler');
 	
 	/**
-	* Register the tests autoload
-	*/
+	 * Register the tests autoload
+	 */
 	spl_autoload_register('tests_autoload');
 	
 	

Spacing +4 added lines, -4 removed lines

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

tests/hmvc/models/DBSessionModel.php

Spacing +3 added lines, -3 removed lines

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

tests/include/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 	//Autoload function
-	function tests_autoload($class){
+	function tests_autoload($class) {
 		$classesMap = array(
 			//Caches
 			'ApcCache' => CORE_CLASSES_CACHE_PATH . 'ApcCache.php',
@@ -40,11 +40,11 @@ 
 			'StringHash' => CORE_LIBRARY_PATH . 'StringHash.php',
 			'Upload' => CORE_LIBRARY_PATH . 'Upload.php',
 		);
-		if(isset($classesMap[$class])){
-			if(file_exists($classesMap[$class])){
+		if (isset($classesMap[$class])) {
+			if (file_exists($classesMap[$class])) {
 				require_once $classesMap[$class];
 			}
-			else{
+			else {
 				echo 'File for class ' . $class . ' not found';
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 		if(isset($classesMap[$class])){
 			if(file_exists($classesMap[$class])){
 				require_once $classesMap[$class];
-			}
-			else{
+			} else{
 				echo 'File for class ' . $class . ' not found';
 			}
 		}

core/classes/model/Model.php

Spacing +45 added lines, -45 removed lines

@@ -33,7 +33,7 @@ 
      * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
      */
 
-    class Model{
+    class Model {
 
         /* --------------------------------------------------------------
          * VARIABLES
@@ -140,13 +140,13 @@ 
          * Initialise the model, tie into the CodeIgniter superobject and
          * try our best to guess the table name.
          */
-        public function __construct(Database $db = null){
-            if (is_object($db)){
+        public function __construct(Database $db = null) {
+            if (is_object($db)) {
                 $this->setDatabaseInstance($db);
             }
-            else{
+            else {
                 $obj = & get_instance();
-        		if (isset($obj->database) && is_object($obj->database)){
+        		if (isset($obj->database) && is_object($obj->database)) {
                     /**
                     * NOTE: Need use "clone" because some Model need have the personal instance of the database library
                     * to prevent duplication
@@ -182,7 +182,7 @@ 
 
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
     		$this->_set_where($where);
 
@@ -224,9 +224,9 @@ 
             $this->trigger('before_get');
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $this->getQueryBuilder()->from($this->_table);
 			$result = $this->_database->getAll($type);
             $this->_temporary_return_type = $this->return_type;
@@ -259,7 +259,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-				return ! $insert_id ? true : $insert_id;
+				return !$insert_id ? true : $insert_id;
             }
             else
             {
@@ -336,13 +336,13 @@ 
         {
             $args = func_get_args();
             $data = array();
-            if (count($args) == 2){
-                if (is_array($args[1])){
+            if (count($args) == 2) {
+                if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
             }
-            else if (count($args) == 3){
-                if (is_array($args[2])){
+            else if (count($args) == 3) {
+                if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
             }
@@ -384,7 +384,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -408,7 +408,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -430,7 +430,7 @@ 
             if ($this->soft_delete)
             {
                 $this->getQueryBuilder()->from($this->_table);	
-				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
+				$result = $this->_database->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -500,7 +500,7 @@ 
                 $key = $this->primary_key;
                 $value = $args[0];
             }
-            $this->trigger('before_dropdown', array( $key, $value ));
+            $this->trigger('before_dropdown', array($key, $value));
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
                 $this->getQueryBuilder()->where($this->soft_delete_key, FALSE);
@@ -525,7 +525,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $where = func_get_args();
             $this->_set_where($where);
@@ -541,7 +541,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->getQueryBuilder()->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
 			$this->getQueryBuilder()->from($this->_table);
 			$this->_database->getAll();
@@ -551,8 +551,8 @@ 
 		/**
 		* Enabled cache temporary
 		*/
-		public function cached($ttl = 0){
-		  if ($ttl > 0){
+		public function cached($ttl = 0) {
+		  if ($ttl > 0) {
 			$this->_database = $this->_database->cached($ttl);
 		  }
 		  return $this;
@@ -706,13 +706,13 @@ 
             {
                 if (is_object($row))
                 {
-					if (isset($row->$attr)){
+					if (isset($row->$attr)) {
 						unset($row->$attr);
 					}
                 }
                 else
                 {
-					if (isset($row[$attr])){
+					if (isset($row[$attr])) {
 						unset($row[$attr]);
 					}
                 }
@@ -724,7 +724,7 @@ 
          * Return the database instance
          * @return Database the database instance
          */
-        public function getDatabaseInstance(){
+        public function getDatabaseInstance() {
             return $this->_database;
         }
 
@@ -732,9 +732,9 @@ 
          * set the Database instance for future use
          * @param Database $db the database object
          */
-         public function setDatabaseInstance($db){
+         public function setDatabaseInstance($db) {
             $this->_database = $db;
-            if ($this->dbCacheTime > 0){
+            if ($this->dbCacheTime > 0) {
                 $this->_database->setCache($this->dbCacheTime);
             }
             return $this;
@@ -744,7 +744,7 @@ 
          * Return the loader instance
          * @return Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loaderInstance;
         }
 
@@ -753,7 +753,7 @@ 
          * @param Loader $loader the loader object
 		 * @return object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loaderInstance = $loader;
             return $this;
         }
@@ -762,7 +762,7 @@ 
          * Return the queryBuilder instance this is the shortcut to database queryBuilder
          * @return object the DatabaseQueryBuilder instance
          */
-        public function getQueryBuilder(){
+        public function getQueryBuilder() {
             return $this->_database->getQueryBuilder();
         }
 
@@ -771,7 +771,7 @@ 
          * @param object $queryBuilder the DatabaseQueryBuilder object
 		 * @return object
          */
-         public function setQueryBuilder($queryBuilder){
+         public function setQueryBuilder($queryBuilder) {
             $this->_database->setQueryBuilder($queryBuilder);
             return $this;
         }
@@ -781,7 +781,7 @@ 
          * Return the FormValidation instance
          * @return FormValidation the form validation instance
          */
-        public function getFormValidation(){
+        public function getFormValidation() {
             return $this->formValidationInstance;
         }
 
@@ -790,7 +790,7 @@ 
          * @param FormValidation $fv the form validation object
 		 * @return object
          */
-         public function setFormValidation($fv){
+         public function setFormValidation($fv) {
             $this->formValidationInstance = $fv;
             return $this;
         }
@@ -804,7 +804,7 @@ 
          */
         public function order_by($criteria, $order = 'ASC')
         {
-            if ( is_array($criteria) )
+            if (is_array($criteria))
             {
                 foreach ($criteria as $key => $value)
                 {
@@ -835,13 +835,13 @@ 
 		* relate for the relation "belongs_to"
 		* @return mixed
 		*/
-		protected function relateBelongsTo($row){
+		protected function relateBelongsTo($row) {
 			foreach ($this->belongs_to as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $value . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -851,10 +851,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -874,13 +874,13 @@ 
 		* relate for the relation "has_many"
 		* @return mixed
 		*/
-		protected function relateHasMany($row){
+		protected function relateHasMany($row) {
 			foreach ($this->has_many as $key => $value)
             {
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $this->_table . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -890,10 +890,10 @@ 
 
                 if (in_array($relationship, $this->_with))
                 {
-                    if (is_object($this->loaderInstance)){
+                    if (is_object($this->loaderInstance)) {
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
                     }
-                    else{
+                    else {
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
@@ -944,10 +944,10 @@ 
             if (!empty($this->validate))
             {
                 $fv = null;
-                if (is_object($this->formValidationInstance)){
+                if (is_object($this->formValidationInstance)) {
                     $fv = $this->formValidationInstance;
                 }
-                else{
+                else {
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -976,7 +976,7 @@ 
 		* Set WHERE parameters, when is array
 		* @param array $params
 		*/
-		protected function _set_where_array(array $params){
+		protected function _set_where_array(array $params) {
 			foreach ($params as $field => $filter)
 			{
 				if (is_array($filter))
@@ -1042,7 +1042,7 @@ 
         /**
             Shortcut to controller
         */
-        public function __get($key){
+        public function __get($key) {
             return get_instance()->{$key};
         }
 

Braces +32 added lines, -64 removed lines

@@ -143,8 +143,7 @@ 
         public function __construct(Database $db = null){
             if (is_object($db)){
                 $this->setDatabaseInstance($db);
-            }
-            else{
+            } else{
                 $obj = & get_instance();
         		if (isset($obj->database) && is_object($obj->database)){
                     /**
@@ -260,8 +259,7 @@ 
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
 				return ! $insert_id ? true : $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -298,8 +296,7 @@ 
                 $result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -322,8 +319,7 @@ 
 				$result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -340,8 +336,7 @@ 
                 if (is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if (count($args) == 3){
+            } else if (count($args) == 3){
                 if (is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -354,8 +349,7 @@ 
 				$result = $this->_database->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -385,8 +379,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -409,8 +402,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -431,8 +423,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -494,8 +485,7 @@ 
             if (count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -647,8 +637,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -660,8 +649,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -688,8 +676,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -709,8 +696,7 @@ 
 					if (isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if (isset($row[$attr])){
 						unset($row[$attr]);
@@ -810,8 +796,7 @@ 
                 {
                     $this->getQueryBuilder()->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->orderBy($criteria, $order);
             }
@@ -842,8 +827,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -853,15 +837,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -881,8 +863,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -892,15 +873,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -946,8 +925,7 @@ 
                 $fv = null;
                 if (is_object($this->formValidationInstance)){
                     $fv = $this->formValidationInstance;
-                }
-                else{
+                } else{
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -959,13 +937,11 @@ 
                 if ($fv->run())
                 {
                     return $data;
-                }
-                else
+                } else
                 {
                     return FALSE;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -982,14 +958,12 @@ 
 				if (is_array($filter))
 				{
 					$this->getQueryBuilder()->in($field, $filter);
-				}
-				else
+				} else
 				{
 					if (is_int($field))
 					{
 						$this->getQueryBuilder()->where($filter);
-					}
-					else
+					} else
 					{
 						$this->getQueryBuilder()->where($field, $filter);
 					}
@@ -1006,33 +980,27 @@ 
             if (count($params) == 1 && is_array($params[0]))
             {
                 $this->_set_where_array($params[0]);
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->getQueryBuilder()->where($params[0]);
-            }
-        	else if (count($params) == 2)
+            } else if (count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }
-    		}
-    		else if (count($params) == 3)
+    		} else if (count($params) == 3)
     		{
     			$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }

Indentation +920 added lines, -920 removed lines

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

core/classes/Database.php

Braces +8 added lines, -16 removed lines

@@ -153,14 +153,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+          } catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
-      }
-      else{
+      } else{
         show_error('Database configuration is not set.');
         return false;
       }
@@ -203,8 +201,7 @@ 
       $query = $this->getAll(true);
       if ($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
       }
     }
@@ -628,15 +625,13 @@ 
       //if need return all result like list of record
       if (is_bool($all) && $all){
           $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
-      }
-      else{
+      } else{
           $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
       if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
         $this->numRows = count($this->result);  
-      }
-      else{
+      } else{
         $this->numRows = $pdoStatment->rowCount(); 
       }
     }
@@ -650,8 +645,7 @@ 
       if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
         $this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $this->numRows = 1; //TODO use the correct method to get the exact affected row
-      }
-      else{
+      } else{
           $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
           $this->numRows = $pdoStatment->rowCount(); 
       }
@@ -776,8 +770,7 @@ 
     protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
       if ($logger !== null){
         $this->setLogger($logger);
-      }
-      else{
+      } else{
           $this->logger =& class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
@@ -790,8 +783,7 @@ 
 	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
 	  if ($queryBuilder !== null){
       $this->setQueryBuilder($queryBuilder);
-	  }
-	  else{
+	  } else{
 		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes');
 	  }
 	}

Indentation +626 added lines, -626 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
   /**
    * TNH Framework
    *
@@ -22,266 +22,266 @@ 
    * You should have received a copy of the GNU General Public License
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
+   */
   class Database{
 	
 	/**
 	 * The PDO instance
 	 * @var object
-	*/
-    private $pdo                 = null;
+	 */
+	private $pdo                 = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
-	*/
+	 */
 	private $databaseName        = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
-	*/
-    private $numRows             = 0;
+	 */
+	private $numRows             = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
-	*/
-    private $insertId            = null;
+	 */
+	private $insertId            = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
-	*/
-    private $query               = null;
+	 */
+	private $query               = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
-	*/
-    private $error               = null;
+	 */
+	private $error               = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
-	*/
-    private $result              = array();
+	 */
+	private $result              = array();
 	
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
-	*/
+	 */
 	private $cacheTtl              = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
-	*/
-    private $temporaryCacheTtl   = 0;
+	 */
+	private $temporaryCacheTtl   = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
-	*/
-    private $queryCount          = 0;
+	 */
+	private $queryCount          = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
-	*/
-    private $data                = array();
+	 */
+	private $data                = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
-	*/
-    private $config              = array();
+	 */
+	private $config              = array();
 	
 	/**
 	 * The logger instance
 	 * @var object
 	 */
-    private $logger              = null;
+	private $logger              = null;
 
-    /**
-    * The cache instance
-    * @var object
-    */
-    private $cacheInstance       = null;
+	/**
+	 * The cache instance
+	 * @var object
+	 */
+	private $cacheInstance       = null;
 
-    /**
-    * The benchmark instance
-    * @var object
-    */
-    private $benchmarkInstance   = null;
+	/**
+	 * The benchmark instance
+	 * @var object
+	 */
+	private $benchmarkInstance   = null;
 	
 	/**
-    * The DatabaseQueryBuilder instance
-    * @var object
-    */
-    private $queryBuilder        = null;
+	 * The DatabaseQueryBuilder instance
+	 * @var object
+	 */
+	private $queryBuilder        = null;
 
 
-    /**
-     * Construct new database
-     * @param array $overwriteConfig the config to overwrite with the config set in database.php
-     */
-    public function __construct($overwriteConfig = array()){
-        //Set Log instance to use
-        $this->setLoggerFromParamOrCreateNewInstance(null);
+	/**
+	 * Construct new database
+	 * @param array $overwriteConfig the config to overwrite with the config set in database.php
+	 */
+	public function __construct($overwriteConfig = array()){
+		//Set Log instance to use
+		$this->setLoggerFromParamOrCreateNewInstance(null);
 		
-		    //Set DatabaseQueryBuilder instance to use
-		    $this->setQueryBuilderFromParamOrCreateNewInstance(null);
+			//Set DatabaseQueryBuilder instance to use
+			$this->setQueryBuilderFromParamOrCreateNewInstance(null);
 
-        //Set database configuration
-        $this->setDatabaseConfiguration($overwriteConfig);
+		//Set database configuration
+		$this->setDatabaseConfiguration($overwriteConfig);
 	
-		    //cache time to live
-    	  $this->temporaryCacheTtl = $this->cacheTtl;
-    }
-
-    /**
-     * This is used to connect to database
-     * @return bool 
-     */
-    public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
-            $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
-            $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
-            $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
-            $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-            return true;
-          }
-          catch (PDOException $e){
-            $this->logger->fatal($e->getMessage());
-            show_error('Cannot connect to Database.');
-            return false;
-          }
-      }
-      else{
-        show_error('Database configuration is not set.');
-        return false;
-      }
-    }
-
-
-    /**
-     * Return the number of rows returned by the current query
-     * @return int
-     */
-    public function numRows(){
-      return $this->numRows;
-    }
-
-    /**
-     * Return the last insert id value
-     * @return mixed
-     */
-    public function insertId(){
-      return $this->insertId;
-    }
-
-    /**
-     * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
-     */
-    public function error(){
+			//cache time to live
+		  $this->temporaryCacheTtl = $this->cacheTtl;
+	}
+
+	/**
+	 * This is used to connect to database
+	 * @return bool 
+	 */
+	public function connect(){
+	  $config = $this->getDatabaseConfiguration();
+	  if (! empty($config)){
+		try{
+			$this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
+			$this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
+			$this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
+			$this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+			return true;
+		  }
+		  catch (PDOException $e){
+			$this->logger->fatal($e->getMessage());
+			show_error('Cannot connect to Database.');
+			return false;
+		  }
+	  }
+	  else{
+		show_error('Database configuration is not set.');
+		return false;
+	  }
+	}
+
+
+	/**
+	 * Return the number of rows returned by the current query
+	 * @return int
+	 */
+	public function numRows(){
+	  return $this->numRows;
+	}
+
+	/**
+	 * Return the last insert id value
+	 * @return mixed
+	 */
+	public function insertId(){
+	  return $this->insertId;
+	}
+
+	/**
+	 * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
+	 */
+	public function error(){
   		if ($this->error){
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
-    }
-
-    /**
-     * Get the result of one record rows returned by the current query
-     * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * If is string will determine the result type "array" or "object"
-     * @return mixed       the query SQL string or the record result
-     */
-    public function get($returnSQLQueryOrResultType = false){
-      $this->getQueryBuilder()->limit(1);
-      $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
-        return $query;
-      }
-      else{
-        return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
-      }
-    }
-
-    /**
-     * Get the result of record rows list returned by the current query
-     * @param  boolean|string $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * If is string will determine the result type "array" or "object"
-     * @return mixed       the query SQL string or the record result
-     */
-    public function getAll($returnSQLQueryOrResultType = false){
+	}
+
+	/**
+	 * Get the result of one record rows returned by the current query
+	 * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * If is string will determine the result type "array" or "object"
+	 * @return mixed       the query SQL string or the record result
+	 */
+	public function get($returnSQLQueryOrResultType = false){
+	  $this->getQueryBuilder()->limit(1);
+	  $query = $this->getAll(true);
+	  if ($returnSQLQueryOrResultType === true){
+		return $query;
+	  }
+	  else{
+		return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
+	  }
+	}
+
+	/**
+	 * Get the result of record rows list returned by the current query
+	 * @param  boolean|string $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * If is string will determine the result type "array" or "object"
+	 * @return mixed       the query SQL string or the record result
+	 */
+	public function getAll($returnSQLQueryOrResultType = false){
 	   $query = $this->getQueryBuilder()->getQuery();
 	   if ($returnSQLQueryOrResultType === true){
-      	return $query;
-      }
-      return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
-    }
-
-    /**
-     * Insert new record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @param  boolean $escape  whether to escape or not the values
-     * @return mixed          the insert id of the new record or null
-     */
-    public function insert($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
-        //as when using $this->setData() may be the data already escaped
-        $escape = false;
-        $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
-      $result = $this->query($query);
-      if ($result){
-        $this->insertId = $this->pdo->lastInsertId();
+	  	return $query;
+	  }
+	  return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
+	}
+
+	/**
+	 * Insert new record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return mixed          the insert id of the new record or null
+	 */
+	public function insert($data = array(), $escape = true){
+	  if (empty($data) && $this->getData()){
+		//as when using $this->setData() may be the data already escaped
+		$escape = false;
+		$data = $this->getData();
+	  }
+	  $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
+	  $result = $this->query($query);
+	  if ($result){
+		$this->insertId = $this->pdo->lastInsertId();
 		//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! $this->insertId() ? true : $this->insertId();
-      }
-      return false;
-    }
-
-    /**
-     * Update record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @param  boolean $escape  whether to escape or not the values
-     * @return mixed          the update status
-     */
-    public function update($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
-        //as when using $this->setData() may be the data already escaped
-        $escape = false;
-        $data = $this->getData();
-      }
-      $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
-      return $this->query($query);
-    }
-
-    /**
-     * Delete the record in database
-     * @return mixed the delete status
-     */
-    public function delete(){
+		return ! $this->insertId() ? true : $this->insertId();
+	  }
+	  return false;
+	}
+
+	/**
+	 * Update record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return mixed          the update status
+	 */
+	public function update($data = array(), $escape = true){
+	  if (empty($data) && $this->getData()){
+		//as when using $this->setData() may be the data already escaped
+		$escape = false;
+		$data = $this->getData();
+	  }
+	  $query = $this->getQueryBuilder()->update($data, $escape)->getQuery();
+	  return $this->query($query);
+	}
+
+	/**
+	 * Delete the record in database
+	 * @return mixed the delete status
+	 */
+	public function delete(){
 		$query = $this->getQueryBuilder()->delete()->getQuery();
-    	return $this->query($query);
-    }
-
-    /**
-     * Set database cache time to live
-     * @param integer $ttl the cache time to live in second
-     * @return object        the current Database instance
-     */
-    public function setCache($ttl = 0){
-      if ($ttl > 0){
-        $this->cacheTtl = $ttl;
-        $this->temporaryCacheTtl = $ttl;
-      }
-      return $this;
-    }
+		return $this->query($query);
+	}
+
+	/**
+	 * Set database cache time to live
+	 * @param integer $ttl the cache time to live in second
+	 * @return object        the current Database instance
+	 */
+	public function setCache($ttl = 0){
+	  if ($ttl > 0){
+		$this->cacheTtl = $ttl;
+		$this->temporaryCacheTtl = $ttl;
+	  }
+	  return $this;
+	}
 	
 	/**
 	 * Enabled cache temporary for the current query not globally	
@@ -289,272 +289,272 @@ 
 	 * @return object        the current Database instance
 	 */
   	public function cached($ttl = 0){
-        if ($ttl > 0){
-          $this->temporaryCacheTtl = $ttl;
-        }
-        return $this;
-    }
-
-    /**
-     * Escape the data before execute query useful for security.
-     * @param  mixed $data the data to be escaped
-     * @param boolean $escaped whether we can do escape of not 
-     * @return mixed       the data after escaped or the same data if not
-     */
-    public function escape($data, $escaped = true){
-      return $escaped ? 
-                      $this->getPdo()->quote(trim($data)) 
-                      : $data; 
-    }
-
-    /**
-     * Return the number query executed count for the current request
-     * @return int
-     */
-    public function queryCount(){
-      return $this->queryCount;
-    }
-
-    /**
-     * Return the current query SQL string
-     * @return string
-     */
-    public function getQuery(){
-      return $this->query;
-    }
-
-    /**
-     * Return the application database name
-     * @return string
-     */
-    public function getDatabaseName(){
-      return $this->databaseName;
-    }
-
-    /**
-     * Return the PDO instance
-     * @return object
-     */
-    public function getPdo(){
-      return $this->pdo;
-    }
-
-    /**
-     * Set the PDO instance
-     * @param object $pdo the pdo object
+		if ($ttl > 0){
+		  $this->temporaryCacheTtl = $ttl;
+		}
+		return $this;
+	}
+
+	/**
+	 * Escape the data before execute query useful for security.
+	 * @param  mixed $data the data to be escaped
+	 * @param boolean $escaped whether we can do escape of not 
+	 * @return mixed       the data after escaped or the same data if not
+	 */
+	public function escape($data, $escaped = true){
+	  return $escaped ? 
+					  $this->getPdo()->quote(trim($data)) 
+					  : $data; 
+	}
+
+	/**
+	 * Return the number query executed count for the current request
+	 * @return int
+	 */
+	public function queryCount(){
+	  return $this->queryCount;
+	}
+
+	/**
+	 * Return the current query SQL string
+	 * @return string
+	 */
+	public function getQuery(){
+	  return $this->query;
+	}
+
+	/**
+	 * Return the application database name
+	 * @return string
+	 */
+	public function getDatabaseName(){
+	  return $this->databaseName;
+	}
+
+	/**
+	 * Return the PDO instance
+	 * @return object
+	 */
+	public function getPdo(){
+	  return $this->pdo;
+	}
+
+	/**
+	 * Set the PDO instance
+	 * @param object $pdo the pdo object
 	 * @return object Database
-     */
-    public function setPdo(PDO $pdo){
-      $this->pdo = $pdo;
-      return $this;
-    }
-
-
-    /**
-     * Return the Log instance
-     * @return Log
-     */
-    public function getLogger(){
-      return $this->logger;
-    }
-
-    /**
-     * Set the log instance
-     * @param Log $logger the log object
+	 */
+	public function setPdo(PDO $pdo){
+	  $this->pdo = $pdo;
+	  return $this;
+	}
+
+
+	/**
+	 * Return the Log instance
+	 * @return Log
+	 */
+	public function getLogger(){
+	  return $this->logger;
+	}
+
+	/**
+	 * Set the log instance
+	 * @param Log $logger the log object
 	 * @return object Database
-     */
-    public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
-    }
-
-     /**
-     * Return the cache instance
-     * @return CacheInterface
-     */
-    public function getCacheInstance(){
-      return $this->cacheInstance;
-    }
-
-    /**
-     * Set the cache instance
-     * @param CacheInterface $cache the cache object
+	 */
+	public function setLogger($logger){
+	  $this->logger = $logger;
+	  return $this;
+	}
+
+	 /**
+	  * Return the cache instance
+	  * @return CacheInterface
+	  */
+	public function getCacheInstance(){
+	  return $this->cacheInstance;
+	}
+
+	/**
+	 * Set the cache instance
+	 * @param CacheInterface $cache the cache object
 	 * @return object Database
-     */
-    public function setCacheInstance($cache){
-      $this->cacheInstance = $cache;
-      return $this;
-    }
-
-    /**
-     * Return the benchmark instance
-     * @return Benchmark
-     */
-    public function getBenchmark(){
-      return $this->benchmarkInstance;
-    }
-
-    /**
-     * Set the benchmark instance
-     * @param Benchmark $benchmark the benchmark object
+	 */
+	public function setCacheInstance($cache){
+	  $this->cacheInstance = $cache;
+	  return $this;
+	}
+
+	/**
+	 * Return the benchmark instance
+	 * @return Benchmark
+	 */
+	public function getBenchmark(){
+	  return $this->benchmarkInstance;
+	}
+
+	/**
+	 * Set the benchmark instance
+	 * @param Benchmark $benchmark the benchmark object
 	 * @return object Database
-     */
-    public function setBenchmark($benchmark){
-      $this->benchmarkInstance = $benchmark;
-      return $this;
-    }
+	 */
+	public function setBenchmark($benchmark){
+	  $this->benchmarkInstance = $benchmark;
+	  return $this;
+	}
 	
 	
 	/**
-     * Return the DatabaseQueryBuilder instance
-     * @return object DatabaseQueryBuilder
-     */
-    public function getQueryBuilder(){
-      return $this->queryBuilder;
-    }
-
-    /**
-     * Set the DatabaseQueryBuilder instance
-     * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
-     */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
-      $this->queryBuilder = $queryBuilder;
-      return $this;
-    }
-
-    /**
-     * Return the data to be used for insert, update, etc.
-     * @return array
-     */
-    public function getData(){
-      return $this->data;
-    }
-
-    /**
-     * Set the data to be used for insert, update, etc.
-     * @param string|array $key the data key identified
-     * @param mixed $value the data value
-     * @param boolean $escape whether to escape or not the $value
-     * @return object        the current Database instance
-     */
-    public function setData($key, $value = null, $escape = true){
+	 * Return the DatabaseQueryBuilder instance
+	 * @return object DatabaseQueryBuilder
+	 */
+	public function getQueryBuilder(){
+	  return $this->queryBuilder;
+	}
+
+	/**
+	 * Set the DatabaseQueryBuilder instance
+	 * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
+	 */
+	public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+	  $this->queryBuilder = $queryBuilder;
+	  return $this;
+	}
+
+	/**
+	 * Return the data to be used for insert, update, etc.
+	 * @return array
+	 */
+	public function getData(){
+	  return $this->data;
+	}
+
+	/**
+	 * Set the data to be used for insert, update, etc.
+	 * @param string|array $key the data key identified
+	 * @param mixed $value the data value
+	 * @param boolean $escape whether to escape or not the $value
+	 * @return object        the current Database instance
+	 */
+	public function setData($key, $value = null, $escape = true){
   	  if(is_array($key)){
-    		foreach($key as $k => $v){
-    			$this->setData($k, $v, $escape);
-    		}	
+			foreach($key as $k => $v){
+				$this->setData($k, $v, $escape);
+			}	
   	  } else {
-        $this->data[$key] = $this->escape($value, $escape);
+		$this->data[$key] = $this->escape($value, $escape);
   	  }
-      return $this;
-    }
-
-     /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean|array $all  if boolean this indicate whether to return all record or not, if array 
-     * will 
-     * @param  boolean $array return the result as array
-     * @return mixed         the query result
-     */
-    public function query($query, $all = true, $array = false){
-      $this->reset();
-      $query = $this->getPreparedQuery($query, $all);
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+	  return $this;
+	}
+
+	 /**
+	  * Execute an SQL query
+	  * @param  string  $query the query SQL string
+	  * @param  boolean|array $all  if boolean this indicate whether to return all record or not, if array 
+	  * will 
+	  * @param  boolean $array return the result as array
+	  * @return mixed         the query result
+	  */
+	public function query($query, $all = true, $array = false){
+	  $this->reset();
+	  $query = $this->getPreparedQuery($query, $all);
+	  $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       
-      $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
-
-      $this->logger->info(
-                          'Execute SQL query ['.$this->query.'], return type: ' 
-                          . ($array?'ARRAY':'OBJECT') .', return as list: ' 
-                          . (is_bool($all) && $all ? 'YES':'NO')
-                        );
-      //cache expire time
-      $cacheExpire = $this->temporaryCacheTtl;
+	  $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
+
+	  $this->logger->info(
+						  'Execute SQL query ['.$this->query.'], return type: ' 
+						  . ($array?'ARRAY':'OBJECT') .', return as list: ' 
+						  . (is_bool($all) && $all ? 'YES':'NO')
+						);
+	  //cache expire time
+	  $cacheExpire = $this->temporaryCacheTtl;
       
-      //return to the initial cache time
-      $this->temporaryCacheTtl = $this->cacheTtl;
+	  //return to the initial cache time
+	  $this->temporaryCacheTtl = $this->cacheTtl;
       
-      //config for cache
-      $cacheEnable = get_config('cache_enable');
+	  //config for cache
+	  $cacheEnable = get_config('cache_enable');
       
-      //the database cache content
-      $cacheContent = null;
+	  //the database cache content
+	  $cacheContent = null;
 
-      //if can use cache feature for this query
-      $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
+	  //if can use cache feature for this query
+	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
-          $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-          $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
-      }
+	  if ($dbCacheStatus && $isSqlSELECTQuery){
+		  $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+		  $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
+	  }
       
-      if ( !$cacheContent){
-        $sqlQuery = $this->runSqlQuery($query, $all, $array);
-        if (is_object($sqlQuery)){
-          if ($isSqlSELECTQuery){
-            $this->setQueryResultForSelect($sqlQuery, $all, $array);
-            $this->setCacheContentForQuery(
-                                            $this->query, 
-                                            $this->getCacheBenchmarkKeyForQuery($this->query, $all, $array), 
-                                            $this->result, 
-                                            $dbCacheStatus && $isSqlSELECTQuery, 
-                                            $cacheExpire
-                                          );
-            if (! $this->result){
-              $this->logger->info('No result where found for the query [' . $query . ']');
-            }
-          } else {
-              $this->setQueryResultForNonSelect($sqlQuery);
-          }
-        }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-          $this->result = $cacheContent;
-          $this->numRows = count($this->result);
-      }
-      return $this->result;
-    }
+	  if ( !$cacheContent){
+		$sqlQuery = $this->runSqlQuery($query, $all, $array);
+		if (is_object($sqlQuery)){
+		  if ($isSqlSELECTQuery){
+			$this->setQueryResultForSelect($sqlQuery, $all, $array);
+			$this->setCacheContentForQuery(
+											$this->query, 
+											$this->getCacheBenchmarkKeyForQuery($this->query, $all, $array), 
+											$this->result, 
+											$dbCacheStatus && $isSqlSELECTQuery, 
+											$cacheExpire
+										  );
+			if (! $this->result){
+			  $this->logger->info('No result where found for the query [' . $query . ']');
+			}
+		  } else {
+			  $this->setQueryResultForNonSelect($sqlQuery);
+		  }
+		}
+	  } else if ($isSqlSELECTQuery){
+		  $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+		  $this->result = $cacheContent;
+		  $this->numRows = count($this->result);
+	  }
+	  return $this->result;
+	}
 	
 	/**
-     * Run the database SQL query and return the PDOStatment object
-     * @see Database::query
-     * 
-     * @return object|void
-     */
-    public function runSqlQuery($query, $all, $array){
-       //for database query execution time
-        $benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        $benchmarkInstance = $this->getBenchmark();
-        if (! is_object($benchmarkInstance)){
-          $obj = & get_instance();
-          $benchmarkInstance = $obj->benchmark; 
-          $this->setBenchmark($benchmarkInstance);
-        }
+	 * Run the database SQL query and return the PDOStatment object
+	 * @see Database::query
+	 * 
+	 * @return object|void
+	 */
+	public function runSqlQuery($query, $all, $array){
+	   //for database query execution time
+		$benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
+		$benchmarkInstance = $this->getBenchmark();
+		if (! is_object($benchmarkInstance)){
+		  $obj = & get_instance();
+		  $benchmarkInstance = $obj->benchmark; 
+		  $this->setBenchmark($benchmarkInstance);
+		}
         
-        $benchmarkInstance->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
-        //Now execute the query
-        $sqlQuery = $this->pdo->query($query);
+		$benchmarkInstance->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
+		//Now execute the query
+		$sqlQuery = $this->pdo->query($query);
         
-        //get response time for this query
-        $responseTime = $benchmarkInstance->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
-		    //TODO use the configuration value for the high response time currently is 1 second
-        if ($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
-        }
-		    //count the number of query execution to server
-        $this->queryCount++;
+		//get response time for this query
+		$responseTime = $benchmarkInstance->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
+			//TODO use the configuration value for the high response time currently is 1 second
+		if ($responseTime >= 1 ){
+			$this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+		}
+			//count the number of query execution to server
+		$this->queryCount++;
 		
-        if ($sqlQuery !== false){
-          return $sqlQuery;
-        }
-        $this->setQueryError();
-    }
+		if ($sqlQuery !== false){
+		  return $sqlQuery;
+		}
+		$this->setQueryError();
+	}
 	
 	
 	 /**
-	 * Return the database configuration
-	 * @return array
-	 */
+	  * Return the database configuration
+	  * @return array
+	  */
 	public  function getDatabaseConfiguration(){
 	  return $this->config;
 	}
@@ -563,39 +563,39 @@ 
     * Setting the database configuration using the configuration file and additional configuration from param
     * @param array $overwriteConfig the additional configuration to overwrite with the existing one
     * @param boolean $useConfigFile whether to use database configuration file
-	  * @return object Database
+    * @return object Database
     */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
-        $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
-            //here don't use require_once because somewhere user can create database instance directly
-            require CONFIG_PATH . 'database.php';
-        }
+	public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+		$db = array();
+		if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+			//here don't use require_once because somewhere user can create database instance directly
+			require CONFIG_PATH . 'database.php';
+		}
         
-        //merge with the parameter  
-        $db = array_merge($db, $overwriteConfig);
+		//merge with the parameter  
+		$db = array_merge($db, $overwriteConfig);
         
-        //default configuration
-        $config = array(
-          'driver' => 'mysql',
-          'username' => 'root',
-          'password' => '',
-          'database' => '',
-          'hostname' => 'localhost',
-          'charset' => 'utf8',
-          'collation' => 'utf8_general_ci',
-          'prefix' => '',
-          'port' => ''
-        );
+		//default configuration
+		$config = array(
+		  'driver' => 'mysql',
+		  'username' => 'root',
+		  'password' => '',
+		  'database' => '',
+		  'hostname' => 'localhost',
+		  'charset' => 'utf8',
+		  'collation' => 'utf8_general_ci',
+		  'prefix' => '',
+		  'port' => ''
+		);
 		
-    		$config = array_merge($config, $db);
-    		//determine the port using the hostname like localhost:3307
-        //hostname will be "localhost", and port "3307"
-        $p = explode(':', $config['hostname']);
-    	  if (count($p) >= 2){
-    		  $config['hostname'] = $p[0];
-    		  $config['port'] = $p[1];
-    		}
+			$config = array_merge($config, $db);
+			//determine the port using the hostname like localhost:3307
+		//hostname will be "localhost", and port "3307"
+		$p = explode(':', $config['hostname']);
+		  if (count($p) >= 2){
+			  $config['hostname'] = $p[0];
+			  $config['port'] = $p[1];
+			}
 		
 		 $this->databaseName = $config['database'];
 		 $this->config = $config;
@@ -620,77 +620,77 @@ 
   }
 	
    /**
-   * Set the result for SELECT query using PDOStatment
-   * @see Database::query
-   */
-    protected function setQueryResultForSelect($pdoStatment, $all, $array){
-      //if need return all result like list of record
-      if (is_bool($all) && $all){
-          $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
-      }
-      else{
-          $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
-      }
-      //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
-        $this->numRows = count($this->result);  
-      }
-      else{
-        $this->numRows = $pdoStatment->rowCount(); 
-      }
-    }
-
-    /**
-     * Set the result for other command than SELECT query using PDOStatment
-     * @see Database::query
-     */
-    protected function setQueryResultForNonSelect($pdoStatment){
-      //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
-        $this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
-        $this->numRows = 1; //TODO use the correct method to get the exact affected row
-      }
-      else{
-          $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
-          $this->numRows = $pdoStatment->rowCount(); 
-      }
-    }
+    * Set the result for SELECT query using PDOStatment
+    * @see Database::query
+    */
+	protected function setQueryResultForSelect($pdoStatment, $all, $array){
+	  //if need return all result like list of record
+	  if (is_bool($all) && $all){
+		  $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
+	  }
+	  else{
+		  $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
+	  }
+	  //Sqlite and pgsql always return 0 when using rowCount()
+	  if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+		$this->numRows = count($this->result);  
+	  }
+	  else{
+		$this->numRows = $pdoStatment->rowCount(); 
+	  }
+	}
+
+	/**
+	 * Set the result for other command than SELECT query using PDOStatment
+	 * @see Database::query
+	 */
+	protected function setQueryResultForNonSelect($pdoStatment){
+	  //Sqlite and pgsql always return 0 when using rowCount()
+	  if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+		$this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
+		$this->numRows = 1; //TODO use the correct method to get the exact affected row
+	  }
+	  else{
+		  $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
+		  $this->numRows = $pdoStatment->rowCount(); 
+	  }
+	}
 
 	
 
-    /**
-     * This method is used to get the PDO DSN string using the configured driver
-     * @return string the DSN string
-     */
-    protected function getDsnFromDriver(){
-      $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        $driver = $config['driver'];
-        $driverDsnMap = array(
-                                'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
-                                            . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
-                                            . 'dbname=' . $config['database'],
-                                'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
-                                            . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
-                                            . 'dbname=' . $config['database'],
-                                'sqlite' => 'sqlite:' . $config['database'],
-                                'oracle' => 'oci:dbname=' . $config['hostname'] 
-                                            . (($config['port']) != '' ? ':' . $config['port'] : '')
-                                            . '/' . $config['database']
-                              );
-        return isset($driverDsnMap[$driver]) ? $driverDsnMap[$driver] : '';
-      }                   
-      return null;
-    }
-
-     /**
-     * Transform the prepared query like (?, ?, ?) into string format
-     * @see Database::query
-     *
-     * @return string
-     */
-    protected function getPreparedQuery($query, $data){
-      if (is_array($data)){
+	/**
+	 * This method is used to get the PDO DSN string using the configured driver
+	 * @return string the DSN string
+	 */
+	protected function getDsnFromDriver(){
+	  $config = $this->getDatabaseConfiguration();
+	  if (! empty($config)){
+		$driver = $config['driver'];
+		$driverDsnMap = array(
+								'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
+											. (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
+											. 'dbname=' . $config['database'],
+								'pgsql' => 'pgsql:host=' . $config['hostname'] . ';' 
+											. (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
+											. 'dbname=' . $config['database'],
+								'sqlite' => 'sqlite:' . $config['database'],
+								'oracle' => 'oci:dbname=' . $config['hostname'] 
+											. (($config['port']) != '' ? ':' . $config['port'] : '')
+											. '/' . $config['database']
+							  );
+		return isset($driverDsnMap[$driver]) ? $driverDsnMap[$driver] : '';
+	  }                   
+	  return null;
+	}
+
+	 /**
+	  * Transform the prepared query like (?, ?, ?) into string format
+	  * @see Database::query
+	  *
+	  * @return string
+	  */
+	protected function getPreparedQuery($query, $data){
+	  if (is_array($data)){
   			$x = explode('?', $query);
   			$q = '';
   			foreach($x as $k => $v){
@@ -699,121 +699,121 @@ 
   			  }
   			}
   			return $q;
-      }
-      return $query;
-    }
-
-    /**
-     * Get the cache content for this query
-     * @see Database::query
-     *      
-     * @return mixed
-     */
-    protected function getCacheContentForQuery($query, $all, $array){
-        $cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        if (! is_object($this->getCacheInstance())){
-    			//can not call method with reference in argument
-    			//like $this->setCacheInstance(& get_instance()->cache);
-    			//use temporary variable
-    			$instance = & get_instance()->cache;
-    			$this->setCacheInstance($instance);
-        }
-        return $this->getCacheInstance()->get($cacheKey);
-    }
-
-    /**
-     * Save the result of query into cache
-     * @param string $query  the SQL query
-     * @param string $key    the cache key
-     * @param mixed $result the query result to save
-     * @param boolean $status whether can save the query result into cache
-     * @param int $expire the cache TTL
-     */
-     protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
-        if ($status){
-            $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-            if (! is_object($this->getCacheInstance())){
-      				//can not call method with reference in argument
-      				//like $this->setCacheInstance(& get_instance()->cache);
-      				//use temporary variable
-      				$instance = & get_instance()->cache;
-      				$this->setCacheInstance($instance);
-      			}
-            $this->getCacheInstance()->set($key, $result, $expire);
-        }
-     }
+	  }
+	  return $query;
+	}
+
+	/**
+	 * Get the cache content for this query
+	 * @see Database::query
+	 *      
+	 * @return mixed
+	 */
+	protected function getCacheContentForQuery($query, $all, $array){
+		$cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
+		if (! is_object($this->getCacheInstance())){
+				//can not call method with reference in argument
+				//like $this->setCacheInstance(& get_instance()->cache);
+				//use temporary variable
+				$instance = & get_instance()->cache;
+				$this->setCacheInstance($instance);
+		}
+		return $this->getCacheInstance()->get($cacheKey);
+	}
+
+	/**
+	 * Save the result of query into cache
+	 * @param string $query  the SQL query
+	 * @param string $key    the cache key
+	 * @param mixed $result the query result to save
+	 * @param boolean $status whether can save the query result into cache
+	 * @param int $expire the cache TTL
+	 */
+	 protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
+		if ($status){
+			$this->logger->info('Save the result for query [' .$query. '] into cache for future use');
+			if (! is_object($this->getCacheInstance())){
+	  				//can not call method with reference in argument
+	  				//like $this->setCacheInstance(& get_instance()->cache);
+	  				//use temporary variable
+	  				$instance = & get_instance()->cache;
+	  				$this->setCacheInstance($instance);
+	  			}
+			$this->getCacheInstance()->set($key, $result, $expire);
+		}
+	 }
 
     
-    /**
-     * Set error for database query execution
-     */
-    protected function setQueryError(){
-      $error = $this->pdo->errorInfo();
-      $this->error = isset($error[2]) ? $error[2] : '';
-      $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
-	    //show error message
-      $this->error();
-    }
+	/**
+	 * Set error for database query execution
+	 */
+	protected function setQueryError(){
+	  $error = $this->pdo->errorInfo();
+	  $this->error = isset($error[2]) ? $error[2] : '';
+	  $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
+		//show error message
+	  $this->error();
+	}
 
 	  /**
-     * Return the cache key for the given query
-     * @see Database::query
-     * 
-     *  @return string
-     */
-    protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
-      if (is_array($all)){
-        $all = 'array';
-      }
-      return md5($query . $all . $array);
-    }
+	   * Return the cache key for the given query
+	   * @see Database::query
+	   * 
+	   *  @return string
+	   */
+	protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
+	  if (is_array($all)){
+		$all = 'array';
+	  }
+	  return md5($query . $all . $array);
+	}
     
 	   /**
-     * Set the Log instance using argument or create new instance
-     * @param object $logger the Log instance if not null
-     */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
-        $this->setLogger($logger);
-      }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
-          $this->logger->setLogger('Library::Database');
-      }
-    }
+	    * Set the Log instance using argument or create new instance
+	    * @param object $logger the Log instance if not null
+	    */
+	protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
+	  if ($logger !== null){
+		$this->setLogger($logger);
+	  }
+	  else{
+		  $this->logger =& class_loader('Log', 'classes');
+		  $this->logger->setLogger('Library::Database');
+	  }
+	}
 	
    /**
-   * Set the DatabaseQueryBuilder instance using argument or create new instance
-   * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
-   */
+    * Set the DatabaseQueryBuilder instance using argument or create new instance
+    * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
+    */
 	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
 	  if ($queryBuilder !== null){
-      $this->setQueryBuilder($queryBuilder);
+	  $this->setQueryBuilder($queryBuilder);
 	  }
 	  else{
 		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes');
 	  }
 	}
 
-    /**
-     * Reset the database class attributs to the initail values before each query.
-     */
-    private function reset(){
+	/**
+	 * Reset the database class attributs to the initail values before each query.
+	 */
+	private function reset(){
 	   //query builder reset
-      $this->getQueryBuilder()->reset();
-      $this->numRows  = 0;
-      $this->insertId = null;
-      $this->query    = null;
-      $this->error    = null;
-      $this->result   = array();
-      $this->data     = array();
-    }
-
-    /**
-     * The class destructor
-     */
-    public function __destruct(){
-      $this->pdo = null;
-    }
+	  $this->getQueryBuilder()->reset();
+	  $this->numRows  = 0;
+	  $this->insertId = null;
+	  $this->query    = null;
+	  $this->error    = null;
+	  $this->result   = array();
+	  $this->data     = array();
+	}
+
+	/**
+	 * The class destructor
+	 */
+	public function __destruct(){
+	  $this->pdo = null;
+	}
 
 }

Spacing +115 added lines, -115 removed lines

@@ -23,110 +23,110 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
 	/**
 	 * The PDO instance
 	 * @var object
 	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
 	*/
-	private $databaseName        = null;
+	private $databaseName = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
 	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
 	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
 	*/
-    private $query               = null;
+    private $query = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
 	*/
-	private $cacheTtl              = 0;
+	private $cacheTtl = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
 	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
 	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
 	*/
-    private $data                = array();
+    private $data = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
 	*/
-    private $config              = array();
+    private $config = array();
 	
 	/**
 	 * The logger instance
 	 * @var object
 	 */
-    private $logger              = null;
+    private $logger = null;
 
     /**
     * The cache instance
     * @var object
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
     /**
     * The benchmark instance
     * @var object
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 	
 	/**
     * The DatabaseQueryBuilder instance
     * @var object
     */
-    private $queryBuilder        = null;
+    private $queryBuilder = null;
 
 
     /**
      * Construct new database
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      */
-    public function __construct($overwriteConfig = array()){
+    public function __construct($overwriteConfig = array()) {
         //Set Log instance to use
         $this->setLoggerFromParamOrCreateNewInstance(null);
 		
@@ -144,23 +144,23 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $this->pdo = new PDO($this->getDsnFromDriver(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
       }
-      else{
+      else {
         show_error('Database configuration is not set.');
         return false;
       }
@@ -171,7 +171,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -179,15 +179,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if ($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -198,13 +198,13 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->getQueryBuilder()->limit(1);
       $query = $this->getAll(true);
-      if ($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
+      else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
       }
     }
@@ -215,9 +215,9 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
 	   $query = $this->getQueryBuilder()->getQuery();
-	   if ($returnSQLQueryOrResultType === true){
+	   if ($returnSQLQueryOrResultType === true) {
       	return $query;
       }
       return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
@@ -229,18 +229,18 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function insert($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
       }
       $query = $this->getQueryBuilder()->insert($data, $escape)->getQuery();
       $result = $this->query($query);
-      if ($result){
+      if ($result) {
         $this->insertId = $this->pdo->lastInsertId();
 		//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! $this->insertId() ? true : $this->insertId();
+        return !$this->insertId() ? true : $this->insertId();
       }
       return false;
     }
@@ -251,8 +251,8 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
-      if (empty($data) && $this->getData()){
+    public function update($data = array(), $escape = true) {
+      if (empty($data) && $this->getData()) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->getData();
@@ -265,7 +265,7 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
 		$query = $this->getQueryBuilder()->delete()->getQuery();
     	return $this->query($query);
     }
@@ -275,8 +275,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if ($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
         $this->temporaryCacheTtl = $ttl;
       }
@@ -288,8 +288,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-  	public function cached($ttl = 0){
-        if ($ttl > 0){
+  	public function cached($ttl = 0) {
+        if ($ttl > 0) {
           $this->temporaryCacheTtl = $ttl;
         }
         return $this;
@@ -301,7 +301,7 @@ 
      * @param boolean $escaped whether we can do escape of not 
      * @return mixed       the data after escaped or the same data if not
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
       return $escaped ? 
                       $this->getPdo()->quote(trim($data)) 
                       : $data; 
@@ -311,7 +311,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -319,7 +319,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -327,7 +327,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -335,7 +335,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -344,7 +344,7 @@ 
      * @param object $pdo the pdo object
 	 * @return object Database
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -354,7 +354,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -363,7 +363,7 @@ 
      * @param Log $logger the log object
 	 * @return object Database
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -372,7 +372,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -381,7 +381,7 @@ 
      * @param CacheInterface $cache the cache object
 	 * @return object Database
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -390,7 +390,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -399,7 +399,7 @@ 
      * @param Benchmark $benchmark the benchmark object
 	 * @return object Database
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -409,7 +409,7 @@ 
      * Return the DatabaseQueryBuilder instance
      * @return object DatabaseQueryBuilder
      */
-    public function getQueryBuilder(){
+    public function getQueryBuilder() {
       return $this->queryBuilder;
     }
 
@@ -417,7 +417,7 @@ 
      * Set the DatabaseQueryBuilder instance
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder) {
       $this->queryBuilder = $queryBuilder;
       return $this;
     }
@@ -426,7 +426,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -437,9 +437,9 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value = null, $escape = true){
-  	  if(is_array($key)){
-    		foreach($key as $k => $v){
+    public function setData($key, $value = null, $escape = true) {
+  	  if (is_array($key)) {
+    		foreach ($key as $k => $v) {
     			$this->setData($k, $v, $escape);
     		}	
   	  } else {
@@ -456,7 +456,7 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
       $query = $this->getPreparedQuery($query, $all);
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
@@ -464,9 +464,9 @@ 
       $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
 
       $this->logger->info(
-                          'Execute SQL query ['.$this->query.'], return type: ' 
-                          . ($array?'ARRAY':'OBJECT') .', return as list: ' 
-                          . (is_bool($all) && $all ? 'YES':'NO')
+                          'Execute SQL query [' . $this->query . '], return type: ' 
+                          . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' 
+                          . (is_bool($all) && $all ? 'YES' : 'NO')
                         );
       //cache expire time
       $cacheExpire = $this->temporaryCacheTtl;
@@ -483,15 +483,15 @@ 
       //if can use cache feature for this query
       $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-      if ($dbCacheStatus && $isSqlSELECTQuery){
+      if ($dbCacheStatus && $isSqlSELECTQuery) {
           $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
           $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
       }
       
-      if ( !$cacheContent){
+      if (!$cacheContent) {
         $sqlQuery = $this->runSqlQuery($query, $all, $array);
-        if (is_object($sqlQuery)){
-          if ($isSqlSELECTQuery){
+        if (is_object($sqlQuery)) {
+          if ($isSqlSELECTQuery) {
             $this->setQueryResultForSelect($sqlQuery, $all, $array);
             $this->setCacheContentForQuery(
                                             $this->query, 
@@ -500,15 +500,15 @@ 
                                             $dbCacheStatus && $isSqlSELECTQuery, 
                                             $cacheExpire
                                           );
-            if (! $this->result){
+            if (!$this->result) {
               $this->logger->info('No result where found for the query [' . $query . ']');
             }
           } else {
               $this->setQueryResultForNonSelect($sqlQuery);
           }
         }
-      } else if ($isSqlSELECTQuery){
-          $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      } else if ($isSqlSELECTQuery) {
+          $this->logger->info('The result for query [' . $this->query . '] already cached use it');
           $this->result = $cacheContent;
           $this->numRows = count($this->result);
       }
@@ -521,11 +521,11 @@ 
      * 
      * @return object|void
      */
-    public function runSqlQuery($query, $all, $array){
+    public function runSqlQuery($query, $all, $array) {
        //for database query execution time
         $benchmarkMarkerKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
         $benchmarkInstance = $this->getBenchmark();
-        if (! is_object($benchmarkInstance)){
+        if (!is_object($benchmarkInstance)) {
           $obj = & get_instance();
           $benchmarkInstance = $obj->benchmark; 
           $this->setBenchmark($benchmarkInstance);
@@ -538,13 +538,13 @@ 
         //get response time for this query
         $responseTime = $benchmarkInstance->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 		    //TODO use the configuration value for the high response time currently is 1 second
-        if ($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
 		    //count the number of query execution to server
         $this->queryCount++;
 		
-        if ($sqlQuery !== false){
+        if ($sqlQuery !== false) {
           return $sqlQuery;
         }
         $this->setQueryError();
@@ -555,7 +555,7 @@ 
 	 * Return the database configuration
 	 * @return array
 	 */
-	public  function getDatabaseConfiguration(){
+	public  function getDatabaseConfiguration() {
 	  return $this->config;
 	}
 
@@ -565,9 +565,9 @@ 
     * @param boolean $useConfigFile whether to use database configuration file
 	  * @return object Database
     */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true){
+    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
         $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')) {
             //here don't use require_once because somewhere user can create database instance directly
             require CONFIG_PATH . 'database.php';
         }
@@ -592,7 +592,7 @@ 
     		//determine the port using the hostname like localhost:3307
         //hostname will be "localhost", and port "3307"
         $p = explode(':', $config['hostname']);
-    	  if (count($p) >= 2){
+    	  if (count($p) >= 2) {
     		  $config['hostname'] = $p[0];
     		  $config['port'] = $p[1];
     		}
@@ -611,7 +611,7 @@ 
 		 $this->connect();
 		 
 		 //update queryBuilder with some properties needed
-		 if(is_object($this->getQueryBuilder())){
+		 if (is_object($this->getQueryBuilder())) {
 			  $this->getQueryBuilder()->setDriver($config['driver']);
 			  $this->getQueryBuilder()->setPrefix($config['prefix']);
 			  $this->getQueryBuilder()->setPdo($this->getPdo());
@@ -623,19 +623,19 @@ 
    * Set the result for SELECT query using PDOStatment
    * @see Database::query
    */
-    protected function setQueryResultForSelect($pdoStatment, $all, $array){
+    protected function setQueryResultForSelect($pdoStatment, $all, $array) {
       //if need return all result like list of record
-      if (is_bool($all) && $all){
+      if (is_bool($all) && $all) {
           $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
       }
-      else{
+      else {
           $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
         $this->numRows = count($this->result);  
       }
-      else{
+      else {
         $this->numRows = $pdoStatment->rowCount(); 
       }
     }
@@ -644,13 +644,13 @@ 
      * Set the result for other command than SELECT query using PDOStatment
      * @see Database::query
      */
-    protected function setQueryResultForNonSelect($pdoStatment){
+    protected function setQueryResultForNonSelect($pdoStatment) {
       //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+      if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
         $this->result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $this->numRows = 1; //TODO use the correct method to get the exact affected row
       }
-      else{
+      else {
           $this->result = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
           $this->numRows = $pdoStatment->rowCount(); 
       }
@@ -662,9 +662,9 @@ 
      * This method is used to get the PDO DSN string using the configured driver
      * @return string the DSN string
      */
-    protected function getDsnFromDriver(){
+    protected function getDsnFromDriver() {
       $config = $this->getDatabaseConfiguration();
-      if (! empty($config)){
+      if (!empty($config)) {
         $driver = $config['driver'];
         $driverDsnMap = array(
                                 'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
@@ -689,12 +689,12 @@ 
      *
      * @return string
      */
-    protected function getPreparedQuery($query, $data){
-      if (is_array($data)){
+    protected function getPreparedQuery($query, $data) {
+      if (is_array($data)) {
   			$x = explode('?', $query);
   			$q = '';
-  			foreach($x as $k => $v){
-  			  if (! empty($v)){
+  			foreach ($x as $k => $v) {
+  			  if (!empty($v)) {
   				  $q .= $v . (isset($data[$k]) ? $this->escape($data[$k]) : '');
   			  }
   			}
@@ -709,9 +709,9 @@ 
      *      
      * @return mixed
      */
-    protected function getCacheContentForQuery($query, $all, $array){
+    protected function getCacheContentForQuery($query, $all, $array) {
         $cacheKey = $this->getCacheBenchmarkKeyForQuery($query, $all, $array);
-        if (! is_object($this->getCacheInstance())){
+        if (!is_object($this->getCacheInstance())) {
     			//can not call method with reference in argument
     			//like $this->setCacheInstance(& get_instance()->cache);
     			//use temporary variable
@@ -729,10 +729,10 @@ 
      * @param boolean $status whether can save the query result into cache
      * @param int $expire the cache TTL
      */
-     protected function setCacheContentForQuery($query, $key, $result, $status, $expire){
-        if ($status){
-            $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-            if (! is_object($this->getCacheInstance())){
+     protected function setCacheContentForQuery($query, $key, $result, $status, $expire) {
+        if ($status) {
+            $this->logger->info('Save the result for query [' . $query . '] into cache for future use');
+            if (!is_object($this->getCacheInstance())) {
       				//can not call method with reference in argument
       				//like $this->setCacheInstance(& get_instance()->cache);
       				//use temporary variable
@@ -747,7 +747,7 @@ 
     /**
      * Set error for database query execution
      */
-    protected function setQueryError(){
+    protected function setQueryError() {
       $error = $this->pdo->errorInfo();
       $this->error = isset($error[2]) ? $error[2] : '';
       $this->logger->error('The database query execution got error: ' . stringfy_vars($error));
@@ -761,8 +761,8 @@ 
      * 
      *  @return string
      */
-    protected function getCacheBenchmarkKeyForQuery($query, $all, $array){
-      if (is_array($all)){
+    protected function getCacheBenchmarkKeyForQuery($query, $all, $array) {
+      if (is_array($all)) {
         $all = 'array';
       }
       return md5($query . $all . $array);
@@ -772,12 +772,12 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+      if ($logger !== null) {
         $this->setLogger($logger);
       }
-      else{
-          $this->logger =& class_loader('Log', 'classes');
+      else {
+          $this->logger = & class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
     }
@@ -786,19 +786,19 @@ 
    * Set the DatabaseQueryBuilder instance using argument or create new instance
    * @param object $queryBuilder the DatabaseQueryBuilder instance if not null
    */
-	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
-	  if ($queryBuilder !== null){
+	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null) {
+	  if ($queryBuilder !== null) {
       $this->setQueryBuilder($queryBuilder);
 	  }
-	  else{
-		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes');
+	  else {
+		  $this->queryBuilder = & class_loader('DatabaseQueryBuilder', 'classes');
 	  }
 	}
 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
-    private function reset(){
+    private function reset() {
 	   //query builder reset
       $this->getQueryBuilder()->reset();
       $this->numRows  = 0;
@@ -812,7 +812,7 @@ 
     /**
      * The class destructor
      */
-    public function __destruct(){
+    public function __destruct() {
       $this->pdo = null;
     }
 

core/classes/DatabaseQueryBuilder.php

Indentation +826 added lines, -826 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
   /**
    * TNH Framework
    *
@@ -22,740 +22,740 @@ 
    * 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 DatabaseQueryBuilder{
   	/**
   	 * 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 full SQL query statment after build for each command
   	 * @var string
-  	*/
-      private $query               = null;
+  	 */
+	  private $query               = null;
   	
   	/**
   	 * The list of SQL valid operators
   	 * @var array
-  	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+  	 */
+	private $operatorList        = array('=','!=','<','>','<=','>=','<>');
   	
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
-	*/
-    private $prefix              = null;
+	 */
+	private $prefix              = null;
     
 
   /**
-	 * The PDO instance
-	 * @var object
-	*/
+   * The PDO instance
+   * @var object
+   */
   private $pdo                 = null;
 	
   	/**
   	 * The database driver name used
   	 * @var string
-  	*/
+  	 */
   	private $driver              = null;
   	
 	
-    /**
-     * Construct new DatabaseQueryBuilder
-     * @param object $pdo the PDO object
-     */
-    public function __construct(PDO $pdo = null){
-        if (is_object($pdo)){
-          $this->setPdo($pdo);
-        }
-    }
-
-    /**
-     * Set the SQL FROM statment
-     * @param  string|array $table the table name or array of table list
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function from($table){
+	/**
+	 * Construct new DatabaseQueryBuilder
+	 * @param object $pdo the PDO object
+	 */
+	public function __construct(PDO $pdo = null){
+		if (is_object($pdo)){
+		  $this->setPdo($pdo);
+		}
+	}
+
+	/**
+	 * Set the SQL FROM statment
+	 * @param  string|array $table the table name or array of table list
+	 * @return object        the current DatabaseQueryBuilder instance
+	 */
+	public function from($table){
 	  if (is_array($table)){
-        $froms = '';
-        foreach($table as $key){
-          $froms .= $this->getPrefix() . $key . ', ';
-        }
-        $this->from = rtrim($froms, ', ');
-      } else {
-        $this->from = $this->getPrefix() . $table;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL SELECT statment
-     * @param  string|array $fields the field name or array of field list
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function select($fields){
-      $select = (is_array($fields) ? implode(', ', $fields) : $fields);
-      $this->select = (($this->select == '*' || empty($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 DatabaseQueryBuilder instance
-     */
-    public function distinct($field){
-      $distinct = ' DISTINCT ' . $field;
-      $this->select = (($this->select == '*' || empty($this->select)) ? $distinct : $this->select . ', ' . $distinct);
-      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 DatabaseQueryBuilder instance
-     */
-    public function count($field = '*', $name = null){
-      return $this->select_min_max_sum_count_avg('COUNT', $field, $name);
-    }
+		$froms = '';
+		foreach($table as $key){
+		  $froms .= $this->getPrefix() . $key . ', ';
+		}
+		$this->from = rtrim($froms, ', ');
+	  } else {
+		$this->from = $this->getPrefix() . $table;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL SELECT statment
+	 * @param  string|array $fields the field name or array of field list
+	 * @return object        the current DatabaseQueryBuilder instance
+	 */
+	public function select($fields){
+	  $select = (is_array($fields) ? implode(', ', $fields) : $fields);
+	  $this->select = (($this->select == '*' || empty($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 DatabaseQueryBuilder instance
+	 */
+	public function distinct($field){
+	  $distinct = ' DISTINCT ' . $field;
+	  $this->select = (($this->select == '*' || empty($this->select)) ? $distinct : $this->select . ', ' . $distinct);
+	  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 DatabaseQueryBuilder instance
+	  */
+	public function count($field = '*', $name = null){
+	  return $this->select_min_max_sum_count_avg('COUNT', $field, $name);
+	}
     
-    /**
-     * 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 DatabaseQueryBuilder instance
-     */
-    public function min($field, $name = null){
-      return $this->select_min_max_sum_count_avg('MIN', $field, $name);
-    }
-
-    /**
-     * 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 DatabaseQueryBuilder instance
-     */
-    public function max($field, $name = null){
-      return $this->select_min_max_sum_count_avg('MAX', $field, $name);
-    }
-
-    /**
-     * 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 DatabaseQueryBuilder instance
-     */
-    public function sum($field, $name = null){
-      return $this->select_min_max_sum_count_avg('SUM', $field, $name);
-    }
-
-    /**
-     * 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 DatabaseQueryBuilder instance
-     */
-    public function avg($field, $name = null){
-      return $this->select_min_max_sum_count_avg('AVG', $field, $name);
-    }
-
-
-    /**
-     * 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 DatabaseQueryBuilder instance
-     */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
-      $on = $field1;
-      $table = $this->getPrefix() . $table;
-      if (! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) 
+	/**
+	 * 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 DatabaseQueryBuilder instance
+	 */
+	public function min($field, $name = null){
+	  return $this->select_min_max_sum_count_avg('MIN', $field, $name);
+	}
+
+	/**
+	 * 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 DatabaseQueryBuilder instance
+	 */
+	public function max($field, $name = null){
+	  return $this->select_min_max_sum_count_avg('MAX', $field, $name);
+	}
+
+	/**
+	 * 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 DatabaseQueryBuilder instance
+	 */
+	public function sum($field, $name = null){
+	  return $this->select_min_max_sum_count_avg('SUM', $field, $name);
+	}
+
+	/**
+	 * 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 DatabaseQueryBuilder instance
+	 */
+	public function avg($field, $name = null){
+	  return $this->select_min_max_sum_count_avg('AVG', $field, $name);
+	}
+
+
+	/**
+	 * 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 DatabaseQueryBuilder instance
+	 */
+	public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+	  $on = $field1;
+	  $table = $this->getPrefix() . $table;
+	  if (! is_null($op)){
+		$on = (! in_array($op, $this->operatorList) 
 													? ($this->getPrefix() . $field1 . ' = ' . $this->getPrefix() . $op) 
 													: ($this->getPrefix() . $field1 . ' ' . $op . ' ' . $this->getPrefix() . $field2));
-      }
-      if (empty($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  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'INNER ');
-    }
-
-    /**
-     * Set the SQL LEFT JOIN statment
-     * @see  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'LEFT ');
-	}
-
-	/**
-     * Set the SQL RIGHT JOIN statment
-     * @see  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if (is_array($field)){
-        foreach($field as $f){
-        	$this->whereIsNull($f, $andOr);
-        }
-      } else {
-          $this->setWhereStr($field.' IS NULL ', $andOr);
-      }
-      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 DatabaseQueryBuilder instance
-     */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if (is_array($field)){
-        foreach($field as $f){
-          $this->whereIsNotNull($f, $andOr);
-        }
-      } else {
-          $this->setWhereStr($field.' IS NOT NULL ', $andOr);
-      }
-      return $this;
-    }
+	  }
+	  if (empty($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  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder instance
+	 */
+	public function innerJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'INNER ');
+	}
+
+	/**
+	 * Set the SQL LEFT JOIN statment
+	 * @see  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder instance
+	 */
+	public function leftJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'LEFT ');
+	}
+
+	/**
+	 * Set the SQL RIGHT JOIN statment
+	 * @see  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::join()
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function whereIsNull($field, $andOr = 'AND'){
+	  if (is_array($field)){
+		foreach($field as $f){
+			$this->whereIsNull($f, $andOr);
+		}
+	  } else {
+		  $this->setWhereStr($field.' IS NULL ', $andOr);
+	  }
+	  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 DatabaseQueryBuilder instance
+	 */
+	public function whereIsNotNull($field, $andOr = 'AND'){
+	  if (is_array($field)){
+		foreach($field as $f){
+		  $this->whereIsNotNull($f, $andOr);
+		}
+	  } else {
+		  $this->setWhereStr($field.' IS NOT NULL ', $andOr);
+	  }
+	  return $this;
+	}
     
-    /**
-     * Set the SQL WHERE CLAUSE statment
-     * @param  string|array  $where the where field or array of field list
-     * @param  array|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 DatabaseQueryBuilder instance
-     */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      $whereStr = '';
-      if (is_array($where)){
-        $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-      }
-      else{
-        if (is_array($op)){
-          $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
-        } else {
-          $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape = true);
-        }
-      }
-      $this->setWhereStr($whereStr, $andOr);
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using OR
-     * @see  DatabaseQueryBuilder::where()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::where()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::where()
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (empty($this->where)){
-        $this->where = $type . ' (';
-      } else {
-          if (substr(trim($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  DatabaseQueryBuilder::groupStart()
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function notGroupStart(){
-      return $this->groupStart('NOT');
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query using OR for separator
-     * @see  DatabaseQueryBuilder::groupStart()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::groupStart()
-     * @return object        the current DatabaseQueryBuilder instance
-     */
-    public function orNotGroupStart(){
-      return $this->groupStart('NOT', ' OR');
-    }
-
-    /**
-     * Close the parenthesis for the grouped SQL
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      $_keys = array();
-      foreach ($keys as $k => $v){
-        if (is_null($v)){
-          $v = '';
-        }
-        $_keys[] = (is_numeric($v) ? $v : $this->escape($v, $escape));
-      }
-      $keys = implode(', ', $_keys);
-      $whereStr = $field . ' ' . $type . ' IN (' . $keys . ')';
-      $this->setWhereStr($whereStr, $andOr);
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
-     * @see  DatabaseQueryBuilder::in()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::in()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::in()
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if (is_null($value1)){
-        $value1 = '';
-      }
-      if (is_null($value2)){
-        $value2 = '';
-      }
-      $whereStr = $field . ' ' . $type . ' BETWEEN ' . $this->escape($value1, $escape) . ' AND ' . $this->escape($value2, $escape);
-      $this->setWhereStr($whereStr, $andOr);
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
-     * @see  DatabaseQueryBuilder::between()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::between()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::between()
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if (empty($data)){
-        $data = '';
-      }
-      $this->setWhereStr($field . ' ' . $type . ' LIKE ' . ($this->escape($data, $escape)), $andOr);
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
-     * @see  DatabaseQueryBuilder::like()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::like()
-     * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::like()
-     * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function limit($limit, $limitEnd = null){
-      if (empty($limit)){
-        $limit = 0;
-      }
-      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 DatabaseQueryBuilder instance
-     */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
-        $this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
-      }
-      else{
-        $this->orderBy = empty($this->orderBy) 
+	/**
+	 * Set the SQL WHERE CLAUSE statment
+	 * @param  string|array  $where the where field or array of field list
+	 * @param  array|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 DatabaseQueryBuilder instance
+	 */
+	public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+	  $whereStr = '';
+	  if (is_array($where)){
+		$whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
+	  }
+	  else{
+		if (is_array($op)){
+		  $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
+		} else {
+		  $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape = true);
+		}
+	  }
+	  $this->setWhereStr($whereStr, $andOr);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using OR
+	 * @see  DatabaseQueryBuilder::where()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::where()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::where()
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function groupStart($type = '', $andOr = ' AND'){
+	  if (empty($this->where)){
+		$this->where = $type . ' (';
+	  } else {
+		  if (substr(trim($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  DatabaseQueryBuilder::groupStart()
+	 * @return object        the current DatabaseQueryBuilder instance
+	 */
+	public function notGroupStart(){
+	  return $this->groupStart('NOT');
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query using OR for separator
+	 * @see  DatabaseQueryBuilder::groupStart()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::groupStart()
+	  * @return object        the current DatabaseQueryBuilder instance
+	  */
+	public function orNotGroupStart(){
+	  return $this->groupStart('NOT', ' OR');
+	}
+
+	/**
+	 * Close the parenthesis for the grouped SQL
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+	  $_keys = array();
+	  foreach ($keys as $k => $v){
+		if (is_null($v)){
+		  $v = '';
+		}
+		$_keys[] = (is_numeric($v) ? $v : $this->escape($v, $escape));
+	  }
+	  $keys = implode(', ', $_keys);
+	  $whereStr = $field . ' ' . $type . ' IN (' . $keys . ')';
+	  $this->setWhereStr($whereStr, $andOr);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
+	 * @see  DatabaseQueryBuilder::in()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::in()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::in()
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
+	  if (is_null($value1)){
+		$value1 = '';
+	  }
+	  if (is_null($value2)){
+		$value2 = '';
+	  }
+	  $whereStr = $field . ' ' . $type . ' BETWEEN ' . $this->escape($value1, $escape) . ' AND ' . $this->escape($value2, $escape);
+	  $this->setWhereStr($whereStr, $andOr);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
+	 * @see  DatabaseQueryBuilder::between()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::between()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::between()
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
+	  if (empty($data)){
+		$data = '';
+	  }
+	  $this->setWhereStr($field . ' ' . $type . ' LIKE ' . ($this->escape($data, $escape)), $andOr);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
+	 * @see  DatabaseQueryBuilder::like()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::like()
+	 * @return object        the current DatabaseQueryBuilder 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  DatabaseQueryBuilder::like()
+	 * @return object        the current DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function limit($limit, $limitEnd = null){
+	  if (empty($limit)){
+		$limit = 0;
+	  }
+	  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 DatabaseQueryBuilder instance
+	 */
+	public function orderBy($orderBy, $orderDir = ' ASC'){
+	  if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
+		$this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
+	  }
+	  else{
+		$this->orderBy = empty($this->orderBy) 
 						? ($orderBy . ' ' . strtoupper($orderDir)) 
 						: $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      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 DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
-     */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if (is_array($op)){
-        $this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
-      }
-      else if (! in_array($op, $this->operatorList)){
-        if (is_null($op)){
-          $op = '';
-        }
-        $this->having = $field . ' > ' . ($this->escape($op, $escape));
-      }
-      else{
-        if (is_null($val)){
-          $val = '';
-        }
-        $this->having = $field . ' ' . $op . ' ' . ($this->escape($val, $escape));
-      }
-      return $this;
-    }
-
-    /**
-     * Insert new record in the database
-     * @param  array   $data   the record data
-     * @param  boolean $escape  whether to escape or not the values
-     * @return object  the current DatabaseQueryBuilder instance        
-     */
-    public function insert($data = array(), $escape = true){
-      $columns = array_keys($data);
-      $column = implode(',', $columns);
-      $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
-
-      $this->query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
-      return $this;
-    }
-
-    /**
-     * 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 object  the current DatabaseQueryBuilder instance 
-     */
-    public function update($data = array(), $escape = true){
-      $query = 'UPDATE ' . $this->from . ' SET ';
-      $values = array();
-      foreach ($data as $column => $val){
-        $values[] = $column . ' = ' . ($this->escape($val, $escape));
-      }
-      $query .= implode(', ', $values);
-      if (! empty($this->where)){
-        $query .= ' WHERE ' . $this->where;
-      }
-
-      if (! empty($this->orderBy)){
-        $query .= ' ORDER BY ' . $this->orderBy;
-      }
-
-      if (! empty($this->limit)){
-        $query .= ' LIMIT ' . $this->limit;
-      }
-      $this->query = $query;
-      return $this;
-    }
-
-    /**
-     * Delete the record in database
-     * @return object  the current DatabaseQueryBuilder instance 
-     */
-    public function delete(){
-    	$query = 'DELETE FROM ' . $this->from;
-      $isTruncate = $query;
-    	if (! empty($this->where)){
+	  }
+	  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 DatabaseQueryBuilder 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 DatabaseQueryBuilder instance
+	 */
+	public function having($field, $op = null, $val = null, $escape = true){
+	  if (is_array($op)){
+		$this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
+	  }
+	  else if (! in_array($op, $this->operatorList)){
+		if (is_null($op)){
+		  $op = '';
+		}
+		$this->having = $field . ' > ' . ($this->escape($op, $escape));
+	  }
+	  else{
+		if (is_null($val)){
+		  $val = '';
+		}
+		$this->having = $field . ' ' . $op . ' ' . ($this->escape($val, $escape));
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Insert new record in the database
+	 * @param  array   $data   the record data
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return object  the current DatabaseQueryBuilder instance        
+	 */
+	public function insert($data = array(), $escape = true){
+	  $columns = array_keys($data);
+	  $column = implode(',', $columns);
+	  $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
+
+	  $this->query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
+	  return $this;
+	}
+
+	/**
+	 * 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 object  the current DatabaseQueryBuilder instance 
+	 */
+	public function update($data = array(), $escape = true){
+	  $query = 'UPDATE ' . $this->from . ' SET ';
+	  $values = array();
+	  foreach ($data as $column => $val){
+		$values[] = $column . ' = ' . ($this->escape($val, $escape));
+	  }
+	  $query .= implode(', ', $values);
+	  if (! empty($this->where)){
+		$query .= ' WHERE ' . $this->where;
+	  }
+
+	  if (! empty($this->orderBy)){
+		$query .= ' ORDER BY ' . $this->orderBy;
+	  }
+
+	  if (! empty($this->limit)){
+		$query .= ' LIMIT ' . $this->limit;
+	  }
+	  $this->query = $query;
+	  return $this;
+	}
+
+	/**
+	 * Delete the record in database
+	 * @return object  the current DatabaseQueryBuilder instance 
+	 */
+	public function delete(){
+		$query = 'DELETE FROM ' . $this->from;
+	  $isTruncate = $query;
+		if (! empty($this->where)){
   		  $query .= ' WHERE ' . $this->where;
-    	}
+		}
 
-    	if (! empty($this->orderBy)){
-    	  $query .= ' ORDER BY ' . $this->orderBy;
-      }
+		if (! empty($this->orderBy)){
+		  $query .= ' ORDER BY ' . $this->orderBy;
+	  }
 
-    	if (! empty($this->limit)){
-    		$query .= ' LIMIT ' . $this->limit;
-      }
+		if (! empty($this->limit)){
+			$query .= ' LIMIT ' . $this->limit;
+	  }
 
   		if ($isTruncate == $query && $this->driver != 'sqlite'){  
-      	$query = 'TRUNCATE TABLE ' . $this->from;
+	  	$query = 'TRUNCATE TABLE ' . $this->from;
   		}
 	   $this->query = $query;
 	   return $this;
-    }
-
-    /**
-     * Escape the data before execute query useful for security.
-     * @param  mixed $data the data to be escaped
-     * @param boolean $escaped whether we can do escape of not 
-     * @return mixed       the data after escaped or the same data if not
-     */
-    public function escape($data, $escaped = true){
-      return $escaped 
-                    ? $this->getPdo()->quote(trim($data)) 
-                    : $data; 
-    }
-
-
-    /**
-     * Return the current SQL query string
-     * @return string
-     */
-    public function getQuery(){
+	}
+
+	/**
+	 * Escape the data before execute query useful for security.
+	 * @param  mixed $data the data to be escaped
+	 * @param boolean $escaped whether we can do escape of not 
+	 * @return mixed       the data after escaped or the same data if not
+	 */
+	public function escape($data, $escaped = true){
+	  return $escaped 
+					? $this->getPdo()->quote(trim($data)) 
+					: $data; 
+	}
+
+
+	/**
+	 * Return the current SQL query string
+	 * @return string
+	 */
+	public function getQuery(){
   	  //INSERT, UPDATE, DELETE already set it, if is the SELECT we need set it now
   	  if(empty($this->query)){
   		  $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
   		  if (! empty($this->join)){
-          $query .= $this->join;
+		  $query .= $this->join;
   		  }
   		  
   		  if (! empty($this->where)){
-          $query .= ' WHERE ' . $this->where;
+		  $query .= ' WHERE ' . $this->where;
   		  }
 
   		  if (! empty($this->groupBy)){
-          $query .= ' GROUP BY ' . $this->groupBy;
+		  $query .= ' GROUP BY ' . $this->groupBy;
   		  }
 
   		  if (! empty($this->having)){
-          $query .= ' HAVING ' . $this->having;
+		  $query .= ' HAVING ' . $this->having;
   		  }
 
   		  if (! empty($this->orderBy)){
@@ -763,198 +763,198 @@ 
   		  }
 
   		  if (! empty($this->limit)){
-          $query .= ' LIMIT ' . $this->limit;
+		  $query .= ' LIMIT ' . $this->limit;
   		  }
   		  $this->query = $query;
   	  }
-      return $this->query;
-    }
+	  return $this->query;
+	}
 
 	
 	 /**
-     * Return the PDO instance
-     * @return PDO
-     */
-    public function getPdo(){
-      return $this->pdo;
-    }
-
-    /**
-     * Set the PDO instance
-     * @param PDO $pdo the pdo object
+	  * Return the PDO instance
+	  * @return PDO
+	  */
+	public function getPdo(){
+	  return $this->pdo;
+	}
+
+	/**
+	 * Set the PDO instance
+	 * @param PDO $pdo the pdo object
 	 * @return object DatabaseQueryBuilder
-     */
-    public function setPdo(PDO $pdo = null){
-      $this->pdo = $pdo;
-      return $this;
-    }
+	 */
+	public function setPdo(PDO $pdo = null){
+	  $this->pdo = $pdo;
+	  return $this;
+	}
 	
    /**
-   * Return the database table prefix
-   * @return string
-   */
-    public function getPrefix(){
-      return $this->prefix;
-    }
-
-    /**
-     * Set the database table prefix
-     * @param string $prefix the new prefix
-	   * @return object DatabaseQueryBuilder
-     */
-    public function setPrefix($prefix){
-      $this->prefix = $prefix;
-      return $this;
-    }
+    * Return the database table prefix
+    * @return string
+    */
+	public function getPrefix(){
+	  return $this->prefix;
+	}
+
+	/**
+	 * Set the database table prefix
+	 * @param string $prefix the new prefix
+	 * @return object DatabaseQueryBuilder
+	 */
+	public function setPrefix($prefix){
+	  $this->prefix = $prefix;
+	  return $this;
+	}
 	
 	   /**
-     * Return the database driver
-     * @return string
-     */
-    public function getDriver(){
-      return $this->driver;
-    }
-
-    /**
-     * Set the database driver
-     * @param string $driver the new driver
-	   * @return object DatabaseQueryBuilder
-     */
-    public function setDriver($driver){
-      $this->driver = $driver;
-      return $this;
-    }
+	    * Return the database driver
+	    * @return string
+	    */
+	public function getDriver(){
+	  return $this->driver;
+	}
+
+	/**
+	 * Set the database driver
+	 * @param string $driver the new driver
+	 * @return object DatabaseQueryBuilder
+	 */
+	public function setDriver($driver){
+	  $this->driver = $driver;
+	  return $this;
+	}
 	
 	   /**
-     * Reset the DatabaseQueryBuilder class attributs to the initial values before each query.
-	   * @return object  the current DatabaseQueryBuilder instance 
-     */
-    public 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->query    = null;
-      return $this;
-    }
+	    * Reset the DatabaseQueryBuilder class attributs to the initial values before each query.
+	    * @return object  the current DatabaseQueryBuilder instance 
+	    */
+	public 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->query    = null;
+	  return $this;
+	}
 
 	   /**
-     * Get the SQL HAVING clause when operator argument is an array
-     * @see DatabaseQueryBuilder::having
-     *
-     * @return string
-     */
-    protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true){
-        $x = explode('?', $field);
-        $w = '';
-        foreach($x as $k => $v){
-  	      if (!empty($v)){
-            if (! isset($op[$k])){
-              $op[$k] = '';
-            }
-  	      	$w .= $v . (isset($op[$k]) ? $this->escape($op[$k], $escape) : '');
-  	      }
-      	}
-        return $w;
-    }
-
-
-    /**
-     * Get the SQL WHERE clause using array column => value
-     * @see DatabaseQueryBuilder::where
-     *
-     * @return string
-     */
-    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true){
-      $_where = array();
-      foreach ($where as $column => $data){
-        if (is_null($data)){
-          $data = '';
-        }
-        $_where[] = $type . $column . ' = ' . ($this->escape($data, $escape));
-      }
-      $where = implode(' '.$andOr.' ', $_where);
-      return $where;
-    }
-
-     /**
-     * Get the SQL WHERE clause when operator argument is an array
-     * @see DatabaseQueryBuilder::where
-     *
-     * @return string
-     */
-    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true){
-     $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]) ? ($this->escape($op[$k], $escape)) : '');
-        }
-      }
-      return $w;
-    }
-
-    /**
-     * Get the default SQL WHERE clause using operator = or the operator argument
-     * @see DatabaseQueryBuilder::where
-     *
-     * @return string
-     */
-    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true){
-       $w = '';
-       if (! in_array((string)$op, $this->operatorList)){
-          if (is_null($op)){
-            $op = '';
-          }
-          $w = $type . $where . ' = ' . ($this->escape($op, $escape));
-        } else {
-          if (is_null($val)){
-            $val = '';
-          }
-          $w = $type . $where . $op . ($this->escape($val, $escape));
-        }
-        return $w;
-      }
-
-      /**
-       * Set the $this->where property 
-       * @param string $whereStr the WHERE clause string
-       * @param  string  $andOr the separator type used 'AND', 'OR', etc.
-       */
-      protected function setWhereStr($whereStr, $andOr = 'AND'){
-        if (empty($this->where)){
-          $this->where = $whereStr;
-        } else {
-          if (substr(trim($this->where), -1) == '('){
-            $this->where = $this->where . ' ' . $whereStr;
-          } else {
-            $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
-          }
-        }
-      }
+	    * Get the SQL HAVING clause when operator argument is an array
+	    * @see DatabaseQueryBuilder::having
+	    *
+	    * @return string
+	    */
+	protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true){
+		$x = explode('?', $field);
+		$w = '';
+		foreach($x as $k => $v){
+  		  if (!empty($v)){
+			if (! isset($op[$k])){
+			  $op[$k] = '';
+			}
+  		  	$w .= $v . (isset($op[$k]) ? $this->escape($op[$k], $escape) : '');
+  		  }
+	  	}
+		return $w;
+	}
+
+
+	/**
+	 * Get the SQL WHERE clause using array column => value
+	 * @see DatabaseQueryBuilder::where
+	 *
+	 * @return string
+	 */
+	protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true){
+	  $_where = array();
+	  foreach ($where as $column => $data){
+		if (is_null($data)){
+		  $data = '';
+		}
+		$_where[] = $type . $column . ' = ' . ($this->escape($data, $escape));
+	  }
+	  $where = implode(' '.$andOr.' ', $_where);
+	  return $where;
+	}
+
+	 /**
+	  * Get the SQL WHERE clause when operator argument is an array
+	  * @see DatabaseQueryBuilder::where
+	  *
+	  * @return string
+	  */
+	protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true){
+	 $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]) ? ($this->escape($op[$k], $escape)) : '');
+		}
+	  }
+	  return $w;
+	}
+
+	/**
+	 * Get the default SQL WHERE clause using operator = or the operator argument
+	 * @see DatabaseQueryBuilder::where
+	 *
+	 * @return string
+	 */
+	protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true){
+	   $w = '';
+	   if (! in_array((string)$op, $this->operatorList)){
+		  if (is_null($op)){
+			$op = '';
+		  }
+		  $w = $type . $where . ' = ' . ($this->escape($op, $escape));
+		} else {
+		  if (is_null($val)){
+			$val = '';
+		  }
+		  $w = $type . $where . $op . ($this->escape($val, $escape));
+		}
+		return $w;
+	  }
+
+	  /**
+	   * Set the $this->where property 
+	   * @param string $whereStr the WHERE clause string
+	   * @param  string  $andOr the separator type used 'AND', 'OR', etc.
+	   */
+	  protected function setWhereStr($whereStr, $andOr = 'AND'){
+		if (empty($this->where)){
+		  $this->where = $whereStr;
+		} else {
+		  if (substr(trim($this->where), -1) == '('){
+			$this->where = $this->where . ' ' . $whereStr;
+		  } else {
+			$this->where = $this->where . ' '.$andOr.' ' . $whereStr;
+		  }
+		}
+	  }
 
 
 	 /**
-     * Set the SQL SELECT for function MIN, MAX, SUM, AVG, COUNT, AVG
-     * @param  string $clause the clause type like MIN, MAX, etc.
-     * @see  DatabaseQueryBuilder::min
-     * @see  DatabaseQueryBuilder::max
-     * @see  DatabaseQueryBuilder::sum
-     * @see  DatabaseQueryBuilder::count
-     * @see  DatabaseQueryBuilder::avg
-     * @return object
-     */
-    protected function select_min_max_sum_count_avg($clause, $field, $name = null){
-      $clause = strtoupper($clause);
-      $func = $clause . '(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
+	  * Set the SQL SELECT for function MIN, MAX, SUM, AVG, COUNT, AVG
+	  * @param  string $clause the clause type like MIN, MAX, etc.
+	  * @see  DatabaseQueryBuilder::min
+	  * @see  DatabaseQueryBuilder::max
+	  * @see  DatabaseQueryBuilder::sum
+	  * @see  DatabaseQueryBuilder::count
+	  * @see  DatabaseQueryBuilder::avg
+	  * @return object
+	  */
+	protected function select_min_max_sum_count_avg($clause, $field, $name = null){
+	  $clause = strtoupper($clause);
+	  $func = $clause . '(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
 }

Spacing +140 added lines, -140 removed lines

@@ -23,94 +23,94 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class DatabaseQueryBuilder{
+  class DatabaseQueryBuilder {
   	/**
   	 * The SQL SELECT statment
   	 * @var string
   	*/
-  	private $select              = '*';
+  	private $select = '*';
   	
   	/**
   	 * The SQL FROM statment
   	 * @var string
   	*/
-      private $from                = null;
+      private $from = null;
   	
   	/**
   	 * The SQL WHERE statment
   	 * @var string
   	*/
-      private $where               = null;
+      private $where = null;
   	
   	/**
   	 * The SQL LIMIT statment
   	 * @var string
   	*/
-      private $limit               = null;
+      private $limit = null;
   	
   	/**
   	 * The SQL JOIN statment
   	 * @var string
   	*/
-      private $join                = null;
+      private $join = null;
   	
   	/**
   	 * The SQL ORDER BY statment
   	 * @var string
   	*/
-      private $orderBy             = null;
+      private $orderBy = null;
   	
   	/**
   	 * The SQL GROUP BY statment
   	 * @var string
   	*/
-      private $groupBy             = null;
+      private $groupBy = null;
   	
   	/**
   	 * The SQL HAVING statment
   	 * @var string
   	*/
-      private $having              = null;
+      private $having = null;
   	
   	/**
   	 * The full SQL query statment after build for each command
   	 * @var string
   	*/
-      private $query               = null;
+      private $query = null;
   	
   	/**
   	 * The list of SQL valid operators
   	 * @var array
   	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = array('=', '!=', '<', '>', '<=', '>=', '<>');
   	
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
 	*/
-    private $prefix              = null;
+    private $prefix = null;
     
 
   /**
 	 * The PDO instance
 	 * @var object
 	*/
-  private $pdo                 = null;
+  private $pdo = null;
 	
   	/**
   	 * The database driver name used
   	 * @var string
   	*/
-  	private $driver              = null;
+  	private $driver = null;
   	
 	
     /**
      * Construct new DatabaseQueryBuilder
      * @param object $pdo the PDO object
      */
-    public function __construct(PDO $pdo = null){
-        if (is_object($pdo)){
+    public function __construct(PDO $pdo = null) {
+        if (is_object($pdo)) {
           $this->setPdo($pdo);
         }
     }
@@ -120,10 +120,10 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function from($table){
-	  if (is_array($table)){
+    public function from($table) {
+	  if (is_array($table)) {
         $froms = '';
-        foreach($table as $key){
+        foreach ($table as $key) {
           $froms .= $this->getPrefix() . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
@@ -138,7 +138,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function select($fields){
+    public function select($fields) {
       $select = (is_array($fields) ? implode(', ', $fields) : $fields);
       $this->select = (($this->select == '*' || empty($this->select)) ? $select : $this->select . ', ' . $select);
       return $this;
@@ -149,7 +149,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function distinct($field){
+    public function distinct($field) {
       $distinct = ' DISTINCT ' . $field;
       $this->select = (($this->select == '*' || empty($this->select)) ? $distinct : $this->select . ', ' . $distinct);
       return $this;
@@ -161,7 +161,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
       return $this->select_min_max_sum_count_avg('COUNT', $field, $name);
     }
     
@@ -171,7 +171,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
       return $this->select_min_max_sum_count_avg('MIN', $field, $name);
     }
 
@@ -181,7 +181,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
       return $this->select_min_max_sum_count_avg('MAX', $field, $name);
     }
 
@@ -191,7 +191,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
       return $this->select_min_max_sum_count_avg('SUM', $field, $name);
     }
 
@@ -201,7 +201,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
       return $this->select_min_max_sum_count_avg('AVG', $field, $name);
     }
 
@@ -215,18 +215,18 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
       $on = $field1;
       $table = $this->getPrefix() . $table;
-      if (! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) 
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) 
 													? ($this->getPrefix() . $field1 . ' = ' . $this->getPrefix() . $op) 
 													: ($this->getPrefix() . $field1 . ' ' . $op . ' ' . $this->getPrefix() . $field2));
       }
-      if (empty($this->join)){
+      if (empty($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
-      else{
+      else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -237,7 +237,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
+    public function innerJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'INNER ');
     }
 
@@ -246,7 +246,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT ');
 	}
 
@@ -255,7 +255,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT ');
     }
 
@@ -264,7 +264,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function fullOuterJoin($table, $field1, $op = null, $field2 = '') {
     	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
     }
 
@@ -273,7 +273,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
     }
 
@@ -282,7 +282,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
     }
 
@@ -292,13 +292,13 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if (is_array($field)){
-        foreach($field as $f){
+    public function whereIsNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
         	$this->whereIsNull($f, $andOr);
         }
       } else {
-          $this->setWhereStr($field.' IS NULL ', $andOr);
+          $this->setWhereStr($field . ' IS NULL ', $andOr);
       }
       return $this;
     }
@@ -309,13 +309,13 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if (is_array($field)){
-        foreach($field as $f){
+    public function whereIsNotNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
           $this->whereIsNotNull($f, $andOr);
         }
       } else {
-          $this->setWhereStr($field.' IS NOT NULL ', $andOr);
+          $this->setWhereStr($field . ' IS NOT NULL ', $andOr);
       }
       return $this;
     }
@@ -330,13 +330,13 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
       $whereStr = '';
-      if (is_array($where)){
+      if (is_array($where)) {
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
       }
-      else{
-        if (is_array($op)){
+      else {
+        if (is_array($op)) {
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
           $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape = true);
@@ -351,7 +351,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
+    public function orWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, '', 'OR', $escape);
     }
 
@@ -361,7 +361,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
+    public function notWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
     }
 
@@ -370,7 +370,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
+    public function orNotWhere($where, $op = null, $val = null, $escape = true) {
     	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
     }
 
@@ -380,11 +380,11 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (empty($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+      if (empty($this->where)) {
         $this->where = $type . ' (';
       } else {
-          if (substr(trim($this->where), -1) == '('){
+          if (substr(trim($this->where), -1) == '(') {
             $this->where .= $type . ' (';
           } else {
           	$this->where .= $andOr . ' ' . $type . ' (';
@@ -398,7 +398,7 @@ 
      * @see  DatabaseQueryBuilder::groupStart()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
       return $this->groupStart('NOT');
     }
 
@@ -407,7 +407,7 @@ 
      * @see  DatabaseQueryBuilder::groupStart()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
       return $this->groupStart('', ' OR');
     }
 
@@ -416,7 +416,7 @@ 
      * @see  DatabaseQueryBuilder::groupStart()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
       return $this->groupStart('NOT', ' OR');
     }
 
@@ -424,7 +424,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
       $this->where .= ')';
       return $this;
     }
@@ -438,10 +438,10 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
       $_keys = array();
-      foreach ($keys as $k => $v){
-        if (is_null($v)){
+      foreach ($keys as $k => $v) {
+        if (is_null($v)) {
           $v = '';
         }
         $_keys[] = (is_numeric($v) ? $v : $this->escape($v, $escape));
@@ -457,7 +457,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notIn($field, array $keys, $escape = true){
+    public function notIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'AND', $escape);
     }
 
@@ -466,7 +466,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -475,7 +475,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotIn($field, array $keys, $escape = true){
+    public function orNotIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'OR', $escape);
     }
 
@@ -489,11 +489,11 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if (is_null($value1)){
+    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($value1)) {
         $value1 = '';
       }
-      if (is_null($value2)){
+      if (is_null($value2)) {
         $value2 = '';
       }
       $whereStr = $field . ' ' . $type . ' BETWEEN ' . $this->escape($value1, $escape) . ' AND ' . $this->escape($value2, $escape);
@@ -506,7 +506,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notBetween($field, $value1, $value2, $escape = true){
+    public function notBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
     }
 
@@ -515,7 +515,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orBetween($field, $value1, $value2, $escape = true){
+    public function orBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, '', 'OR', $escape);
     }
 
@@ -524,7 +524,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
+    public function orNotBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
     }
 
@@ -537,8 +537,8 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if (empty($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+      if (empty($data)) {
         $data = '';
       }
       $this->setWhereStr($field . ' ' . $type . ' LIKE ' . ($this->escape($data, $escape)), $andOr);
@@ -550,7 +550,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
       return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -559,7 +559,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -568,7 +568,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -579,14 +579,14 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function limit($limit, $limitEnd = null){
-      if (empty($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (empty($limit)) {
         $limit = 0;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
       }
-      else{
+      else {
         $this->limit = $limit;
       }
       return $this;
@@ -598,11 +598,11 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
         $this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
       }
-      else{
+      else {
         $this->orderBy = empty($this->orderBy) 
 						? ($orderBy . ' ' . strtoupper($orderDir)) 
 						: $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
@@ -615,11 +615,11 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupBy($field){
-      if (is_array($field)){
+    public function groupBy($field) {
+      if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
       }
-      else{
+      else {
         $this->groupBy = $field;
       }
       return $this;
@@ -633,18 +633,18 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if (is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+      if (is_array($op)) {
         $this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
       }
-      else if (! in_array($op, $this->operatorList)){
-        if (is_null($op)){
+      else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
           $op = '';
         }
         $this->having = $field . ' > ' . ($this->escape($op, $escape));
       }
-      else{
-        if (is_null($val)){
+      else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($this->escape($val, $escape));
@@ -658,7 +658,7 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return object  the current DatabaseQueryBuilder instance        
      */
-    public function insert($data = array(), $escape = true){
+    public function insert($data = array(), $escape = true) {
       $columns = array_keys($data);
       $column = implode(',', $columns);
       $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -673,22 +673,22 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return object  the current DatabaseQueryBuilder instance 
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
       $query = 'UPDATE ' . $this->from . ' SET ';
       $values = array();
-      foreach ($data as $column => $val){
+      foreach ($data as $column => $val) {
         $values[] = $column . ' = ' . ($this->escape($val, $escape));
       }
       $query .= implode(', ', $values);
-      if (! empty($this->where)){
+      if (!empty($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! empty($this->orderBy)){
+      if (!empty($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if (! empty($this->limit)){
+      if (!empty($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
       }
       $this->query = $query;
@@ -699,22 +699,22 @@ 
      * Delete the record in database
      * @return object  the current DatabaseQueryBuilder instance 
      */
-    public function delete(){
+    public function delete() {
     	$query = 'DELETE FROM ' . $this->from;
       $isTruncate = $query;
-    	if (! empty($this->where)){
+    	if (!empty($this->where)) {
   		  $query .= ' WHERE ' . $this->where;
     	}
 
-    	if (! empty($this->orderBy)){
+    	if (!empty($this->orderBy)) {
     	  $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-    	if (! empty($this->limit)){
+    	if (!empty($this->limit)) {
     		$query .= ' LIMIT ' . $this->limit;
       }
 
-  		if ($isTruncate == $query && $this->driver != 'sqlite'){  
+  		if ($isTruncate == $query && $this->driver != 'sqlite') {  
       	$query = 'TRUNCATE TABLE ' . $this->from;
   		}
 	   $this->query = $query;
@@ -727,7 +727,7 @@ 
      * @param boolean $escaped whether we can do escape of not 
      * @return mixed       the data after escaped or the same data if not
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
       return $escaped 
                     ? $this->getPdo()->quote(trim($data)) 
                     : $data; 
@@ -738,31 +738,31 @@ 
      * Return the current SQL query string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
   	  //INSERT, UPDATE, DELETE already set it, if is the SELECT we need set it now
-  	  if(empty($this->query)){
+  	  if (empty($this->query)) {
   		  $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-  		  if (! empty($this->join)){
+  		  if (!empty($this->join)) {
           $query .= $this->join;
   		  }
   		  
-  		  if (! empty($this->where)){
+  		  if (!empty($this->where)) {
           $query .= ' WHERE ' . $this->where;
   		  }
 
-  		  if (! empty($this->groupBy)){
+  		  if (!empty($this->groupBy)) {
           $query .= ' GROUP BY ' . $this->groupBy;
   		  }
 
-  		  if (! empty($this->having)){
+  		  if (!empty($this->having)) {
           $query .= ' HAVING ' . $this->having;
   		  }
 
-  		  if (! empty($this->orderBy)){
+  		  if (!empty($this->orderBy)) {
   			  $query .= ' ORDER BY ' . $this->orderBy;
   		  }
 
-  		  if (! empty($this->limit)){
+  		  if (!empty($this->limit)) {
           $query .= ' LIMIT ' . $this->limit;
   		  }
   		  $this->query = $query;
@@ -775,7 +775,7 @@ 
      * Return the PDO instance
      * @return PDO
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -784,7 +784,7 @@ 
      * @param PDO $pdo the pdo object
 	 * @return object DatabaseQueryBuilder
      */
-    public function setPdo(PDO $pdo = null){
+    public function setPdo(PDO $pdo = null) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -793,7 +793,7 @@ 
    * Return the database table prefix
    * @return string
    */
-    public function getPrefix(){
+    public function getPrefix() {
       return $this->prefix;
     }
 
@@ -802,7 +802,7 @@ 
      * @param string $prefix the new prefix
 	   * @return object DatabaseQueryBuilder
      */
-    public function setPrefix($prefix){
+    public function setPrefix($prefix) {
       $this->prefix = $prefix;
       return $this;
     }
@@ -811,7 +811,7 @@ 
      * Return the database driver
      * @return string
      */
-    public function getDriver(){
+    public function getDriver() {
       return $this->driver;
     }
 
@@ -820,7 +820,7 @@ 
      * @param string $driver the new driver
 	   * @return object DatabaseQueryBuilder
      */
-    public function setDriver($driver){
+    public function setDriver($driver) {
       $this->driver = $driver;
       return $this;
     }
@@ -829,7 +829,7 @@ 
      * Reset the DatabaseQueryBuilder class attributs to the initial values before each query.
 	   * @return object  the current DatabaseQueryBuilder instance 
      */
-    public function reset(){
+    public function reset() {
       $this->select   = '*';
       $this->from     = null;
       $this->where    = null;
@@ -848,12 +848,12 @@ 
      *
      * @return string
      */
-    protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true){
+    protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-  	      if (!empty($v)){
-            if (! isset($op[$k])){
+        foreach ($x as $k => $v) {
+  	      if (!empty($v)) {
+            if (!isset($op[$k])) {
               $op[$k] = '';
             }
   	      	$w .= $v . (isset($op[$k]) ? $this->escape($op[$k], $escape) : '');
@@ -869,15 +869,15 @@ 
      *
      * @return string
      */
-    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true){
+    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true) {
       $_where = array();
-      foreach ($where as $column => $data){
-        if (is_null($data)){
+      foreach ($where as $column => $data) {
+        if (is_null($data)) {
           $data = '';
         }
         $_where[] = $type . $column . ' = ' . ($this->escape($data, $escape));
       }
-      $where = implode(' '.$andOr.' ', $_where);
+      $where = implode(' ' . $andOr . ' ', $_where);
       return $where;
     }
 
@@ -887,12 +887,12 @@ 
      *
      * @return string
      */
-    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true){
+    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true) {
      $x = explode('?', $where);
      $w = '';
-      foreach($x as $k => $v){
-        if (! empty($v)){
-            if (isset($op[$k]) && is_null($op[$k])){
+      foreach ($x as $k => $v) {
+        if (!empty($v)) {
+            if (isset($op[$k]) && is_null($op[$k])) {
               $op[$k] = '';
             }
             $w .= $type . $v . (isset($op[$k]) ? ($this->escape($op[$k], $escape)) : '');
@@ -907,15 +907,15 @@ 
      *
      * @return string
      */
-    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true){
+    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true) {
        $w = '';
-       if (! in_array((string)$op, $this->operatorList)){
-          if (is_null($op)){
+       if (!in_array((string) $op, $this->operatorList)) {
+          if (is_null($op)) {
             $op = '';
           }
           $w = $type . $where . ' = ' . ($this->escape($op, $escape));
         } else {
-          if (is_null($val)){
+          if (is_null($val)) {
             $val = '';
           }
           $w = $type . $where . $op . ($this->escape($val, $escape));
@@ -928,14 +928,14 @@ 
        * @param string $whereStr the WHERE clause string
        * @param  string  $andOr the separator type used 'AND', 'OR', etc.
        */
-      protected function setWhereStr($whereStr, $andOr = 'AND'){
-        if (empty($this->where)){
+      protected function setWhereStr($whereStr, $andOr = 'AND') {
+        if (empty($this->where)) {
           $this->where = $whereStr;
         } else {
-          if (substr(trim($this->where), -1) == '('){
+          if (substr(trim($this->where), -1) == '(') {
             $this->where = $this->where . ' ' . $whereStr;
           } else {
-            $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
+            $this->where = $this->where . ' ' . $andOr . ' ' . $whereStr;
           }
         }
       }
@@ -951,7 +951,7 @@ 
      * @see  DatabaseQueryBuilder::avg
      * @return object
      */
-    protected function select_min_max_sum_count_avg($clause, $field, $name = null){
+    protected function select_min_max_sum_count_avg($clause, $field, $name = null) {
       $clause = strtoupper($clause);
       $func = $clause . '(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);

Braces +7 added lines, -14 removed lines

@@ -225,8 +225,7 @@ 
       }
       if (empty($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -334,8 +333,7 @@ 
       $whereStr = '';
       if (is_array($where)){
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-      }
-      else{
+      } else{
         if (is_array($op)){
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
@@ -585,8 +583,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -601,8 +598,7 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
         $this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
-      }
-      else{
+      } else{
         $this->orderBy = empty($this->orderBy) 
 						? ($orderBy . ' ' . strtoupper($orderDir)) 
 						: $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
@@ -618,8 +614,7 @@ 
     public function groupBy($field){
       if (is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -636,14 +631,12 @@ 
     public function having($field, $op = null, $val = null, $escape = true){
       if (is_array($op)){
         $this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if (is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($this->escape($op, $escape));
-      }
-      else{
+      } else{
         if (is_null($val)){
           $val = '';
         }

core/libraries/Upload.php

Indentation +801 added lines, -801 removed lines

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

Spacing +48 added lines, -48 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload{
+    class Upload {
 
         /**
         *   Version
@@ -69,7 +69,7 @@ 
         *    @version    1.0
         *    @var        array
         */
-        private $file_array    = array();
+        private $file_array = array();
 
         /**
         *    If the file you are trying to upload already exists it will
@@ -119,7 +119,7 @@ 
         *    @version    1.0
         *    @var        float
         */
-        private $max_file_size= 0.0;
+        private $max_file_size = 0.0;
 
         /**
         *    List of allowed mime types
@@ -217,12 +217,12 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
+        public function __construct() {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
 
             Loader::lang('file_upload');
-            $obj =& get_instance();
+            $obj = & get_instance();
 
             $this->error_messages = array(
                 'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
@@ -239,15 +239,15 @@ 
             );
 
             $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
+                '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
@@ -257,7 +257,7 @@ 
             if (isset($_FILES) && is_array($_FILES)) {
                 $this->file_array = $_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -273,7 +273,7 @@ 
         */
         public function setInput($input)
         {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+            if (!empty($input) && (is_string($input) || is_numeric($input))) {
                 $this->input = $input;
             }
             return $this;
@@ -309,7 +309,7 @@ 
         */
         public function setAutoFilename()
         {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
+            $this->filename = sha1(mt_rand(1, 9999) . uniqid());
             $this->filename .= time();
             return $this;
         }
@@ -330,7 +330,7 @@ 
                 $php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
                 // Calculate difference
                 if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+                    $this->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;
             }
@@ -348,7 +348,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -413,7 +413,7 @@ 
         {
             if (!empty($name) && is_string($name)) {
                 if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+                    return $this->setAllowedMimeTypes($this->mime_helping[$name]);
                 }
             }
             return $this;
@@ -432,8 +432,8 @@ 
         */
         public function setUploadFunction($function)
         {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
+            if (!empty($function) && (is_array($function) || is_string($function))) {
+                if (is_callable($function)) {
                     $this->upload_function = $function;
                 }
             }
@@ -478,8 +478,8 @@ 
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -529,7 +529,7 @@ 
         public function isFilename($filename)
         {
             $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+            return (!empty($filename) && (is_string($filename) || is_numeric($filename)));
         }
         /**
         *    Validate mime type with allowed mime types,
@@ -571,11 +571,11 @@ 
         */
         public function isDirpath($path)
         {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+            if (!empty($path) && (is_string($path) || is_numeric($path))) {
                 if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+                    return (preg_match('/^[^*?"<>|:]*$/', $path) == 1);
                 } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+                    return (preg_match("/^[^*?\"<>|:]*$/", substr($path, 2)) == 1);
                 }
             }
             return false;
@@ -603,7 +603,7 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
 
@@ -611,7 +611,7 @@ 
          * Check if the file is uploaded
          * @return boolean
          */
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             && is_uploaded_file($this->file_array[$this->input]['tmp_name']);
         }
@@ -625,13 +625,13 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             if (count($this->file_array) > 0 && 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{
+                else {
                     // Replace %s for extension in filename
                     // Before: /[\w\d]*(.[\d\w]+)$/i
                     // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -655,10 +655,10 @@ 
                 $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));
+                $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                 $error = $this->uploadHasError();
-                if($error){
+                if ($error) {
                     return false;
                 }
                 // Execute input callback
@@ -692,10 +692,10 @@ 
         */
         public function sizeFormat($size, $precision = 2)
         {
-            if($size > 0){
+            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 round(pow(1024, $base - floor($base)), $precision) . (isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
             }
             return null;
         }
@@ -719,14 +719,14 @@ 
             if (array_key_exists('unit', $matches)) {
                 $unit = strtoupper($matches['unit']);
             }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+            return (floatval($matches['size']) * pow(1024, $units[$unit]));
         }
 
         /**
          * Get the upload error message
          * @return string
          */
-        public function getError(){
+        public function getError() {
             return $this->error;
         }
 
@@ -734,7 +734,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The file upload got error : ' . $message);
             $this->error = $message;
         }
@@ -744,9 +744,9 @@ 
          * @param string $type the type of callback "input" or "output"
          * @return void 
          */
-        protected function runCallback($type){
-            if (!empty( $this->callbacks[$type])) {
-                call_user_func($this->callbacks[$type], (object)$this->file);
+        protected function runCallback($type) {
+            if (!empty($this->callbacks[$type])) {
+                call_user_func($this->callbacks[$type], (object) $this->file);
             }
         }
 
@@ -754,21 +754,21 @@ 
          * Check if file upload has error
          * @return boolean
          */
-        protected function uploadHasError(){
+        protected function uploadHasError() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return true;
             }
 
              //check for php upload error
-            if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+            if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
             }
             
             //check for mime type
-            if (! $this->checkMimeType($this->file['mime'])) {
+            if (!$this->checkMimeType($this->file['mime'])) {
                 $this->setError($this->error_messages['accept_file_types']);
                 return true;
             }
@@ -792,7 +792,7 @@ 
          * @param  int $code the error code
          * @return string the error message
          */
-        private function getPhpUploadErrorMessageByCode($code){
+        private function getPhpUploadErrorMessageByCode($code) {
             $codeMessageMaps = array(
                 1 => $this->error_messages['upload_err_ini_size'],
                 2 => $this->error_messages['upload_err_form_size'],

Braces +2 added lines, -4 removed lines

@@ -477,8 +477,7 @@ 
                     if (mkdir($destination_directory, 0775, true)) {
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
-                    }
-                    else{
+                    } else{
                         $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
                     }
                 }
@@ -630,8 +629,7 @@ 
                 // set original filename if not have a new name
                 if (empty($this->filename)) {
                     $this->filename = $this->file_array[$this->input]['name'];
-                }
-                else{
+                } else{
                     // Replace %s for extension in filename
                     // Before: /[\w\d]*(.[\d\w]+)$/i
                     // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu