tnhfw / tnh-fw

core/libraries/FormValidation.php

Indentation +877 added lines, -877 removed lines

@@ -1,918 +1,918 @@
 <?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();
-        }
-
-        /**
-         * 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() {
-            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){
-                     $this->logger->info('Check the CSRF value if is valid');
-                    if(! 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');
-                }
-            }
-            /////////////////////////////////////////////
-            $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();
+		}
+
+		/**
+		 * 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() {
+			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){
+					 $this->logger->info('Check the CSRF value if is valid');
+					if(! 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');
+				}
+			}
+			/////////////////////////////////////////////
+			$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;
-                    break;
-                // 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]) : false;
-            }
-            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;
+					break;
+				// 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]) : false;
+			}
+			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(isset($regexRule[0]) && !empty($regexRule[0])){
-                     $ruleSets[] = $regexRule[0];
-                 }
-                 $ruleStringRegex = explode('|', $ruleStringTemp);
-                 if(is_array($ruleStringRegex)){
-                    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();
-
-            // Get the rule arguments, realRule is just the base rule name
-            // Like min_length instead of min_length[3]
-            $realRule = preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
-            $ruleName = preg_replace('/\[(.*)\]/', '', $ruleName);
+			if(strpos($ruleString, 'regex') !== false){
+				$regexRule = array();
+				$rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
+				preg_match($rule, $ruleString, $regexRule);
+				$ruleStringTemp = preg_replace($rule, '', $ruleString);
+				 if(isset($regexRule[0]) && !empty($regexRule[0])){
+					 $ruleSets[] = $regexRule[0];
+				 }
+				 $ruleStringRegex = explode('|', $ruleStringTemp);
+				 if(is_array($ruleStringRegex)){
+					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();
+
+			// Get the rule arguments, realRule is just the base rule name
+			// Like min_length instead of min_length[3]
+			$realRule = preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
+			$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 $replacements
-		*/
-        protected function _setError($inputName, $ruleName, $replacements = array()) {
-            $rulePhraseKeyParts = explode(',', $ruleName);
-            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 $replacements
+		 */
+		protected function _setError($inputName, $ruleName, $replacements = array()) {
+			$rulePhraseKeyParts = explode(',', $ruleName);
+			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 anything
-         */
-        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 anything
+		 */
+		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 anything
-         */
-        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 anything
+		 */
+		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 +54 added lines, -54 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);
         }
 
         /**
@@ -215,16 +215,16 @@ 
          * afterwards.
          */
         protected function _run() {
-            if(get_instance()->request->method() == 'POST' || $this->enableCsrfCheck){
+            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){
+                if (get_config('csrf_enable', false) || $this->enableCsrfCheck) {
                      $this->logger->info('Check the CSRF value if is valid');
-                    if(! Security::validateCSRF()){
+                    if (!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');
                 }
             }
@@ -232,10 +232,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]);
     			}
 
@@ -262,7 +262,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;
         }
 
@@ -427,7 +427,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -452,26 +452,26 @@ 
             /*
             //////////////// 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(isset($regexRule[0]) && !empty($regexRule[0])){
+                 if (isset($regexRule[0]) && !empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
-                 if(is_array($ruleStringRegex)){
+                 if (is_array($ruleStringRegex)) {
                     foreach ($ruleStringRegex as $rule) {
                         $rule = trim($rule);
-                        if($rule){
+                        if ($rule) {
                             $ruleSets[] = $rule;
                         }
                     }
                  }
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -503,7 +503,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();
 
@@ -547,7 +547,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;
             }
         }
@@ -599,13 +599,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));
             }
         }
@@ -631,7 +631,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)));
 				}
             }
@@ -665,7 +665,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -695,8 +695,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));
@@ -712,7 +712,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])));
@@ -728,7 +728,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])));
@@ -744,7 +744,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])));
@@ -760,7 +760,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])));
@@ -776,7 +776,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])));
@@ -791,8 +791,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)));
@@ -808,7 +808,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]);
@@ -817,7 +817,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)));
@@ -833,7 +833,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]);
@@ -842,7 +842,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)));
@@ -858,11 +858,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]);
@@ -873,7 +873,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)));
@@ -890,8 +890,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])));
@@ -907,8 +907,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)));

Braces +4 added lines, -8 removed lines

@@ -223,8 +223,7 @@ 
                     if(! 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');
                 }
             }
@@ -234,8 +233,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]);
     			}
 
@@ -604,8 +602,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));
             }
         }
@@ -664,8 +661,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;

core/libraries/StringHash.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class StringHash{
 		 

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class StringHash{
+	class StringHash {
 		 
 		 //blowfish
 		private static $algo = '$2a';

core/libraries/Html.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Html{
 

Spacing +46 added lines, -46 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Html{
+	class Html {
 
 		/**
 		 * Generate the html anchor link
@@ -35,21 +35,21 @@ 
 		 *
 		 * @return string|void             the anchor link generated html if $return is true or display it if not
 		 */
-		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true){
-			if(! is_url($link)){
+		public static function a($link = '', $anchor = null, array $attributes = array(), $return = true) {
+			if (!is_url($link)) {
 				$link = Url::site_url($link);
 			}
-			if(! $anchor){
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "'.$link.'"';
+			$str .= '<a href = "' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -64,18 +64,18 @@ 
 		 *
 		 * @return string|void             the generated html for mailto link if $return is true or display it if not
 		 */
-		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true){
-			if(! $anchor){
+		public static function mailto($link, $anchor = null, array $attributes = array(), $return = true) {
+			if (!$anchor) {
 				$anchor = $link;
 			}
 			$str = null;
-			$str .= '<a href = "mailto:'.$link.'"';
+			$str .= '<a href = "mailto:' . $link . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$str .= $anchor;
 			$str .= '</a>';
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -88,8 +88,8 @@ 
 		 *
 		 * @return string|void      the generated "br" html if $return is true or display it if not
 		 */
-		public static function br($nb = 1, $return = true){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function br($nb = 1, $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
 			$str = null;
@@ -97,7 +97,7 @@ 
 				$str .= '<br />';
 			}
 
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -111,15 +111,15 @@ 
 		 *
 		 * @return string|void the generated "hr" html if $return is true or display it if not.
 		 */
-		public static function hr($nb = 1, array $attributes = array(), $return = true){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function hr($nb = 1, array $attributes = array(), $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<hr' .attributes_to_string($attributes). ' />';
+				$str .= '<hr' . attributes_to_string($attributes) . ' />';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -135,18 +135,18 @@ 
 		 *
 		 * @return string|void the generated header html if $return is true or display it if not.
 		 */
-		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true){
-			if(! is_numeric($nb) || $nb <= 0){
+		public static function head($type = 1, $text = null, $nb = 1, array $attributes = array(), $return = true) {
+			if (!is_numeric($nb) || $nb <= 0) {
 				$nb = 1;
 			}
-			if(! is_numeric($type) || $type <= 0 || $type > 6){
+			if (!is_numeric($type) || $type <= 0 || $type > 6) {
 				$type = 1;
 			}
 			$str = null;
 			for ($i = 1; $i <= $nb; $i++) {
-				$str .= '<h' . $type . attributes_to_string($attributes). '>' .$text. '</h' . $type . '>';
+				$str .= '<h' . $type . attributes_to_string($attributes) . '>' . $text . '</h' . $type . '>';
 			}
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -161,15 +161,15 @@ 
 		 *
 		 * @return string|void the generated "ul" html  if $return is true or display it if not.
 		 */
-		public static function ul($data = array(), $attributes = array(), $return = true){
+		public static function ul($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ul' . (! empty($attributes['ul']) ? attributes_to_string($attributes['ul']):'') . '>';
+			$str .= '<ul' . (!empty($attributes['ul']) ? attributes_to_string($attributes['ul']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (! empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ul>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -183,15 +183,15 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "ol" html  if $return is true or display it if not.
 		 */
-		public static function ol($data = array(), $attributes = array(), $return = true){
+		public static function ol($data = array(), $attributes = array(), $return = true) {
 			$data = (array) $data;
 			$str = null;
-			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']):'') . '>';
+			$str .= '<ol' . (!empty($attributes['ol']) ? attributes_to_string($attributes['ol']) : '') . '>';
 			foreach ($data as $row) {
-				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']):'') .'>' .$row. '</li>';
+				$str .= '<li' . (!empty($attributes['li']) ? attributes_to_string($attributes['li']) : '') . '>' . $row . '</li>';
 			}
 			$str .= '</ol>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;
@@ -209,46 +209,46 @@ 
 		 * @param  boolean $return whether need return the generated html or just display it directly
 		 * @return string|void the generated "table" html  if $return is true or display it if not.
 		 */
-		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true){
+		public static function table($headers = array(), $body = array(), $attributes = array(), $use_footer = false, $return = true) {
 			$headers = (array) $headers;
 			$body = (array) $body;
 			$str = null;
-			$str .= '<table' . (! empty($attributes['table']) ? attributes_to_string($attributes['table']):'') . '>';
-			if(! empty($headers)){
-				$str .= '<thead' . (! empty($attributes['thead']) ? attributes_to_string($attributes['thead']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']):'') .'>';
+			$str .= '<table' . (!empty($attributes['table']) ? attributes_to_string($attributes['table']) : '') . '>';
+			if (!empty($headers)) {
+				$str .= '<thead' . (!empty($attributes['thead']) ? attributes_to_string($attributes['thead']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['thead_tr']) ? attributes_to_string($attributes['thead_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['thead_th']) ? attributes_to_string($attributes['thead_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
 			}
-			else{
+			else {
 				//no need check for footer
 				$use_footer = false;
 			}
-			$str .= '<tbody' . (! empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']):'') .'>';
+			$str .= '<tbody' . (!empty($attributes['tbody']) ? attributes_to_string($attributes['tbody']) : '') . '>';
 			foreach ($body as $row) {
-				if(is_array($row)){
-					$str .= '<tr' . (! empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']):'') .'>';
+				if (is_array($row)) {
+					$str .= '<tr' . (!empty($attributes['tbody_tr']) ? attributes_to_string($attributes['tbody_tr']) : '') . '>';
 					foreach ($row as $value) {
-						$str .= '<td' . (! empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']):'') .'>' .$value. '</td>';	
+						$str .= '<td' . (!empty($attributes['tbody_td']) ? attributes_to_string($attributes['tbody_td']) : '') . '>' . $value . '</td>';	
 					}
 					$str .= '</tr>';
 				}
 			}
 			$str .= '</tbody>';
-			if($use_footer){
-				$str .= '<tfoot' . (! empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']):'') .'>';
-				$str .= '<tr' . (! empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']):'') .'>';
+			if ($use_footer) {
+				$str .= '<tfoot' . (!empty($attributes['tfoot']) ? attributes_to_string($attributes['tfoot']) : '') . '>';
+				$str .= '<tr' . (!empty($attributes['tfoot_tr']) ? attributes_to_string($attributes['tfoot_tr']) : '') . '>';
 				foreach ($headers as $value) {
-					$str .= '<th' . (! empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']):'') .'>' .$value. '</th>';
+					$str .= '<th' . (!empty($attributes['tfoot_th']) ? attributes_to_string($attributes['tfoot_th']) : '') . '>' . $value . '</th>';
 				}
 				$str .= '</tr>';
 				$str .= '</tfoot>';
 			}
 			$str .= '</table>';
-			if($return){
+			if ($return) {
 				return $str;
 			}
 			echo $str;

Braces +1 added lines, -2 removed lines

@@ -222,8 +222,7 @@
 				}
 				$str .= '</tr>';
 				$str .= '</thead>';
-			}
-			else{
+			} else{
 				//no need check for footer
 				$use_footer = false;
 			}

core/libraries/Pagination.php

Indentation +132 added lines, -132 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
 	/**
 	 * TNH Framework
 	 *
@@ -22,26 +22,26 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
-    class Pagination{
+	class Pagination{
         
 		/**
-         * The list of loaded config
-         * @var array
-         */
-        private $config = array();
+		 * The list of loaded config
+		 * @var array
+		 */
+		private $config = array();
 
-        /**
-         * Create an instance of pagination
-         * @param array $overwriteConfig the list of configuration to overwrite the defined configuration in config_pagination.php
-         */
-        public function __construct($overwriteConfig = array()){
-            if(file_exists(CONFIG_PATH . 'config_pagination.php')){
-                require_once CONFIG_PATH . 'config_pagination.php';
-                if(empty($config) || ! is_array($config)){
-                    show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
-                }
+		/**
+		 * Create an instance of pagination
+		 * @param array $overwriteConfig the list of configuration to overwrite the defined configuration in config_pagination.php
+		 */
+		public function __construct($overwriteConfig = array()){
+			if(file_exists(CONFIG_PATH . 'config_pagination.php')){
+				require_once CONFIG_PATH . 'config_pagination.php';
+				if(empty($config) || ! is_array($config)){
+					show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
+				}
 				else{
 					if(! empty($overwriteConfig)){
 						$config = array_merge($config, $overwriteConfig);
@@ -50,125 +50,125 @@ 
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
-                show_error('Unable to find the pagination configuration file');
-            }
-        }
+			}
+			else{
+				show_error('Unable to find the pagination configuration file');
+			}
+		}
 
 
-        /**
-         * Set the pagination custom configuration to overwrite the default configuration in
-         * config_pagination.php
-         * @param array $config the configuration to set
-         */
-        public function setConfig(array $config = array()){
-            if(! empty($config)){
-                $this->config = array_merge($this->config, $config);
-                Config::setAll($config);
-            }
-        }
+		/**
+		 * Set the pagination custom configuration to overwrite the default configuration in
+		 * config_pagination.php
+		 * @param array $config the configuration to set
+		 */
+		public function setConfig(array $config = array()){
+			if(! empty($config)){
+				$this->config = array_merge($this->config, $config);
+				Config::setAll($config);
+			}
+		}
 
-        /**
-         * Generate the pagination link
-         * @param  int $totalRows the total number of data
-         * @param  int $currentPageNumber the current page number
-         * @return string the pagination link
-         */
-        public function getLink($totalRows, $currentPageNumber){
-            $pageQueryName = $this->config['page_query_string_name'];
-            $numberOfLink = $this->config['nb_link'];
+		/**
+		 * Generate the pagination link
+		 * @param  int $totalRows the total number of data
+		 * @param  int $currentPageNumber the current page number
+		 * @return string the pagination link
+		 */
+		public function getLink($totalRows, $currentPageNumber){
+			$pageQueryName = $this->config['page_query_string_name'];
+			$numberOfLink = $this->config['nb_link'];
 			$numberOfRowPerPage = $this->config['pagination_per_page'];
-            $queryString = Url::queryString();
-            $currentUrl = Url::current();
-            if($queryString == ''){
-                $query = '?' . $pageQueryName . '=';
-            }
-            else{
-                $tab = explode($pageQueryName . '=', $queryString);
-                $nb = count($tab);
-                if($nb == 1){
-                    $query = '?' . $queryString . '&' . $pageQueryName . '=';
-                }
-                else{
-                    if($tab[0] == ''){
-                        $query = '?' . $pageQueryName . '=';
-                    }
-                    else{
-                        $query = '?' . $tab[0] . '' . $pageQueryName . '=';
-                    }
-                }
-            }
-            $temp = explode('?', $currentUrl);
-            $query = $temp[0] . $query;
-            $navbar = '';
-            $numberOfPage = ceil($totalRows / $numberOfRowPerPage);
+			$queryString = Url::queryString();
+			$currentUrl = Url::current();
+			if($queryString == ''){
+				$query = '?' . $pageQueryName . '=';
+			}
+			else{
+				$tab = explode($pageQueryName . '=', $queryString);
+				$nb = count($tab);
+				if($nb == 1){
+					$query = '?' . $queryString . '&' . $pageQueryName . '=';
+				}
+				else{
+					if($tab[0] == ''){
+						$query = '?' . $pageQueryName . '=';
+					}
+					else{
+						$query = '?' . $tab[0] . '' . $pageQueryName . '=';
+					}
+				}
+			}
+			$temp = explode('?', $currentUrl);
+			$query = $temp[0] . $query;
+			$navbar = '';
+			$numberOfPage = ceil($totalRows / $numberOfRowPerPage);
 			if(! is_numeric ($currentPageNumber) || $currentPageNumber <= 0){
 				$currentPageNumber = 1;
 			}
-            if($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
-            ){
-                return $navbar;
-            }
-            if($numberOfLink % 2 == 0){
-                $start = $currentPageNumber - ($numberOfLink / 2) + 1;
-                $end = $currentPageNumber + ($numberOfLink / 2);
-            }
-            else{
-                $start = $currentPageNumber - floor($numberOfLink / 2);
-                $end = $currentPageNumber + floor($numberOfLink / 2);
-            }
-            if($start <= 1){
-                $begin = 1;
-                $end = $numberOfLink;
-            }
-            else if($start > 1 && $end < $numberOfPage){
-                $begin = $start;
-                $end = $end;
-            }
-            else{
-                $begin = ($numberOfPage - $numberOfLink) + 1;
-                $end = $numberOfPage;
-            }
-            if($numberOfPage <= $numberOfLink){
-                $begin = 1;
-                $end = $numberOfPage;
-            }
-            if($currentPageNumber == 1){
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
-                        $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
-                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
-                    }
-                }
-                $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
-            }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
-                $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
-                        $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
-                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
-                    }
-                }
-                $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
-            }
-            else if($currentPageNumber == $numberOfPage){
-                $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
-                        $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
-                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
-                    }
-                }
-            }
-            $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
-            return $navbar;
-        }
-    }
\ No newline at end of file
+			if($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
+			){
+				return $navbar;
+			}
+			if($numberOfLink % 2 == 0){
+				$start = $currentPageNumber - ($numberOfLink / 2) + 1;
+				$end = $currentPageNumber + ($numberOfLink / 2);
+			}
+			else{
+				$start = $currentPageNumber - floor($numberOfLink / 2);
+				$end = $currentPageNumber + floor($numberOfLink / 2);
+			}
+			if($start <= 1){
+				$begin = 1;
+				$end = $numberOfLink;
+			}
+			else if($start > 1 && $end < $numberOfPage){
+				$begin = $start;
+				$end = $end;
+			}
+			else{
+				$begin = ($numberOfPage - $numberOfLink) + 1;
+				$end = $numberOfPage;
+			}
+			if($numberOfPage <= $numberOfLink){
+				$begin = 1;
+				$end = $numberOfPage;
+			}
+			if($currentPageNumber == 1){
+				for($i = $begin; $i <= $end; $i++){
+					if($i == $currentPageNumber){
+						$navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
+					}
+					else{
+						$navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
+					}
+				}
+				$navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
+			}
+			else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+				$navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
+				for($i = $begin; $i <= $end; $i++){
+					if($i == $currentPageNumber){
+						$navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
+					}
+					else{
+						$navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
+					}
+				}
+				$navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
+			}
+			else if($currentPageNumber == $numberOfPage){
+				$navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
+				for($i = $begin; $i <= $end; $i++){
+					if($i == $currentPageNumber){
+						$navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
+					}
+					else{
+						$navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
+					}
+				}
+			}
+			$navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
+			return $navbar;
+		}
+	}
\ No newline at end of file

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-    class Pagination{
+    class Pagination {
         
 		/**
          * The list of loaded config
@@ -36,14 +36,14 @@ 
          * Create an instance of pagination
          * @param array $overwriteConfig the list of configuration to overwrite the defined configuration in config_pagination.php
          */
-        public function __construct($overwriteConfig = array()){
-            if(file_exists(CONFIG_PATH . 'config_pagination.php')){
+        public function __construct($overwriteConfig = array()) {
+            if (file_exists(CONFIG_PATH . 'config_pagination.php')) {
                 require_once CONFIG_PATH . 'config_pagination.php';
-                if(empty($config) || ! is_array($config)){
+                if (empty($config) || !is_array($config)) {
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					if(! empty($overwriteConfig)){
+				else {
+					if (!empty($overwriteConfig)) {
 						$config = array_merge($config, $overwriteConfig);
 					}
 					$this->config = $config;
@@ -51,7 +51,7 @@ 
 					unset($config);
 				}
             }
-            else{
+            else {
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -62,8 +62,8 @@ 
          * config_pagination.php
          * @param array $config the configuration to set
          */
-        public function setConfig(array $config = array()){
-            if(! empty($config)){
+        public function setConfig(array $config = array()) {
+            if (!empty($config)) {
                 $this->config = array_merge($this->config, $config);
                 Config::setAll($config);
             }
@@ -75,26 +75,26 @@ 
          * @param  int $currentPageNumber the current page number
          * @return string the pagination link
          */
-        public function getLink($totalRows, $currentPageNumber){
+        public function getLink($totalRows, $currentPageNumber) {
             $pageQueryName = $this->config['page_query_string_name'];
             $numberOfLink = $this->config['nb_link'];
 			$numberOfRowPerPage = $this->config['pagination_per_page'];
             $queryString = Url::queryString();
             $currentUrl = Url::current();
-            if($queryString == ''){
+            if ($queryString == '') {
                 $query = '?' . $pageQueryName . '=';
             }
-            else{
+            else {
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
-                if($nb == 1){
+                if ($nb == 1) {
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
                 }
-                else{
-                    if($tab[0] == ''){
+                else {
+                    if ($tab[0] == '') {
                         $query = '?' . $pageQueryName . '=';
                     }
-                    else{
+                    else {
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -103,67 +103,67 @@ 
             $query = $temp[0] . $query;
             $navbar = '';
             $numberOfPage = ceil($totalRows / $numberOfRowPerPage);
-			if(! is_numeric ($currentPageNumber) || $currentPageNumber <= 0){
+			if (!is_numeric($currentPageNumber) || $currentPageNumber <= 0) {
 				$currentPageNumber = 1;
 			}
-            if($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
-            ){
+            if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0 || !is_numeric($numberOfLink) || !is_numeric($numberOfRowPerPage)
+            ) {
                 return $navbar;
             }
-            if($numberOfLink % 2 == 0){
+            if ($numberOfLink % 2 == 0) {
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end = $currentPageNumber + ($numberOfLink / 2);
             }
-            else{
+            else {
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end = $currentPageNumber + floor($numberOfLink / 2);
             }
-            if($start <= 1){
+            if ($start <= 1) {
                 $begin = 1;
                 $end = $numberOfLink;
             }
-            else if($start > 1 && $end < $numberOfPage){
+            else if ($start > 1 && $end < $numberOfPage) {
                 $begin = $start;
                 $end = $end;
             }
-            else{
+            else {
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end = $numberOfPage;
             }
-            if($numberOfPage <= $numberOfLink){
+            if ($numberOfPage <= $numberOfLink) {
                 $begin = 1;
                 $end = $numberOfPage;
             }
-            if($currentPageNumber == 1){
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+            if ($currentPageNumber == 1) {
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
+                    else {
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
             }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            else if ($currentPageNumber > 1 && $currentPageNumber < $numberOfPage) {
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
-                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
+                    else {
+                        $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
-                $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
+                $navbar .= $this->config['next_open'] . "<a href='$query" . ($currentPageNumber + 1) . "'>" . $this->config['next_text'] . "</a>" . $this->config['next_close'];
             }
-            else if($currentPageNumber == $numberOfPage){
+            else if ($currentPageNumber == $numberOfPage) {
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
-                for($i = $begin; $i <= $end; $i++){
-                    if($i == $currentPageNumber){
+                for ($i = $begin; $i <= $end; $i++) {
+                    if ($i == $currentPageNumber) {
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
                     }
-                    else{
+                    else {
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }

Braces +13 added lines, -26 removed lines

@@ -41,8 +41,7 @@ 
                 require_once CONFIG_PATH . 'config_pagination.php';
                 if(empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
-                }
-				else{
+                } else{
 					if(! empty($overwriteConfig)){
 						$config = array_merge($config, $overwriteConfig);
 					}
@@ -50,8 +49,7 @@ 
 					Config::setAll($config);
 					unset($config);
 				}
-            }
-            else{
+            } else{
                 show_error('Unable to find the pagination configuration file');
             }
         }
@@ -83,18 +81,15 @@ 
             $currentUrl = Url::current();
             if($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
-            }
-            else{
+            } else{
                 $tab = explode($pageQueryName . '=', $queryString);
                 $nb = count($tab);
                 if($nb == 1){
                     $query = '?' . $queryString . '&' . $pageQueryName . '=';
-                }
-                else{
+                } else{
                     if($tab[0] == ''){
                         $query = '?' . $pageQueryName . '=';
-                    }
-                    else{
+                    } else{
                         $query = '?' . $tab[0] . '' . $pageQueryName . '=';
                     }
                 }
@@ -113,20 +108,17 @@ 
             if($numberOfLink % 2 == 0){
                 $start = $currentPageNumber - ($numberOfLink / 2) + 1;
                 $end = $currentPageNumber + ($numberOfLink / 2);
-            }
-            else{
+            } else{
                 $start = $currentPageNumber - floor($numberOfLink / 2);
                 $end = $currentPageNumber + floor($numberOfLink / 2);
             }
             if($start <= 1){
                 $begin = 1;
                 $end = $numberOfLink;
-            }
-            else if($start > 1 && $end < $numberOfPage){
+            } else if($start > 1 && $end < $numberOfPage){
                 $begin = $start;
                 $end = $end;
-            }
-            else{
+            } else{
                 $begin = ($numberOfPage - $numberOfLink) + 1;
                 $end = $numberOfPage;
             }
@@ -138,32 +130,27 @@ 
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '" ' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' . $this->config['next_text'] . '</a>' . $this->config['next_close'];
-            }
-            else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
+            } else if($currentPageNumber > 1 && $currentPageNumber < $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i .'</a>' . $this->config['digit_close'];
                     }
                 }
                 $navbar .= $this->config['next_open']."<a href='$query".($currentPageNumber + 1)."'>".$this->config['next_text']."</a>".$this->config['next_close'];
-            }
-            else if($currentPageNumber == $numberOfPage){
+            } else if($currentPageNumber == $numberOfPage){
                 $navbar .= $this->config['previous_open'] . '<a href="' . $query . ($currentPageNumber - 1) . '">' . $this->config['previous_text'] . '</a>' . $this->config['previous_close'];
                 for($i = $begin; $i <= $end; $i++){
                     if($i == $currentPageNumber){
                         $navbar .= $this->config['active_link_open'] . $currentPageNumber . $this->config['active_link_close'];
-                    }
-                    else{
+                    } else{
                         $navbar .= $this->config['digit_open'] . '<a href="' . $query . $i . '"' . attributes_to_string($this->config['attributes']) . '>' . $i . '</a>' . $this->config['digit_close'];
                     }
                 }

core/libraries/Form.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 
 	class Form{

Spacing +51 added lines, -51 removed lines

@@ -25,7 +25,7 @@ 
 	*/
 
 
-	class Form{
+	class Form {
 
 		/**
 		 * Generate the form opened tag
@@ -35,33 +35,33 @@ 
 		 * @param  string $enctype    the form enctype like "multipart/form-data"
 		 * @return string             the generated form html
 		 */
-		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null){
-			if($path){
+		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null) {
+			if ($path) {
 				$path = Url::site_url($path);
 			}
 			$method = strtoupper($method);
 			$str = null;
-			$str .= '<form action = "'.$path.'" method = "'.$method.'"';
-			if(! empty($enctype)){
-				$str .= ' enctype = "'.$enctype.'" ';
+			$str .= '<form action = "' . $path . '" method = "' . $method . '"';
+			if (!empty($enctype)) {
+				$str .= ' enctype = "' . $enctype . '" ';
 			}
-			if(! isset($attributes['accept-charset'])){
+			if (!isset($attributes['accept-charset'])) {
 				$attributes['accept-charset'] = get_config('charset', 'utf-8');
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
 			$checkCsrf = false;
 			//check if the user set the checking of CSRF manually
-			if($method != 'POST' && isset($attributes['csrf'])){
+			if ($method != 'POST' && isset($attributes['csrf'])) {
 				$obj = & get_instance();
-				if(! isset($obj->formvalidation)){
+				if (!isset($obj->formvalidation)) {
 					Loader::library('FormValidation');
 				}
 				$obj->formvalidation->enableCsrfCheck = true;
 				$checkCsrf = true;
 			}
 			//if CSRF enable or is set manually
-			if((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)){
+			if ((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)) {
 				$csrfValue = Security::generateCSRF();
 				$csrfName = get_config('csrf_key', 'csrf_key');
 				$str .= static::hidden($csrfName, $csrfValue);
@@ -74,7 +74,7 @@ 
 		 * @see Form::open() for more details
 		 * @return string the generated multipart form html
 		 */
-		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
+		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST') {
 			return self::open($path, $attributes, $method, 'multipart/form-data');
 		}
 
@@ -82,7 +82,7 @@ 
 		 * Generate the form close
 		 * @return string the form close html
 		 */
-		public static function close(){
+		public static function close() {
 			return '</form>';
 		}
 
@@ -93,10 +93,10 @@ 
 		 * @param  array  $legendAttributes the legend additional HTML attributes. Is used only is $legend is not empty
 		 * @return string         the generated fieldset value
 		 */
-		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()){
+		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()) {
 			$str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
-			if($legend){
-				$str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
+			if ($legend) {
+				$str .= '<legend' . attributes_to_string($legendAttributes) . '>' . $legend . '</legend>';
 			}
 			return $str;
 		}
@@ -105,7 +105,7 @@ 
 		 * Generate the fieldset close tag
 		 * @return string the generated html for fieldset close
 		 */
-		public static function fieldsetClose(){
+		public static function fieldsetClose() {
 			return '</fieldset>';
 		}
 
@@ -115,13 +115,13 @@ 
 		 * @param  string $name the form field name
 		 * @return string       the error message if exists and null if not
 		 */
-		public static function error($name){
+		public static function error($name) {
 			$return = null;
 			$obj = & get_instance();
-			if(isset($obj->formvalidation)){
+			if (isset($obj->formvalidation)) {
 				$errors = $obj->formvalidation->returnErrors();
-				$error =  isset($errors[$name]) ? $errors[$name] : null;
-				if($error){
+				$error = isset($errors[$name]) ? $errors[$name] : null;
+				if ($error) {
 					list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
 					$return = $errorStart . $error . $errorEnd;
 				}
@@ -135,7 +135,7 @@ 
 		 * @param  mixed $default the default value if can not found the given form field name
 		 * @return mixed the form field value if is set, otherwise return the default value.
 		 */
-		public static function value($name, $default = null){
+		public static function value($name, $default = null) {
 			$value = get_instance()->request->query($name);
 			return $value ? $value : $default;
 		}
@@ -147,14 +147,14 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string the generated label html content
 		 */
-		public static function label($label, $for = '', array $attributes = array()){
+		public static function label($label, $for = '', array $attributes = array()) {
 			$str = '<label';
-			if($for){
-				$str .= ' for = "'.$for.'"';
+			if ($for) {
+				$str .= ' for = "' . $for . '"';
 			}
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $label.'</label>';
+			$str .= $label . '</label>';
 			return $str;
 		}
 
@@ -166,9 +166,9 @@ 
 		 * @param  string $type       the type of the form field (password, text, submit, button, etc.)
 		 * @return string             the generated form field html content for the input
 		 */
-		public static function input($name, $value = null, array $attributes = array(), $type = 'text'){
+		public static function input($name, $value = null, array $attributes = array(), $type = 'text') {
 			$str = null;
-			$str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
+			$str .= '<input name = "' . $name . '" value = "' . $value . '" type = "' . $type . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '/>';
 			return $str;
@@ -178,7 +178,7 @@ 
 		 * Generate the form field for "text"
 		 * @see Form::input() for more details
 		 */
-		public static function text($name, $value = null, array $attributes = array()){
+		public static function text($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'text');
 		}
 
@@ -186,7 +186,7 @@ 
 		 * Generate the form field for "password"
 		 * @see Form::input() for more details
 		 */
-		public static function password($name, $value = null, array $attributes = array()){
+		public static function password($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'password');
 		}
 
@@ -194,8 +194,8 @@ 
 		 * Generate the form field for "radio"
 		 * @see Form::input() for more details
 		 */
-		public static function radio($name, $value = null,  $checked = false, array $attributes = array()){
-			if($checked){
+		public static function radio($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'radio');
@@ -205,8 +205,8 @@ 
 		 * Generate the form field for "checkbox"
 		 * @see Form::input() for more details
 		 */
-		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()){
-			if($checked){
+		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()) {
+			if ($checked) {
 				$attributes['checked'] = true;
 			}
 			return self::input($name, $value, $attributes, 'checkbox');
@@ -216,7 +216,7 @@ 
 		 * Generate the form field for "number"
 		 * @see Form::input() for more details
 		 */
-		public static function number($name, $value = null, array $attributes = array()){
+		public static function number($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'number');
 		}
 
@@ -224,7 +224,7 @@ 
 		 * Generate the form field for "phone"
 		 * @see Form::input() for more details
 		 */
-		public static function phone($name, $value = null, array $attributes = array()){
+		public static function phone($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'phone');
 		}
 
@@ -232,7 +232,7 @@ 
 		 * Generate the form field for "email"
 		 * @see Form::input() for more details
 		 */
-		public static function email($name, $value = null, array $attributes = array()){
+		public static function email($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'email');
 		}
 		
@@ -240,7 +240,7 @@ 
 		 * Generate the form field for "search"
 		 * @see Form::input() for more details
 		 */
-		public static function search($name, $value = null, array $attributes = array()){
+		public static function search($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'search');
 		}
 		
@@ -248,7 +248,7 @@ 
 		 * Generate the form field for "hidden"
 		 * @see Form::input() for more details
 		 */
-		public static function hidden($name, $value = null, array $attributes = array()){
+		public static function hidden($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'hidden');
 		}
 		
@@ -256,7 +256,7 @@ 
 		 * Generate the form field for "file"
 		 * @see Form::input() for more details
 		 */
-		public static function file($name, array $attributes = array()){
+		public static function file($name, array $attributes = array()) {
 			return self::input($name, null, $attributes, 'file');
 		}
 		
@@ -264,7 +264,7 @@ 
 		 * Generate the form field for "button"
 		 * @see Form::input() for more details
 		 */
-		public static function button($name, $value = null, array $attributes = array()){
+		public static function button($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'button');
 		}
 		
@@ -272,7 +272,7 @@ 
 		 * Generate the form field for "reset"
 		 * @see Form::input() for more details
 		 */
-		public static function reset($name, $value = null, array $attributes = array()){
+		public static function reset($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'reset');
 		}
 		
@@ -280,7 +280,7 @@ 
 		 * Generate the form field for "submit"
 		 * @see Form::input() for more details
 		 */
-		public static function submit($name, $value = null, array $attributes = array()){
+		public static function submit($name, $value = null, array $attributes = array()) {
 			return self::input($name, $value, $attributes, 'submit');
 		}
 
@@ -291,12 +291,12 @@ 
 		 * @param  array  $attributes the additional attributes to be added
 		 * @return string             the generated textarea form html content
 		 */
-		public static function textarea($name, $value = '', array $attributes = array()){
+		public static function textarea($name, $value = '', array $attributes = array()) {
 			$str = null;
-			$str .= '<textarea name = "'.$name.'"';
+			$str .= '<textarea name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			$str .= $value.'</textarea>';
+			$str .= $value . '</textarea>';
 			return $str;
 		}
 		
@@ -308,20 +308,20 @@ 
 		 * @param  array  $attributes the additional attribute to be added
 		 * @return string             the generated form field html content for select
 		 */
-		public static function select($name, $values = null, $selected = null, array $attributes = array()){
-			if(! is_array($values)){
+		public static function select($name, $values = null, $selected = null, array $attributes = array()) {
+			if (!is_array($values)) {
 				$values = array('' => $values);
 			}
 			$str = null;
-			$str .= '<select name = "'.$name.'"';
+			$str .= '<select name = "' . $name . '"';
 			$str .= attributes_to_string($attributes);
 			$str .= '>';
-			foreach($values as $key => $val){
+			foreach ($values as $key => $val) {
 				$select = '';
-				if($key == $selected){
+				if ($key == $selected) {
 					$select = 'selected';
 				}
-				$str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
+				$str .= '<option value = "' . $key . '" ' . $select . '>' . $val . '</option>';
 			}
 			$str .= '</select>';
 			return $str;

core/libraries/Browser.php

Indentation +1731 added lines, -1731 removed lines

@@ -1,1732 +1,1732 @@
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
-    /**
-     * File: Browser.php
-     * Author: Chris Schuld (http://chrisschuld.com/)
-     * Last Modified: July 22nd, 2016
-     * @version 2.0
-     * @package PegasusPHP
-     *
-     * Copyright (C) 2008-2010 Chris Schuld  (chris@chrisschuld.com)
-     *
-     * 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 2 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 at:
-     * http://www.gnu.org/copyleft/gpl.html
-     *
-     *
-     * Typical Usage:
-     *
-     *   $browser = new Browser();
-     *   if( $browser->getBrowser() == Browser::BROWSER_FIREFOX && $browser->getVersion() >= 2 ) {
-     *    echo 'You have FireFox version 2 or greater';
-     *   }
-     *
-     * User Agents Sampled from: http://www.useragentstring.com/
-     *
-     * This implementation is based on the original work from Gary White
-     * http://apptools.com/phptools/browser/
-     *
-     */
-    class Browser
-    {
-        private $_agent = '';
-        private $_browser_name = '';
-        private $_version = '';
-        private $_platform = '';
-        private $_os = '';
-        private $_is_aol = false;
-        private $_is_mobile = false;
-        private $_is_tablet = false;
-        private $_is_robot = false;
-        private $_is_facebook = false;
-        private $_aol_version = '';
-
-        const BROWSER_UNKNOWN = 'unknown';
-        const VERSION_UNKNOWN = 'unknown';
-
-        const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
-        const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
-        const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
-        const BROWSER_EDGE = 'Edge'; // https://www.microsoft.com/edge
-        const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
-        const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
-        const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
-        const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
-        const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
-        const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
-        const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
-        const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
-        const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
-        const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
-        const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
-        const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
-        const BROWSER_SAFARI = 'Safari'; // http://apple.com
-        const BROWSER_IPHONE = 'iPhone'; // http://apple.com
-        const BROWSER_IPOD = 'iPod'; // http://apple.com
-        const BROWSER_IPAD = 'iPad'; // http://apple.com
-        const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
-        const BROWSER_ANDROID = 'Android'; // http://www.android.com/
-        const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
-
-        const BROWSER_YANDEXBOT = 'YandexBot'; // http://yandex.com/bots
-        const BROWSER_YANDEXIMAGERESIZER_BOT = 'YandexImageResizer'; // http://yandex.com/bots
-        const BROWSER_YANDEXIMAGES_BOT = 'YandexImages'; // http://yandex.com/bots
-        const BROWSER_YANDEXVIDEO_BOT = 'YandexVideo'; // http://yandex.com/bots
-        const BROWSER_YANDEXMEDIA_BOT = 'YandexMedia'; // http://yandex.com/bots
-        const BROWSER_YANDEXBLOGS_BOT = 'YandexBlogs'; // http://yandex.com/bots
-        const BROWSER_YANDEXFAVICONS_BOT = 'YandexFavicons'; // http://yandex.com/bots
-        const BROWSER_YANDEXWEBMASTER_BOT = 'YandexWebmaster'; // http://yandex.com/bots
-        const BROWSER_YANDEXDIRECT_BOT = 'YandexDirect'; // http://yandex.com/bots
-        const BROWSER_YANDEXMETRIKA_BOT = 'YandexMetrika'; // http://yandex.com/bots
-        const BROWSER_YANDEXNEWS_BOT = 'YandexNews'; // http://yandex.com/bots
-        const BROWSER_YANDEXCATALOG_BOT = 'YandexCatalog'; // http://yandex.com/bots
-
-        const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
-        const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
-        const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
-        const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
-        const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
-        const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
-        const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
-        const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
-        const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
-        const BROWSER_VIVALDI = 'Vivalidi'; // https://vivaldi.com/
-        const BROWSER_YANDEX = 'Yandex'; // https://browser.yandex.ua/
-
-        const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
-        const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
-        const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
-        const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
-        const BROWSER_PLAYSTATION = "PlayStation";
-        const BROWSER_SAMSUNG = "SamsungBrowser";
-        const BROWSER_SILK = "Silk";
-        const BROWSER_I_FRAME = "Iframely";
-        const BROWSER_COCOA = "CocoaRestClient";
-
-        const PLATFORM_UNKNOWN = 'unknown';
-        const PLATFORM_WINDOWS = 'Windows';
-        const PLATFORM_WINDOWS_CE = 'Windows CE';
-        const PLATFORM_APPLE = 'Apple';
-        const PLATFORM_LINUX = 'Linux';
-        const PLATFORM_OS2 = 'OS/2';
-        const PLATFORM_BEOS = 'BeOS';
-        const PLATFORM_IPHONE = 'iPhone';
-        const PLATFORM_IPOD = 'iPod';
-        const PLATFORM_IPAD = 'iPad';
-        const PLATFORM_BLACKBERRY = 'BlackBerry';
-        const PLATFORM_NOKIA = 'Nokia';
-        const PLATFORM_FREEBSD = 'FreeBSD';
-        const PLATFORM_OPENBSD = 'OpenBSD';
-        const PLATFORM_NETBSD = 'NetBSD';
-        const PLATFORM_SUNOS = 'SunOS';
-        const PLATFORM_OPENSOLARIS = 'OpenSolaris';
-        const PLATFORM_ANDROID = 'Android';
-        const PLATFORM_PLAYSTATION = "Sony PlayStation";
-        const PLATFORM_ROKU = "Roku";
-        const PLATFORM_APPLE_TV = "Apple TV";
-        const PLATFORM_TERMINAL = "Terminal";
-        const PLATFORM_FIRE_OS = "Fire OS";
-        const PLATFORM_SMART_TV = "SMART-TV";
-        const PLATFORM_CHROME_OS = "Chrome OS";
-        const PLATFORM_JAVA_ANDROID = "Java/Android";
-        const PLATFORM_POSTMAN = "Postman";
-        const PLATFORM_I_FRAME = "Iframely";
-
-        const OPERATING_SYSTEM_UNKNOWN = 'unknown';
-
-        /**
-         * Class constructor
-         */
-        public function __construct($userAgent = "")
-        {
-            $this->reset();
-            if ($userAgent != "") {
-                $this->setUserAgent($userAgent);
-            } else {
-                $this->determine();
-            }
-        }
-
-        /**
-         * Reset all properties
-         */
-        public function reset()
-        {
-            $this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
-            $this->_browser_name = self::BROWSER_UNKNOWN;
-            $this->_version = self::VERSION_UNKNOWN;
-            $this->_platform = self::PLATFORM_UNKNOWN;
-            $this->_os = self::OPERATING_SYSTEM_UNKNOWN;
-            $this->_is_aol = false;
-            $this->_is_mobile = false;
-            $this->_is_tablet = false;
-            $this->_is_robot = false;
-            $this->_is_facebook = false;
-            $this->_aol_version = self::VERSION_UNKNOWN;
-        }
-
-        /**
-         * Check to see if the specific browser is valid
-         * @param string $browserName
-         * @return bool True if the browser is the specified browser
-         */
-        function isBrowser($browserName)
-        {
-            return (0 == strcasecmp($this->_browser_name, trim($browserName)));
-        }
-
-        /**
-         * The name of the browser.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getBrowser()
-        {
-            return $this->_browser_name;
-        }
-
-        /**
-         * Set the name of the browser
-         * @param $browser string The name of the Browser
-         */
-        public function setBrowser($browser)
-        {
-            $this->_browser_name = $browser;
-        }
-
-        /**
-         * The name of the platform.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getPlatform()
-        {
-            return $this->_platform;
-        }
-
-        /**
-         * Set the name of the platform
-         * @param string $platform The name of the Platform
-         */
-        public function setPlatform($platform)
-        {
-            $this->_platform = $platform;
-        }
-
-        /**
-         * The version of the browser.
-         * @return string Version of the browser (will only contain alpha-numeric characters and a period)
-         */
-        public function getVersion()
-        {
-            return $this->_version;
-        }
-
-        /**
-         * Set the version of the browser
-         * @param string $version The version of the Browser
-         */
-        public function setVersion($version)
-        {
-            $this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
-        }
-
-        /**
-         * The version of AOL.
-         * @return string Version of AOL (will only contain alpha-numeric characters and a period)
-         */
-        public function getAolVersion()
-        {
-            return $this->_aol_version;
-        }
-
-        /**
-         * Set the version of AOL
-         * @param string $version The version of AOL
-         */
-        public function setAolVersion($version)
-        {
-            $this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
-        }
-
-        /**
-         * Is the browser from AOL?
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        public function isAol()
-        {
-            return $this->_is_aol;
-        }
-
-        /**
-         * Is the browser from a mobile device?
-         * @return boolean True if the browser is from a mobile device otherwise false
-         */
-        public function isMobile()
-        {
-            return $this->_is_mobile;
-        }
-
-        /**
-         * Is the browser from a tablet device?
-         * @return boolean True if the browser is from a tablet device otherwise false
-         */
-        public function isTablet()
-        {
-            return $this->_is_tablet;
-        }
-
-        /**
-         * Is the browser from a robot (ex Slurp,GoogleBot)?
-         * @return boolean True if the browser is from a robot otherwise false
-         */
-        public function isRobot()
-        {
-            return $this->_is_robot;
-        }
-
-        /**
-         * Is the browser from facebook?
-         * @return boolean True if the browser is from facebook otherwise false
-         */
-        public function isFacebook()
-        {
-            return $this->_is_facebook;
-        }
-
-        /**
-         * Set the browser to be from AOL
-         * @param $isAol
-         */
-        public function setAol($isAol)
-        {
-            $this->_is_aol = $isAol;
-        }
-
-        /**
-         * Set the Browser to be mobile
-         * @param boolean $value is the browser a mobile browser or not
-         */
-        protected function setMobile($value = true)
-        {
-            $this->_is_mobile = $value;
-        }
-
-        /**
-         * Set the Browser to be tablet
-         * @param boolean $value is the browser a tablet browser or not
-         */
-        protected function setTablet($value = true)
-        {
-            $this->_is_tablet = $value;
-        }
-
-        /**
-         * Set the Browser to be a robot
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setRobot($value = true)
-        {
-            $this->_is_robot = $value;
-        }
-
-        /**
-         * Set the Browser to be a Facebook request
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setFacebook($value = true)
-        {
-            $this->_is_facebook = $value;
-        }
-
-        /**
-         * Get the user agent value in use to determine the browser
-         * @return string The user agent from the HTTP header
-         */
-        public function getUserAgent()
-        {
-            return $this->_agent;
-        }
-
-        /**
-         * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
-         * @param string $agent_string The value for the User Agent
-         */
-        public function setUserAgent($agent_string)
-        {
-            $this->reset();
-            $this->_agent = $agent_string;
-            $this->determine();
-        }
-
-        /**
-         * Used to determine if the browser is actually "chromeframe"
-         * @since 1.7
-         * @return boolean True if the browser is using chromeframe
-         */
-        public function isChromeFrame()
-        {
-            return (strpos($this->_agent, "chromeframe") !== false);
-        }
-
-        /**
-         * Returns a formatted string with a summary of the details of the browser.
-         * @return string formatted string with a summary of the browser
-         */
-        public function __toString()
-        {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-                "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-                "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
-                "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
-        }
-
-        /**
-         * Protected routine to calculate and determine what the browser is in use (including platform)
-         */
-        protected function determine()
-        {
-            $this->checkPlatform();
-            $this->checkBrowsers();
-            $this->checkForAol();
-        }
-
-        /**
-         * Protected routine to determine the browser type
-         * @return boolean True if the browser was detected otherwise false
-         */
-        protected function checkBrowsers()
-        {
-            return (
-                // well-known, well-used
-                // Special Notes:
-                // (1) Opera must be checked before FireFox due to the odd
-                //     user agents used in some older versions of Opera
-                // (2) WebTV is strapped onto Internet Explorer so we must
-                //     check for WebTV before IE
-                // (3) (deprecated) Galeon is based on Firefox and needs to be
-                //     tested before Firefox is tested
-                // (4) OmniWeb is based on Safari so OmniWeb check must occur
-                //     before Safari
-                // (5) Netscape 9+ is based on Firefox so Netscape checks
-                //     before FireFox are necessary
-                // (6) Vivalid is UA contains both Firefox and Chrome so Vivalid checks
-                //     before Firefox and Chrome
-                $this->checkBrowserWebTv() ||
-                $this->checkBrowserEdge() ||
-                $this->checkBrowserInternetExplorer() ||
-                $this->checkBrowserOpera() ||
-                $this->checkBrowserGaleon() ||
-                $this->checkBrowserNetscapeNavigator9Plus() ||
-                $this->checkBrowserVivaldi() ||
-                $this->checkBrowserYandex() ||
-                $this->checkBrowserFirefox() ||
-                $this->checkBrowserChrome() ||
-                $this->checkBrowserOmniWeb() ||
-
-                // common mobile
-                $this->checkBrowserAndroid() ||
-                $this->checkBrowseriPad() ||
-                $this->checkBrowseriPod() ||
-                $this->checkBrowseriPhone() ||
-                $this->checkBrowserBlackBerry() ||
-                $this->checkBrowserNokia() ||
-
-                // common bots
-                $this->checkBrowserGoogleBot() ||
-                $this->checkBrowserMSNBot() ||
-                $this->checkBrowserBingBot() ||
-                $this->checkBrowserSlurp() ||
-
-                // Yandex bots
-                $this->checkBrowserYandexBot() ||
-                $this->checkBrowserYandexImageResizerBot() ||
-                $this->checkBrowserYandexBlogsBot() ||
-                $this->checkBrowserYandexCatalogBot() ||
-                $this->checkBrowserYandexDirectBot() ||
-                $this->checkBrowserYandexFaviconsBot() ||
-                $this->checkBrowserYandexImagesBot() ||
-                $this->checkBrowserYandexMediaBot() ||
-                $this->checkBrowserYandexMetrikaBot() ||
-                $this->checkBrowserYandexNewsBot() ||
-                $this->checkBrowserYandexVideoBot() ||
-                $this->checkBrowserYandexWebmasterBot() ||
-
-                // check for facebook external hit when loading URL
-                $this->checkFacebookExternalHit() ||
-
-                // WebKit base check (post mobile and others)
-                $this->checkBrowserSamsung() ||
-                $this->checkBrowserSilk() ||
-                $this->checkBrowserSafari() ||
-
-                // everyone else
-                $this->checkBrowserNetPositive() ||
-                $this->checkBrowserFirebird() ||
-                $this->checkBrowserKonqueror() ||
-                $this->checkBrowserIcab() ||
-                $this->checkBrowserPhoenix() ||
-                $this->checkBrowserAmaya() ||
-                $this->checkBrowserLynx() ||
-                $this->checkBrowserShiretoko() ||
-                $this->checkBrowserIceCat() ||
-                $this->checkBrowserIceweasel() ||
-                $this->checkBrowserW3CValidator() ||
-                $this->checkBrowserPlayStation() ||
-                $this->checkBrowserIframely() ||
-                $this->checkBrowserCocoa() ||
-                $this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
-
-
-            );
-        }
-
-        /**
-         * Determine if the user is using a BlackBerry (last updated 1.7)
-         * @return boolean True if the browser is the BlackBerry browser otherwise false
-         */
-        protected function checkBrowserBlackBerry()
-        {
-            if (stripos($this->_agent, 'blackberry') !== false) {
-                $aresult = explode("/", stristr($this->_agent, "BlackBerry"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_BLACKBERRY;
-                    $this->setMobile(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the user is using an AOL User Agent (last updated 1.7)
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        protected function checkForAol()
-        {
-            $this->setAol(false);
-            $this->setAolVersion(self::VERSION_UNKNOWN);
-
-            if (stripos($this->_agent, 'aol') !== false) {
-                $aversion = explode(' ', stristr($this->_agent, 'AOL'));
-                if (isset($aversion[1])) {
-                    $this->setAol(true);
-                    $this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the GoogleBot or not (last updated 1.7)
-         * @return boolean True if the browser is the GoogletBot otherwise false
-         */
-        protected function checkBrowserGoogleBot()
-        {
-            if (stripos($this->_agent, 'googlebot') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'googlebot'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_GOOGLEBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexBot or not
-         * @return boolean True if the browser is the YandexBot otherwise false
-         */
-        protected function checkBrowserYandexBot()
-        {
-            if (stripos($this->_agent, 'YandexBot') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexBot'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexImageResizer or not
-         * @return boolean True if the browser is the YandexImageResizer otherwise false
-         */
-        protected function checkBrowserYandexImageResizerBot()
-        {
-            if (stripos($this->_agent, 'YandexImageResizer') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexImageResizer'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXIMAGERESIZER_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexCatalog or not
-         * @return boolean True if the browser is the YandexCatalog otherwise false
-         */
-        protected function checkBrowserYandexCatalogBot()
-        {
-            if (stripos($this->_agent, 'YandexCatalog') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexCatalog'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXCATALOG_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexNews or not
-         * @return boolean True if the browser is the YandexNews otherwise false
-         */
-        protected function checkBrowserYandexNewsBot()
-        {
-            if (stripos($this->_agent, 'YandexNews') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexNews'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXNEWS_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexMetrika or not
-         * @return boolean True if the browser is the YandexMetrika otherwise false
-         */
-        protected function checkBrowserYandexMetrikaBot()
-        {
-            if (stripos($this->_agent, 'YandexMetrika') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexMetrika'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXMETRIKA_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexDirect or not
-         * @return boolean True if the browser is the YandexDirect otherwise false
-         */
-        protected function checkBrowserYandexDirectBot()
-        {
-            if (stripos($this->_agent, 'YandexDirect') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexDirect'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXDIRECT_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexWebmaster or not
-         * @return boolean True if the browser is the YandexWebmaster otherwise false
-         */
-        protected function checkBrowserYandexWebmasterBot()
-        {
-            if (stripos($this->_agent, 'YandexWebmaster') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexWebmaster'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXWEBMASTER_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexFavicons or not
-         * @return boolean True if the browser is the YandexFavicons otherwise false
-         */
-        protected function checkBrowserYandexFaviconsBot()
-        {
-            if (stripos($this->_agent, 'YandexFavicons') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexFavicons'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXFAVICONS_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexBlogs or not
-         * @return boolean True if the browser is the YandexBlogs otherwise false
-         */
-        protected function checkBrowserYandexBlogsBot()
-        {
-            if (stripos($this->_agent, 'YandexBlogs') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexBlogs'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXBLOGS_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexMedia or not
-         * @return boolean True if the browser is the YandexMedia otherwise false
-         */
-        protected function checkBrowserYandexMediaBot()
-        {
-            if (stripos($this->_agent, 'YandexMedia') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexMedia'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXMEDIA_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexVideo or not
-         * @return boolean True if the browser is the YandexVideo otherwise false
-         */
-        protected function checkBrowserYandexVideoBot()
-        {
-            if (stripos($this->_agent, 'YandexVideo') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexVideo'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXVIDEO_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the YandexImages or not
-         * @return boolean True if the browser is the YandexImages otherwise false
-         */
-        protected function checkBrowserYandexImagesBot()
-        {
-            if (stripos($this->_agent, 'YandexImages') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YandexImages'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_YANDEXIMAGES_BOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the MSNBot or not (last updated 1.9)
-         * @return boolean True if the browser is the MSNBot otherwise false
-         */
-        protected function checkBrowserMSNBot()
-        {
-            if (stripos($this->_agent, "msnbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "msnbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_MSNBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the BingBot or not (last updated 1.9)
-         * @return boolean True if the browser is the BingBot otherwise false
-         */
-        protected function checkBrowserBingBot()
-        {
-            if (stripos($this->_agent, "bingbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "bingbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_BINGBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the W3C Validator or not (last updated 1.7)
-         * @return boolean True if the browser is the W3C Validator otherwise false
-         */
-        protected function checkBrowserW3CValidator()
-        {
-            if (stripos($this->_agent, 'W3C-checklink') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C_Validator') !== false) {
-                // Some of the Validator versions do not delineate w/ a slash - add it back in
-                $ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
-                $aresult = explode('/', stristr($ua, 'W3C_Validator'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
-                $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
-         * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
-         */
-        protected function checkBrowserSlurp()
-        {
-            if (stripos($this->_agent, 'slurp') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Slurp'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_SLURP;
-                    $this->setRobot(true);
-                    $this->setMobile(false);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Edge or not
-         * @return boolean True if the browser is Edge otherwise false
-         */
-        protected function checkBrowserEdge()
-        {
-            if (stripos($this->_agent, 'Edge/') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Edge'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_EDGE);
-                    if (stripos($this->_agent, 'Windows Phone') !== false || stripos($this->_agent, 'Android') !== false) {
-                        $this->setMobile(true);
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Internet Explorer or not (last updated 1.7)
-         * @return boolean True if the browser is Internet Explorer otherwise false
-         */
-        protected function checkBrowserInternetExplorer()
-        {
-            //  Test for IE11
-            if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('11.0');
-                return true;
-            } // Test for v1 - v1.5 IE
-            else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('1.0');
-                $aresult = stristr($this->_agent, '/');
-                if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
-                    $this->setVersion('1.5');
-                }
-                return true;
-            } // Test for versions > 1.5
-            else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
-                // See if the browser is the odd MSN Explorer
-                if (stripos($this->_agent, 'msnb') !== false) {
-                    $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
-                    if (isset($aresult[1])) {
-                        $this->setBrowser(self::BROWSER_MSN);
-                        $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                        return true;
-                    }
-                }
-                $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
-                if (isset($aresult[1])) {
-                    $this->setBrowser(self::BROWSER_IE);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                    if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
-                        if($aresult[1] == '3.1'){
-                            $this->setVersion('7.0');
-                        }
-                        else if($aresult[1] == '4.0'){
-                            $this->setVersion('8.0');
-                        }
-                        else if($aresult[1] == '5.0'){
-                            $this->setVersion('9.0');
-                        }
-                        else if($aresult[1] == '6.0'){
-                            $this->setVersion('10.0');
-                        }
-                        else if($aresult[1] == '7.0'){
-                            $this->setVersion('11.0');
-                        }
-                        else if($aresult[1] == '8.0'){
-                            $this->setVersion('11.0');
-                        }
-                    }
-                    if(stripos($this->_agent, 'IEMobile') !== false) {
-                        $this->setBrowser(self::BROWSER_POCKET_IE);
-                        $this->setMobile(true);
-                    }
-                    return true;
-                }
-            } // Test for versions > IE 10
-            else if (stripos($this->_agent, 'trident') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $result = explode('rv:', $this->_agent);
-                if (isset($result[1])) {
-                    $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-                    $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-                }
-            } // Test for Pocket IE
-            else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'mspie'));
-                if (isset($aresult[1])) {
-                    $this->setPlatform(self::PLATFORM_WINDOWS_CE);
-                    $this->setBrowser(self::BROWSER_POCKET_IE);
-                    $this->setMobile(true);
-
-                    if (stripos($this->_agent, 'mspie') !== false) {
-                        $this->setVersion($aresult[1]);
-                    } else {
-                        $aversion = explode('/', $this->_agent);
-                        if (isset($aversion[1])) {
-                            $this->setVersion($aversion[1]);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Opera or not (last updated 1.7)
-         * @return boolean True if the browser is Opera otherwise false
-         */
-        protected function checkBrowserOpera()
-        {
-            if (stripos($this->_agent, 'opera mini') !== false) {
-                $resultant = stristr($this->_agent, 'opera mini');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', $resultant);
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera mini'));
-                    if (isset($aversion[1])) {
-                        $this->setVersion($aversion[1]);
-                    }
-                }
-                $this->_browser_name = self::BROWSER_OPERA_MINI;
-                $this->setMobile(true);
-                return true;
-            } else if (stripos($this->_agent, 'opera') !== false) {
-                $resultant = stristr($this->_agent, 'opera');
-                if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
-                    $this->setVersion($matches[1]);
-                } else if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera'));
-                    $this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
-                }
-                if (stripos($this->_agent, 'Opera Mobi') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            } else if (stripos($this->_agent, 'OPR') !== false) {
-                $resultant = stristr($this->_agent, 'OPR');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Chrome or not (last updated 1.7)
-         * @return boolean True if the browser is Chrome otherwise false
-         */
-        protected function checkBrowserChrome()
-        {
-            if (stripos($this->_agent, 'Chrome') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Chrome'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_CHROME);
-                    //Chrome on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-
-        /**
-         * Determine if the browser is WebTv or not (last updated 1.7)
-         * @return boolean True if the browser is WebTv otherwise false
-         */
-        protected function checkBrowserWebTv()
-        {
-            if (stripos($this->_agent, 'webtv') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'webtv'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_WEBTV);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is NetPositive or not (last updated 1.7)
-         * @return boolean True if the browser is NetPositive otherwise false
-         */
-        protected function checkBrowserNetPositive()
-        {
-            if (stripos($this->_agent, 'NetPositive') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'NetPositive'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
-                    $this->setBrowser(self::BROWSER_NETPOSITIVE);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Galeon or not (last updated 1.7)
-         * @return boolean True if the browser is Galeon otherwise false
-         */
-        protected function checkBrowserGaleon()
-        {
-            if (stripos($this->_agent, 'galeon') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'galeon'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_GALEON);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Konqueror or not (last updated 1.7)
-         * @return boolean True if the browser is Konqueror otherwise false
-         */
-        protected function checkBrowserKonqueror()
-        {
-            if (stripos($this->_agent, 'Konqueror') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_KONQUEROR);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iCab or not (last updated 1.7)
-         * @return boolean True if the browser is iCab otherwise false
-         */
-        protected function checkBrowserIcab()
-        {
-            if (stripos($this->_agent, 'icab') !== false) {
-                $aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_ICAB);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is OmniWeb or not (last updated 1.7)
-         * @return boolean True if the browser is OmniWeb otherwise false
-         */
-        protected function checkBrowserOmniWeb()
-        {
-            if (stripos($this->_agent, 'omniweb') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'omniweb'));
-                $aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_OMNIWEB);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Phoenix or not (last updated 1.7)
-         * @return boolean True if the browser is Phoenix otherwise false
-         */
-        protected function checkBrowserPhoenix()
-        {
-            if (stripos($this->_agent, 'Phoenix') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Phoenix'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_PHOENIX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firebird or not (last updated 1.7)
-         * @return boolean True if the browser is Firebird otherwise false
-         */
-        protected function checkBrowserFirebird()
-        {
-            if (stripos($this->_agent, 'Firebird') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Firebird'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_FIREBIRD);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
-         * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
-         * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
-         */
-        protected function checkBrowserNetscapeNavigator9Plus()
-        {
-            if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            } else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
-         * @return boolean True if the browser is Shiretoko otherwise false
-         */
-        protected function checkBrowserShiretoko()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_SHIRETOKO);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
-         * @return boolean True if the browser is Ice Cat otherwise false
-         */
-        protected function checkBrowserIceCat()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_ICECAT);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Nokia or not (last updated 1.7)
-         * @return boolean True if the browser is Nokia otherwise false
-         */
-        protected function checkBrowserNokia()
-        {
-            if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
-                $this->setVersion($matches[2]);
-                if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
-                    $this->setBrowser(self::BROWSER_NOKIA_S60);
-                } else {
-                    $this->setBrowser(self::BROWSER_NOKIA);
-                }
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserFirefox()
-        {
-            if (stripos($this->_agent, 'safari') === false) {
-                if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
-                    $this->setVersion($matches[1]);
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    //Firefox on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                } else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
-                    $this->setVersion("");
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserIceweasel()
-        {
-            if (stripos($this->_agent, 'Iceweasel') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_ICEWEASEL);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Mozilla or not (last updated 1.7)
-         * @return boolean True if the browser is Mozilla otherwise false
-         */
-        protected function checkBrowserMozilla()
-        {
-            if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode(' ', stristr($this->_agent, 'rv:'));
-                preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode('', stristr($this->_agent, 'rv:'));
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Lynx or not (last updated 1.7)
-         * @return boolean True if the browser is Lynx otherwise false
-         */
-        protected function checkBrowserLynx()
-        {
-            if (stripos($this->_agent, 'lynx') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Lynx'));
-                $aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_LYNX);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Amaya or not (last updated 1.7)
-         * @return boolean True if the browser is Amaya otherwise false
-         */
-        protected function checkBrowserAmaya()
-        {
-            if (stripos($this->_agent, 'amaya') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Amaya'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_AMAYA);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Safari or not (last updated 1.7)
-         * @return boolean True if the browser is Safari otherwise false
-         */
-        protected function checkBrowserSafari()
-        {
-            if (stripos($this->_agent, 'Safari') !== false
-                && stripos($this->_agent, 'iPhone') === false
-                && stripos($this->_agent, 'iPod') === false
-            ) {
-
-                $aresult = explode('/', stristr($this->_agent, 'Version'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_SAFARI);
-                return true;
-            }
-            return false;
-        }
-
-        protected function checkBrowserSamsung()
-        {
-            if (stripos($this->_agent, 'SamsungBrowser') !== false) {
-
-                $aresult = explode('/', stristr($this->_agent, 'SamsungBrowser'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_SAMSUNG);
-                return true;
-            }
-            return false;
-        }
-
-        protected function checkBrowserSilk()
-        {
-            if (stripos($this->_agent, 'Silk') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Silk'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_SILK);
-                return true;
-            }
-            return false;
-        }
-
-        protected function checkBrowserIframely()
-        {
-            if (stripos($this->_agent, 'Iframely') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Iframely'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_I_FRAME);
-                return true;
-            }
-            return false;
-        }
-
-        protected function checkBrowserCocoa()
-        {
-            if (stripos($this->_agent, 'CocoaRestClient') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'CocoaRestClient'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_COCOA);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is loaded from FacebookExternalHit
-         * @return boolean True if it detects FacebookExternalHit otherwise false
-         */
-        protected function checkFacebookExternalHit()
-        {
-            if (stristr($this->_agent, 'FacebookExternalHit')) {
-                $this->setRobot(true);
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is being loaded from internal Facebook browser
-         * @return boolean True if it detects internal Facebook browser otherwise false
-         */
-        protected function checkForFacebookIos()
-        {
-            if (stristr($this->_agent, 'FBIOS')) {
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Safari browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getSafariVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'Version'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Chrome browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getChromeVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'CriOS'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_CHROME);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPhone or not (last updated 1.7)
-         * @return boolean True if the browser is iPhone otherwise false
-         */
-        protected function checkBrowseriPhone()
-        {
-            if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPHONE);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPad or not (last updated 1.7)
-         * @return boolean True if the browser is iPad otherwise false
-         */
-        protected function checkBrowseriPad()
-        {
-            if (stripos($this->_agent, 'iPad') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPAD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setTablet(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPod or not (last updated 1.7)
-         * @return boolean True if the browser is iPod otherwise false
-         */
-        protected function checkBrowseriPod()
-        {
-            if (stripos($this->_agent, 'iPod') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPOD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Android or not (last updated 1.7)
-         * @return boolean True if the browser is Android otherwise false
-         */
-        protected function checkBrowserAndroid()
-        {
-            if (stripos($this->_agent, 'Android') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Android'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                } else {
-                    $this->setTablet(true);
-                }
-                $this->setBrowser(self::BROWSER_ANDROID);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Vivaldi
-         * @return boolean True if the browser is Vivaldi otherwise false
-         */
-        protected function checkBrowserVivaldi()
-        {
-            if (stripos($this->_agent, 'Vivaldi') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Vivaldi'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_VIVALDI);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Yandex
-         * @return boolean True if the browser is Yandex otherwise false
-         */
-        protected function checkBrowserYandex()
-        {
-            if (stripos($this->_agent, 'YaBrowser') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'YaBrowser'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_YANDEX);
-
-                    if (stripos($this->_agent, 'iPad') !== false) {
-                        $this->setTablet(true);
-                    } elseif (stripos($this->_agent, 'Mobile') !== false) {
-                        $this->setMobile(true);
-                    } elseif (stripos($this->_agent, 'Android') !== false) {
-                        $this->setTablet(true);
-                    }
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * Determine if the browser is a PlayStation
-         * @return boolean True if the browser is PlayStation otherwise false
-         */
-        protected function checkBrowserPlayStation()
-        {
-            if (stripos($this->_agent, 'PlayStation ') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'PlayStation '));
-                $this->setBrowser(self::BROWSER_PLAYSTATION);
-                if (isset($aresult[0])) {
-                    $aversion = explode(')', $aresult[2]);
-                    $this->setVersion($aversion[0]);
-                    if (stripos($this->_agent, 'Portable)') !== false || stripos($this->_agent, 'Vita') !== false) {
-                        $this->setMobile(true);
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine the user's platform (last updated 2.0)
-         */
-        protected function checkPlatform()
-        {
-            if (stripos($this->_agent, 'windows') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            } else if (stripos($this->_agent, 'iPad') !== false) {
-                $this->_platform = self::PLATFORM_IPAD;
-            } else if (stripos($this->_agent, 'iPod') !== false) {
-                $this->_platform = self::PLATFORM_IPOD;
-            } else if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->_platform = self::PLATFORM_IPHONE;
-            } elseif (stripos($this->_agent, 'mac') !== false) {
-                $this->_platform = self::PLATFORM_APPLE;
-            } elseif (stripos($this->_agent, 'android') !== false) {
-                $this->_platform = self::PLATFORM_ANDROID;
-            } elseif (stripos($this->_agent, 'Silk') !== false) {
-                $this->_platform = self::PLATFORM_FIRE_OS;
-            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false ) {
-                $this->_platform = self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV;
-            } elseif (stripos($this->_agent, 'linux') !== false) {
-                $this->_platform = self::PLATFORM_LINUX;
-            } else if (stripos($this->_agent, 'Nokia') !== false) {
-                $this->_platform = self::PLATFORM_NOKIA;
-            } else if (stripos($this->_agent, 'BlackBerry') !== false) {
-                $this->_platform = self::PLATFORM_BLACKBERRY;
-            } elseif (stripos($this->_agent, 'FreeBSD') !== false) {
-                $this->_platform = self::PLATFORM_FREEBSD;
-            } elseif (stripos($this->_agent, 'OpenBSD') !== false) {
-                $this->_platform = self::PLATFORM_OPENBSD;
-            } elseif (stripos($this->_agent, 'NetBSD') !== false) {
-                $this->_platform = self::PLATFORM_NETBSD;
-            } elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
-                $this->_platform = self::PLATFORM_OPENSOLARIS;
-            } elseif (stripos($this->_agent, 'SunOS') !== false) {
-                $this->_platform = self::PLATFORM_SUNOS;
-            } elseif (stripos($this->_agent, 'OS\/2') !== false) {
-                $this->_platform = self::PLATFORM_OS2;
-            } elseif (stripos($this->_agent, 'BeOS') !== false) {
-                $this->_platform = self::PLATFORM_BEOS;
-            } elseif (stripos($this->_agent, 'win') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            } elseif (stripos($this->_agent, 'Playstation') !== false) {
-                $this->_platform = self::PLATFORM_PLAYSTATION;
-            } elseif (stripos($this->_agent, 'Roku') !== false) {
-                $this->_platform = self::PLATFORM_ROKU;
-            } elseif (stripos($this->_agent, 'iOS') !== false) {
-                $this->_platform = self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD;
-            } elseif (stripos($this->_agent, 'tvOS') !== false) {
-                $this->_platform = self::PLATFORM_APPLE_TV;
-            } elseif (stripos($this->_agent, 'curl') !== false) {
-                $this->_platform = self::PLATFORM_TERMINAL;
-            } elseif (stripos($this->_agent, 'CrOS') !== false) {
-                $this->_platform = self::PLATFORM_CHROME_OS;
-            } elseif (stripos($this->_agent, 'okhttp') !== false) {
-                $this->_platform = self::PLATFORM_JAVA_ANDROID;
-            } elseif (stripos($this->_agent, 'PostmanRuntime') !== false) {
-                $this->_platform = self::PLATFORM_POSTMAN;
-            } elseif (stripos($this->_agent, 'Iframely') !== false) {
-                $this->_platform = self::PLATFORM_I_FRAME;
-            }
-
-        }
-    }
+	defined('ROOT_PATH') || exit('Access denied');
+	/**
+	 * File: Browser.php
+	 * Author: Chris Schuld (http://chrisschuld.com/)
+	 * Last Modified: July 22nd, 2016
+	 * @version 2.0
+	 * @package PegasusPHP
+	 *
+	 * Copyright (C) 2008-2010 Chris Schuld  (chris@chrisschuld.com)
+	 *
+	 * 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 2 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 at:
+	 * http://www.gnu.org/copyleft/gpl.html
+	 *
+	 *
+	 * Typical Usage:
+	 *
+	 *   $browser = new Browser();
+	 *   if( $browser->getBrowser() == Browser::BROWSER_FIREFOX && $browser->getVersion() >= 2 ) {
+	 *    echo 'You have FireFox version 2 or greater';
+	 *   }
+	 *
+	 * User Agents Sampled from: http://www.useragentstring.com/
+	 *
+	 * This implementation is based on the original work from Gary White
+	 * http://apptools.com/phptools/browser/
+	 *
+	 */
+	class Browser
+	{
+		private $_agent = '';
+		private $_browser_name = '';
+		private $_version = '';
+		private $_platform = '';
+		private $_os = '';
+		private $_is_aol = false;
+		private $_is_mobile = false;
+		private $_is_tablet = false;
+		private $_is_robot = false;
+		private $_is_facebook = false;
+		private $_aol_version = '';
+
+		const BROWSER_UNKNOWN = 'unknown';
+		const VERSION_UNKNOWN = 'unknown';
+
+		const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
+		const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
+		const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
+		const BROWSER_EDGE = 'Edge'; // https://www.microsoft.com/edge
+		const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
+		const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
+		const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
+		const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
+		const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
+		const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
+		const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
+		const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
+		const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
+		const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
+		const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
+		const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
+		const BROWSER_SAFARI = 'Safari'; // http://apple.com
+		const BROWSER_IPHONE = 'iPhone'; // http://apple.com
+		const BROWSER_IPOD = 'iPod'; // http://apple.com
+		const BROWSER_IPAD = 'iPad'; // http://apple.com
+		const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
+		const BROWSER_ANDROID = 'Android'; // http://www.android.com/
+		const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
+
+		const BROWSER_YANDEXBOT = 'YandexBot'; // http://yandex.com/bots
+		const BROWSER_YANDEXIMAGERESIZER_BOT = 'YandexImageResizer'; // http://yandex.com/bots
+		const BROWSER_YANDEXIMAGES_BOT = 'YandexImages'; // http://yandex.com/bots
+		const BROWSER_YANDEXVIDEO_BOT = 'YandexVideo'; // http://yandex.com/bots
+		const BROWSER_YANDEXMEDIA_BOT = 'YandexMedia'; // http://yandex.com/bots
+		const BROWSER_YANDEXBLOGS_BOT = 'YandexBlogs'; // http://yandex.com/bots
+		const BROWSER_YANDEXFAVICONS_BOT = 'YandexFavicons'; // http://yandex.com/bots
+		const BROWSER_YANDEXWEBMASTER_BOT = 'YandexWebmaster'; // http://yandex.com/bots
+		const BROWSER_YANDEXDIRECT_BOT = 'YandexDirect'; // http://yandex.com/bots
+		const BROWSER_YANDEXMETRIKA_BOT = 'YandexMetrika'; // http://yandex.com/bots
+		const BROWSER_YANDEXNEWS_BOT = 'YandexNews'; // http://yandex.com/bots
+		const BROWSER_YANDEXCATALOG_BOT = 'YandexCatalog'; // http://yandex.com/bots
+
+		const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
+		const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
+		const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
+		const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
+		const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
+		const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
+		const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
+		const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
+		const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
+		const BROWSER_VIVALDI = 'Vivalidi'; // https://vivaldi.com/
+		const BROWSER_YANDEX = 'Yandex'; // https://browser.yandex.ua/
+
+		const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
+		const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
+		const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
+		const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
+		const BROWSER_PLAYSTATION = "PlayStation";
+		const BROWSER_SAMSUNG = "SamsungBrowser";
+		const BROWSER_SILK = "Silk";
+		const BROWSER_I_FRAME = "Iframely";
+		const BROWSER_COCOA = "CocoaRestClient";
+
+		const PLATFORM_UNKNOWN = 'unknown';
+		const PLATFORM_WINDOWS = 'Windows';
+		const PLATFORM_WINDOWS_CE = 'Windows CE';
+		const PLATFORM_APPLE = 'Apple';
+		const PLATFORM_LINUX = 'Linux';
+		const PLATFORM_OS2 = 'OS/2';
+		const PLATFORM_BEOS = 'BeOS';
+		const PLATFORM_IPHONE = 'iPhone';
+		const PLATFORM_IPOD = 'iPod';
+		const PLATFORM_IPAD = 'iPad';
+		const PLATFORM_BLACKBERRY = 'BlackBerry';
+		const PLATFORM_NOKIA = 'Nokia';
+		const PLATFORM_FREEBSD = 'FreeBSD';
+		const PLATFORM_OPENBSD = 'OpenBSD';
+		const PLATFORM_NETBSD = 'NetBSD';
+		const PLATFORM_SUNOS = 'SunOS';
+		const PLATFORM_OPENSOLARIS = 'OpenSolaris';
+		const PLATFORM_ANDROID = 'Android';
+		const PLATFORM_PLAYSTATION = "Sony PlayStation";
+		const PLATFORM_ROKU = "Roku";
+		const PLATFORM_APPLE_TV = "Apple TV";
+		const PLATFORM_TERMINAL = "Terminal";
+		const PLATFORM_FIRE_OS = "Fire OS";
+		const PLATFORM_SMART_TV = "SMART-TV";
+		const PLATFORM_CHROME_OS = "Chrome OS";
+		const PLATFORM_JAVA_ANDROID = "Java/Android";
+		const PLATFORM_POSTMAN = "Postman";
+		const PLATFORM_I_FRAME = "Iframely";
+
+		const OPERATING_SYSTEM_UNKNOWN = 'unknown';
+
+		/**
+		 * Class constructor
+		 */
+		public function __construct($userAgent = "")
+		{
+			$this->reset();
+			if ($userAgent != "") {
+				$this->setUserAgent($userAgent);
+			} else {
+				$this->determine();
+			}
+		}
+
+		/**
+		 * Reset all properties
+		 */
+		public function reset()
+		{
+			$this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+			$this->_browser_name = self::BROWSER_UNKNOWN;
+			$this->_version = self::VERSION_UNKNOWN;
+			$this->_platform = self::PLATFORM_UNKNOWN;
+			$this->_os = self::OPERATING_SYSTEM_UNKNOWN;
+			$this->_is_aol = false;
+			$this->_is_mobile = false;
+			$this->_is_tablet = false;
+			$this->_is_robot = false;
+			$this->_is_facebook = false;
+			$this->_aol_version = self::VERSION_UNKNOWN;
+		}
+
+		/**
+		 * Check to see if the specific browser is valid
+		 * @param string $browserName
+		 * @return bool True if the browser is the specified browser
+		 */
+		function isBrowser($browserName)
+		{
+			return (0 == strcasecmp($this->_browser_name, trim($browserName)));
+		}
+
+		/**
+		 * The name of the browser.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getBrowser()
+		{
+			return $this->_browser_name;
+		}
+
+		/**
+		 * Set the name of the browser
+		 * @param $browser string The name of the Browser
+		 */
+		public function setBrowser($browser)
+		{
+			$this->_browser_name = $browser;
+		}
+
+		/**
+		 * The name of the platform.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getPlatform()
+		{
+			return $this->_platform;
+		}
+
+		/**
+		 * Set the name of the platform
+		 * @param string $platform The name of the Platform
+		 */
+		public function setPlatform($platform)
+		{
+			$this->_platform = $platform;
+		}
+
+		/**
+		 * The version of the browser.
+		 * @return string Version of the browser (will only contain alpha-numeric characters and a period)
+		 */
+		public function getVersion()
+		{
+			return $this->_version;
+		}
+
+		/**
+		 * Set the version of the browser
+		 * @param string $version The version of the Browser
+		 */
+		public function setVersion($version)
+		{
+			$this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
+		}
+
+		/**
+		 * The version of AOL.
+		 * @return string Version of AOL (will only contain alpha-numeric characters and a period)
+		 */
+		public function getAolVersion()
+		{
+			return $this->_aol_version;
+		}
+
+		/**
+		 * Set the version of AOL
+		 * @param string $version The version of AOL
+		 */
+		public function setAolVersion($version)
+		{
+			$this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
+		}
+
+		/**
+		 * Is the browser from AOL?
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		public function isAol()
+		{
+			return $this->_is_aol;
+		}
+
+		/**
+		 * Is the browser from a mobile device?
+		 * @return boolean True if the browser is from a mobile device otherwise false
+		 */
+		public function isMobile()
+		{
+			return $this->_is_mobile;
+		}
+
+		/**
+		 * Is the browser from a tablet device?
+		 * @return boolean True if the browser is from a tablet device otherwise false
+		 */
+		public function isTablet()
+		{
+			return $this->_is_tablet;
+		}
+
+		/**
+		 * Is the browser from a robot (ex Slurp,GoogleBot)?
+		 * @return boolean True if the browser is from a robot otherwise false
+		 */
+		public function isRobot()
+		{
+			return $this->_is_robot;
+		}
+
+		/**
+		 * Is the browser from facebook?
+		 * @return boolean True if the browser is from facebook otherwise false
+		 */
+		public function isFacebook()
+		{
+			return $this->_is_facebook;
+		}
+
+		/**
+		 * Set the browser to be from AOL
+		 * @param $isAol
+		 */
+		public function setAol($isAol)
+		{
+			$this->_is_aol = $isAol;
+		}
+
+		/**
+		 * Set the Browser to be mobile
+		 * @param boolean $value is the browser a mobile browser or not
+		 */
+		protected function setMobile($value = true)
+		{
+			$this->_is_mobile = $value;
+		}
+
+		/**
+		 * Set the Browser to be tablet
+		 * @param boolean $value is the browser a tablet browser or not
+		 */
+		protected function setTablet($value = true)
+		{
+			$this->_is_tablet = $value;
+		}
+
+		/**
+		 * Set the Browser to be a robot
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setRobot($value = true)
+		{
+			$this->_is_robot = $value;
+		}
+
+		/**
+		 * Set the Browser to be a Facebook request
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setFacebook($value = true)
+		{
+			$this->_is_facebook = $value;
+		}
+
+		/**
+		 * Get the user agent value in use to determine the browser
+		 * @return string The user agent from the HTTP header
+		 */
+		public function getUserAgent()
+		{
+			return $this->_agent;
+		}
+
+		/**
+		 * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
+		 * @param string $agent_string The value for the User Agent
+		 */
+		public function setUserAgent($agent_string)
+		{
+			$this->reset();
+			$this->_agent = $agent_string;
+			$this->determine();
+		}
+
+		/**
+		 * Used to determine if the browser is actually "chromeframe"
+		 * @since 1.7
+		 * @return boolean True if the browser is using chromeframe
+		 */
+		public function isChromeFrame()
+		{
+			return (strpos($this->_agent, "chromeframe") !== false);
+		}
+
+		/**
+		 * Returns a formatted string with a summary of the details of the browser.
+		 * @return string formatted string with a summary of the browser
+		 */
+		public function __toString()
+		{
+			return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
+				"<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
+				"<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+				"<strong>Platform:</strong> {$this->getPlatform()}<br/>";
+		}
+
+		/**
+		 * Protected routine to calculate and determine what the browser is in use (including platform)
+		 */
+		protected function determine()
+		{
+			$this->checkPlatform();
+			$this->checkBrowsers();
+			$this->checkForAol();
+		}
+
+		/**
+		 * Protected routine to determine the browser type
+		 * @return boolean True if the browser was detected otherwise false
+		 */
+		protected function checkBrowsers()
+		{
+			return (
+				// well-known, well-used
+				// Special Notes:
+				// (1) Opera must be checked before FireFox due to the odd
+				//     user agents used in some older versions of Opera
+				// (2) WebTV is strapped onto Internet Explorer so we must
+				//     check for WebTV before IE
+				// (3) (deprecated) Galeon is based on Firefox and needs to be
+				//     tested before Firefox is tested
+				// (4) OmniWeb is based on Safari so OmniWeb check must occur
+				//     before Safari
+				// (5) Netscape 9+ is based on Firefox so Netscape checks
+				//     before FireFox are necessary
+				// (6) Vivalid is UA contains both Firefox and Chrome so Vivalid checks
+				//     before Firefox and Chrome
+				$this->checkBrowserWebTv() ||
+				$this->checkBrowserEdge() ||
+				$this->checkBrowserInternetExplorer() ||
+				$this->checkBrowserOpera() ||
+				$this->checkBrowserGaleon() ||
+				$this->checkBrowserNetscapeNavigator9Plus() ||
+				$this->checkBrowserVivaldi() ||
+				$this->checkBrowserYandex() ||
+				$this->checkBrowserFirefox() ||
+				$this->checkBrowserChrome() ||
+				$this->checkBrowserOmniWeb() ||
+
+				// common mobile
+				$this->checkBrowserAndroid() ||
+				$this->checkBrowseriPad() ||
+				$this->checkBrowseriPod() ||
+				$this->checkBrowseriPhone() ||
+				$this->checkBrowserBlackBerry() ||
+				$this->checkBrowserNokia() ||
+
+				// common bots
+				$this->checkBrowserGoogleBot() ||
+				$this->checkBrowserMSNBot() ||
+				$this->checkBrowserBingBot() ||
+				$this->checkBrowserSlurp() ||
+
+				// Yandex bots
+				$this->checkBrowserYandexBot() ||
+				$this->checkBrowserYandexImageResizerBot() ||
+				$this->checkBrowserYandexBlogsBot() ||
+				$this->checkBrowserYandexCatalogBot() ||
+				$this->checkBrowserYandexDirectBot() ||
+				$this->checkBrowserYandexFaviconsBot() ||
+				$this->checkBrowserYandexImagesBot() ||
+				$this->checkBrowserYandexMediaBot() ||
+				$this->checkBrowserYandexMetrikaBot() ||
+				$this->checkBrowserYandexNewsBot() ||
+				$this->checkBrowserYandexVideoBot() ||
+				$this->checkBrowserYandexWebmasterBot() ||
+
+				// check for facebook external hit when loading URL
+				$this->checkFacebookExternalHit() ||
+
+				// WebKit base check (post mobile and others)
+				$this->checkBrowserSamsung() ||
+				$this->checkBrowserSilk() ||
+				$this->checkBrowserSafari() ||
+
+				// everyone else
+				$this->checkBrowserNetPositive() ||
+				$this->checkBrowserFirebird() ||
+				$this->checkBrowserKonqueror() ||
+				$this->checkBrowserIcab() ||
+				$this->checkBrowserPhoenix() ||
+				$this->checkBrowserAmaya() ||
+				$this->checkBrowserLynx() ||
+				$this->checkBrowserShiretoko() ||
+				$this->checkBrowserIceCat() ||
+				$this->checkBrowserIceweasel() ||
+				$this->checkBrowserW3CValidator() ||
+				$this->checkBrowserPlayStation() ||
+				$this->checkBrowserIframely() ||
+				$this->checkBrowserCocoa() ||
+				$this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
+
+
+			);
+		}
+
+		/**
+		 * Determine if the user is using a BlackBerry (last updated 1.7)
+		 * @return boolean True if the browser is the BlackBerry browser otherwise false
+		 */
+		protected function checkBrowserBlackBerry()
+		{
+			if (stripos($this->_agent, 'blackberry') !== false) {
+				$aresult = explode("/", stristr($this->_agent, "BlackBerry"));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_BLACKBERRY;
+					$this->setMobile(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the user is using an AOL User Agent (last updated 1.7)
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		protected function checkForAol()
+		{
+			$this->setAol(false);
+			$this->setAolVersion(self::VERSION_UNKNOWN);
+
+			if (stripos($this->_agent, 'aol') !== false) {
+				$aversion = explode(' ', stristr($this->_agent, 'AOL'));
+				if (isset($aversion[1])) {
+					$this->setAol(true);
+					$this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the GoogleBot or not (last updated 1.7)
+		 * @return boolean True if the browser is the GoogletBot otherwise false
+		 */
+		protected function checkBrowserGoogleBot()
+		{
+			if (stripos($this->_agent, 'googlebot') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'googlebot'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_GOOGLEBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexBot or not
+		 * @return boolean True if the browser is the YandexBot otherwise false
+		 */
+		protected function checkBrowserYandexBot()
+		{
+			if (stripos($this->_agent, 'YandexBot') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexBot'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexImageResizer or not
+		 * @return boolean True if the browser is the YandexImageResizer otherwise false
+		 */
+		protected function checkBrowserYandexImageResizerBot()
+		{
+			if (stripos($this->_agent, 'YandexImageResizer') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexImageResizer'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXIMAGERESIZER_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexCatalog or not
+		 * @return boolean True if the browser is the YandexCatalog otherwise false
+		 */
+		protected function checkBrowserYandexCatalogBot()
+		{
+			if (stripos($this->_agent, 'YandexCatalog') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexCatalog'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXCATALOG_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexNews or not
+		 * @return boolean True if the browser is the YandexNews otherwise false
+		 */
+		protected function checkBrowserYandexNewsBot()
+		{
+			if (stripos($this->_agent, 'YandexNews') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexNews'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXNEWS_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexMetrika or not
+		 * @return boolean True if the browser is the YandexMetrika otherwise false
+		 */
+		protected function checkBrowserYandexMetrikaBot()
+		{
+			if (stripos($this->_agent, 'YandexMetrika') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexMetrika'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXMETRIKA_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexDirect or not
+		 * @return boolean True if the browser is the YandexDirect otherwise false
+		 */
+		protected function checkBrowserYandexDirectBot()
+		{
+			if (stripos($this->_agent, 'YandexDirect') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexDirect'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXDIRECT_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexWebmaster or not
+		 * @return boolean True if the browser is the YandexWebmaster otherwise false
+		 */
+		protected function checkBrowserYandexWebmasterBot()
+		{
+			if (stripos($this->_agent, 'YandexWebmaster') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexWebmaster'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXWEBMASTER_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexFavicons or not
+		 * @return boolean True if the browser is the YandexFavicons otherwise false
+		 */
+		protected function checkBrowserYandexFaviconsBot()
+		{
+			if (stripos($this->_agent, 'YandexFavicons') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexFavicons'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXFAVICONS_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexBlogs or not
+		 * @return boolean True if the browser is the YandexBlogs otherwise false
+		 */
+		protected function checkBrowserYandexBlogsBot()
+		{
+			if (stripos($this->_agent, 'YandexBlogs') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexBlogs'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXBLOGS_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexMedia or not
+		 * @return boolean True if the browser is the YandexMedia otherwise false
+		 */
+		protected function checkBrowserYandexMediaBot()
+		{
+			if (stripos($this->_agent, 'YandexMedia') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexMedia'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXMEDIA_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexVideo or not
+		 * @return boolean True if the browser is the YandexVideo otherwise false
+		 */
+		protected function checkBrowserYandexVideoBot()
+		{
+			if (stripos($this->_agent, 'YandexVideo') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexVideo'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXVIDEO_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the YandexImages or not
+		 * @return boolean True if the browser is the YandexImages otherwise false
+		 */
+		protected function checkBrowserYandexImagesBot()
+		{
+			if (stripos($this->_agent, 'YandexImages') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YandexImages'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_YANDEXIMAGES_BOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the MSNBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the MSNBot otherwise false
+		 */
+		protected function checkBrowserMSNBot()
+		{
+			if (stripos($this->_agent, "msnbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "msnbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_MSNBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the BingBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the BingBot otherwise false
+		 */
+		protected function checkBrowserBingBot()
+		{
+			if (stripos($this->_agent, "bingbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "bingbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_BINGBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the W3C Validator or not (last updated 1.7)
+		 * @return boolean True if the browser is the W3C Validator otherwise false
+		 */
+		protected function checkBrowserW3CValidator()
+		{
+			if (stripos($this->_agent, 'W3C-checklink') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C_Validator') !== false) {
+				// Some of the Validator versions do not delineate w/ a slash - add it back in
+				$ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
+				$aresult = explode('/', stristr($ua, 'W3C_Validator'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
+				$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
+		 * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
+		 */
+		protected function checkBrowserSlurp()
+		{
+			if (stripos($this->_agent, 'slurp') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Slurp'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_SLURP;
+					$this->setRobot(true);
+					$this->setMobile(false);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Edge or not
+		 * @return boolean True if the browser is Edge otherwise false
+		 */
+		protected function checkBrowserEdge()
+		{
+			if (stripos($this->_agent, 'Edge/') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Edge'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_EDGE);
+					if (stripos($this->_agent, 'Windows Phone') !== false || stripos($this->_agent, 'Android') !== false) {
+						$this->setMobile(true);
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Internet Explorer or not (last updated 1.7)
+		 * @return boolean True if the browser is Internet Explorer otherwise false
+		 */
+		protected function checkBrowserInternetExplorer()
+		{
+			//  Test for IE11
+			if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('11.0');
+				return true;
+			} // Test for v1 - v1.5 IE
+			else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('1.0');
+				$aresult = stristr($this->_agent, '/');
+				if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
+					$this->setVersion('1.5');
+				}
+				return true;
+			} // Test for versions > 1.5
+			else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
+				// See if the browser is the odd MSN Explorer
+				if (stripos($this->_agent, 'msnb') !== false) {
+					$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
+					if (isset($aresult[1])) {
+						$this->setBrowser(self::BROWSER_MSN);
+						$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+						return true;
+					}
+				}
+				$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
+				if (isset($aresult[1])) {
+					$this->setBrowser(self::BROWSER_IE);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+					if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
+						if($aresult[1] == '3.1'){
+							$this->setVersion('7.0');
+						}
+						else if($aresult[1] == '4.0'){
+							$this->setVersion('8.0');
+						}
+						else if($aresult[1] == '5.0'){
+							$this->setVersion('9.0');
+						}
+						else if($aresult[1] == '6.0'){
+							$this->setVersion('10.0');
+						}
+						else if($aresult[1] == '7.0'){
+							$this->setVersion('11.0');
+						}
+						else if($aresult[1] == '8.0'){
+							$this->setVersion('11.0');
+						}
+					}
+					if(stripos($this->_agent, 'IEMobile') !== false) {
+						$this->setBrowser(self::BROWSER_POCKET_IE);
+						$this->setMobile(true);
+					}
+					return true;
+				}
+			} // Test for versions > IE 10
+			else if (stripos($this->_agent, 'trident') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$result = explode('rv:', $this->_agent);
+				if (isset($result[1])) {
+					$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+					$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+				}
+			} // Test for Pocket IE
+			else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'mspie'));
+				if (isset($aresult[1])) {
+					$this->setPlatform(self::PLATFORM_WINDOWS_CE);
+					$this->setBrowser(self::BROWSER_POCKET_IE);
+					$this->setMobile(true);
+
+					if (stripos($this->_agent, 'mspie') !== false) {
+						$this->setVersion($aresult[1]);
+					} else {
+						$aversion = explode('/', $this->_agent);
+						if (isset($aversion[1])) {
+							$this->setVersion($aversion[1]);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Opera or not (last updated 1.7)
+		 * @return boolean True if the browser is Opera otherwise false
+		 */
+		protected function checkBrowserOpera()
+		{
+			if (stripos($this->_agent, 'opera mini') !== false) {
+				$resultant = stristr($this->_agent, 'opera mini');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', $resultant);
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera mini'));
+					if (isset($aversion[1])) {
+						$this->setVersion($aversion[1]);
+					}
+				}
+				$this->_browser_name = self::BROWSER_OPERA_MINI;
+				$this->setMobile(true);
+				return true;
+			} else if (stripos($this->_agent, 'opera') !== false) {
+				$resultant = stristr($this->_agent, 'opera');
+				if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
+					$this->setVersion($matches[1]);
+				} else if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera'));
+					$this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
+				}
+				if (stripos($this->_agent, 'Opera Mobi') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			} else if (stripos($this->_agent, 'OPR') !== false) {
+				$resultant = stristr($this->_agent, 'OPR');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Chrome or not (last updated 1.7)
+		 * @return boolean True if the browser is Chrome otherwise false
+		 */
+		protected function checkBrowserChrome()
+		{
+			if (stripos($this->_agent, 'Chrome') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Chrome'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_CHROME);
+					//Chrome on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		/**
+		 * Determine if the browser is WebTv or not (last updated 1.7)
+		 * @return boolean True if the browser is WebTv otherwise false
+		 */
+		protected function checkBrowserWebTv()
+		{
+			if (stripos($this->_agent, 'webtv') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'webtv'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_WEBTV);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is NetPositive or not (last updated 1.7)
+		 * @return boolean True if the browser is NetPositive otherwise false
+		 */
+		protected function checkBrowserNetPositive()
+		{
+			if (stripos($this->_agent, 'NetPositive') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'NetPositive'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
+					$this->setBrowser(self::BROWSER_NETPOSITIVE);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Galeon or not (last updated 1.7)
+		 * @return boolean True if the browser is Galeon otherwise false
+		 */
+		protected function checkBrowserGaleon()
+		{
+			if (stripos($this->_agent, 'galeon') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'galeon'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_GALEON);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Konqueror or not (last updated 1.7)
+		 * @return boolean True if the browser is Konqueror otherwise false
+		 */
+		protected function checkBrowserKonqueror()
+		{
+			if (stripos($this->_agent, 'Konqueror') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_KONQUEROR);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iCab or not (last updated 1.7)
+		 * @return boolean True if the browser is iCab otherwise false
+		 */
+		protected function checkBrowserIcab()
+		{
+			if (stripos($this->_agent, 'icab') !== false) {
+				$aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_ICAB);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is OmniWeb or not (last updated 1.7)
+		 * @return boolean True if the browser is OmniWeb otherwise false
+		 */
+		protected function checkBrowserOmniWeb()
+		{
+			if (stripos($this->_agent, 'omniweb') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'omniweb'));
+				$aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_OMNIWEB);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Phoenix or not (last updated 1.7)
+		 * @return boolean True if the browser is Phoenix otherwise false
+		 */
+		protected function checkBrowserPhoenix()
+		{
+			if (stripos($this->_agent, 'Phoenix') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Phoenix'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_PHOENIX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firebird or not (last updated 1.7)
+		 * @return boolean True if the browser is Firebird otherwise false
+		 */
+		protected function checkBrowserFirebird()
+		{
+			if (stripos($this->_agent, 'Firebird') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Firebird'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_FIREBIRD);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
+		 * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
+		 * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
+		 */
+		protected function checkBrowserNetscapeNavigator9Plus()
+		{
+			if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			} else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
+		 * @return boolean True if the browser is Shiretoko otherwise false
+		 */
+		protected function checkBrowserShiretoko()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_SHIRETOKO);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
+		 * @return boolean True if the browser is Ice Cat otherwise false
+		 */
+		protected function checkBrowserIceCat()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_ICECAT);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Nokia or not (last updated 1.7)
+		 * @return boolean True if the browser is Nokia otherwise false
+		 */
+		protected function checkBrowserNokia()
+		{
+			if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
+				$this->setVersion($matches[2]);
+				if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
+					$this->setBrowser(self::BROWSER_NOKIA_S60);
+				} else {
+					$this->setBrowser(self::BROWSER_NOKIA);
+				}
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserFirefox()
+		{
+			if (stripos($this->_agent, 'safari') === false) {
+				if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
+					$this->setVersion($matches[1]);
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					//Firefox on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				} else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
+					$this->setVersion("");
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserIceweasel()
+		{
+			if (stripos($this->_agent, 'Iceweasel') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_ICEWEASEL);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Mozilla or not (last updated 1.7)
+		 * @return boolean True if the browser is Mozilla otherwise false
+		 */
+		protected function checkBrowserMozilla()
+		{
+			if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode(' ', stristr($this->_agent, 'rv:'));
+				preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode('', stristr($this->_agent, 'rv:'));
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Lynx or not (last updated 1.7)
+		 * @return boolean True if the browser is Lynx otherwise false
+		 */
+		protected function checkBrowserLynx()
+		{
+			if (stripos($this->_agent, 'lynx') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Lynx'));
+				$aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_LYNX);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Amaya or not (last updated 1.7)
+		 * @return boolean True if the browser is Amaya otherwise false
+		 */
+		protected function checkBrowserAmaya()
+		{
+			if (stripos($this->_agent, 'amaya') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Amaya'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_AMAYA);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Safari or not (last updated 1.7)
+		 * @return boolean True if the browser is Safari otherwise false
+		 */
+		protected function checkBrowserSafari()
+		{
+			if (stripos($this->_agent, 'Safari') !== false
+				&& stripos($this->_agent, 'iPhone') === false
+				&& stripos($this->_agent, 'iPod') === false
+			) {
+
+				$aresult = explode('/', stristr($this->_agent, 'Version'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_SAFARI);
+				return true;
+			}
+			return false;
+		}
+
+		protected function checkBrowserSamsung()
+		{
+			if (stripos($this->_agent, 'SamsungBrowser') !== false) {
+
+				$aresult = explode('/', stristr($this->_agent, 'SamsungBrowser'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_SAMSUNG);
+				return true;
+			}
+			return false;
+		}
+
+		protected function checkBrowserSilk()
+		{
+			if (stripos($this->_agent, 'Silk') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Silk'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_SILK);
+				return true;
+			}
+			return false;
+		}
+
+		protected function checkBrowserIframely()
+		{
+			if (stripos($this->_agent, 'Iframely') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Iframely'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_I_FRAME);
+				return true;
+			}
+			return false;
+		}
+
+		protected function checkBrowserCocoa()
+		{
+			if (stripos($this->_agent, 'CocoaRestClient') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'CocoaRestClient'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_COCOA);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is loaded from FacebookExternalHit
+		 * @return boolean True if it detects FacebookExternalHit otherwise false
+		 */
+		protected function checkFacebookExternalHit()
+		{
+			if (stristr($this->_agent, 'FacebookExternalHit')) {
+				$this->setRobot(true);
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is being loaded from internal Facebook browser
+		 * @return boolean True if it detects internal Facebook browser otherwise false
+		 */
+		protected function checkForFacebookIos()
+		{
+			if (stristr($this->_agent, 'FBIOS')) {
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Safari browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getSafariVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'Version'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Chrome browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getChromeVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'CriOS'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_CHROME);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPhone or not (last updated 1.7)
+		 * @return boolean True if the browser is iPhone otherwise false
+		 */
+		protected function checkBrowseriPhone()
+		{
+			if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPHONE);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPad or not (last updated 1.7)
+		 * @return boolean True if the browser is iPad otherwise false
+		 */
+		protected function checkBrowseriPad()
+		{
+			if (stripos($this->_agent, 'iPad') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPAD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setTablet(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPod or not (last updated 1.7)
+		 * @return boolean True if the browser is iPod otherwise false
+		 */
+		protected function checkBrowseriPod()
+		{
+			if (stripos($this->_agent, 'iPod') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPOD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Android or not (last updated 1.7)
+		 * @return boolean True if the browser is Android otherwise false
+		 */
+		protected function checkBrowserAndroid()
+		{
+			if (stripos($this->_agent, 'Android') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Android'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				} else {
+					$this->setTablet(true);
+				}
+				$this->setBrowser(self::BROWSER_ANDROID);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Vivaldi
+		 * @return boolean True if the browser is Vivaldi otherwise false
+		 */
+		protected function checkBrowserVivaldi()
+		{
+			if (stripos($this->_agent, 'Vivaldi') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Vivaldi'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_VIVALDI);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Yandex
+		 * @return boolean True if the browser is Yandex otherwise false
+		 */
+		protected function checkBrowserYandex()
+		{
+			if (stripos($this->_agent, 'YaBrowser') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'YaBrowser'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_YANDEX);
+
+					if (stripos($this->_agent, 'iPad') !== false) {
+						$this->setTablet(true);
+					} elseif (stripos($this->_agent, 'Mobile') !== false) {
+						$this->setMobile(true);
+					} elseif (stripos($this->_agent, 'Android') !== false) {
+						$this->setTablet(true);
+					}
+
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is a PlayStation
+		 * @return boolean True if the browser is PlayStation otherwise false
+		 */
+		protected function checkBrowserPlayStation()
+		{
+			if (stripos($this->_agent, 'PlayStation ') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'PlayStation '));
+				$this->setBrowser(self::BROWSER_PLAYSTATION);
+				if (isset($aresult[0])) {
+					$aversion = explode(')', $aresult[2]);
+					$this->setVersion($aversion[0]);
+					if (stripos($this->_agent, 'Portable)') !== false || stripos($this->_agent, 'Vita') !== false) {
+						$this->setMobile(true);
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine the user's platform (last updated 2.0)
+		 */
+		protected function checkPlatform()
+		{
+			if (stripos($this->_agent, 'windows') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			} else if (stripos($this->_agent, 'iPad') !== false) {
+				$this->_platform = self::PLATFORM_IPAD;
+			} else if (stripos($this->_agent, 'iPod') !== false) {
+				$this->_platform = self::PLATFORM_IPOD;
+			} else if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->_platform = self::PLATFORM_IPHONE;
+			} elseif (stripos($this->_agent, 'mac') !== false) {
+				$this->_platform = self::PLATFORM_APPLE;
+			} elseif (stripos($this->_agent, 'android') !== false) {
+				$this->_platform = self::PLATFORM_ANDROID;
+			} elseif (stripos($this->_agent, 'Silk') !== false) {
+				$this->_platform = self::PLATFORM_FIRE_OS;
+			} elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false ) {
+				$this->_platform = self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV;
+			} elseif (stripos($this->_agent, 'linux') !== false) {
+				$this->_platform = self::PLATFORM_LINUX;
+			} else if (stripos($this->_agent, 'Nokia') !== false) {
+				$this->_platform = self::PLATFORM_NOKIA;
+			} else if (stripos($this->_agent, 'BlackBerry') !== false) {
+				$this->_platform = self::PLATFORM_BLACKBERRY;
+			} elseif (stripos($this->_agent, 'FreeBSD') !== false) {
+				$this->_platform = self::PLATFORM_FREEBSD;
+			} elseif (stripos($this->_agent, 'OpenBSD') !== false) {
+				$this->_platform = self::PLATFORM_OPENBSD;
+			} elseif (stripos($this->_agent, 'NetBSD') !== false) {
+				$this->_platform = self::PLATFORM_NETBSD;
+			} elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
+				$this->_platform = self::PLATFORM_OPENSOLARIS;
+			} elseif (stripos($this->_agent, 'SunOS') !== false) {
+				$this->_platform = self::PLATFORM_SUNOS;
+			} elseif (stripos($this->_agent, 'OS\/2') !== false) {
+				$this->_platform = self::PLATFORM_OS2;
+			} elseif (stripos($this->_agent, 'BeOS') !== false) {
+				$this->_platform = self::PLATFORM_BEOS;
+			} elseif (stripos($this->_agent, 'win') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			} elseif (stripos($this->_agent, 'Playstation') !== false) {
+				$this->_platform = self::PLATFORM_PLAYSTATION;
+			} elseif (stripos($this->_agent, 'Roku') !== false) {
+				$this->_platform = self::PLATFORM_ROKU;
+			} elseif (stripos($this->_agent, 'iOS') !== false) {
+				$this->_platform = self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD;
+			} elseif (stripos($this->_agent, 'tvOS') !== false) {
+				$this->_platform = self::PLATFORM_APPLE_TV;
+			} elseif (stripos($this->_agent, 'curl') !== false) {
+				$this->_platform = self::PLATFORM_TERMINAL;
+			} elseif (stripos($this->_agent, 'CrOS') !== false) {
+				$this->_platform = self::PLATFORM_CHROME_OS;
+			} elseif (stripos($this->_agent, 'okhttp') !== false) {
+				$this->_platform = self::PLATFORM_JAVA_ANDROID;
+			} elseif (stripos($this->_agent, 'PostmanRuntime') !== false) {
+				$this->_platform = self::PLATFORM_POSTMAN;
+			} elseif (stripos($this->_agent, 'Iframely') !== false) {
+				$this->_platform = self::PLATFORM_I_FRAME;
+			}
+
+		}
+	}

Spacing +10 added lines, -10 removed lines

@@ -918,27 +918,27 @@ 
                 if (isset($aresult[1])) {
                     $this->setBrowser(self::BROWSER_IE);
                     $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                    if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
-                        if($aresult[1] == '3.1'){
+                    if (preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)) {
+                        if ($aresult[1] == '3.1') {
                             $this->setVersion('7.0');
                         }
-                        else if($aresult[1] == '4.0'){
+                        else if ($aresult[1] == '4.0') {
                             $this->setVersion('8.0');
                         }
-                        else if($aresult[1] == '5.0'){
+                        else if ($aresult[1] == '5.0') {
                             $this->setVersion('9.0');
                         }
-                        else if($aresult[1] == '6.0'){
+                        else if ($aresult[1] == '6.0') {
                             $this->setVersion('10.0');
                         }
-                        else if($aresult[1] == '7.0'){
+                        else if ($aresult[1] == '7.0') {
                             $this->setVersion('11.0');
                         }
-                        else if($aresult[1] == '8.0'){
+                        else if ($aresult[1] == '8.0') {
                             $this->setVersion('11.0');
                         }
                     }
-                    if(stripos($this->_agent, 'IEMobile') !== false) {
+                    if (stripos($this->_agent, 'IEMobile') !== false) {
                         $this->setBrowser(self::BROWSER_POCKET_IE);
                         $this->setMobile(true);
                     }
@@ -1684,8 +1684,8 @@ 
                 $this->_platform = self::PLATFORM_ANDROID;
             } elseif (stripos($this->_agent, 'Silk') !== false) {
                 $this->_platform = self::PLATFORM_FIRE_OS;
-            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false ) {
-                $this->_platform = self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV;
+            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false) {
+                $this->_platform = self::PLATFORM_LINUX . '/' . self::PLATFORM_SMART_TV;
             } elseif (stripos($this->_agent, 'linux') !== false) {
                 $this->_platform = self::PLATFORM_LINUX;
             } else if (stripos($this->_agent, 'Nokia') !== false) {

Braces +5 added lines, -10 removed lines

@@ -921,20 +921,15 @@
                     if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
                         if($aresult[1] == '3.1'){
                             $this->setVersion('7.0');
-                        }
-                        else if($aresult[1] == '4.0'){
+                        } else if($aresult[1] == '4.0'){
                             $this->setVersion('8.0');
-                        }
-                        else if($aresult[1] == '5.0'){
+                        } else if($aresult[1] == '5.0'){
                             $this->setVersion('9.0');
-                        }
-                        else if($aresult[1] == '6.0'){
+                        } else if($aresult[1] == '6.0'){
                             $this->setVersion('10.0');
-                        }
-                        else if($aresult[1] == '7.0'){
+                        } else if($aresult[1] == '7.0'){
                             $this->setVersion('11.0');
-                        }
-                        else if($aresult[1] == '8.0'){
+                        } else if($aresult[1] == '8.0'){
                             $this->setVersion('11.0');
                         }
                     }

core/functions/function_lang.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	if(! function_exists('__')){
 		/**

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	if(! function_exists('__')){
+	if (!function_exists('__')) {
 		/**
 		 * function for the shortcut to Lang::get()
 		 * @param  string $key the language key to retrieve
@@ -32,20 +32,20 @@ 
 		 * for the given key
 		 * @return string  the language value
 		 */
-		function __($key, $default = 'LANGUAGE_ERROR'){
+		function __($key, $default = 'LANGUAGE_ERROR') {
 			return get_instance()->lang->get($key, $default);
 		}
 
 	}
 
 
-	if(! function_exists('get_languages')){
+	if (!function_exists('get_languages')) {
 		/**
 		 * function for the shortcut to Lang::getSupported()
 		 * 
 		 * @return array all the supported languages
 		 */
-		function get_languages(){
+		function get_languages() {
 			return get_instance()->lang->getSupported();
 		}
 

core/functions/function_user_agent.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 
 	/**

Braces +4 added lines, -8 removed lines

@@ -55,17 +55,13 @@
 
 			if (isset($_SERVER["HTTP_CLIENT_IP"])) {
 				$ip = $_SERVER["HTTP_CLIENT_IP"];
-			}
-			else if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
+			} else if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) {
 				$ip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-			} 
-			else if (isset($_SERVER["HTTP_X_FORWARDED"])) {
+			} else if (isset($_SERVER["HTTP_X_FORWARDED"])) {
 				$ip = $_SERVER["HTTP_X_FORWARDED"];
-			} 
-			else if (isset($_SERVER["HTTP_FORWARDED_FOR"])) {
+			} else if (isset($_SERVER["HTTP_FORWARDED_FOR"])) {
 				$ip = $_SERVER["HTTP_FORWARDED_FOR"];
-			} 
-			else if (isset($_SERVER["HTTP_FORWARDED"])) {
+			} else if (isset($_SERVER["HTTP_FORWARDED"])) {
 				$ip = $_SERVER["HTTP_FORWARDED"];
 			} 
 

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	 
-	if(! function_exists('get_ip')){
+	if (!function_exists('get_ip')) {
 		/**
 		 *  Retrieves the user's IP address
 		 *  
@@ -50,7 +50,7 @@ 
 		 *  
 		 *  @return string the IP address.
 		 */
-		function get_ip(){
+		function get_ip() {
 			$ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
 
 			if (isset($_SERVER["HTTP_CLIENT_IP"])) {

core/functions/function_string.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 *  @file function_string.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 	 *  @filesource
 	 */
 
-	if(! function_exists('get_random_string')){
+	if (!function_exists('get_random_string')) {
 		/**
 		 * Generate a random string
 		 * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
@@ -49,9 +49,9 @@ 
 		 * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
 		 * @return string the generated string.
 		 */
-		function get_random_string($type = 'alnum', $length = 10, $lower = false){
+		function get_random_string($type = 'alnum', $length = 10, $lower = false) {
 			$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-			switch($type){
+			switch ($type) {
 				case 'alpha':
 					$str = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 				break;
@@ -63,10 +63,10 @@ 
 				break;
 			}
 			$random = null;
-			for($i = 0; $i < $length; $i++){
+			for ($i = 0; $i < $length; $i++) {
 				$random .= $str[mt_rand() % strlen($str)];
 			}
-			if($lower){
+			if ($lower) {
 				$random = strtolower($random);
 			}
 			return $random;