tnhfw / tnh-fw

core/classes/Log.php

Indentation +251 added lines, -251 removed lines

@@ -1,279 +1,279 @@
 <?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.
-	*/
+    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 Log{
+    class Log{
 		
-		/**
-		 * The defined constante for Log level
-		 */
-		const NONE = 99999999;
-		const FATAL = 500;
-		const ERROR = 400;
-		const WARNING = 300;
-		const INFO = 200;
-		const DEBUG = 100;
-		const ALL = -99999999;
+        /**
+         * The defined constante for Log level
+         */
+        const NONE = 99999999;
+        const FATAL = 500;
+        const ERROR = 400;
+        const WARNING = 300;
+        const INFO = 200;
+        const DEBUG = 100;
+        const ALL = -99999999;
 
-		/**
-		 * The logger name
-		 * @var string
-		 */
-		private $logger = 'ROOT_LOGGER';
+        /**
+         * The logger name
+         * @var string
+         */
+        private $logger = 'ROOT_LOGGER';
 		
-		/**
-		 * List of valid log level to be checked for the configuration
-		 * @var array
-		 */
-		private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
+        /**
+         * List of valid log level to be checked for the configuration
+         * @var array
+         */
+        private static $validConfigLevel = array('off', 'none', 'fatal', 'error', 'warning', 'warn', 'info', 'debug', 'all');
 
-		/**
-		 * Create new Log instance
-		 */
-		public function __construct(){
-		}
+        /**
+         * Create new Log instance
+         */
+        public function __construct(){
+        }
 
-		/**
-		 * Set the logger to identify each message in the log
-		 * @param string $logger the logger name
-		 */
-		public  function setLogger($logger){
-			$this->logger = $logger;
-		}
+        /**
+         * Set the logger to identify each message in the log
+         * @param string $logger the logger name
+         */
+        public  function setLogger($logger){
+            $this->logger = $logger;
+        }
 
-		/**
-		 * Save the fatal message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function fatal($message){
-			$this->writeLog($message, self::FATAL);
-		} 
+        /**
+         * Save the fatal message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function fatal($message){
+            $this->writeLog($message, self::FATAL);
+        } 
 		
-		/**
-		 * Save the error message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function error($message){
-			$this->writeLog($message, self::ERROR);
-		} 
+        /**
+         * Save the error message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function error($message){
+            $this->writeLog($message, self::ERROR);
+        } 
 
-		/**
-		 * Save the warning message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function warning($message){
-			$this->writeLog($message, self::WARNING);
-		} 
+        /**
+         * Save the warning message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function warning($message){
+            $this->writeLog($message, self::WARNING);
+        } 
 		
-		/**
-		 * Save the info message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function info($message){
-			$this->writeLog($message, self::INFO);
-		} 
+        /**
+         * Save the info message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function info($message){
+            $this->writeLog($message, self::INFO);
+        } 
 		
-		/**
-		 * Save the debug message in the log
-		 * @see Log::writeLog for more detail
-		 * @param  string $message the log message to save
-		 */
-		public function debug($message){
-			$this->writeLog($message, self::DEBUG);
-		} 
+        /**
+         * Save the debug message in the log
+         * @see Log::writeLog for more detail
+         * @param  string $message the log message to save
+         */
+        public function debug($message){
+            $this->writeLog($message, self::DEBUG);
+        } 
 		
 		
-		/**
-		 * Save the log message
-		 * @param  string $message the log message to be saved
-		 * @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){
-			$configLogLevel = get_config('log_level');
-			if(! $configLogLevel){
-				//so means no need log just stop here
-				return;
-			}
-			//check config log level
-			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);	
-			}
+        /**
+         * Save the log message
+         * @param  string $message the log message to be saved
+         * @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){
+            $configLogLevel = get_config('log_level');
+            if(! $configLogLevel){
+                //so means no need log just stop here
+                return;
+            }
+            //check config log level
+            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){
-				$configLoggersName = get_config('log_logger_name', array());
-				if (!empty($configLoggersName)) {
-					//for best comparaison put all string to lowercase
-					$configLoggersName = array_map('strtolower', $configLoggersName);
-					if(! in_array(strtolower($this->logger), $configLoggersName)){
-						return;
-					}
-				}
-			}
+            //check if config log_logger_name is set
+            if($this->logger){
+                $configLoggersName = get_config('log_logger_name', array());
+                if (!empty($configLoggersName)) {
+                    //for best comparaison put all string to lowercase
+                    $configLoggersName = array_map('strtolower', $configLoggersName);
+                    if(! in_array(strtolower($this->logger), $configLoggersName)){
+                        return;
+                    }
+                }
+            }
 			
-			//if $level is not an integer
-			if(! is_numeric($level)){
-				$level = self::getLevelValue($level);
-			}
+            //if $level is not an integer
+            if(! is_numeric($level)){
+                $level = self::getLevelValue($level);
+            }
 			
-			//check if can logging regarding the log level config
-			$configLevel = self::getLevelValue($configLogLevel);
-			if($configLevel > $level){
-				//can't log
-				return;
-			}
-			//check log file and directory
-			$path = $this->checkAndSetLogFileDirectory();
-			//save the log data
-			$this->saveLogData($path, $level, $message);
-		}	
+            //check if can logging regarding the log level config
+            $configLevel = self::getLevelValue($configLogLevel);
+            if($configLevel > $level){
+                //can't log
+                return;
+            }
+            //check log file and directory
+            $path = $this->checkAndSetLogFileDirectory();
+            //save the log data
+            $this->saveLogData($path, $level, $message);
+        }	
 
-		/**
-		 * Save the log data into file
-		 * @param  string $path    the path of the log file
-		 * @param  int $level   the log level in numeric format
-		 * @param  string $message the log message to save
-		 * @return void
-		 */
-		public function saveLogData($path, $level, $message){
-			//may be at this time helper user_agent not yet included
-			require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
+        /**
+         * Save the log data into file
+         * @param  string $path    the path of the log file
+         * @param  int $level   the log level in numeric format
+         * @param  string $message the log message to save
+         * @return void
+         */
+        public function saveLogData($path, $level, $message){
+            //may be at this time helper user_agent not yet included
+            require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 			
-			///////////////////// date //////////////
-			$timestampWithMicro = microtime(true);
-			$microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
-			$dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
-			$logDate = $dateTime->format('Y-m-d H:i:s.u'); 
-			//ip
-			$ip = get_ip();
-			//level name
-			$levelName = self::getLevelName($level);
+            ///////////////////// date //////////////
+            $timestampWithMicro = microtime(true);
+            $microtime = sprintf('%06d', ($timestampWithMicro - floor($timestampWithMicro)) * 1000000);
+            $dateTime = new DateTime(date('Y-m-d H:i:s.' . $microtime, $timestampWithMicro));
+            $logDate = $dateTime->format('Y-m-d H:i:s.u'); 
+            //ip
+            $ip = get_ip();
+            //level name
+            $levelName = self::getLevelName($level);
 			
-			//debug info
-			$dtrace = debug_backtrace();
-			$fileInfo = $dtrace[0]['file'] == __FILE__ ? $dtrace[1] : $dtrace[0];
+            //debug info
+            $dtrace = debug_backtrace();
+            $fileInfo = $dtrace[0]['file'] == __FILE__ ? $dtrace[1] : $dtrace[0];
 			
-			$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)){
-				flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
-				fwrite($fp, $str);
-				fclose($fp);
-			}
-		}	
+            $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)){
+                flock($fp, LOCK_EX); // exclusive lock, will get released when the file is closed
+                fwrite($fp, $str);
+                fclose($fp);
+            }
+        }	
 
-		/**
-		 * Check the file and directory 
-		 * @return string the log file path
-		 */
-		protected function checkAndSetLogFileDirectory(){
-			$logSavePath = get_config('log_save_path');
-			if(! $logSavePath){
-				$logSavePath = LOGS_PATH;
-			}
+        /**
+         * Check the file and directory 
+         * @return string the log file path
+         */
+        protected function checkAndSetLogFileDirectory(){
+            $logSavePath = get_config('log_save_path');
+            if(! $logSavePath){
+                $logSavePath = LOGS_PATH;
+            }
 			
-			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);
-			}
+            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)){
-				touch($path);
-			}
-			return $path;
-		}
+            $path = $logSavePath . 'logs-' . date('Y-m-d') . '.log';
+            if(! file_exists($path)){
+                touch($path);
+            }
+            return $path;
+        }
 		
-		/**
-		 * Check if the given log level is valid
-		 *
-		 * @param  string  $level the log level
-		 *
-		 * @return boolean        true if the given log level is valid, false if not
-		 */
-		protected static function isValidConfigLevel($level){
-			$level = strtolower($level);
-			return in_array($level, self::$validConfigLevel);
-		}
+        /**
+         * Check if the given log level is valid
+         *
+         * @param  string  $level the log level
+         *
+         * @return boolean        true if the given log level is valid, false if not
+         */
+        protected static function isValidConfigLevel($level){
+            $level = strtolower($level);
+            return in_array($level, self::$validConfigLevel);
+        }
 
-		/**
-		 * Get the log level number for the given level string
-		 * @param  string $level the log level in string format
-		 * 
-		 * @return int        the log level in integer format using the predefinied constants
-		 */
-		protected static function getLevelValue($level){
-			$level = strtolower($level);
-			$levelMaps = array(
-				'fatal'   => self::FATAL,
-				'error'   => self::ERROR,
-				'warning' => self::WARNING,
-				'warn'    => self::WARNING,
-				'info'    => self::INFO,
-				'debug'   => self::DEBUG,
-				'all'     => self::ALL
-			);
-			//the default value is NONE, so means no need test for NONE
-			$value = self::NONE;
-			foreach ($levelMaps as $k => $v) {
-				if($level == $k){
-					$value = $v;
-					break;
-				}
-			}
-			return $value;
-		}
+        /**
+         * Get the log level number for the given level string
+         * @param  string $level the log level in string format
+         * 
+         * @return int        the log level in integer format using the predefinied constants
+         */
+        protected static function getLevelValue($level){
+            $level = strtolower($level);
+            $levelMaps = array(
+                'fatal'   => self::FATAL,
+                'error'   => self::ERROR,
+                'warning' => self::WARNING,
+                'warn'    => self::WARNING,
+                'info'    => self::INFO,
+                'debug'   => self::DEBUG,
+                'all'     => self::ALL
+            );
+            //the default value is NONE, so means no need test for NONE
+            $value = self::NONE;
+            foreach ($levelMaps as $k => $v) {
+                if($level == $k){
+                    $value = $v;
+                    break;
+                }
+            }
+            return $value;
+        }
 
-		/**
-		 * Get the log level string for the given log level integer
-		 * @param  integer $level the log level in integer format
-		 * @return string        the log level in string format
-		 */
-		protected static function getLevelName($level){
-			$levelMaps = array(
-				self::FATAL   => 'FATAL',
-				self::ERROR   => 'ERROR',
-				self::WARNING => 'WARNING',
-				self::INFO    => 'INFO',
-				self::DEBUG   => 'DEBUG'
-			);
-			$value = '';
-			foreach ($levelMaps as $k => $v) {
-				if($level == $k){
-					$value = $v;
-					break;
-				}
-			}
-			//no need for ALL
-			return $value;
-		}
+        /**
+         * Get the log level string for the given log level integer
+         * @param  integer $level the log level in integer format
+         * @return string        the log level in string format
+         */
+        protected static function getLevelName($level){
+            $levelMaps = array(
+                self::FATAL   => 'FATAL',
+                self::ERROR   => 'ERROR',
+                self::WARNING => 'WARNING',
+                self::INFO    => 'INFO',
+                self::DEBUG   => 'DEBUG'
+            );
+            $value = '';
+            foreach ($levelMaps as $k => $v) {
+                if($level == $k){
+                    $value = $v;
+                    break;
+                }
+            }
+            //no need for ALL
+            return $value;
+        }
 
-	}
+    }

core/libraries/FormValidation.php

Indentation +94 added lines, -94 removed lines

@@ -22,10 +22,10 @@ 
      * 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{
+        class FormValidation{
 		 
         /**
          * The form validation status
@@ -60,7 +60,7 @@ 
          */
         protected $_eachErrorDelimiter   = array('<p class="error">', '</p>');
         
-		/**
+        /**
          * Indicated if need force the validation to be failed
          * @var boolean
          */
@@ -100,7 +100,7 @@ 
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::FormValidation');
            
-		   //Load form validation language message
+            //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
             $this->_errorsMessages  = array(
@@ -162,13 +162,13 @@ 
         /**
          * 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 $this;
+            return $this;
         }
 
         /**
@@ -179,11 +179,11 @@ 
             return $this->data;
         }
 
-		/**
-		* Get the validation function name to validate a rule
-		*
-		* @return string the function name
-		*/
+        /**
+         * 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;
@@ -253,12 +253,12 @@ 
             $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(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) {
@@ -274,7 +274,7 @@ 
          *
          * @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) {
@@ -288,8 +288,8 @@ 
          * 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.
+         *
+         * @return FormValidation Current instance of object.
          */
         public function setRules(array $ruleSets) {
             foreach ($ruleSets as $ruleSet) {
@@ -311,7 +311,7 @@ 
          * @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.
+         * @return FormValidation Current instance of object.
          */
         public function setErrorsDelimiter($start, $end) {
             $this->_allErrorsDelimiter[0] = $start;
@@ -326,7 +326,7 @@ 
          * @param string $start Displayed before each error.
          * @param string $end Displayed after each error.
          * 
-		 * @return FormValidation Current instance of object.
+         * @return FormValidation Current instance of object.
          */
         public function setErrorDelimiter($start, $end) {
             $this->_eachErrorDelimiter[0] = $start;
@@ -334,21 +334,21 @@ 
             return $this;
         }
 
-		/**
-		* Get the each errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorDelimiter() {
+        /**
+         * Get the each errors delimiters
+         *
+         * @return array
+         */
+        public function getErrorDelimiter() {
             return $this->_eachErrorDelimiter;
         }
 
-		/**
-		* Get the all errors delimiters
-		*
-		* @return array
-		*/
-    	public function getErrorsDelimiter() {
+        /**
+         * Get the all errors delimiters
+         *
+         * @return array
+         */
+        public function getErrorsDelimiter() {
             return $this->_allErrorsDelimiter;
         }
 
@@ -386,7 +386,7 @@ 
          *
          * @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) {
@@ -423,17 +423,17 @@ 
          *
          * @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;
+            $i = 0;
             if (!empty($this->_errors)) {
                 foreach ($this->_errors as $fieldName => $error) {
-        	    	if ($i === $limit) { 
+                    if ($i === $limit) { 
                         break; 
                     }
                     $errorOutput .= $errorStart;
@@ -461,7 +461,7 @@ 
          * 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) {
@@ -474,10 +474,10 @@ 
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
-                     $ruleSets[] = $regexRule[0];
-                 }
-                 $ruleStringRegex = explode('|', $ruleStringTemp);
+                    if(!empty($regexRule[0])){
+                        $ruleSets[] = $regexRule[0];
+                    }
+                    $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
                     if($rule){
@@ -493,7 +493,7 @@ 
                 } else {
                     $ruleSets[] = $ruleString;
                 }
-             }
+                }
             return $ruleSets;
         }
 
@@ -501,7 +501,7 @@ 
          * 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) {
@@ -536,13 +536,13 @@ 
             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
-		*/
+        /**
+         * 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;
@@ -559,7 +559,7 @@ 
             }
             // Type cast to array in case it's a string
             $replacements = (array) $replacements;
-			$replacementCount = count($replacements);
+            $replacementCount = count($replacements);
             for ($i = 1; $i <= $replacementCount; $i++) {
                 $key = $i - 1;
                 $rulePhrase = str_replace('%' . $i, $replacements[$key], $rulePhrase);
@@ -577,11 +577,11 @@ 
          *
          * @param type $inputArg
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runCallback($inputArg, $callbackFunc) {
-			return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
+            return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
         }
 
         /**
@@ -590,7 +590,7 @@ 
          * arguments.
          *
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runEmptyCallback($callbackFunc) {
@@ -601,7 +601,7 @@ 
          * Gets a specific label of a specific field input name.
          *
          * @param string $inputName
-		 *
+         *
          * @return string
          */
         protected function _getLabel($inputName) {
@@ -614,7 +614,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("required")
          * @param  array  $ruleArgs  the rules argument
          */
-		protected function _validateRequired($inputName, $ruleName, array $ruleArgs) {
+        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]);
@@ -622,8 +622,8 @@ 
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
             } 
-			else if($inputVal == '') {
-				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
+            else if($inputVal == '') {
+                $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
 
@@ -647,10 +647,10 @@ 
          */
         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)));
-				}
+                $result = $this->_runCallback($this->data[$inputName], $ruleArgs[1]);
+                if(! $result){
+                    $this->_setError($inputName, $ruleName, array($this->_getLabel($inputName)));
+                }
             }
         }
 
@@ -682,7 +682,7 @@ 
                         continue;
                     }
                 } 
-				else{
+                else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -774,7 +774,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("less_than")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateLessThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal >= $ruleArgs[1]) { 
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -790,7 +790,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("greater_than")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateGreaterThan($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if ($inputVal <= $ruleArgs[1]) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -806,7 +806,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("numeric")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateNumeric($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (! is_numeric($inputVal)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -822,18 +822,18 @@ 
          * @param  string $ruleName  the rule name for this validation ("exists")
          * @param  array  $ruleArgs  the rules argument
          */
-		protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateExists($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		if (! is_object($this->databaseInstance)){
+            if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
                 if(isset($obj->database)){
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-    			                                       ->where($column, $inputVal);
-    		$this->databaseInstance->get();
+            list($table, $column) = explode('.', $ruleArgs[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal);
+            $this->databaseInstance->get();
             if ($this->databaseInstance->numRows() <= 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
@@ -848,7 +848,7 @@ 
          * @param  string $ruleName  the rule name for this validation ("is_unique")
          * @param  array  $ruleArgs  the rules argument
          */
-    	protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
+        protected function _validateIsUnique($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
             if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
@@ -856,11 +856,11 @@ 
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		list($table, $column) = explode('.', $ruleArgs[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-    			                                      ->where($column, $inputVal);
-    		$this->databaseInstance->get();
-    		if ($this->databaseInstance->numRows() > 0) {
+            list($table, $column) = explode('.', $ruleArgs[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal);
+            $this->databaseInstance->get();
+            if ($this->databaseInstance->numRows() > 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
@@ -874,25 +874,25 @@ 
          * @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) {
+        protected function _validateIsUniqueUpdate($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		if (! is_object($this->databaseInstance)){
+            if (! is_object($this->databaseInstance)){
                 $obj = & get_instance();
                 if(isset($obj->database)){
                     $this->databaseInstance = $obj->database;
                 } 
             }
-    		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
-    			return;
-    		}
-    		list($table, $column) = explode('.', $data[0]);
-    		list($field, $val)    = explode('=', $data[1]);
-    		$this->databaseInstance->getQueryBuilder()->from($table)
-                                			          ->where($column, $inputVal)
-                                            		  ->where($field, '!=', trim($val));
+            $data = explode(',', $ruleArgs[1]);
+            if(count($data) < 2){
+                return;
+            }
+            list($table, $column) = explode('.', $data[0]);
+            list($field, $val)    = explode('=', $data[1]);
+            $this->databaseInstance->getQueryBuilder()->from($table)
+                                                        ->where($column, $inputVal)
+                                                        ->where($field, '!=', trim($val));
             $this->databaseInstance->get();
-    		if ($this->databaseInstance->numRows() > 0) {
+            if ($this->databaseInstance->numRows() > 0) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;
                 }
@@ -908,7 +908,7 @@ 
          */
         protected function _validateInList($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		$list = explode(',', $ruleArgs[1]);
+            $list = explode(',', $ruleArgs[1]);
             $list = array_map('trim', $list);
             if (! in_array($inputVal, $list)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
@@ -926,7 +926,7 @@ 
          */
         protected function _validateRegex($inputName, $ruleName, array $ruleArgs) {
             $inputVal = $this->post($inputName);
-    		$regex = $ruleArgs[1];
+            $regex = $ruleArgs[1];
             if (! preg_match($regex, $inputVal)) {
                 if (! $this->_fieldIsRequired($inputName) && empty($this->data[$inputName])) {
                     return;

core/libraries/Pagination.php

Indentation +42 added lines, -42 removed lines

@@ -1,32 +1,32 @@ 
 <?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.
-	*/
+    /**
+     * 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 Pagination{
         
-		/**
+        /**
          * The list of loaded config
          * @var array
          */
@@ -49,15 +49,15 @@ 
                 if (empty($config) || ! is_array($config)){
                     show_error('No configuration found in ' . CONFIG_PATH . 'config_pagination.php');
                 }
-				else{
-					if (! empty($overwriteConfig)){
-						$config = array_merge($config, $overwriteConfig);
-					}
-					$this->config = $config;
+                else{
+                    if (! empty($overwriteConfig)){
+                        $config = array_merge($config, $overwriteConfig);
+                    }
+                    $this->config = $config;
                     //put it gobally
-					Config::setAll($config);
-					unset($config);
-				}
+                    Config::setAll($config);
+                    unset($config);
+                }
             }
             else{
                 show_error('Unable to find the pagination configuration file');
@@ -94,11 +94,11 @@ 
             return $this->paginationQueryString;
         }
 
-         /**
-         * Set the value of the pagination query string
-         * @param string $paginationQueryString the new value
-         * @return object
-         */
+            /**
+             * Set the value of the pagination query string
+             * @param string $paginationQueryString the new value
+             * @return object
+             */
         public function setPaginationQueryString($paginationQueryString){
             $this->paginationQueryString = $paginationQueryString;
             return $this;
@@ -117,7 +117,7 @@ 
             $queryString = Url::queryString();
             $currentUrl = Url::current();
             $query = '';
-             if ($queryString == ''){
+                if ($queryString == ''){
                 $query = '?' . $pageQueryName . '=';
             }
             else{
@@ -150,7 +150,7 @@ 
          */
         public function getLink($totalRows, $currentPageNumber){
             $numberOfLink = $this->config['nb_link'];
-			$numberOfRowPerPage = $this->config['pagination_per_page'];
+            $numberOfRowPerPage = $this->config['pagination_per_page'];
             if (empty($this->paginationQueryString)){
                 //determine the pagination query string value
                 $this->determinePaginationQueryStringValue();
@@ -164,8 +164,8 @@ 
             $numberOfRowPerPage = (int) $numberOfRowPerPage;
 			
             if ($currentPageNumber <= 0){
-				$currentPageNumber = 1;
-			}
+                $currentPageNumber = 1;
+            }
             if ($numberOfPage <= 1 || $numberOfLink <= 0 || $numberOfRowPerPage <= 0) {
                 return $navbar;
             }
@@ -206,7 +206,7 @@ 
                 $navbar .= $this->buildPaginationLinkForMiddlePage($begin, $end, $currentPageNumber);
             }
             else if ($currentPageNumber == $numberOfPage){
-               $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
+                $navbar .= $this->buildPaginationLinkForLastPage($begin, $end, $currentPageNumber);
             }
             $navbar = $this->config['pagination_open'] . $navbar . $this->config['pagination_close'];
             return $navbar;

core/libraries/Browser.php

Indentation +28 added lines, -28 removed lines

@@ -1669,34 +1669,34 @@
         protected function checkPlatform()
         {
             $platformMaps = array(
-              'windows' => self::PLATFORM_WINDOWS,
-              'iPad' => self::PLATFORM_IPAD,
-              'iPod' => self::PLATFORM_IPOD,
-              'iPhone' => self::PLATFORM_IPHONE,
-              'mac' => self::PLATFORM_APPLE,
-              'android' => self::PLATFORM_ANDROID,
-              'Silk' => self::PLATFORM_FIRE_OS,
-              'linux_smarttv' => self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV,
-              'linux' => self::PLATFORM_LINUX,
-              'Nokia' => self::PLATFORM_NOKIA,
-              'BlackBerry' => self::PLATFORM_BLACKBERRY,
-              'FreeBSD' => self::PLATFORM_FREEBSD,
-              'OpenBSD' => self::PLATFORM_OPENBSD,
-              'NetBSD' => self::PLATFORM_NETBSD,
-              'OpenSolaris' => self::PLATFORM_OPENSOLARIS,
-              'SunOS' => self::PLATFORM_SUNOS,
-              'OS\/2' => self::PLATFORM_OS2,
-              'BeOS' => self::PLATFORM_BEOS,
-              'win' => self::PLATFORM_WINDOWS,
-              'Playstation' => self::PLATFORM_PLAYSTATION,
-              'Roku' => self::PLATFORM_ROKU,
-              'iOS' => self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD,
-              'tvOS' => self::PLATFORM_APPLE_TV,
-              'curl' => self::PLATFORM_TERMINAL,
-              'CrOS' => self::PLATFORM_CHROME_OS,
-              'okhttp' => self::PLATFORM_JAVA_ANDROID,
-              'PostmanRuntime' => self::PLATFORM_POSTMAN,
-              'Iframely' => self::PLATFORM_I_FRAME
+                'windows' => self::PLATFORM_WINDOWS,
+                'iPad' => self::PLATFORM_IPAD,
+                'iPod' => self::PLATFORM_IPOD,
+                'iPhone' => self::PLATFORM_IPHONE,
+                'mac' => self::PLATFORM_APPLE,
+                'android' => self::PLATFORM_ANDROID,
+                'Silk' => self::PLATFORM_FIRE_OS,
+                'linux_smarttv' => self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV,
+                'linux' => self::PLATFORM_LINUX,
+                'Nokia' => self::PLATFORM_NOKIA,
+                'BlackBerry' => self::PLATFORM_BLACKBERRY,
+                'FreeBSD' => self::PLATFORM_FREEBSD,
+                'OpenBSD' => self::PLATFORM_OPENBSD,
+                'NetBSD' => self::PLATFORM_NETBSD,
+                'OpenSolaris' => self::PLATFORM_OPENSOLARIS,
+                'SunOS' => self::PLATFORM_SUNOS,
+                'OS\/2' => self::PLATFORM_OS2,
+                'BeOS' => self::PLATFORM_BEOS,
+                'win' => self::PLATFORM_WINDOWS,
+                'Playstation' => self::PLATFORM_PLAYSTATION,
+                'Roku' => self::PLATFORM_ROKU,
+                'iOS' => self::PLATFORM_IPHONE . '/' . self::PLATFORM_IPAD,
+                'tvOS' => self::PLATFORM_APPLE_TV,
+                'curl' => self::PLATFORM_TERMINAL,
+                'CrOS' => self::PLATFORM_CHROME_OS,
+                'okhttp' => self::PLATFORM_JAVA_ANDROID,
+                'PostmanRuntime' => self::PLATFORM_POSTMAN,
+                'Iframely' => self::PLATFORM_I_FRAME
             );
 
             foreach ($platformMaps as $name => $value) {

core/functions/function_string.php

Indentation +68 added lines, -68 removed lines

@@ -1,71 +1,71 @@
 <?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.
-	*/
+    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.
+     */
 
-	/**
-	 *  @file function_string.php
-	 *
-	 *  This file contains the definition of the functions relating to the processing of strings characters.
-	 *
-	 *  @package	core
-	 *  @author	Tony NGUEREZA
-	 *  @copyright	Copyright (c) 2017
-	 *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
-	 *  @link	http://www.iacademy.cf
-	 *  @version 1.0.0
-	 *  @since 1.0.0
-	 *  @filesource
-	 */
+    /**
+     *  @file function_string.php
+     *
+     *  This file contains the definition of the functions relating to the processing of strings characters.
+     *
+     *  @package	core
+     *  @author	Tony NGUEREZA
+     *  @copyright	Copyright (c) 2017
+     *  @license	https://opensource.org/licenses/gpl-3.0.html GNU GPL License (GPL)
+     *  @link	http://www.iacademy.cf
+     *  @version 1.0.0
+     *  @since 1.0.0
+     *  @filesource
+     */
 
-	if(! function_exists('get_random_string')){
-		/**
-		 * Generate a random string
-		 * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
-		 * "alnum" for alpha-numeric characters and "num" for numbers.
-		 * By default it is "alnum".
-		 * @param  integer $length the length of the string to generate. By default it is 10.
-		 * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
-		 * @return string the generated string.
-		 */
-		function get_random_string($type = 'alnum', $length = 10, $lower = false){
-			$chars = array(
-							'alpha' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
-							'alnum' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890',
-							'num' => '1234567890'
-						);
-			$str = null;
-			if(isset($chars[$type])){
-				$str = $chars[$type];
-			}
-			$random = null;
-			for($i = 0; $i < $length; $i++){
-				$random .= $str[mt_rand() % strlen($str)];
-			}
-			if($lower){
-				$random = strtolower($random);
-			}
-			return $random;
-		}
-	}
+    if(! function_exists('get_random_string')){
+        /**
+         * Generate a random string
+         * @param  string $type the type of generation. It can take the values: "alpha" for alphabetic characters,
+         * "alnum" for alpha-numeric characters and "num" for numbers.
+         * By default it is "alnum".
+         * @param  integer $length the length of the string to generate. By default it is 10.
+         * @param  boolean $lower if we return the generated string in lowercase (true). By default it's false.
+         * @return string the generated string.
+         */
+        function get_random_string($type = 'alnum', $length = 10, $lower = false){
+            $chars = array(
+                            'alpha' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
+                            'alnum' => 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890',
+                            'num' => '1234567890'
+                        );
+            $str = null;
+            if(isset($chars[$type])){
+                $str = $chars[$type];
+            }
+            $random = null;
+            for($i = 0; $i < $length; $i++){
+                $random .= $str[mt_rand() % strlen($str)];
+            }
+            if($lower){
+                $random = strtolower($random);
+            }
+            return $random;
+        }
+    }