tnhfw / tnh-fw

core/classes/Log.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 Log{
 		

Braces +10 added lines, -20 removed lines

@@ -137,8 +137,7 @@ 
 						if(! in_array(strtolower($this->logger), $configLoggerName)){
 							return;
 						}
-					}
-					else if(strtolower($this->logger) !== strtolower($configLoggerName)){
+					} else if(strtolower($this->logger) !== strtolower($configLoggerName)){
 						return; 
 					}
 				}
@@ -218,20 +217,15 @@ 
 			//the default value is NONE, so means no need test for NONE
 			if($level == 'fatal'){
 				$value = self::FATAL;
-			}
-			else if($level == 'error'){
+			} else if($level == 'error'){
 				$value = self::ERROR;
-			}
-			else if($level == 'warning' || $level == 'warn'){
+			} else if($level == 'warning' || $level == 'warn'){
 				$value = self::WARNING;
-			}
-			else if($level == 'info'){
+			} else if($level == 'info'){
 				$value = self::INFO;
-			}
-			else if($level == 'debug'){
+			} else if($level == 'debug'){
 				$value = self::DEBUG;
-			}
-			else if($level == 'all'){
+			} else if($level == 'all'){
 				$value = self::ALL;
 			}
 			return $value;
@@ -248,17 +242,13 @@ 
 			//the default value is NONE, so means no need test for NONE
 			if($level == self::FATAL){
 				$value = 'FATAL';
-			}
-			else if($level == self::ERROR){
+			} else if($level == self::ERROR){
 				$value = 'ERROR';
-			}
-			else if($level == self::WARNING){
+			} else if($level == self::WARNING){
 				$value = 'WARNING';
-			}
-			else if($level == self::INFO){
+			} else if($level == self::INFO){
 				$value = 'INFO';
-			}
-			else if($level == self::DEBUG){
+			} else if($level == self::DEBUG){
 				$value = 'DEBUG';
 			}
 			//no need for ALL

Spacing +36 added lines, -36 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Log{
+	class Log {
 		
 		/**
 		 * The defined constante for Log level
@@ -52,14 +52,14 @@ 
 		/**
 		 * Create new Log instance
 		 */
-		public function __construct(){
+		public function __construct() {
 		}
 
 		/**
 		 * Set the logger to identify each message in the log
 		 * @param string $logger the logger name
 		 */
-		public  function setLogger($logger){
+		public  function setLogger($logger) {
 			$this->logger = $logger;
 		}
 
@@ -68,7 +68,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function fatal($message){
+		public function fatal($message) {
 			$this->writeLog($message, self::FATAL);
 		} 
 		
@@ -77,7 +77,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function error($message){
+		public function error($message) {
 			$this->writeLog($message, self::ERROR);
 		} 
 
@@ -86,7 +86,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function warning($message){
+		public function warning($message) {
 			$this->writeLog($message, self::WARNING);
 		} 
 		
@@ -95,7 +95,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function info($message){
+		public function info($message) {
 			$this->writeLog($message, self::INFO);
 		} 
 		
@@ -104,7 +104,7 @@ 
 		 * @see Log::writeLog for more detail
 		 * @param  string $message the log message to save
 		 */
-		public function debug($message){
+		public function debug($message) {
 			$this->writeLog($message, self::DEBUG);
 		} 
 		
@@ -115,59 +115,59 @@ 
 		 * @param  integer|string $level   the log level in integer or string format, if is string will convert into integer
 		 * to allow check the log level threshold.
 		 */
-		public function writeLog($message, $level = self::INFO){
+		public function writeLog($message, $level = self::INFO) {
 			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
+			if (!$configLogLevel) {
 				//so means no need log just stop here
 				return;
 			}
 			//check config log level
-			if(! self::isValidConfigLevel($configLogLevel)){
+			if (!self::isValidConfigLevel($configLogLevel)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Invalid config log level [' . $configLogLevel . '], the value must be one of the following: ' . implode(', ', array_map('strtoupper', self::$validConfigLevel)), $title = 'Log Config Error', $logging = false);	
 			}
 			
 			//check if config log_logger_name is set
-			if($this->logger){
+			if ($this->logger) {
 				$configLoggerName = get_config('log_logger_name', '');
-				if($configLoggerName){
-					if (is_array($configLoggerName)){
+				if ($configLoggerName) {
+					if (is_array($configLoggerName)) {
 						//for best comparaison put all string to lowercase
 						$configLoggerName = array_map('strtolower', $configLoggerName);
-						if(! in_array(strtolower($this->logger), $configLoggerName)){
+						if (!in_array(strtolower($this->logger), $configLoggerName)) {
 							return;
 						}
 					}
-					else if(strtolower($this->logger) !== strtolower($configLoggerName)){
+					else if (strtolower($this->logger) !== strtolower($configLoggerName)) {
 						return; 
 					}
 				}
 			}
 			
 			//if $level is not an integer
-			if(! is_numeric($level)){
+			if (!is_numeric($level)) {
 				$level = self::getLevelValue($level);
 			}
 			
 			//check if can logging regarding the log level config
 			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
+			if ($configLevel > $level) {
 				//can't log
 				return;
 			}
 			
 			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
+			if (!$logSavePath) {
 				$logSavePath = LOGS_PATH;
 			}
 			
-			if(! is_dir($logSavePath) || !is_writable($logSavePath)){
+			if (!is_dir($logSavePath) || !is_writable($logSavePath)) {
 				//NOTE: here need put the show_error() "logging" to false to prevent loop
 				show_error('Error : the log dir does not exists or is not writable', $title = 'Log directory error', $logging = false);
 			}
 			
 			$path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
-			if(! file_exists($path)){
+			if (!file_exists($path)) {
 				touch($path);
 			}
 			//may be at this time helper user_agent not yet included
@@ -189,7 +189,7 @@ 
 			
 			$str = $logDate . ' [' . str_pad($levelName, 7 /*warning len*/) . '] ' . ' [' . str_pad($ip, 15) . '] ' . $this->logger . ' : ' . $message . ' ' . '[' . $fileInfo['file'] . '::' . $fileInfo['line'] . ']' . "\n";
 			$fp = fopen($path, 'a+');
-			if(is_resource($fp)){
+			if (is_resource($fp)) {
 				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
 				fwrite($fp, $str);
 				fclose($fp);
@@ -203,7 +203,7 @@ 
 		 *
 		 * @return boolean        true if the given log level is valid, false if not
 		 */
-		private static function isValidConfigLevel($level){
+		private static function isValidConfigLevel($level) {
 			$level = strtolower($level);
 			return in_array($level, self::$validConfigLevel);
 		}
@@ -213,27 +213,27 @@ 
 		 * @param  string $level the log level in string format
 		 * @return int        the log level in integer format using the predefinied constants
 		 */
-		private static function getLevelValue($level){
+		private static function getLevelValue($level) {
 			$level = strtolower($level);
 			$value = self::NONE;
 			
 			//the default value is NONE, so means no need test for NONE
-			if($level == 'fatal'){
+			if ($level == 'fatal') {
 				$value = self::FATAL;
 			}
-			else if($level == 'error'){
+			else if ($level == 'error') {
 				$value = self::ERROR;
 			}
-			else if($level == 'warning' || $level == 'warn'){
+			else if ($level == 'warning' || $level == 'warn') {
 				$value = self::WARNING;
 			}
-			else if($level == 'info'){
+			else if ($level == 'info') {
 				$value = self::INFO;
 			}
-			else if($level == 'debug'){
+			else if ($level == 'debug') {
 				$value = self::DEBUG;
 			}
-			else if($level == 'all'){
+			else if ($level == 'all') {
 				$value = self::ALL;
 			}
 			return $value;
@@ -244,23 +244,23 @@ 
 		 * @param  integer $level the log level in integer format
 		 * @return string        the log level in string format
 		 */
-		private static function getLevelName($level){
+		private static function getLevelName($level) {
 			$value = '';
 			
 			//the default value is NONE, so means no need test for NONE
-			if($level == self::FATAL){
+			if ($level == self::FATAL) {
 				$value = 'FATAL';
 			}
-			else if($level == self::ERROR){
+			else if ($level == self::ERROR) {
 				$value = 'ERROR';
 			}
-			else if($level == self::WARNING){
+			else if ($level == self::WARNING) {
 				$value = 'WARNING';
 			}
-			else if($level == self::INFO){
+			else if ($level == self::INFO) {
 				$value = 'INFO';
 			}
-			else if($level == self::DEBUG){
+			else if ($level == self::DEBUG) {
 				$value = 'DEBUG';
 			}
 			//no need for ALL

core/libraries/Benchmark.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 for Benchmark

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Class for Benchmark
 	 */
-	class Benchmark{
+	class Benchmark {
 		/**
 		 * The markers for excution time
 		 * @var array
@@ -44,7 +44,7 @@ 
 		 * This method is used to mark one point for benchmark (execution time and memory usage)
 		 * @param  string $name the marker name
 		 */
-		public function mark($name){
+		public function mark($name) {
 			//Marker for execution time
 			$this->markersTime[$name] = microtime(true);
 			//Marker for memory usage
@@ -58,12 +58,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total execution time
 		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersTime[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersTime[$endMarkerName])){
+			if (!isset($this->markersTime[$endMarkerName])) {
 				$this->markersTime[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
@@ -76,12 +76,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total memory usage
 		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersMemory[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
+			if (!isset($this->markersMemory[$endMarkerName])) {
 				$this->markersMemory[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);

core/libraries/PDF.php

Indentation +7 added lines, -7 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.
-	*/
+	 */
 
 	/**
 	 * PDF library to generate PDF document using the library DOMPDF
@@ -45,8 +45,8 @@ 
 		 * Create PDF library instance
 		 */
 		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::PDF');
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::PDF');
 
 			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
 			$this->dompdf = new Dompdf();
@@ -76,10 +76,10 @@ 
 		}
 		
 		/**
-		* Return the instance of Dompdf
-		*
-		* @return object the dompdf instance
-		*/
+		 * Return the instance of Dompdf
+		 *
+		 * @return object the dompdf instance
+		 */
 		public function getDompdf(){
 			return $this->dompdf;
 		}

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * PDF library to generate PDF document using the library DOMPDF
 	 */
-	class PDF{
+	class PDF {
 		
 		/**
 		 * The dompdf instance
@@ -44,11 +44,11 @@ 
 		/**
 		 * Create PDF library instance
 		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+	        $this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::PDF');
 
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
+			require_once VENDOR_PATH . 'dompdf/dompdf_config.inc.php';
 			$this->dompdf = new Dompdf();
 		}
 
@@ -62,15 +62,15 @@ 
 		 * @return string|void               if $stream is true send PDF document to browser for download, else return the generated PDF
 		 * content like to join in Email attachment of for other purpose use.
 		 */
-		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait'){
-			$this->logger->info('Generating of PDF document: filename [' .$filename. '], stream [' .($stream ? 'TRUE':'FALSE'). '], paper [' .$paper. '], orientation [' .$orientation. ']');
+		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait') {
+			$this->logger->info('Generating of PDF document: filename [' . $filename . '], stream [' . ($stream ? 'TRUE' : 'FALSE') . '], paper [' . $paper . '], orientation [' . $orientation . ']');
 			$this->dompdf->load_html($html);
 			$this->dompdf->set_paper($paper, $orientation);
 			$this->dompdf->render();
-			if($stream){
+			if ($stream) {
 				$this->dompdf->stream($filename);
 			}
-			else{
+			else {
 				return $this->dompdf->output();
 			}
 		}
@@ -80,7 +80,7 @@ 
 		*
 		* @return object the dompdf instance
 		*/
-		public function getDompdf(){
+		public function getDompdf() {
 			return $this->dompdf;
 		}
 		

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			$this->dompdf->render();
 			if($stream){
 				$this->dompdf->stream($filename);
-			}
-			else{
+			} else{
 				return $this->dompdf->output();
 			}
 		}

core/libraries/Email.php

Indentation +16 added lines, -16 removed lines

@@ -74,9 +74,9 @@ 
 		protected $_uid;
 		
 		/**
-         * The logger instance
-         * @var Log
-         */
+		 * The logger instance
+		 * @var Log
+		 */
 		private $logger;
 
 		/**
@@ -87,7 +87,7 @@ 
 		public function __construct()
 		{
 			$this->logger =& class_loader('Log', 'classes');
-            $this->logger->setLogger('Library::Email');
+			$this->logger->setLogger('Library::Email');
 			$this->reset();
 		}
 
@@ -112,13 +112,13 @@ 
 		}
 		
 		 /**
-		 * setFrom
-		 *
-		 * @param string $email The email to send as from.
-		 * @param string $name  The name to send as from.
-		 *
-		 * @return self
-		 */
+		  * setFrom
+		  *
+		  * @param string $email The email to send as from.
+		  * @param string $name  The name to send as from.
+		  *
+		  * @return self
+		  */
 		public function setFrom($email, $name = null)
 		{
 			$this->addMailHeader('From', (string) $email, (string) $name);
@@ -140,11 +140,11 @@ 
 		}
 		
 		/**
-		* Set destination using array
-		* @params array $emails the list of recipient. This is an associative array name => email
-		* @example array('John Doe' => 'email1@example.com')
-		* @return Object the current instance
-		*/
+		 * Set destination using array
+		 * @params array $emails the list of recipient. This is an associative array name => email
+		 * @example array('John Doe' => 'email1@example.com')
+		 * @return Object the current instance
+		 */
 		public function setTos(array $emails)
 		{
 			foreach ($emails as $name => $email) {

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 			foreach ($emails as $name => $email) {
 				if(is_numeric($name)){
 					$this->setTo($email);
-				}
-				else{
+				} else{
 					$this->setTo($email, $name);
 				}
 			}

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
 		 */
 		public function __construct()
 		{
-			$this->logger =& class_loader('Log', 'classes');
+			$this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Email');
 			$this->reset();
 		}
@@ -148,10 +148,10 @@ 
 		public function setTos(array $emails)
 		{
 			foreach ($emails as $name => $email) {
-				if(is_numeric($name)){
+				if (is_numeric($name)) {
 					$this->setTo($email);
 				}
-				else{
+				else {
 					$this->setTo($email, $name);
 				}
 			}
@@ -281,8 +281,8 @@ 
 		 */
 		public function addAttachment($path, $filename = null, $data = null)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filename = empty($filename) ? basename($path) : $filename;
 			$filename = $this->encodeUtf8($this->filterOther((string) $filename));
@@ -304,13 +304,13 @@ 
 		 */
 		public function getAttachmentData($path)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filesize = filesize($path);
 			$handle = fopen($path, "r");
 			$attachment = null;
-			if(is_resource($handle)){
+			if (is_resource($handle)) {
 				$attachment = fread($handle, $filesize);
 				fclose($handle);
 			}

core/libraries/Cookie.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 Cookie{
 		

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
 				$logger->info('Delete cookie item ['.$item.']');
 				unset($_COOKIE[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
 				return false;
 			}

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Cookie{
+	class Cookie {
 		
 		/**
 		 * The logger instance
@@ -36,9 +36,9 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Cookie');
 			}
 			return self::$logger[0];
@@ -50,9 +50,9 @@ 
 		 * @param  mixed $default the default value to use if can not find the cokkie item in the list
 		 * @return mixed          the cookie value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
+			if (array_key_exists($item, $_COOKIE)) {
 				return $_COOKIE[$item];
 			}
 			$logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
@@ -69,14 +69,14 @@ 
 		 * @param boolean $secure   if this cookie will be available on secure connection or not
 		 * @param boolean $httponly if this cookie will be available under HTTP protocol.
 		 */
-		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false){
-			if(headers_sent()){
+		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false) {
+			if (headers_sent()) {
 				show_error('There exists a cookie that we wanted to create that we couldn\'t 
 						    because headers was already sent. Make sure to do this first 
 							before outputing anything.');
 			}
 			$timestamp = $expire;
-			if($expire){
+			if ($expire) {
 				$timestamp = time() + $expire;
 			}
 			setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
@@ -87,15 +87,15 @@ 
 		 * @param  string $item the cookie item name to be cleared
 		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
 		 */
-		public static function delete($item){
+		public static function delete($item) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				$logger->info('Delete cookie item ['.$item.']');
+			if (array_key_exists($item, $_COOKIE)) {
+				$logger->info('Delete cookie item [' . $item . ']');
 				unset($_COOKIE[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Cookie item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -105,7 +105,7 @@ 
 		 * @param  string $item the cookie item name
 		 * @return boolean       true if the cookie item is set, false or not
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_COOKIE);
 		}
 

core/libraries/Assets.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 Assets.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	 *  @since 1.0.0
 	 *  @filesource
 	 */
-	class Assets{
+	class Assets {
 		
 		/**
 		 * The logger instance
@@ -50,10 +50,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				//can't assign reference to static variable
-				self::$logger[0] =& class_loader('Log', 'classes');
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Assets');
 			}
 			return self::$logger[0];
@@ -72,13 +72,13 @@ 
 		 *  @param $asset the name of the assets file path with the extension.
 		 *  @return string|null the absolute path of the assets file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function path($asset){
+		public static function path($asset) {
 			$logger = self::getLogger();	
 			$path = ASSETS_PATH . $asset;
 			
 			$logger->debug('Including the Assets file [' . $path . ']');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] included successfully');
 				return Url::base_url($path);
 			}
@@ -98,7 +98,7 @@ 
 		 *  @param $path the name of the css file without the extension.
 		 *  @return string|null the absolute path of the css file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function css($path){
+		public static function css($path) {
 			$logger = self::getLogger();
 			/*
 			* if the file name contains the ".css" extension, replace it with 
@@ -109,7 +109,7 @@ 
 			
 			$logger->debug('Including the Assets file [' . $path . '] for CSS');
 			//Check if the file exists
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for CSS included successfully');
 				return Url::base_url($path);
 			}
@@ -129,12 +129,12 @@ 
 		 *  @param $path the name of the javascript file without the extension.
 		 *  @return string|null the absolute path of the javascript file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function js($path){
+		public static function js($path) {
 			$logger = self::getLogger();
 			$path = str_ireplace('.js', '', $path);
 			$path = ASSETS_PATH . 'js/' . $path . '.js';
 			$logger->debug('Including the Assets file [' . $path . '] for javascript');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for Javascript included successfully');
 				return Url::base_url($path);
 			}
@@ -154,11 +154,11 @@ 
 		 *  @param $path the name of the image file with the extension.
 		 *  @return string|null the absolute path of the image file, if it exists otherwise returns null if the file does not exist.
 		 */
-		public static function img($path){
+		public static function img($path) {
 			$logger = self::getLogger();
 			$path = ASSETS_PATH . 'images/' . $path;
 			$logger->debug('Including the Assets file [' . $path . '] for image');
-			if(file_exists($path)){
+			if (file_exists($path)) {
 				$logger->info('Assets file [' . $path . '] for image included successfully');
 				return Url::base_url($path);
 			}

core/libraries/Upload.php

Braces +2 added lines, -4 removed lines

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

Indentation +791 added lines, -791 removed lines

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

Spacing +47 added lines, -47 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload{
+    class Upload {
 
         /**
         *   Version
@@ -69,7 +69,7 @@ 
         *    @version    1.0
         *    @var        array
         */
-        private $file_array    = array();
+        private $file_array = array();
 
         /**
         *    If the file you are trying to upload already exists it will
@@ -119,7 +119,7 @@ 
         *    @version    1.0
         *    @var        float
         */
-        private $max_file_size= 0.0;
+        private $max_file_size = 0.0;
 
         /**
         *    List of allowed mime types
@@ -217,12 +217,12 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
+        public function __construct() {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
 
             Loader::lang('file_upload');
-            $obj =& get_instance();
+            $obj = & get_instance();
 
             $this->error_messages = array(
                 'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
@@ -239,15 +239,15 @@ 
             );
 
             $this->file = array(
-                'status'                =>    false,    // True: success upload
-                'mime'                  =>    '',       // Empty string
-                'filename'              =>    '',       // Empty string
-                'original'              =>    '',       // Empty string
-                'size'                  =>    0,        // 0 Bytes
-                'sizeFormated'          =>    '0B',     // 0 Bytes
-                'destination'           =>    './',     // Default: ./
-                'allowed_mime_types'    =>    array(),  // Allowed mime types
-                'error'                 =>    null,        // File error
+                'status'                =>    false, // True: success upload
+                'mime'                  =>    '', // Empty string
+                'filename'              =>    '', // Empty string
+                'original'              =>    '', // Empty string
+                'size'                  =>    0, // 0 Bytes
+                'sizeFormated'          =>    '0B', // 0 Bytes
+                'destination'           =>    './', // Default: ./
+                'allowed_mime_types'    =>    array(), // Allowed mime types
+                'error'                 =>    null, // File error
             );
 
             // Change dir to current dir
@@ -259,7 +259,7 @@ 
             } elseif (isset($HTTP_POST_FILES) && is_array($HTTP_POST_FILES)) {
                 $this->file_array = $HTTP_POST_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -275,7 +275,7 @@ 
         */
         public function setInput($input)
         {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+            if (!empty($input) && (is_string($input) || is_numeric($input))) {
                 $this->input = $input;
             }
             return $this;
@@ -311,7 +311,7 @@ 
         */
         public function setAutoFilename()
         {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
+            $this->filename = sha1(mt_rand(1, 9999) . uniqid());
             $this->filename .= time();
             return $this;
         }
@@ -332,7 +332,7 @@ 
                 $php_size = $this->sizeInBytes((int) ini_get('upload_max_filesize'));
                 // Calculate difference
                 if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+                    $this->logger->warning('The upload max file size you set [' . $file_size . '] is greather than the PHP configuration for upload max file size [' . $php_size . ']');
                 }
                 $this->max_file_size = $file_size;
             }
@@ -350,7 +350,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -415,7 +415,7 @@ 
         {
             if (!empty($name) && is_string($name)) {
                 if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+                    return $this->setAllowedMimeTypes($this->mime_helping[$name]);
                 }
             }
             return $this;
@@ -434,8 +434,8 @@ 
         */
         public function setUploadFunction($function)
         {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
+            if (!empty($function) && (is_array($function) || is_string($function))) {
+                if (is_callable($function)) {
                     $this->upload_function = $function;
                 }
             }
@@ -488,8 +488,8 @@ 
                             chdir($destination_directory);
                         }
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -539,7 +539,7 @@ 
         public function isFilename($filename)
         {
             $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+            return (!empty($filename) && (is_string($filename) || is_numeric($filename)));
         }
         /**
         *    Validate mime type with allowed mime types,
@@ -581,11 +581,11 @@ 
         */
         public function isDirpath($path)
         {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+            if (!empty($path) && (is_string($path) || is_numeric($path))) {
                 if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+                    return (preg_match('/^[^*?"<>|:]*$/', $path) == 1);
                 } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+                    return (preg_match("/^[^*?\"<>|:]*$/", substr($path, 2)) == 1);
                 }
             }
             return false;
@@ -613,10 +613,10 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             &&
             is_uploaded_file($this->file_array[$this->input]['tmp_name']);
@@ -629,9 +629,9 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return false;
             }
@@ -641,7 +641,7 @@ 
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
                     }
-                    else{
+                    else {
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -652,7 +652,7 @@ 
                             '$1',
                             $this->file_array[$this->input]['name']
                         );
-                        $this->filename = $this->filename.'.'.$extension;
+                        $this->filename = $this->filename . '.' . $extension;
                     }
 
                     // set file info
@@ -665,10 +665,10 @@ 
                     $this->file['filename']     = $this->filename;
                     $this->file['error']        = $this->file_array[$this->input]['error'];
 
-                    $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+                    $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                     //check for php upload error
-                    if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+                    if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                         $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                         return false;
                     }
@@ -697,8 +697,8 @@ 
                     }
 
                     // Execute input callback
-                    if (!empty( $this->callbacks['input'])) {
-                        call_user_func($this->callbacks['input'], (object)$this->file);
+                    if (!empty($this->callbacks['input'])) {
+                        call_user_func($this->callbacks['input'], (object) $this->file);
                     }
                    
 
@@ -710,8 +710,8 @@ 
                     );
 
                     // Execute output callback
-                    if (!empty( $this->callbacks['output'])) {
-                        call_user_func($this->callbacks['output'], (object)$this->file);
+                    if (!empty($this->callbacks['output'])) {
+                        call_user_func($this->callbacks['output'], (object) $this->file);
                     }
                     return $this->file['status'];
                 }
@@ -730,10 +730,10 @@ 
         */
         public function sizeFormat($size, $precision = 2)
         {
-            if($size > 0){
+            if ($size > 0) {
                 $base       = log($size) / log(1024);
                 $suffixes   = array('B', 'K', 'M', 'G', 'T');
-                return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
+                return round(pow(1024, $base - floor($base)), $precision) . (isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
             }
             return null;
         }
@@ -757,14 +757,14 @@ 
             if (array_key_exists('unit', $matches)) {
                 $unit = strtoupper($matches['unit']);
             }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+            return (floatval($matches['size']) * pow(1024, $units[$unit]));
         }
 
         /**
          * Get the upload error message
          * @return string
          */
-        public function getError(){
+        public function getError() {
             return $this->error;
         }
 
@@ -772,7 +772,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The upload got error : ' . $message);
             $this->error = $message;
         }
@@ -782,7 +782,7 @@ 
          * @param  int $code the error code
          * @return string the error message
          */
-        private function getPhpUploadErrorMessageByCode($code){
+        private function getPhpUploadErrorMessageByCode($code) {
             $codeMessageMaps = array(
                 1 => $this->error_messages['upload_err_ini_size'],
                 2 => $this->error_messages['upload_err_form_size'],

core/libraries/FormValidation.php

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;

Spacing +53 added lines, -53 removed lines

@@ -25,13 +25,13 @@ 
     */
 
 
-     class FormValidation{
+     class FormValidation {
 		 
         /**
          * The form validation status
          * @var boolean
          */
-        protected $_success  = false;
+        protected $_success = false;
 
         /**
          * The list of errors messages
@@ -40,31 +40,31 @@ 
         protected $_errorsMessages = array();
         
         // Array of rule sets, fieldName => PIPE seperated ruleString
-        protected $_rules             = array();
+        protected $_rules = array();
         
         // Array of errors, niceName => Error Message
-        protected $_errors             = array();
+        protected $_errors = array();
         
         // Array of post Key => Nice name labels
-        protected $_labels          = array();
+        protected $_labels = array();
         
         /**
          * The errors delimiters
          * @var array
          */
-        protected $_allErrorsDelimiter   = array('<div class="error">', '</div>');
+        protected $_allErrorsDelimiter = array('<div class="error">', '</div>');
 
         /**
          * The each error delimiter
          * @var array
          */
-        protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
+        protected $_eachErrorDelimiter = array('<p class="error">', '</p>');
         
 		/**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
-        protected $_forceFail            = false;
+        protected $_forceFail = false;
 
         /**
          * The list of the error messages overrides by the original
@@ -98,13 +98,13 @@ 
          * @return void
          */
         public function __construct() {
-            $this->logger =& class_loader('Log', 'classes');
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
 		   //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
-            $this->_errorsMessages  = array(
+            $this->_errorsMessages = array(
                         'required'         => $obj->lang->get('fv_required'),
                         'min_length'       => $obj->lang->get('fv_min_length'),
                         'max_length'       => $obj->lang->get('fv_max_length'),
@@ -141,7 +141,7 @@ 
             $this->_success              = false;
             $this->_forceFail            = false;
             $this->data                  = array();
-			$this->enableCsrfCheck       = false;
+			$this->enableCsrfCheck = false;
         }
 
         /**
@@ -150,7 +150,7 @@ 
 		 *
          * @return FormValidation Current instance of object.
          */
-        public function setData(array $data){
+        public function setData(array $data) {
             $this->logger->debug('Setting the form validation data, the values are: ' . stringfy_vars($data));
             $this->data = $data;
 			return $this;
@@ -160,7 +160,7 @@ 
          * Get the form validation data
          * @return array the form validation data to be validated
          */
-        public function getData(){
+        public function getData() {
             return $this->data;
         }
 
@@ -169,7 +169,7 @@ 
 		*
 		* @return string the function name
 		*/
-        protected function _toCallCase($funcName, $prefix='_validate') {
+        protected function _toCallCase($funcName, $prefix = '_validate') {
             $funcName = strtolower($funcName);
             $finalFuncName = $prefix;
             foreach (explode('_', $funcName) as $funcNamePart) {
@@ -193,7 +193,7 @@ 
          * @return boolean Whether or not the form has been submitted or the data is available for validation.
          */
         public function canDoValidation() {
-            return get_instance()->request->method() === 'POST' || ! empty($this->data);
+            return get_instance()->request->method() === 'POST' || !empty($this->data);
         }
 
         /**
@@ -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;
         }
 
@@ -426,7 +426,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -451,25 +451,25 @@ 
             /*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
+            if (strpos($ruleString, 'regex') !== false) {
                 $regexRule = array();
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(isset($regexRule[0]) && !empty($regexRule[0])){
+                 if (isset($regexRule[0]) && !empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
-                    if($rule){
+                    if ($rule) {
                         $ruleSets[] = $rule;
                     }
                 }
                  
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -501,7 +501,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();
 
@@ -545,7 +545,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;
             }
         }
@@ -597,13 +597,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));
             }
         }
@@ -629,7 +629,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)));
 				}
             }
@@ -663,7 +663,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -693,8 +693,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));
@@ -710,7 +710,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])));
@@ -726,7 +726,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])));
@@ -742,7 +742,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])));
@@ -758,7 +758,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])));
@@ -774,7 +774,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])));
@@ -789,8 +789,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)));
@@ -806,7 +806,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]);
@@ -815,7 +815,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)));
@@ -831,7 +831,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]);
@@ -840,7 +840,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)));
@@ -856,11 +856,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]);
@@ -871,7 +871,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)));
@@ -888,8 +888,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])));
@@ -905,8 +905,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)));

Indentation +875 added lines, -875 removed lines

@@ -1,917 +1,917 @@
 <?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;
-                // A global rule error message
-                case 2:
-                    foreach ($this->post(null) as $key => $val) {
-                        $this->_errorPhraseOverrides[$key][func_get_arg(0)] = func_get_arg(1);
-                    }
-                    break;
-                // Field specific rule error message
-                case 3:
-                    $this->_errorPhraseOverrides[func_get_arg(1)][func_get_arg(0)] = func_get_arg(2);
-                    break;
-            }
-            return true;
-        }
-
-        /**
-         * Adds a custom error message in the errorSet array, that will
-         * forcibly display it.
-         *
-         * @param string $inputName The form input name or data key
-         * @param string $errorMessage Error to display
-		 *
-         * @return formValidation Current instance of the object
-         */
-        public function setCustomError($inputName, $errorMessage) {
-            $errorMessage = str_replace('%1', $this->_labels[$inputName], $errorMessage);
-            $this->_errors[$inputName] = $errorMessage;
-            return $this;
-        }
-
-        /**
-         * Allows for an accesor to any/all post values, if a value of null is passed as the key, it
-         * will recursively find all keys/values of the $_POST array or data array. It also automatically trims
-         * all values.
-         *
-         * @param string $key Key of $this->data to be found, pass null for all Key => Val pairs.
-         * @param boolean $trim Defaults to true, trims all $this->data values.
-         * @return string|array Array of post or data values if null is passed as key, string if only one key is desired.
-         */
-        public function post($key = null, $trim = true) {
-            $returnValue = null;
-            if (is_null($key)) {
-                $returnValue = array();
-                foreach ($this->getData()  as $key => $val) {
-                    $returnValue[$key] = $this->post($key, $trim);
-                }
-            } else {
-                $returnValue = (array_key_exists($key, $this->getData())) ? (($trim) ? trim($this->data[$key]) : $this->data[$key]) : null;
-            }
-            return $returnValue;
-        }
-
-        /**
-         * Gets all errors from errorSet and displays them, can be echo out from the
-         * function or just returned.
-         *
-         * @param boolean $limit number of error to display or return
-         * @param boolean $echo Whether or not the values are to be returned or displayed
-		 *
-         * @return string Errors formatted for output
-         */
-        public function displayErrors($limit = null, $echo = true) {
-            list($errorsStart, $errorsEnd) = $this->_allErrorsDelimiter;
-            list($errorStart, $errorEnd) = $this->_eachErrorDelimiter;
-            $errorOutput = $errorsStart;
-    		$i = 0;
-            if (!empty($this->_errors)) {
-                foreach ($this->_errors as $fieldName => $error) {
-        	    	if ($i === $limit) { 
-                        break; 
-                    }
-                    $errorOutput .= $errorStart;
-                    $errorOutput .= $error;
-                    $errorOutput .= $errorEnd;
-                    $i++;
-                }
-            }
-            $errorOutput .= $errorsEnd;
-            echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
-        }
-
-        /**
-         * Returns raw array of errors in no format instead of displaying them
-         * formatted.
-         *
-         * @return array
-         */
-        public function returnErrors() {
-            return $this->_errors;
-        }
-
-        /**
-         * Breaks up a PIPE seperated string of rules, and puts them into an array.
-         *
-         * @param string $ruleString String to be parsed.
-		 *
-         * @return array Array of each value in original string.
-         */
-        protected function _parseRuleString($ruleString) {
-            $ruleSets = array();
-            /*
+		 */
+		public function setErrorsDelimiter($start, $end) {
+			$this->_allErrorsDelimiter[0] = $start;
+			$this->_allErrorsDelimiter[1] = $end;
+			return $this;
+		}
+
+		/**
+		 * This is the individual error delimiter, each argument occurs once before and after
+		 * each individual error listed.
+		 *
+		 * @param string $start Displayed before each error.
+		 * @param string $end Displayed after each error.
+		 * 
+		 * @return FormValidation Current instance of object.
+		 */
+		public function setErrorDelimiter($start, $end) {
+			$this->_eachErrorDelimiter[0] = $start;
+			$this->_eachErrorDelimiter[1] = $end;
+			return $this;
+		}
+
+		/**
+		 * Get the each errors delimiters
+		 *
+		 * @return array
+		 */
+		public function getErrorDelimiter() {
+			return $this->_eachErrorDelimiter;
+		}
+
+		/**
+		 * Get the all errors delimiters
+		 *
+		 * @return array
+		 */
+		public function getErrorsDelimiter() {
+			return $this->_allErrorsDelimiter;
+		}
+
+		/**
+		 * This sets a custom error message that can override the default error phrase provided
+		 * by FormValidation, it can be used in the format of setMessage('rule', 'error phrase')
+		 * which will globally change the error phrase of that rule, or in the format of:
+		 * setMessage('rule', 'fieldname', 'error phrase') - which will only change the error phrase for
+		 * that rule, applied on that field.
+		 *
+		 * @return boolean True on success, false on failure.
+		 */
+		public function setMessage() {
+			$numArgs = func_num_args();
+			switch ($numArgs) {
+				default:
+					return false;
+				// A global rule error message
+				case 2:
+					foreach ($this->post(null) as $key => $val) {
+						$this->_errorPhraseOverrides[$key][func_get_arg(0)] = func_get_arg(1);
+					}
+					break;
+				// Field specific rule error message
+				case 3:
+					$this->_errorPhraseOverrides[func_get_arg(1)][func_get_arg(0)] = func_get_arg(2);
+					break;
+			}
+			return true;
+		}
+
+		/**
+		 * Adds a custom error message in the errorSet array, that will
+		 * forcibly display it.
+		 *
+		 * @param string $inputName The form input name or data key
+		 * @param string $errorMessage Error to display
+		 *
+		 * @return formValidation Current instance of the object
+		 */
+		public function setCustomError($inputName, $errorMessage) {
+			$errorMessage = str_replace('%1', $this->_labels[$inputName], $errorMessage);
+			$this->_errors[$inputName] = $errorMessage;
+			return $this;
+		}
+
+		/**
+		 * Allows for an accesor to any/all post values, if a value of null is passed as the key, it
+		 * will recursively find all keys/values of the $_POST array or data array. It also automatically trims
+		 * all values.
+		 *
+		 * @param string $key Key of $this->data to be found, pass null for all Key => Val pairs.
+		 * @param boolean $trim Defaults to true, trims all $this->data values.
+		 * @return string|array Array of post or data values if null is passed as key, string if only one key is desired.
+		 */
+		public function post($key = null, $trim = true) {
+			$returnValue = null;
+			if (is_null($key)) {
+				$returnValue = array();
+				foreach ($this->getData()  as $key => $val) {
+					$returnValue[$key] = $this->post($key, $trim);
+				}
+			} else {
+				$returnValue = (array_key_exists($key, $this->getData())) ? (($trim) ? trim($this->data[$key]) : $this->data[$key]) : null;
+			}
+			return $returnValue;
+		}
+
+		/**
+		 * Gets all errors from errorSet and displays them, can be echo out from the
+		 * function or just returned.
+		 *
+		 * @param boolean $limit number of error to display or return
+		 * @param boolean $echo Whether or not the values are to be returned or displayed
+		 *
+		 * @return string Errors formatted for output
+		 */
+		public function displayErrors($limit = null, $echo = true) {
+			list($errorsStart, $errorsEnd) = $this->_allErrorsDelimiter;
+			list($errorStart, $errorEnd) = $this->_eachErrorDelimiter;
+			$errorOutput = $errorsStart;
+			$i = 0;
+			if (!empty($this->_errors)) {
+				foreach ($this->_errors as $fieldName => $error) {
+					if ($i === $limit) { 
+						break; 
+					}
+					$errorOutput .= $errorStart;
+					$errorOutput .= $error;
+					$errorOutput .= $errorEnd;
+					$i++;
+				}
+			}
+			$errorOutput .= $errorsEnd;
+			echo ($echo) ? $errorOutput : '';
+			return (! $echo) ? $errorOutput : null;
+		}
+
+		/**
+		 * Returns raw array of errors in no format instead of displaying them
+		 * formatted.
+		 *
+		 * @return array
+		 */
+		public function returnErrors() {
+			return $this->_errors;
+		}
+
+		/**
+		 * Breaks up a PIPE seperated string of rules, and puts them into an array.
+		 *
+		 * @param string $ruleString String to be parsed.
+		 *
+		 * @return array Array of each value in original string.
+		 */
+		protected function _parseRuleString($ruleString) {
+			$ruleSets = array();
+			/*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
-                $regexRule = array();
-                $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
-                preg_match($rule, $ruleString, $regexRule);
-                $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(isset($regexRule[0]) && !empty($regexRule[0])){
-                     $ruleSets[] = $regexRule[0];
-                 }
-                 $ruleStringRegex = explode('|', $ruleStringTemp);
-                foreach ($ruleStringRegex as $rule) {
-                    $rule = trim($rule);
-                    if($rule){
-                        $ruleSets[] = $rule;
-                    }
-                }
+			if(strpos($ruleString, 'regex') !== false){
+				$regexRule = array();
+				$rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
+				preg_match($rule, $ruleString, $regexRule);
+				$ruleStringTemp = preg_replace($rule, '', $ruleString);
+				 if(isset($regexRule[0]) && !empty($regexRule[0])){
+					 $ruleSets[] = $regexRule[0];
+				 }
+				 $ruleStringRegex = explode('|', $ruleStringTemp);
+				foreach ($ruleStringRegex as $rule) {
+					$rule = trim($rule);
+					if($rule){
+						$ruleSets[] = $rule;
+					}
+				}
                  
-            }
-            /***********************************/
-            else{
-                if (strpos($ruleString, '|') !== FALSE) {
-                    $ruleSets = explode('|', $ruleString);
-                } else {
-                    $ruleSets[] = $ruleString;
-                }
-             }
-            return $ruleSets;
-        }
-
-        /**
-         * Returns whether or not a field obtains the rule "required".
-         *
-         * @param string $fieldName Field to check if required.
-		 *
-         * @return boolean Whether or not the field is required.
-         */
-        protected function _fieldIsRequired($fieldName) {
-            $rules = $this->_parseRuleString($this->_rules[$fieldName]);
-            return (in_array('required', $rules));
-        }
-
-        /**
-         * Takes a data input name, it's value, and the rule it's being validated against (ex: max_length[16])
-         * and adds an error to the errorSet if it fails validation of the rule.
-         *
-         * @param string $inputName Name or key of the validation data
-         * @param string $inputVal Value of the validation data
-         * @param string $ruleName Rule to be validated against, including args (exact_length[5])
-         * @return void
-         */
-        protected function _validateRule($inputName, $inputVal, $ruleName) {
-            $this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
-            // Array to store args
-            $ruleArgs = array();
-
-            preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
-
-            // Get the rule arguments, realRule is just the base rule name
-            // Like min_length instead of min_length[3]
-            $ruleName = preg_replace('/\[(.*)\]/', '', $ruleName);
+			}
+			/***********************************/
+			else{
+				if (strpos($ruleString, '|') !== FALSE) {
+					$ruleSets = explode('|', $ruleString);
+				} else {
+					$ruleSets[] = $ruleString;
+				}
+			 }
+			return $ruleSets;
+		}
+
+		/**
+		 * Returns whether or not a field obtains the rule "required".
+		 *
+		 * @param string $fieldName Field to check if required.
+		 *
+		 * @return boolean Whether or not the field is required.
+		 */
+		protected function _fieldIsRequired($fieldName) {
+			$rules = $this->_parseRuleString($this->_rules[$fieldName]);
+			return (in_array('required', $rules));
+		}
+
+		/**
+		 * Takes a data input name, it's value, and the rule it's being validated against (ex: max_length[16])
+		 * and adds an error to the errorSet if it fails validation of the rule.
+		 *
+		 * @param string $inputName Name or key of the validation data
+		 * @param string $inputVal Value of the validation data
+		 * @param string $ruleName Rule to be validated against, including args (exact_length[5])
+		 * @return void
+		 */
+		protected function _validateRule($inputName, $inputVal, $ruleName) {
+			$this->logger->debug('Rule validation of field [' .$inputName. '], value [' .$inputVal. '], rule [' .$ruleName. ']');
+			// Array to store args
+			$ruleArgs = array();
+
+			preg_match('/\[(.*)\]/', $ruleName, $ruleArgs);
+
+			// Get the rule arguments, realRule is just the base rule name
+			// Like min_length instead of min_length[3]
+			$ruleName = preg_replace('/\[(.*)\]/', '', $ruleName);
             
-            if (method_exists($this, $this->_toCallCase($ruleName))) {
-                $methodToCall = $this->_toCallCase($ruleName);
-                call_user_func(array($this, $methodToCall), $inputName, $ruleName, $ruleArgs);
-            }
-            return;
-        }
-
-		/**
-		* Set error for the given field or key
-		*
-		* @param string $inputName the input or key name
-		* @param string $ruleName the rule name
-		* @param array|string $replacements
-		*/
-        protected function _setError($inputName, $ruleName, $replacements = array()) {
-            $rulePhraseKeyParts = explode(',', $ruleName);
-            $rulePhrase = null;
-            foreach ($rulePhraseKeyParts as $rulePhraseKeyPart) {
-                if (array_key_exists($rulePhraseKeyPart, $this->_errorsMessages)) {
-                    $rulePhrase = $this->_errorsMessages[$rulePhraseKeyPart];
-                } else {
-                    $rulePhrase = $rulePhrase[$rulePhraseKeyPart];
-                }
-            }
-            // Any overrides?
-            if (array_key_exists($inputName, $this->_errorPhraseOverrides) && array_key_exists($ruleName, $this->_errorPhraseOverrides[$inputName])) {
-                $rulePhrase = $this->_errorPhraseOverrides[$inputName][$ruleName];
-            }
-            // Type cast to array in case it's a string
-            $replacements = (array) $replacements;
+			if (method_exists($this, $this->_toCallCase($ruleName))) {
+				$methodToCall = $this->_toCallCase($ruleName);
+				call_user_func(array($this, $methodToCall), $inputName, $ruleName, $ruleArgs);
+			}
+			return;
+		}
+
+		/**
+		 * Set error for the given field or key
+		 *
+		 * @param string $inputName the input or key name
+		 * @param string $ruleName the rule name
+		 * @param array|string $replacements
+		 */
+		protected function _setError($inputName, $ruleName, $replacements = array()) {
+			$rulePhraseKeyParts = explode(',', $ruleName);
+			$rulePhrase = null;
+			foreach ($rulePhraseKeyParts as $rulePhraseKeyPart) {
+				if (array_key_exists($rulePhraseKeyPart, $this->_errorsMessages)) {
+					$rulePhrase = $this->_errorsMessages[$rulePhraseKeyPart];
+				} else {
+					$rulePhrase = $rulePhrase[$rulePhraseKeyPart];
+				}
+			}
+			// Any overrides?
+			if (array_key_exists($inputName, $this->_errorPhraseOverrides) && array_key_exists($ruleName, $this->_errorPhraseOverrides[$inputName])) {
+				$rulePhrase = $this->_errorPhraseOverrides[$inputName][$ruleName];
+			}
+			// Type cast to array in case it's a string
+			$replacements = (array) $replacements;
 			$replacementCount = count($replacements);
-            for ($i = 1; $i <= $replacementCount; $i++) {
-                $key = $i - 1;
-                $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
-            }
-            if (! array_key_exists($inputName, $this->_errors)) {
-                $this->_errors[$inputName] = $rulePhrase;
-            }
-        }
-
-        /**
-         * Used to run a callback for the callback rule, as well as pass in a default
-         * argument of the post value. For example the username field having a rule:
-         * callback[userExists] will eval userExists(data[username]) - Note the use
-         * of eval over call_user_func is in case the function is not user defined.
-         *
-         * @param type $inputArg
-         * @param string $callbackFunc
-		 *
-         * @return mixed
-         */
-        protected function _runCallback($inputArg, $callbackFunc) {
+			for ($i = 1; $i <= $replacementCount; $i++) {
+				$key = $i - 1;
+				$rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
+			}
+			if (! array_key_exists($inputName, $this->_errors)) {
+				$this->_errors[$inputName] = $rulePhrase;
+			}
+		}
+
+		/**
+		 * Used to run a callback for the callback rule, as well as pass in a default
+		 * argument of the post value. For example the username field having a rule:
+		 * callback[userExists] will eval userExists(data[username]) - Note the use
+		 * of eval over call_user_func is in case the function is not user defined.
+		 *
+		 * @param type $inputArg
+		 * @param string $callbackFunc
+		 *
+		 * @return mixed
+		 */
+		protected function _runCallback($inputArg, $callbackFunc) {
 			return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
-        }
-
-        /**
-         * Used for applying a rule only if the empty callback evaluates to true,
-         * for example required[funcName] - This runs funcName without passing any
-         * arguments.
-         *
-         * @param string $callbackFunc
-		 *
-         * @return 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)));
+			}
+		}
         
-    }
+	}

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';