tnhfw / tnh-fw

core/bootstrap.php

Indentation +189 added lines, -189 removed lines

@@ -1,207 +1,207 @@
 <?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.
-	*/
-
-	/**
-	 *  @file bootstrap.php
-	 *  
-	 *  Contains the loading process: loading of constants, common functions, libraries 
-	 *  configurations, etc
-	 *  verification of the environment and the routing of the request.
-	 *  
-	 *  @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
-	 *  @filesource
-	 */
+    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 bootstrap.php
+     *  
+     *  Contains the loading process: loading of constants, common functions, libraries 
+     *  configurations, etc
+     *  verification of the environment and the routing of the request.
+     *  
+     *  @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
+     *  @filesource
+     */
 	
-	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
-		$_SESSION = array();
-	}
+    //if the application is running in CLI mode $_SESSION global variable is not available
+    if(IS_CLI){
+        $_SESSION = array();
+    }
 		
-	/**
-	*  inclusion of global constants of the environment that contain : name of the framework,
-	*  version, release date, version of PHP required, etc.
-	*/
-	require_once CORE_PATH . 'constants.php';	
+    /**
+     *  inclusion of global constants of the environment that contain : name of the framework,
+     *  version, release date, version of PHP required, etc.
+     */
+    require_once CORE_PATH . 'constants.php';	
 	
-	/**
-	 *  include file containing commons functions used in the framework such: show_error, 
-	 *  php_exception_handler, php_error_handler, get_instance, etc.
-	 */
-	require_once CORE_PATH . 'common.php';
-
-	/**
-	 * Include of the file containing the BaseClass 
-	 */
-	require_once CORE_CLASSES_PATH . 'BaseClass.php';
-
-	/**
-	 * Include of the file containing the BaseClass 
-	 */
-	require_once CORE_CLASSES_PATH . 'BaseStaticClass.php';
-
-	/**
-	 * The Benchmark class
-	 */
-	$BENCHMARK =& class_loader('Benchmark');
+    /**
+     *  include file containing commons functions used in the framework such: show_error, 
+     *  php_exception_handler, php_error_handler, get_instance, etc.
+     */
+    require_once CORE_PATH . 'common.php';
+
+    /**
+     * Include of the file containing the BaseClass 
+     */
+    require_once CORE_CLASSES_PATH . 'BaseClass.php';
+
+    /**
+     * Include of the file containing the BaseClass 
+     */
+    require_once CORE_CLASSES_PATH . 'BaseStaticClass.php';
+
+    /**
+     * The Benchmark class
+     */
+    $BENCHMARK =& class_loader('Benchmark');
 	
-	$BENCHMARK->mark('APP_EXECUTION_START');
+    $BENCHMARK->mark('APP_EXECUTION_START');
 	
-	/**
-    * instance of the Log class
-    */
+    /**
+     * instance of the Log class
+     */
     $LOGGER =& class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
     $LOGGER->debug('Checking PHP version ...');	
 	
-	/**
-	* Verification of the PHP environment: minimum and maximum version
-	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
-		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
-		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
-	}
-	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
-
-	/**
-	* Setting of the PHP error message handling function
-	*/
-	set_error_handler('php_error_handler');
-
-	/**
-	* Setting of the PHP error exception handling function
-	*/
-	set_exception_handler('php_exception_handler');
-
-	/**
-	 * Setting of the PHP shutdown handling function
-	 */
-	register_shutdown_function('php_shudown_handler');
+    /**
+     * Verification of the PHP environment: minimum and maximum version
+     */
+    if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+        show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
+    }
+    else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+        show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
+    }
+    $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
+
+    /**
+     * Setting of the PHP error message handling function
+     */
+    set_error_handler('php_error_handler');
+
+    /**
+     * Setting of the PHP error exception handling function
+     */
+    set_exception_handler('php_exception_handler');
+
+    /**
+     * Setting of the PHP shutdown handling function
+     */
+    register_shutdown_function('php_shudown_handler');
 	
-	//if user have some composer packages
-	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
-		$LOGGER->info('The composer autoload file exists include it');
-		require_once VENDOR_PATH . 'autoload.php';
-	}
-	else{
-		$LOGGER->info('The composer autoload file does not exist skipping');
-	}
+    //if user have some composer packages
+    $LOGGER->debug('Check for composer autoload');
+    if(file_exists(VENDOR_PATH . 'autoload.php')){
+        $LOGGER->info('The composer autoload file exists include it');
+        require_once VENDOR_PATH . 'autoload.php';
+    }
+    else{
+        $LOGGER->info('The composer autoload file does not exist skipping');
+    }
 	
-	$LOGGER->debug('Begin to load the required resources');
-
-	/**
-	 * Load the EventInfo class file
-	 */
-	require_once CORE_CLASSES_PATH . 'EventInfo.php';
-
-
-	$BENCHMARK->mark('CONFIG_INIT_START');
-	/**
-	* Load configurations and using the 
-	* static method "init()" to initialize the Config class .
-	*/
-	$CONFIG =& class_loader('Config', 'classes');	
-	$CONFIG->init();
-	$BENCHMARK->mark('CONFIG_INIT_END');
-
-	$BENCHMARK->mark('MODULE_INIT_START');
-	/**
-	* Load modules and using the 
-	* static method "init()" to initialize the Module class.
-	*/
-	$MODULE =& class_loader('Module', 'classes');
-	$MODULE->init();
-	$BENCHMARK->mark('MODULE_INIT_END');
-
-	$LOGGER->debug('Loading Base Controller ...');
-	/**
-	 * Include of the file containing the Base Controller class 
-	 */
-	require_once CORE_CLASSES_PATH . 'Controller.php';
-	$LOGGER->info('Base Controller loaded successfully');
-
-	/**
-	* Register controllers autoload function
-	*/
-	 spl_autoload_register('autoload_controller');
-
-	/**
-	* Loading Security class
-	*/
-	$SECURITY =& class_loader('Security', 'classes');
-	$SECURITY->checkWhiteListIpAccess();
+    $LOGGER->debug('Begin to load the required resources');
+
+    /**
+     * Load the EventInfo class file
+     */
+    require_once CORE_CLASSES_PATH . 'EventInfo.php';
+
+
+    $BENCHMARK->mark('CONFIG_INIT_START');
+    /**
+     * Load configurations and using the 
+     * static method "init()" to initialize the Config class .
+     */
+    $CONFIG =& class_loader('Config', 'classes');	
+    $CONFIG->init();
+    $BENCHMARK->mark('CONFIG_INIT_END');
+
+    $BENCHMARK->mark('MODULE_INIT_START');
+    /**
+     * Load modules and using the 
+     * static method "init()" to initialize the Module class.
+     */
+    $MODULE =& class_loader('Module', 'classes');
+    $MODULE->init();
+    $BENCHMARK->mark('MODULE_INIT_END');
+
+    $LOGGER->debug('Loading Base Controller ...');
+    /**
+     * Include of the file containing the Base Controller class 
+     */
+    require_once CORE_CLASSES_PATH . 'Controller.php';
+    $LOGGER->info('Base Controller loaded successfully');
+
+    /**
+     * Register controllers autoload function
+     */
+        spl_autoload_register('autoload_controller');
+
+    /**
+     * Loading Security class
+     */
+    $SECURITY =& class_loader('Security', 'classes');
+    $SECURITY->checkWhiteListIpAccess();
 	
-	/**
-	* Loading Url class
-	*/
-	$URL =& class_loader('Url', 'classes');
+    /**
+     * Loading Url class
+     */
+    $URL =& class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
-		/**
-		 * Load Cache interface file
-		 */
-		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
-		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
-			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
-		}
-		$CACHE = null;
-		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
-		}
-		else{
-			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
-		}
-		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
-			$RESPONSE = & class_loader('Response', 'classes');
-			if ($RESPONSE->renderFinalPageFromCache($CACHE)){
-				return;
-			}
-		}
-	}
+    if(get_config('cache_enable', false)){
+        /**
+         * Load Cache interface file
+         */
+        require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
+        $cacheHandler = get_config('cache_handler');
+        if(! $cacheHandler){
+            show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
+        }
+        $CACHE = null;
+        //first check if the cache handler is the system driver
+        if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
+            $CACHE =& class_loader($cacheHandler, 'classes/cache');
+        }
+        else{
+            //it's not a system driver use user library
+            $CACHE =& class_loader($cacheHandler);
+        }
+        //check if the page already cached
+        if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+            $RESPONSE = & class_loader('Response', 'classes');
+            if ($RESPONSE->renderFinalPageFromCache($CACHE)){
+                return;
+            }
+        }
+    }
 	
-	//load model class
-	require_once CORE_CLASSES_MODEL_PATH . 'Model.php';
+    //load model class
+    require_once CORE_CLASSES_MODEL_PATH . 'Model.php';
 	
-	$LOGGER->info('Everything is OK load Router library and dispatch the request to the corresponding controller');
-	/**
-	* Routing
-	* instantiation of the "Router" class and request processing.
-	*/
-	$ROUTER = & class_loader('Router', 'classes');
-	$ROUTER->processRequest();
+    $LOGGER->info('Everything is OK load Router library and dispatch the request to the corresponding controller');
+    /**
+     * Routing
+     * instantiation of the "Router" class and request processing.
+     */
+    $ROUTER = & class_loader('Router', 'classes');
+    $ROUTER->processRequest();

core/libraries/Email.php

Indentation +728 added lines, -728 removed lines

@@ -1,733 +1,733 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * Simple Mail
-	 *
-	 * A simple PHP wrapper class for sending email using the mail() method.
-	 *
-	 * PHP version > 5.2
-	 *
-	 * LICENSE: This source file is subject to the MIT license, which is
-	 * available through the world-wide-web at the following URI:
-	 * http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt
-	 *
-	 * @category  SimpleMail
-	 * @package   SimpleMail
-	 * @author    Eoghan O'Brien <eoghan@eoghanobrien.com>
-	 * @copyright 2009 - 2017 Eoghan O'Brien
-	 * @license   http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt MIT
-	 * @version   1.7.1
-	 * @link      http://github.com/eoghanobrien/php-simple-mail
-	 */
-
-	/**
-	 * Simple Mail class.
-	 *
-	 * @category  SimpleMail
-	 * @package   SimpleMail
-	 * @author    Eoghan O'Brien <eoghan@eoghanobrien.com>
-	 * @copyright 2009 - 2017 Eoghan O'Brien
-	 * @license   http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt MIT
-	 * @version   1.7.1
-	 * @link      http://github.com/eoghanobrien/php-simple-mail
-	 */
-	class Email extends BaseClass
-	{
-		/**
-		 * @var int $_wrap
-		 */
-		protected $_wrap = 78;
-
-		/**
-		 * @var array $_to
-		 */
-		protected $_to = array();
-
-		/**
-		 * @var string $_subject
-		 */
-		protected $_subject;
-
-		/**
-		 * @var string $_message
-		 */
-		protected $_message;
-
-		/**
-		 * @var array $_headers
-		 */
-		protected $_headers = array();
-
-		/**
-		 * @var string $_parameters
-		 */
-		protected $_params;
-
-		/**
-		 * @var array $_attachments
-		 */
-		protected $_attachments = array();
-
-		/**
-		 * @var string $_uid
-		 */
-		protected $_uid;
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * Simple Mail
+     *
+     * A simple PHP wrapper class for sending email using the mail() method.
+     *
+     * PHP version > 5.2
+     *
+     * LICENSE: This source file is subject to the MIT license, which is
+     * available through the world-wide-web at the following URI:
+     * http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt
+     *
+     * @category  SimpleMail
+     * @package   SimpleMail
+     * @author    Eoghan O'Brien <eoghan@eoghanobrien.com>
+     * @copyright 2009 - 2017 Eoghan O'Brien
+     * @license   http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt MIT
+     * @version   1.7.1
+     * @link      http://github.com/eoghanobrien/php-simple-mail
+     */
+
+    /**
+     * Simple Mail class.
+     *
+     * @category  SimpleMail
+     * @package   SimpleMail
+     * @author    Eoghan O'Brien <eoghan@eoghanobrien.com>
+     * @copyright 2009 - 2017 Eoghan O'Brien
+     * @license   http://github.com/eoghanobrien/php-simple-mail/LICENCE.txt MIT
+     * @version   1.7.1
+     * @link      http://github.com/eoghanobrien/php-simple-mail
+     */
+    class Email extends BaseClass
+    {
+        /**
+         * @var int $_wrap
+         */
+        protected $_wrap = 78;
+
+        /**
+         * @var array $_to
+         */
+        protected $_to = array();
+
+        /**
+         * @var string $_subject
+         */
+        protected $_subject;
+
+        /**
+         * @var string $_message
+         */
+        protected $_message;
+
+        /**
+         * @var array $_headers
+         */
+        protected $_headers = array();
+
+        /**
+         * @var string $_parameters
+         */
+        protected $_params;
+
+        /**
+         * @var array $_attachments
+         */
+        protected $_attachments = array();
+
+        /**
+         * @var string $_uid
+         */
+        protected $_uid;
 		
 
-		/**
-		 * __construct
-		 *
-		 * Resets the class properties.
-		 */
-		public function __construct()
-		{
-			parent::__construct();
-			$this->reset();
-		}
-
-		/**
-		 * reset
-		 *
-		 * Resets all properties to initial state.
-		 *
-		 * @return self
-		 */
-		public function reset()
-		{
-			$this->_to = array();
-			$this->_headers = array();
-			$this->_subject = null;
-			$this->_message = null;
-			$this->_wrap = 78;
-			$this->_params = null;
-			$this->_attachments = array();
-			$this->_uid = $this->getUniqueId();
-			return $this;
-		}
+        /**
+         * __construct
+         *
+         * Resets the class properties.
+         */
+        public function __construct()
+        {
+            parent::__construct();
+            $this->reset();
+        }
+
+        /**
+         * reset
+         *
+         * Resets all properties to initial state.
+         *
+         * @return self
+         */
+        public function reset()
+        {
+            $this->_to = array();
+            $this->_headers = array();
+            $this->_subject = null;
+            $this->_message = null;
+            $this->_wrap = 78;
+            $this->_params = null;
+            $this->_attachments = array();
+            $this->_uid = $this->getUniqueId();
+            return $this;
+        }
 		
-		 /**
-		 * 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);
-			return $this;
-		}
-
-		/**
-		 * setTo
-		 *
-		 * @param string $email The email address to send to.
-		 * @param string $name  The name of the person to send to.
-		 *
-		 * @return self
-		 */
-		public function setTo($email, $name = null)
-		{
-			$this->_to[] = $this->formatHeader((string) $email, (string) $name);
-			return $this;
-		}
+            /**
+             * 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);
+            return $this;
+        }
+
+        /**
+         * setTo
+         *
+         * @param string $email The email address to send to.
+         * @param string $name  The name of the person to send to.
+         *
+         * @return self
+         */
+        public function setTo($email, $name = null)
+        {
+            $this->_to[] = $this->formatHeader((string) $email, (string) $name);
+            return $this;
+        }
 		
-		/**
-		* 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) {
-				if(is_numeric($name)){
-					$this->setTo($email);
-				}
-				else{
-					$this->setTo($email, $name);
-				}
-			}
-			return $this;
-		}
-
-
-		/**
-		 * getTo
-		 *
-		 * Return an array of formatted To addresses.
-		 *
-		 * @return array
-		 */
-		public function getTo()
-		{
-			return $this->_to;
-		}
-
-
-		/**
-		 * setCc
-		 *
-		 * @param array  $pairs  An array of name => email pairs.
-		 *
-		 * @return self
-		 */
-		public function setCc(array $pairs)
-		{
-			return $this->addMailHeaders('Cc', $pairs);
-		}
-
-		/**
-		 * setBcc
-		 *
-		 * @param array  $pairs  An array of name => email pairs.
-		 *
-		 * @return self
-		 */
-		public function setBcc(array $pairs)
-		{
-			return $this->addMailHeaders('Bcc', $pairs);
-		}
-
-		/**
-		 * setReplyTo
-		 *
-		 * @param string $email
-		 * @param string $name
-		 *
-		 * @return self
-		 */
-		public function setReplyTo($email, $name = null)
-		{
-			return $this->addMailHeader('Reply-To', $email, $name);
-		}
-
-		/**
-		 * setHtml
-		 *
-		 * @return self
-		 */
-		public function setHtml()
-		{
-			$this->addGenericHeader(
-				'Content-Type', 'text/html; charset="utf-8"'
-			);
-			return $this;
-		}
-
-		/**
-		 * setSubject
-		 *
-		 * @param string $subject The email subject
-		 *
-		 * @return self
-		 */
-		public function setSubject($subject)
-		{
-			$this->_subject = $this->encodeUtf8(
-				$this->filterOther((string) $subject)
-			);
-			return $this;
-		}
-
-		/**
-		 * getSubject function.
-		 *
-		 * @return string
-		 */
-		public function getSubject()
-		{
-			return $this->_subject;
-		}
-
-		/**
-		 * setMessage
-		 *
-		 * @param string $message The message to send.
-		 *
-		 * @return self
-		 */
-		public function setMessage($message)
-		{
-			$this->_message = str_replace("\n.", "\n..", (string) $message);
-			return $this;
-		}
-
-		/**
-		 * getMessage
-		 *
-		 * @return string
-		 */
-		public function getMessage()
-		{
-			return $this->_message;
-		}
-
-		/**
-		 * addAttachment
-		 *
-		 * @param string $path The file path to the attachment.
-		 * @param string $filename The filename of the attachment when emailed.
-		 * @param string $data
-		 * 
-		 * @return self
-		 */
-		public function addAttachment($path, $filename = null, $data = null)
-		{
-			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));
-			$data = empty($data) ? $this->getAttachmentData($path) : $data;
-			$this->_attachments[] = array(
-				'path' => $path,
-				'file' => $filename,
-				'data' => chunk_split(base64_encode($data))
-			);
-			return $this;
-		}
-
-		/**
-		 * getAttachmentData
-		 *
-		 * @param string $path The path to the attachment file.
-		 *
-		 * @return string
-		 */
-		public function getAttachmentData($path)
-		{
-			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)){
-				$attachment = fread($handle, $filesize);
-				fclose($handle);
-			}
-			return $attachment;
-		}
-
-		/**
-		 * addMailHeader
-		 *
-		 * @param string $header The header to add.
-		 * @param string $email  The email to add.
-		 * @param string $name   The name to add.
-		 *
-		 * @return self
-		 */
-		public function addMailHeader($header, $email, $name = null)
-		{
-			$address = $this->formatHeader((string) $email, (string) $name);
-			$this->_headers[] = sprintf('%s: %s', (string) $header, $address);
-			return $this;
-		}
-
-		/**
-		 * addMailHeaders
-		 *
-		 * @param string $header The header to add.
-		 * @param array  $pairs  An array of name => email pairs.
-		 *
-		 * @return self
-		 */
-		public function addMailHeaders($header, array $pairs)
-		{
-			if (count($pairs) === 0) {
-				show_error('You must pass at least one name => email pair.');
-			}
-			$addresses = array();
-			foreach ($pairs as $name => $email) {
-				$name = is_numeric($name) ? null : $name;
-				$addresses[] = $this->formatHeader($email, $name);
-			}
-			$this->addGenericHeader($header, implode(',', $addresses));
-			return $this;
-		}
-
-		/**
-		 * addGenericHeader
-		 *
-		 * @param string $name The generic header to add.
-		 * @param mixed  $value  The value of the header.
-		 *
-		 * @return self
-		 */
-		public function addGenericHeader($name, $value)
-		{
-			$this->_headers[] = sprintf(
-				'%s: %s',
-				(string) $name,
-				(string) $value
-			);
-			return $this;
-		}
-
-		/**
-		 * getHeaders
-		 *
-		 * Return the headers registered so far as an array.
-		 *
-		 * @return array
-		 */
-		public function getHeaders()
-		{
-			return $this->_headers;
-		}
-
-		/**
-		 * setAdditionalParameters
-		 *
-		 * Such as "-fyouremail@yourserver.com
-		 *
-		 * @param string $additionalParameters The addition mail parameter.
-		 *
-		 * @return self
-		 */
-		public function setParameters($additionalParameters)
-		{
-			$this->_params = (string) $additionalParameters;
-			return $this;
-		}
-
-		/**
-		 * getAdditionalParameters
-		 *
-		 * @return string
-		 */
-		public function getParameters()
-		{
-			return $this->_params;
-		}
-
-		/**
-		 * setWrap
-		 *
-		 * @param int $wrap The number of characters at which the message will wrap.
-		 *
-		 * @return self
-		 */
-		public function setWrap($wrap = 78)
-		{
-			$wrap = (int) $wrap;
-			if ($wrap < 1) {
-				$wrap = 78;
-			}
-			$this->_wrap = $wrap;
-			return $this;
-		}
-
-		/**
-		 * getWrap
-		 *
-		 * @return int
-		 */
-		public function getWrap()
-		{
-			return $this->_wrap;
-		}
-
-		/**
-		 * hasAttachments
-		 * 
-		 * Checks if the email has any registered attachments.
-		 *
-		 * @return bool
-		 */
-		public function hasAttachments()
-		{
-			return !empty($this->_attachments);
-		}
-
-		/**
-		 * assembleAttachment
-		 *
-		 * @return string
-		 */
-		public function assembleAttachmentHeaders()
-		{
-			$head = array();
-			$head[] = "MIME-Version: 1.0";
-			$head[] = "Content-Type: multipart/mixed; boundary=\"{$this->_uid}\"";
-
-			return join(PHP_EOL, $head);
-		}
-
-		/**
-		 * assembleAttachmentBody
-		 *
-		 * @return string
-		 */
-		public function assembleAttachmentBody()
-		{
-			$body = array();
-			$body[] = "This is a multi-part message in MIME format.";
-			$body[] = "--{$this->_uid}";
-			$body[] = "Content-Type: text/html; charset=\"utf-8\"";
-			$body[] = "Content-Transfer-Encoding: quoted-printable";
-			$body[] = "";
-			$body[] = quoted_printable_encode($this->_message);
-			$body[] = "";
-			$body[] = "--{$this->_uid}";
-
-			foreach ($this->_attachments as $attachment) {
-				$body[] = $this->getAttachmentMimeTemplate($attachment);
-			}
-
-			return implode(PHP_EOL, $body) . '--';
-		}
-
-		/**
-		 * getAttachmentMimeTemplate
-		 *
-		 * @param array  $attachment An array containing 'file' and 'data' keys.
-		 *
-		 * @return string
-		 */
-		public function getAttachmentMimeTemplate($attachment)
-		{
-			$file = $attachment['file'];
-			$data = $attachment['data'];
-
-			$head = array();
-			$head[] = "Content-Type: application/octet-stream; name=\"{$file}\"";
-			$head[] = "Content-Transfer-Encoding: base64";
-			$head[] = "Content-Disposition: attachment; filename=\"{$file}\"";
-			$head[] = "";
-			$head[] = $data;
-			$head[] = "";
-			$head[] = "--{$this->_uid}";
-
-			return implode(PHP_EOL, $head);
-		}
-
-		/**
-		 * send the email
-		 *
-		 * @return boolean
-		 */
-		public function send()
-		{
-			$to = $this->getToForSend();
-			$headers = $this->getHeadersForSend();
-
-			if (empty($to)) {
-				show_error('Unable to send, no To address has been set.');
-			}
-
-			if ($this->hasAttachments()) {
-				$message  = $this->assembleAttachmentBody();
-				$headers .= PHP_EOL . $this->assembleAttachmentHeaders();
-			} else {
-				$message = $this->getWrapMessage();
-			}
-			$this->logger->info('Sending new mail, the information are listed below: destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
-			return mail($to, $this->_subject, $message, $headers, $this->_params);
-		}
-
-		/**
-		 * debug
-		 *
-		 * @return string
-		 */
-		public function debug()
-		{
-			return '<pre>' . print_r($this, true) . '</pre>';
-		}
-
-		/**
-		 * magic __toString function
-		 *
-		 * @return string
-		 */
-		public function __toString()
-		{
-			return print_r($this, true);
-		}
-
-		/**
-		 * formatHeader
-		 *
-		 * Formats a display address for emails according to RFC2822 e.g.
-		 * Name <address@domain.tld>
-		 *
-		 * @param string $email The email address.
-		 * @param string $name  The display name.
-		 *
-		 * @return string
-		 */
-		public function formatHeader($email, $name = null)
-		{
-			$email = $this->filterEmail((string) $email);
-			if (empty($name)) {
-				return $email;
-			}
-			$name = $this->encodeUtf8($this->filterName((string) $name));
-			return sprintf('"%s" <%s>', $name, $email);
-		}
-
-		/**
-		 * encodeUtf8
-		 *
-		 * @param string $value The value to encode.
-		 *
-		 * @return string
-		 */
-		public function encodeUtf8($value)
-		{
-			$value = trim($value);
-			if (preg_match('/(\s)/', $value)) {
-				return $this->encodeUtf8Words($value);
-			}
-			return $this->encodeUtf8Word($value);
-		}
-
-		/**
-		 * encodeUtf8Word
-		 *
-		 * @param string $value The word to encode.
-		 *
-		 * @return string
-		 */
-		public function encodeUtf8Word($value)
-		{
-			return sprintf('=?UTF-8?B?%s?=', base64_encode($value));
-		}
-
-		/**
-		 * encodeUtf8Words
-		 *
-		 * @param string $value The words to encode.
-		 *
-		 * @return string
-		 */
-		public function encodeUtf8Words($value)
-		{
-			$words = explode(' ', $value);
-			$encoded = array();
-			foreach ($words as $word) {
-				$encoded[] = $this->encodeUtf8Word($word);
-			}
-			return join($this->encodeUtf8Word(' '), $encoded);
-		}
-
-		/**
-		 * filterEmail
-		 *
-		 * Removes any carriage return, line feed, tab, double quote, comma
-		 * and angle bracket characters before sanitizing the email address.
-		 *
-		 * @param string $email The email to filter.
-		 *
-		 * @return string
-		 */
-		public function filterEmail($email)
-		{
-			$rule = array(
-				"\r" => '',
-				"\n" => '',
-				"\t" => '',
-				'"'  => '',
-				','  => '',
-				'<'  => '',
-				'>'  => ''
-			);
-			$email = strtr($email, $rule);
-			$email = filter_var($email, FILTER_SANITIZE_EMAIL);
-			return $email;
-		}
-
-		/**
-		 * filterName
-		 *
-		 * Removes any carriage return, line feed or tab characters. Replaces
-		 * double quotes with single quotes and angle brackets with square
-		 * brackets, before sanitizing the string and stripping out html tags.
-		 *
-		 * @param string $name The name to filter.
-		 *
-		 * @return string
-		 */
-		public function filterName($name)
-		{
-			$rule = array(
-				"\r" => '',
-				"\n" => '',
-				"\t" => '',
-				'"'  => "'",
-				'<'  => '[',
-				'>'  => ']',
-			);
-			$filtered = filter_var(
-				$name,
-				FILTER_SANITIZE_STRING,
-				FILTER_FLAG_NO_ENCODE_QUOTES
-			);
-			return trim(strtr($filtered, $rule));
-		}
-
-		/**
-		 * filterOther
-		 *
-		 * Removes ASCII control characters including any carriage return, line
-		 * feed or tab characters.
-		 *
-		 * @param string $data The data to filter.
-		 *
-		 * @return string
-		 */
-		public function filterOther($data)
-		{
-			return filter_var($data, FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW);
-		}
-
-		/**
-		 * getHeadersForSend
-		 *
-		 * @return string
-		 */
-		public function getHeadersForSend()
-		{
-			if (empty($this->_headers)) {
-				return '';
-			}
-			return join(PHP_EOL, $this->_headers);
-		}
-
-		/**
-		 * getToForSend
-		 *
-		 * @return string
-		 */
-		public function getToForSend()
-		{
-			if (empty($this->_to)) {
-				return '';
-			}
-			return join(', ', $this->_to);
-		}
-
-		/**
-		 * getUniqueId
-		 *
-		 * @return string
-		 */
-		public function getUniqueId()
-		{
-			return md5(uniqid(time()));
-		}
-
-		/**
-		 * getWrapMessage
-		 *
-		 * @return string
-		 */
-		public function getWrapMessage()
-		{
-			return wordwrap($this->_message, $this->_wrap);
-		}
-	}
+        /**
+         * 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) {
+                if(is_numeric($name)){
+                    $this->setTo($email);
+                }
+                else{
+                    $this->setTo($email, $name);
+                }
+            }
+            return $this;
+        }
+
+
+        /**
+         * getTo
+         *
+         * Return an array of formatted To addresses.
+         *
+         * @return array
+         */
+        public function getTo()
+        {
+            return $this->_to;
+        }
+
+
+        /**
+         * setCc
+         *
+         * @param array  $pairs  An array of name => email pairs.
+         *
+         * @return self
+         */
+        public function setCc(array $pairs)
+        {
+            return $this->addMailHeaders('Cc', $pairs);
+        }
+
+        /**
+         * setBcc
+         *
+         * @param array  $pairs  An array of name => email pairs.
+         *
+         * @return self
+         */
+        public function setBcc(array $pairs)
+        {
+            return $this->addMailHeaders('Bcc', $pairs);
+        }
+
+        /**
+         * setReplyTo
+         *
+         * @param string $email
+         * @param string $name
+         *
+         * @return self
+         */
+        public function setReplyTo($email, $name = null)
+        {
+            return $this->addMailHeader('Reply-To', $email, $name);
+        }
+
+        /**
+         * setHtml
+         *
+         * @return self
+         */
+        public function setHtml()
+        {
+            $this->addGenericHeader(
+                'Content-Type', 'text/html; charset="utf-8"'
+            );
+            return $this;
+        }
+
+        /**
+         * setSubject
+         *
+         * @param string $subject The email subject
+         *
+         * @return self
+         */
+        public function setSubject($subject)
+        {
+            $this->_subject = $this->encodeUtf8(
+                $this->filterOther((string) $subject)
+            );
+            return $this;
+        }
+
+        /**
+         * getSubject function.
+         *
+         * @return string
+         */
+        public function getSubject()
+        {
+            return $this->_subject;
+        }
+
+        /**
+         * setMessage
+         *
+         * @param string $message The message to send.
+         *
+         * @return self
+         */
+        public function setMessage($message)
+        {
+            $this->_message = str_replace("\n.", "\n..", (string) $message);
+            return $this;
+        }
+
+        /**
+         * getMessage
+         *
+         * @return string
+         */
+        public function getMessage()
+        {
+            return $this->_message;
+        }
+
+        /**
+         * addAttachment
+         *
+         * @param string $path The file path to the attachment.
+         * @param string $filename The filename of the attachment when emailed.
+         * @param string $data
+         * 
+         * @return self
+         */
+        public function addAttachment($path, $filename = null, $data = null)
+        {
+            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));
+            $data = empty($data) ? $this->getAttachmentData($path) : $data;
+            $this->_attachments[] = array(
+                'path' => $path,
+                'file' => $filename,
+                'data' => chunk_split(base64_encode($data))
+            );
+            return $this;
+        }
+
+        /**
+         * getAttachmentData
+         *
+         * @param string $path The path to the attachment file.
+         *
+         * @return string
+         */
+        public function getAttachmentData($path)
+        {
+            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)){
+                $attachment = fread($handle, $filesize);
+                fclose($handle);
+            }
+            return $attachment;
+        }
+
+        /**
+         * addMailHeader
+         *
+         * @param string $header The header to add.
+         * @param string $email  The email to add.
+         * @param string $name   The name to add.
+         *
+         * @return self
+         */
+        public function addMailHeader($header, $email, $name = null)
+        {
+            $address = $this->formatHeader((string) $email, (string) $name);
+            $this->_headers[] = sprintf('%s: %s', (string) $header, $address);
+            return $this;
+        }
+
+        /**
+         * addMailHeaders
+         *
+         * @param string $header The header to add.
+         * @param array  $pairs  An array of name => email pairs.
+         *
+         * @return self
+         */
+        public function addMailHeaders($header, array $pairs)
+        {
+            if (count($pairs) === 0) {
+                show_error('You must pass at least one name => email pair.');
+            }
+            $addresses = array();
+            foreach ($pairs as $name => $email) {
+                $name = is_numeric($name) ? null : $name;
+                $addresses[] = $this->formatHeader($email, $name);
+            }
+            $this->addGenericHeader($header, implode(',', $addresses));
+            return $this;
+        }
+
+        /**
+         * addGenericHeader
+         *
+         * @param string $name The generic header to add.
+         * @param mixed  $value  The value of the header.
+         *
+         * @return self
+         */
+        public function addGenericHeader($name, $value)
+        {
+            $this->_headers[] = sprintf(
+                '%s: %s',
+                (string) $name,
+                (string) $value
+            );
+            return $this;
+        }
+
+        /**
+         * getHeaders
+         *
+         * Return the headers registered so far as an array.
+         *
+         * @return array
+         */
+        public function getHeaders()
+        {
+            return $this->_headers;
+        }
+
+        /**
+         * setAdditionalParameters
+         *
+         * Such as "-fyouremail@yourserver.com
+         *
+         * @param string $additionalParameters The addition mail parameter.
+         *
+         * @return self
+         */
+        public function setParameters($additionalParameters)
+        {
+            $this->_params = (string) $additionalParameters;
+            return $this;
+        }
+
+        /**
+         * getAdditionalParameters
+         *
+         * @return string
+         */
+        public function getParameters()
+        {
+            return $this->_params;
+        }
+
+        /**
+         * setWrap
+         *
+         * @param int $wrap The number of characters at which the message will wrap.
+         *
+         * @return self
+         */
+        public function setWrap($wrap = 78)
+        {
+            $wrap = (int) $wrap;
+            if ($wrap < 1) {
+                $wrap = 78;
+            }
+            $this->_wrap = $wrap;
+            return $this;
+        }
+
+        /**
+         * getWrap
+         *
+         * @return int
+         */
+        public function getWrap()
+        {
+            return $this->_wrap;
+        }
+
+        /**
+         * hasAttachments
+         * 
+         * Checks if the email has any registered attachments.
+         *
+         * @return bool
+         */
+        public function hasAttachments()
+        {
+            return !empty($this->_attachments);
+        }
+
+        /**
+         * assembleAttachment
+         *
+         * @return string
+         */
+        public function assembleAttachmentHeaders()
+        {
+            $head = array();
+            $head[] = "MIME-Version: 1.0";
+            $head[] = "Content-Type: multipart/mixed; boundary=\"{$this->_uid}\"";
+
+            return join(PHP_EOL, $head);
+        }
+
+        /**
+         * assembleAttachmentBody
+         *
+         * @return string
+         */
+        public function assembleAttachmentBody()
+        {
+            $body = array();
+            $body[] = "This is a multi-part message in MIME format.";
+            $body[] = "--{$this->_uid}";
+            $body[] = "Content-Type: text/html; charset=\"utf-8\"";
+            $body[] = "Content-Transfer-Encoding: quoted-printable";
+            $body[] = "";
+            $body[] = quoted_printable_encode($this->_message);
+            $body[] = "";
+            $body[] = "--{$this->_uid}";
+
+            foreach ($this->_attachments as $attachment) {
+                $body[] = $this->getAttachmentMimeTemplate($attachment);
+            }
+
+            return implode(PHP_EOL, $body) . '--';
+        }
+
+        /**
+         * getAttachmentMimeTemplate
+         *
+         * @param array  $attachment An array containing 'file' and 'data' keys.
+         *
+         * @return string
+         */
+        public function getAttachmentMimeTemplate($attachment)
+        {
+            $file = $attachment['file'];
+            $data = $attachment['data'];
+
+            $head = array();
+            $head[] = "Content-Type: application/octet-stream; name=\"{$file}\"";
+            $head[] = "Content-Transfer-Encoding: base64";
+            $head[] = "Content-Disposition: attachment; filename=\"{$file}\"";
+            $head[] = "";
+            $head[] = $data;
+            $head[] = "";
+            $head[] = "--{$this->_uid}";
+
+            return implode(PHP_EOL, $head);
+        }
+
+        /**
+         * send the email
+         *
+         * @return boolean
+         */
+        public function send()
+        {
+            $to = $this->getToForSend();
+            $headers = $this->getHeadersForSend();
+
+            if (empty($to)) {
+                show_error('Unable to send, no To address has been set.');
+            }
+
+            if ($this->hasAttachments()) {
+                $message  = $this->assembleAttachmentBody();
+                $headers .= PHP_EOL . $this->assembleAttachmentHeaders();
+            } else {
+                $message = $this->getWrapMessage();
+            }
+            $this->logger->info('Sending new mail, the information are listed below: destination: ' . $to . ', headers: ' . $headers . ', message: ' . $message);
+            return mail($to, $this->_subject, $message, $headers, $this->_params);
+        }
+
+        /**
+         * debug
+         *
+         * @return string
+         */
+        public function debug()
+        {
+            return '<pre>' . print_r($this, true) . '</pre>';
+        }
+
+        /**
+         * magic __toString function
+         *
+         * @return string
+         */
+        public function __toString()
+        {
+            return print_r($this, true);
+        }
+
+        /**
+         * formatHeader
+         *
+         * Formats a display address for emails according to RFC2822 e.g.
+         * Name <address@domain.tld>
+         *
+         * @param string $email The email address.
+         * @param string $name  The display name.
+         *
+         * @return string
+         */
+        public function formatHeader($email, $name = null)
+        {
+            $email = $this->filterEmail((string) $email);
+            if (empty($name)) {
+                return $email;
+            }
+            $name = $this->encodeUtf8($this->filterName((string) $name));
+            return sprintf('"%s" <%s>', $name, $email);
+        }
+
+        /**
+         * encodeUtf8
+         *
+         * @param string $value The value to encode.
+         *
+         * @return string
+         */
+        public function encodeUtf8($value)
+        {
+            $value = trim($value);
+            if (preg_match('/(\s)/', $value)) {
+                return $this->encodeUtf8Words($value);
+            }
+            return $this->encodeUtf8Word($value);
+        }
+
+        /**
+         * encodeUtf8Word
+         *
+         * @param string $value The word to encode.
+         *
+         * @return string
+         */
+        public function encodeUtf8Word($value)
+        {
+            return sprintf('=?UTF-8?B?%s?=', base64_encode($value));
+        }
+
+        /**
+         * encodeUtf8Words
+         *
+         * @param string $value The words to encode.
+         *
+         * @return string
+         */
+        public function encodeUtf8Words($value)
+        {
+            $words = explode(' ', $value);
+            $encoded = array();
+            foreach ($words as $word) {
+                $encoded[] = $this->encodeUtf8Word($word);
+            }
+            return join($this->encodeUtf8Word(' '), $encoded);
+        }
+
+        /**
+         * filterEmail
+         *
+         * Removes any carriage return, line feed, tab, double quote, comma
+         * and angle bracket characters before sanitizing the email address.
+         *
+         * @param string $email The email to filter.
+         *
+         * @return string
+         */
+        public function filterEmail($email)
+        {
+            $rule = array(
+                "\r" => '',
+                "\n" => '',
+                "\t" => '',
+                '"'  => '',
+                ','  => '',
+                '<'  => '',
+                '>'  => ''
+            );
+            $email = strtr($email, $rule);
+            $email = filter_var($email, FILTER_SANITIZE_EMAIL);
+            return $email;
+        }
+
+        /**
+         * filterName
+         *
+         * Removes any carriage return, line feed or tab characters. Replaces
+         * double quotes with single quotes and angle brackets with square
+         * brackets, before sanitizing the string and stripping out html tags.
+         *
+         * @param string $name The name to filter.
+         *
+         * @return string
+         */
+        public function filterName($name)
+        {
+            $rule = array(
+                "\r" => '',
+                "\n" => '',
+                "\t" => '',
+                '"'  => "'",
+                '<'  => '[',
+                '>'  => ']',
+            );
+            $filtered = filter_var(
+                $name,
+                FILTER_SANITIZE_STRING,
+                FILTER_FLAG_NO_ENCODE_QUOTES
+            );
+            return trim(strtr($filtered, $rule));
+        }
+
+        /**
+         * filterOther
+         *
+         * Removes ASCII control characters including any carriage return, line
+         * feed or tab characters.
+         *
+         * @param string $data The data to filter.
+         *
+         * @return string
+         */
+        public function filterOther($data)
+        {
+            return filter_var($data, FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW);
+        }
+
+        /**
+         * getHeadersForSend
+         *
+         * @return string
+         */
+        public function getHeadersForSend()
+        {
+            if (empty($this->_headers)) {
+                return '';
+            }
+            return join(PHP_EOL, $this->_headers);
+        }
+
+        /**
+         * getToForSend
+         *
+         * @return string
+         */
+        public function getToForSend()
+        {
+            if (empty($this->_to)) {
+                return '';
+            }
+            return join(', ', $this->_to);
+        }
+
+        /**
+         * getUniqueId
+         *
+         * @return string
+         */
+        public function getUniqueId()
+        {
+            return md5(uniqid(time()));
+        }
+
+        /**
+         * getWrapMessage
+         *
+         * @return string
+         */
+        public function getWrapMessage()
+        {
+            return wordwrap($this->_message, $this->_wrap);
+        }
+    }

Spacing +7 added lines, -7 removed lines

@@ -142,10 +142,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);
 				}
 			}
@@ -275,8 +275,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));
@@ -298,13 +298,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/PDF.php

Indentation +72 added lines, -72 removed lines

@@ -1,80 +1,80 @@
 <?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.
-	*/
+    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.
+     */
 
-	/**
-	 * PDF library to generate PDF document using the library DOMPDF
-	 */
-	class PDF extends BaseClass{
+    /**
+     * PDF library to generate PDF document using the library DOMPDF
+     */
+    class PDF extends BaseClass{
 		
-		/**
-		 * The dompdf instance
-		 * @var Dompdf
-		 */
-		private $dompdf = null;
+        /**
+         * The dompdf instance
+         * @var Dompdf
+         */
+        private $dompdf = null;
 		
-		/**
-		 * Create PDF library instance
-		 */
-		public function __construct(){
-			parent::__construct();
+        /**
+         * Create PDF library instance
+         */
+        public function __construct(){
+            parent::__construct();
 
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
-			$this->dompdf = new Dompdf();
-		}
+            require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
+            $this->dompdf = new Dompdf();
+        }
 
-		/**
-		 * Generate PDF document
-		 * @param  string  $html        the HTML content to use for generation
-		 * @param  string  $filename    the generated PDF document filename
-		 * @param  boolean $stream      if need send the generated PDF to browser for download
-		 * @param  string  $paper       the PDF document paper type like 'A4', 'A5', 'letter', etc.
-		 * @param  string  $orientation the PDF document orientation like 'portrait', 'landscape'
-		 * @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. ']');
-			$this->dompdf->load_html($html);
-			$this->dompdf->set_paper($paper, $orientation);
-			$this->dompdf->render();
-			if($stream){
-				$this->dompdf->stream($filename);
-			}
-			else{
-				return $this->dompdf->output();
-			}
-		}
+        /**
+         * Generate PDF document
+         * @param  string  $html        the HTML content to use for generation
+         * @param  string  $filename    the generated PDF document filename
+         * @param  boolean $stream      if need send the generated PDF to browser for download
+         * @param  string  $paper       the PDF document paper type like 'A4', 'A5', 'letter', etc.
+         * @param  string  $orientation the PDF document orientation like 'portrait', 'landscape'
+         * @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. ']');
+            $this->dompdf->load_html($html);
+            $this->dompdf->set_paper($paper, $orientation);
+            $this->dompdf->render();
+            if($stream){
+                $this->dompdf->stream($filename);
+            }
+            else{
+                return $this->dompdf->output();
+            }
+        }
 		
-		/**
-		* Return the instance of Dompdf
-		*
-		* @return object the dompdf instance
-		*/
-		public function getDompdf(){
-			return $this->dompdf;
-		}
+        /**
+         * Return the instance of Dompdf
+         *
+         * @return object the dompdf instance
+         */
+        public function getDompdf(){
+            return $this->dompdf;
+        }
 		
-	}
+    }

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * PDF library to generate PDF document using the library DOMPDF
 	 */
-	class PDF extends BaseClass{
+	class PDF extends BaseClass {
 		
 		/**
 		 * The dompdf instance
@@ -38,10 +38,10 @@ 
 		/**
 		 * Create PDF library instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			parent::__construct();
 
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
+			require_once VENDOR_PATH . 'dompdf/dompdf_config.inc.php';
 			$this->dompdf = new Dompdf();
 		}
 
@@ -55,15 +55,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();
 			}
 		}
@@ -73,7 +73,7 @@ 
 		*
 		* @return object the dompdf instance
 		*/
-		public function getDompdf(){
+		public function getDompdf() {
 			return $this->dompdf;
 		}
 		

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 extends BaseClass{
+        class FormValidation extends BaseClass{
 		 
         /**
          * 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
          */
@@ -93,7 +93,7 @@ 
         public function __construct() {
             parent::__construct();
            
-		   //Load form validation language message
+            //Load form validation language message
             Loader::lang('form_validation');
             $obj = & get_instance();
             $this->_errorsMessages  = array(
@@ -155,13 +155,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;
         }
 
         /**
@@ -172,11 +172,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;
@@ -246,12 +246,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) {
@@ -267,7 +267,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) {
@@ -281,8 +281,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) {
@@ -304,7 +304,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;
@@ -319,7 +319,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;
@@ -327,21 +327,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;
         }
 
@@ -379,7 +379,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) {
@@ -416,17 +416,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;
@@ -454,7 +454,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) {
@@ -467,10 +467,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){
@@ -486,7 +486,7 @@ 
                 } else {
                     $ruleSets[] = $ruleString;
                 }
-             }
+                }
             return $ruleSets;
         }
 
@@ -494,7 +494,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) {
@@ -529,13 +529,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;
@@ -552,7 +552,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);
@@ -570,11 +570,11 @@ 
          *
          * @param type $inputArg
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runCallback($inputArg, $callbackFunc) {
-			return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
+            return eval('return ' . $callbackFunc . '("' . $inputArg . '");');
         }
 
         /**
@@ -583,7 +583,7 @@ 
          * arguments.
          *
          * @param string $callbackFunc
-		 *
+         *
          * @return mixed
          */
         protected function _runEmptyCallback($callbackFunc) {
@@ -594,7 +594,7 @@ 
          * Gets a specific label of a specific field input name.
          *
          * @param string $inputName
-		 *
+         *
          * @return string
          */
         protected function _getLabel($inputName) {
@@ -607,7 +607,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]);
@@ -615,8 +615,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));
             }
         }
 
@@ -640,10 +640,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)));
+                }
             }
         }
 
@@ -675,7 +675,7 @@ 
                         continue;
                     }
                 } 
-				else{
+                else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -767,7 +767,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])) {
@@ -783,7 +783,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])) {
@@ -799,7 +799,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])) {
@@ -815,18 +815,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;
@@ -841,7 +841,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();
@@ -849,11 +849,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;
                 }
@@ -867,25 +867,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;
                 }
@@ -901,7 +901,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])) {
@@ -919,7 +919,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;

Spacing +57 added lines, -57 removed lines

@@ -25,13 +25,13 @@ 
     */
 
 
-     class FormValidation extends BaseClass{
+     class FormValidation extends BaseClass {
 		 
         /**
          * 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
@@ -96,7 +96,7 @@ 
 		   //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'),
@@ -126,7 +126,7 @@ 
          * Set the database instance
          * @param object $database the database instance
          */
-        public function setDatabase(Database $database){
+        public function setDatabase(Database $database) {
             $this->databaseInstance = $database;
             return $this;
         }
@@ -135,7 +135,7 @@ 
          * Get the database instance
          * @return object the database instance
          */
-        public function getDatabase(){
+        public function getDatabase() {
             return $this->databaseInstance;
         }
 
@@ -158,7 +158,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;
@@ -168,7 +168,7 @@ 
          * Get the form validation data
          * @return array the form validation data to be validated
          */
-        public function getData(){
+        public function getData() {
             return $this->data;
         }
 
@@ -177,7 +177,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) {
@@ -201,7 +201,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);
         }
 
         /**
@@ -221,14 +221,14 @@ 
          * Validate the CSRF 
          * @return void 
          */
-        protected function validateCSRF(){
-            if(get_instance()->request->method() == 'POST'){
+        protected function validateCSRF() {
+            if (get_instance()->request->method() == 'POST') {
                 $this->logger->debug('Check if CSRF is enabled in configuration');
                 //first check for CSRF
-                if (get_config('csrf_enable', false) && ! Security::validateCSRF()){
+                if (get_config('csrf_enable', false) && !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');
                 }
             }
@@ -246,10 +246,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]);
     			}
 
@@ -259,7 +259,7 @@ 
                     }
                 }
             }
-            $this->_success =  empty($this->_errors) && $this->_forceFail === false;
+            $this->_success = empty($this->_errors) && $this->_forceFail === false;
         }
 
         /**
@@ -273,7 +273,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;
         }
 
@@ -437,7 +437,7 @@ 
             }
             $errorOutput .= $errorsEnd;
             echo ($echo) ? $errorOutput : '';
-            return (! $echo) ? $errorOutput : null;
+            return (!$echo) ? $errorOutput : null;
         }
 
         /**
@@ -462,25 +462,25 @@ 
             /*
             //////////////// hack for regex rule that can contain "|"
             */
-            if(strpos($ruleString, 'regex') !== false){
+            if (strpos($ruleString, 'regex') !== false) {
                 $regexRule = array();
                 $rule = '#regex\[\/(.*)\/([a-zA-Z0-9]?)\]#';
                 preg_match($rule, $ruleString, $regexRule);
                 $ruleStringTemp = preg_replace($rule, '', $ruleString);
-                 if(!empty($regexRule[0])){
+                 if (!empty($regexRule[0])) {
                      $ruleSets[] = $regexRule[0];
                  }
                  $ruleStringRegex = explode('|', $ruleStringTemp);
                 foreach ($ruleStringRegex as $rule) {
                     $rule = trim($rule);
-                    if($rule){
+                    if ($rule) {
                         $ruleSets[] = $rule;
                     }
                 }
                  
             }
             /***********************************/
-            else{
+            else {
                 if (strpos($ruleString, '|') !== FALSE) {
                     $ruleSets = explode('|', $ruleString);
                 } else {
@@ -512,7 +512,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();
 
@@ -557,7 +557,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;
             }
         }
@@ -609,13 +609,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));
             }
         }
@@ -641,7 +641,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)));
 				}
             }
@@ -675,7 +675,7 @@ 
                         continue;
                     }
                 } 
-				else{
+				else {
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;
@@ -705,8 +705,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));
@@ -722,7 +722,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])));
@@ -738,7 +738,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])));
@@ -754,7 +754,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])));
@@ -770,7 +770,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])));
@@ -786,7 +786,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])));
@@ -801,8 +801,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)));
@@ -817,9 +817,9 @@ 
          */
 		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)){
+                if (isset($obj->database)) {
                     $this->databaseInstance = $obj->database;
                 } 
             }
@@ -828,7 +828,7 @@ 
     			                                       ->where($column, $inputVal);
     		$this->databaseInstance->get();
             if ($this->databaseInstance->numRows() <= 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)));
@@ -843,9 +843,9 @@ 
          */
     	protected function _validateIsUnique($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)){
+                if (isset($obj->database)) {
                     $this->databaseInstance = $obj->database;
                 } 
             }
@@ -854,7 +854,7 @@ 
     			                                      ->where($column, $inputVal);
     		$this->databaseInstance->get();
     		if ($this->databaseInstance->numRows() > 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)));
@@ -869,14 +869,14 @@ 
          */
     	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)){
+                if (isset($obj->database)) {
                     $this->databaseInstance = $obj->database;
                 } 
             }
     		$data = explode(',', $ruleArgs[1]);
-    		if(count($data) < 2){
+    		if (count($data) < 2) {
     			return;
     		}
     		list($table, $column) = explode('.', $data[0]);
@@ -886,7 +886,7 @@ 
                                             		  ->where($field, '!=', trim($val));
             $this->databaseInstance->get();
     		if ($this->databaseInstance->numRows() > 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)));
@@ -903,8 +903,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])));
@@ -920,8 +920,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)));

core/libraries/Upload.php

Indentation +293 added lines, -293 removed lines

@@ -22,139 +22,139 @@ 
      * 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
-    */
+     *    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 extends BaseClass{
 
         /**
-        *   Version
-        *
-        *   @since      1.5
-        *   @version    1.0
-        */
+         *   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
-        */
+         *    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
-        */
+         *    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
-        */
+         *    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
-        */
+         *    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
-        */
+         *    Path output
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $destination_directory;
 
         /**
-        *    Output filename
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        string
-        */
+         *    Output filename
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        string
+         */
         private $filename;
 
         /**
-        *    Max file size
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        float
-        */
+         *    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
-        */
+         *    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
-        */
+         *    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
-        */
+         *    File object
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        object
+         */
         private $file;
 
         /**
-        *    Helping mime types
-        *
-        *    @since        1.0
-        *    @version    1.0
-        *    @var        array
-        */
+         *    Helping mime types
+         *
+         *    @since        1.0
+         *    @version    1.0
+         *    @var        array
+         */
         private $mime_helping = array(
             'text'      =>    array('text/plain',),
             'image'     =>    array(
@@ -204,13 +204,13 @@ 
 
 
         /**
-        *    Construct
-        *
-        *    @since     0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    object    __construct
-        */
+         *    Construct
+         *
+         *    @since     0.1
+         *    @version   1.0.1
+         *    @return    object
+         *    @method    object    __construct
+         */
         public function __construct(){
             parent::__construct();
 
@@ -253,17 +253,17 @@ 
             $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
-        */
+         *    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) )) {
@@ -272,18 +272,18 @@ 
             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
-        */
+         *    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)) {
@@ -292,14 +292,14 @@ 
             return $this;
         }
         /**
-        *    Set automatic filename
-        *
-        *    @since     1.0
-        *    @version   1.5
-        *    @param     string      $extension
-        *    @return    object
-        *    @method    boolean     setAutoFilename
-        */
+         *    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());
@@ -307,14 +307,14 @@ 
             return $this;
         }
         /**
-        *    Set file size limit
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     double     $file_size
-        *    @return    object
-        *    @method    boolean     setMaxFileSize
-        */
+         *    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);
@@ -330,14 +330,14 @@ 
             return $this;
         }
         /**
-        *    Set array mime types
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     array       $mimes
-        *    @return    object
-        *    @method    boolean     setAllowedMimeTypes
-        */
+         *    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) {
@@ -346,14 +346,14 @@ 
             return $this;
         }
         /**
-        *    Set input callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackInput
-        */
+         *    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)) {
@@ -362,14 +362,14 @@ 
             return $this;
         }
         /**
-        *    Set output callback
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @param     mixed       $callback
-        *    @return    object
-        *    @method    boolean     setCallbackOutput
-        */
+         *    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)) {
@@ -378,14 +378,14 @@ 
             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
-        */
+         *    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)) {
@@ -395,13 +395,13 @@ 
             return $this;
         }
         /**
-        *    Set allowed mime types from mime helping
-        *
-        *    @since     1.0.1
-        *    @version   1.0.1
-        *    @return    object
-        *    @method    boolean    setMimeHelping
-        */
+         *    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)) {
@@ -412,17 +412,17 @@ 
             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
-        */
+         *    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) )) {
@@ -433,13 +433,13 @@ 
             return $this;
         }
         /**
-        *    Clear allowed mime types cache
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    object
-        *    @method    boolean    clearAllowedMimeTypes
-        */
+         *    Clear allowed mime types cache
+         *
+         *    @since     1.0
+         *    @version   1.0
+         *    @return    object
+         *    @method    boolean    clearAllowedMimeTypes
+         */
         public function clearAllowedMimeTypes()
         {
             $this->allowed_mime_types = array();
@@ -447,15 +447,15 @@ 
             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
-        */
+         *    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) {
@@ -479,14 +479,14 @@ 
             return $this;
         }
         /**
-        *    Check file exists
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      string     $file_destination
-        *    @return     boolean
-        *    @method     boolean    fileExists
-        */
+         *    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)) {
@@ -495,14 +495,14 @@ 
             return false;
         }
         /**
-        *    Check dir exists
-        *
-        *    @since        1.0
-        *    @version    1.0.1
-        *    @param      string     $path
-        *    @return     boolean
-        *    @method     boolean    dirExists
-        */
+         *    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)) {
@@ -511,29 +511,29 @@ 
             return false;
         }
         /**
-        *    Check valid filename
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @param     string      $filename
-        *    @return    boolean
-        *    @method    boolean     isFilename
-        */
+         *    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
-        */
+         *    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) {
@@ -542,26 +542,26 @@ 
             return in_array(strtolower($mime), $this->allowed_mime_types);
         }
         /**
-        *    Retrive status of upload
-        *
-        *    @since     1.0
-        *    @version   1.0
-        *    @return    boolean
-        *    @method    boolean    getStatus
-        */
+         *    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
-        */
+         *    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) )) {
@@ -574,26 +574,26 @@ 
             return false;
         }
         /**
-        *    Allow overwriting files
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @return     object
-        *    @method     boolean    allowOverwriting
-        */
+         *    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
-        */
+         *    File info
+         *
+         *    @since      1.0
+         *    @version    1.0
+         *    @return     object
+         *    @method     object    getInfo
+         */
         public function getInfo()
         {
             return (object)$this->file;
@@ -611,13 +611,13 @@ 
 
         
         /**
-        *    Upload file
-        *
-        *    @since     1.0
-        *    @version   1.0.1
-        *    @return    boolean
-        *    @method    boolean    save
-        */
+         *    Upload file
+         *
+         *    @since     1.0
+         *    @version   1.0.1
+         *    @return    boolean
+         *    @method    boolean    save
+         */
         public function save(){
             if (count($this->file_array) > 0 && array_key_exists($this->input, $this->file_array)) {
                 // set original filename if not have a new name
@@ -674,15 +674,15 @@ 
 
 
         /**
-        *    File size for humans.
-        *
-        *    @since      1.0
-        *    @version    1.0
-        *    @param      integer    $bytes
-        *    @param      integer    $precision
-        *    @return     string
-        *    @method     string     sizeFormat
-        */
+         *    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){
@@ -695,14 +695,14 @@ 
 
         
         /**
-        *    Convert human file size to bytes
-        *
-        *    @since      1.0
-        *    @version    1.0.1
-        *    @param      integer|double    $size
-        *    @return     integer|double
-        *    @method     string     sizeInBytes
-        */
+         *    Convert human file size to bytes
+         *
+         *    @since      1.0
+         *    @version    1.0.1
+         *    @param      integer|double    $size
+         *    @return     integer|double
+         *    @method     string     sizeInBytes
+         */
         public function sizeInBytes($size)
         {
             $unit = 'B';
@@ -754,7 +754,7 @@ 
                 return true;
             }
 
-             //check for php upload error
+                //check for php upload error
             if(is_numeric($this->file['error']) && $this->file['error'] > 0){
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
@@ -766,7 +766,7 @@ 
                 return true;
             }
 
-             // Check file size
+                // Check file size
             if ($this->max_file_size > 0 && $this->max_file_size < $this->file['size']) {
                 $this->setError(sprintf($this->error_messages['max_file_size'], $this->sizeFormat($this->max_file_size)));
                 return true;

Spacing +47 added lines, -47 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload extends BaseClass{
+    class Upload extends BaseClass {
 
         /**
         *   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
@@ -211,11 +211,11 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
+        public function __construct() {
             parent::__construct();
 
             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'),
@@ -232,15 +232,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
@@ -250,7 +250,7 @@ 
             if (isset($_FILES) && is_array($_FILES)) {
                 $this->file_array = $_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -266,7 +266,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;
@@ -302,7 +302,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;
         }
@@ -323,7 +323,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;
             }
@@ -341,7 +341,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -406,7 +406,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;
@@ -425,8 +425,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;
                 }
             }
@@ -471,8 +471,8 @@ 
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -522,7 +522,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,
@@ -564,11 +564,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;
@@ -596,7 +596,7 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
 
@@ -604,7 +604,7 @@ 
          * Check if the file is uploaded
          * @return boolean
          */
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             && is_uploaded_file($this->file_array[$this->input]['tmp_name']);
         }
@@ -618,13 +618,13 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             if (count($this->file_array) > 0 && array_key_exists($this->input, $this->file_array)) {
                 // set original filename if not have a new name
                 if (empty($this->filename)) {
                     $this->filename = $this->file_array[$this->input]['name'];
                 }
-                else{
+                else {
                     // Replace %s for extension in filename
                     // Before: /[\w\d]*(.[\d\w]+)$/i
                     // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -648,10 +648,10 @@ 
                 $this->file['filename']     = $this->filename;
                 $this->file['error']        = $this->file_array[$this->input]['error'];
 
-                $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+                $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                 $error = $this->uploadHasError();
-                if($error){
+                if ($error) {
                     return false;
                 }
                 // Execute input callback
@@ -685,10 +685,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;
         }
@@ -712,14 +712,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;
         }
 
@@ -727,7 +727,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The file upload got error : ' . $message);
             $this->error = $message;
         }
@@ -737,9 +737,9 @@ 
          * @param string $type the type of callback "input" or "output"
          * @return void 
          */
-        protected function runCallback($type){
-            if (!empty( $this->callbacks[$type])) {
-                call_user_func($this->callbacks[$type], (object)$this->file);
+        protected function runCallback($type) {
+            if (!empty($this->callbacks[$type])) {
+                call_user_func($this->callbacks[$type], (object) $this->file);
             }
         }
 
@@ -747,21 +747,21 @@ 
          * Check if file upload has error
          * @return boolean
          */
-        protected function uploadHasError(){
+        protected function uploadHasError() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return true;
             }
 
              //check for php upload error
-            if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+            if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                 $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                 return true;
             }
             
             //check for mime type
-            if (! $this->checkMimeType($this->file['mime'])) {
+            if (!$this->checkMimeType($this->file['mime'])) {
                 $this->setError($this->error_messages['accept_file_types']);
                 return true;
             }
@@ -785,7 +785,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/Assets.php

Indentation +137 added lines, -137 removed lines

@@ -1,149 +1,149 @@
 <?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 Assets.php
-	 *    
-	 *  This class contains static methods for generating static content links (images, Javascript, CSS, etc.).
-	 *  
-	 *  @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
-	 */
-	class Assets extends BaseStaticClass{
+    /**
+     *  @file Assets.php
+     *    
+     *  This class contains static methods for generating static content links (images, Javascript, CSS, etc.).
+     *  
+     *  @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
+     */
+    class Assets extends BaseStaticClass{
 
 
-		/**
-		 *  Generate the link of the assets file.
-		 *  
-		 *  Generates the absolute link of a file inside ASSETS_PATH folder.
-		 *  For example :
-		 *  	echo Assets::path('foo/bar/css/style.css'); => http://mysite.com/assets/foo/bar/css/style.css
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $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){
-			$logger = self::getLogger();	
-			$path = ASSETS_PATH . $asset;
+        /**
+         *  Generate the link of the assets file.
+         *  
+         *  Generates the absolute link of a file inside ASSETS_PATH folder.
+         *  For example :
+         *  	echo Assets::path('foo/bar/css/style.css'); => http://mysite.com/assets/foo/bar/css/style.css
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $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){
+            $logger = self::getLogger();	
+            $path = ASSETS_PATH . $asset;
 			
-			$logger->debug('Including the Assets file [' . $path . ']');
-			//Check if the file exists
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] does not exist');
-			return null;
-		}
+            $logger->debug('Including the Assets file [' . $path . ']');
+            //Check if the file exists
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] does not exist');
+            return null;
+        }
 		
-		/**
-		 *  Generate the link of the css file.
-		 *  
-		 *  Generates the absolute link of a file containing the CSS style.
-		 *  For example :
-		 *  	echo Assets::css('mystyle'); => http://mysite.com/assets/css/mystyle.css
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $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){
-			$logger = self::getLogger();
-			/*
+        /**
+         *  Generate the link of the css file.
+         *  
+         *  Generates the absolute link of a file containing the CSS style.
+         *  For example :
+         *  	echo Assets::css('mystyle'); => http://mysite.com/assets/css/mystyle.css
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $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){
+            $logger = self::getLogger();
+            /*
 			* if the file name contains the ".css" extension, replace it with 
 			* an empty string for better processing.
 			*/
-			$path = str_ireplace('.css', '', $path);
-			$path = ASSETS_PATH . 'css/' . $path . '.css';
+            $path = str_ireplace('.css', '', $path);
+            $path = ASSETS_PATH . 'css/' . $path . '.css';
 			
-			$logger->debug('Including the Assets file [' . $path . '] for CSS');
-			//Check if the file exists
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] for CSS included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for CSS does not exist');
-			return null;
-		}
+            $logger->debug('Including the Assets file [' . $path . '] for CSS');
+            //Check if the file exists
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] for CSS included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for CSS does not exist');
+            return null;
+        }
 
-		/**
-		 *  Generate the link of the javascript file.
-		 *  
-		 *  Generates the absolute link of a file containing the javascript.
-		 *  For example :
-		 *  	echo Assets::js('myscript'); => http://mysite.com/assets/js/myscript.js
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $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){
-			$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)){
-				$logger->info('Assets file [' . $path . '] for Javascript included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for Javascript does not exist');
-			return null;
-		}
+        /**
+         *  Generate the link of the javascript file.
+         *  
+         *  Generates the absolute link of a file containing the javascript.
+         *  For example :
+         *  	echo Assets::js('myscript'); => http://mysite.com/assets/js/myscript.js
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $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){
+            $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)){
+                $logger->info('Assets file [' . $path . '] for Javascript included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for Javascript does not exist');
+            return null;
+        }
 
-		/**
-		 *  Generate the link of the image file.
-		 *  
-		 *  Generates the absolute link of a file containing the image.
-		 *  For example :
-		 *  	echo Assets::img('myimage.png'); => http://mysite.com/assets/images/myimage.png
-		 *  Note:
-		 *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
-		 *  
-		 *  @param string $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){
-			$logger = self::getLogger();
-			$path = ASSETS_PATH . 'images/' . $path;
-			$logger->debug('Including the Assets file [' . $path . '] for image');
-			if(file_exists($path)){
-				$logger->info('Assets file [' . $path . '] for image included successfully');
-				return Url::base_url($path);
-			}
-			$logger->warning('Assets file [' . $path . '] for image does not exist');
-			return null;
-		}
-	}
+        /**
+         *  Generate the link of the image file.
+         *  
+         *  Generates the absolute link of a file containing the image.
+         *  For example :
+         *  	echo Assets::img('myimage.png'); => http://mysite.com/assets/images/myimage.png
+         *  Note:
+         *  The argument passed to this function must be the relative link to the folder that contains the static contents defined by the constant ASSETS_PATH.
+         *  
+         *  @param string $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){
+            $logger = self::getLogger();
+            $path = ASSETS_PATH . 'images/' . $path;
+            $logger->debug('Including the Assets file [' . $path . '] for image');
+            if(file_exists($path)){
+                $logger->info('Assets file [' . $path . '] for image included successfully');
+                return Url::base_url($path);
+            }
+            $logger->warning('Assets file [' . $path . '] for image does not exist');
+            return null;
+        }
+    }

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 	 *  @since 1.0.0
 	 *  @filesource
 	 */
-	class Assets extends BaseStaticClass{
+	class Assets extends BaseStaticClass {
 
 
 		/**
@@ -53,13 +53,13 @@ 
 		 *  @param string $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);
 			}
@@ -79,7 +79,7 @@ 
 		 *  @param string $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 
@@ -90,7 +90,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);
 			}
@@ -110,12 +110,12 @@ 
 		 *  @param string $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);
 			}
@@ -135,11 +135,11 @@ 
 		 *  @param string $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/Cookie.php

Indentation +85 added lines, -85 removed lines

@@ -1,94 +1,94 @@
 <?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 Cookie extends BaseStaticClass{
+    class Cookie extends BaseStaticClass{
 
-		/**
-		 * Get the cookie item value
-		 * @param  string $item    the cookie item name to get
-		 * @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){
-			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				return $_COOKIE[$item];
-			}
-			$logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
-			return $default;
-		}
+        /**
+         * Get the cookie item value
+         * @param  string $item    the cookie item name to get
+         * @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){
+            $logger = self::getLogger();
+            if(array_key_exists($item, $_COOKIE)){
+                return $_COOKIE[$item];
+            }
+            $logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
+            return $default;
+        }
 
-		/**
-		 * Set the cookie item value
-		 * @param string  $name     the cookie item name
-		 * @param string  $value    the cookie value to set
-		 * @param integer $expire   the time to live for this cookie
-		 * @param string  $path     the path that the cookie will be available
-		 * @param string  $domain   the domain that the cookie will be available
-		 * @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()){
-				show_error('There exists a cookie that we wanted to create that we couldn\'t 
+        /**
+         * Set the cookie item value
+         * @param string  $name     the cookie item name
+         * @param string  $value    the cookie value to set
+         * @param integer $expire   the time to live for this cookie
+         * @param string  $path     the path that the cookie will be available
+         * @param string  $domain   the domain that the cookie will be available
+         * @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()){
+                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){
-				$timestamp = time() + $expire;
-			}
-			setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
-		}
+            }
+            $timestamp = $expire;
+            if($expire){
+                $timestamp = time() + $expire;
+            }
+            setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
+        }
 
-		/**
-		 * Delete the cookie item in the list
-		 * @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){
-			$logger = self::getLogger();
-			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');
-				return false;
-			}
-		}
+        /**
+         * Delete the cookie item in the list
+         * @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){
+            $logger = self::getLogger();
+            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');
+                return false;
+            }
+        }
 
-		/**
-		 * Check if the given cookie item exists
-		 * @param  string $item the cookie item name
-		 * @return boolean       true if the cookie item is set, false or not
-		 */
-		public static function exists($item){
-			return array_key_exists($item, $_COOKIE);
-		}
+        /**
+         * Check if the given cookie item exists
+         * @param  string $item the cookie item name
+         * @return boolean       true if the cookie item is set, false or not
+         */
+        public static function exists($item){
+            return array_key_exists($item, $_COOKIE);
+        }
 
-	}
+    }

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Cookie extends BaseStaticClass{
+	class Cookie extends BaseStaticClass {
 
 		/**
 		 * Get the cookie item value
@@ -32,9 +32,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 . ']');
@@ -51,14 +51,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);
@@ -69,15 +69,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;
 			}
 		}
@@ -87,7 +87,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/classes/Module.php

Indentation +228 added lines, -228 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
      * TNH Framework
      *
      * A simple PHP framework using HMVC architecture
@@ -22,252 +22,252 @@ 
      * 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 Module extends BaseStaticClass{
+    class Module extends BaseStaticClass{
 		
-		/**
-		 * list of loaded module
-		 * @var array
-		 */
-		private static $list = array();
+        /**
+         * list of loaded module
+         * @var array
+         */
+        private static $list = array();
 
-		/**
-		 * Initialise the module list by scanning the directory MODULE_PATH
-		 */
-		public function init(){
-			$logger = self::getLogger();
-			$logger->debug('Check if the application contains the modules ...');
-			$moduleDir = opendir(MODULE_PATH);
-			if (is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
-						self::$list[] = $module;
-					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
-					}
-				}
-				closedir($moduleDir);
-			}
-			ksort(self::$list);
+        /**
+         * Initialise the module list by scanning the directory MODULE_PATH
+         */
+        public function init(){
+            $logger = self::getLogger();
+            $logger->debug('Check if the application contains the modules ...');
+            $moduleDir = opendir(MODULE_PATH);
+            if (is_resource($moduleDir)){
+                while(($module = readdir($moduleDir)) !== false){
+                    if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+                        self::$list[] = $module;
+                    }
+                    else{
+                        $logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+                    }
+                }
+                closedir($moduleDir);
+            }
+            ksort(self::$list);
 			
-			if (! empty(self::$list)){
-				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
-			}
-		}
+            if (! empty(self::$list)){
+                $logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
+            }
+        }
 		
 
-		/**
-		 * Add new module in the list
-		 * @param string $name the name of the module
-		 *
-		 * @return object the current instance
-		 */
-		public function add($name){
-			self::$list[] = $name;
-			return $this;
-		}
+        /**
+         * Add new module in the list
+         * @param string $name the name of the module
+         *
+         * @return object the current instance
+         */
+        public function add($name){
+            self::$list[] = $name;
+            return $this;
+        }
 		
-		/**
-		 * Get the list of the custom autoload configuration from module if exists
-		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
-		 */
-		public static function getModulesAutoloadConfig(){
-			$logger = self::getLogger();
-			if (empty(self::$list)){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$autoloads = array();
-			$autoloads['libraries'] = array();
-			$autoloads['config']    = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			$autoloads['languages'] = array();
+        /**
+         * Get the list of the custom autoload configuration from module if exists
+         * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
+         */
+        public static function getModulesAutoloadConfig(){
+            $logger = self::getLogger();
+            if (empty(self::$list)){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $autoloads = array();
+            $autoloads['libraries'] = array();
+            $autoloads['config']    = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            $autoloads['languages'] = array();
 			
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if (file_exists($file)){
-					$autoload = array();
-					require_once $file;
-					if (! empty($autoload) && is_array($autoload)){
-						$autoloads = array_merge_recursive($autoloads, $autoload);
-						unset($autoload);
-					}
-				}
-			}
-			return $autoloads;
-		}
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
+                if (file_exists($file)){
+                    $autoload = array();
+                    require_once $file;
+                    if (! empty($autoload) && is_array($autoload)){
+                        $autoloads = array_merge_recursive($autoloads, $autoload);
+                        unset($autoload);
+                    }
+                }
+            }
+            return $autoloads;
+        }
 
-		/**
-		 * Get the list of the custom routes configuration from module if exists
-		 * @return array|boolean the routes list or false if no module contains the routes configuration
-		 */
-		public static function getModulesRoutesConfig(){
-			$logger = self::getLogger();
-			if (empty(self::$list)){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$routes = array();
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if (file_exists($file)){
-					$route = array();
-					require_once $file;
-					if (! empty($route) && is_array($route)){
-						$routes = array_merge($routes, $route);
-						unset($route);
-					}
-				}
-			}
-			return $routes;
-		}
+        /**
+         * Get the list of the custom routes configuration from module if exists
+         * @return array|boolean the routes list or false if no module contains the routes configuration
+         */
+        public static function getModulesRoutesConfig(){
+            $logger = self::getLogger();
+            if (empty(self::$list)){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $routes = array();
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
+                if (file_exists($file)){
+                    $route = array();
+                    require_once $file;
+                    if (! empty($route) && is_array($route)){
+                        $routes = array_merge($routes, $route);
+                        unset($route);
+                    }
+                }
+            }
+            return $routes;
+        }
 
 
-		/**
-		 * Check if in module list can have this controller
-		 * @see Module::findClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
-		 */
-		public static function findControllerFullPath($class, $module = null){
-			return self::findClassInModuleFullFilePath($class, $module, 'controllers');
-		}
+        /**
+         * Check if in module list can have this controller
+         * @see Module::findClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this controller, path the full path of the controller
+         */
+        public static function findControllerFullPath($class, $module = null){
+            return self::findClassInModuleFullFilePath($class, $module, 'controllers');
+        }
 
-		/**
-		 * Check if in module list can have this model
-		 * @see Module::findClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this model, return the full path of this model
-		 */
-		public static function findModelFullPath($class, $module = null){
-			return self::findClassInModuleFullFilePath($class, $module, 'models');
-		}
+        /**
+         * Check if in module list can have this model
+         * @see Module::findClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this model, return the full path of this model
+         */
+        public static function findModelFullPath($class, $module = null){
+            return self::findClassInModuleFullFilePath($class, $module, 'models');
+        }
 
-		/**
-		 * Check if in module list can have this library
-		 * @see Module::findClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
-		 */
-		public static function findLibraryFullPath($class, $module = null){
-			return self::findClassInModuleFullFilePath($class, $module, 'libraries');
-		}
+        /**
+         * Check if in module list can have this library
+         * @see Module::findClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this library,  return the full path of this library
+         */
+        public static function findLibraryFullPath($class, $module = null){
+            return self::findClassInModuleFullFilePath($class, $module, 'libraries');
+        }
 
 		
-		/**
-		 * Check if in module list can have this config
-		 * @see  Module::findNonClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
-		 */
-		public static function findConfigFullPath($configuration, $module = null){
-			return self::findNonClassInModuleFullFilePath($configuration, $module, 'config');
-		}
+        /**
+         * Check if in module list can have this config
+         * @see  Module::findNonClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
+         */
+        public static function findConfigFullPath($configuration, $module = null){
+            return self::findNonClassInModuleFullFilePath($configuration, $module, 'config');
+        }
 
-		/**
-		 * Check if in module list can have this helper
-		 * @see  Module::findNonClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
-		 */
-		public static function findFunctionFullPath($helper, $module = null){
-			return self::findNonClassInModuleFullFilePath($helper, $module, 'functions');
-		}
+        /**
+         * Check if in module list can have this helper
+         * @see  Module::findNonClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
+         */
+        public static function findFunctionFullPath($helper, $module = null){
+            return self::findNonClassInModuleFullFilePath($helper, $module, 'functions');
+        }
 
-		/**
-		 * Check if in module list can have this view
-		 * @see  Module::findNonClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this view, path the full path of the view
-		 */
-		public static function findViewFullPath($view, $module = null){
-			return self::findNonClassInModuleFullFilePath($view, $module, 'views');
-		}
+        /**
+         * Check if in module list can have this view
+         * @see  Module::findNonClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this view, path the full path of the view
+         */
+        public static function findViewFullPath($view, $module = null){
+            return self::findNonClassInModuleFullFilePath($view, $module, 'views');
+        }
 
-		/**
-		 * Check if in module list can have this language
-		 * @see  Module::findNonClassInModuleFullFilePath
-		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
-		 */
-		public static function findLanguageFullPath($language, $appLang, $module = null){
-			return self::findNonClassInModuleFullFilePath($language, $module, 'lang', $appLang);
-		}
+        /**
+         * Check if in module list can have this language
+         * @see  Module::findNonClassInModuleFullFilePath
+         * @return boolean|string  false or null if no module have this language,  return the full path of this language
+         */
+        public static function findLanguageFullPath($language, $appLang, $module = null){
+            return self::findNonClassInModuleFullFilePath($language, $module, 'lang', $appLang);
+        }
 
-		/**
-		 * Get the list of module loaded
-		 * @return array the module list
-		 */
-		public static function getModuleList(){
-			return self::$list;
-		}
+        /**
+         * Get the list of module loaded
+         * @return array the module list
+         */
+        public static function getModuleList(){
+            return self::$list;
+        }
 
-		/**
-		 * Check if the application has an module
-		 * @return boolean
-		 */
-		public static function hasModule(){
-			return !empty(self::$list);
-		}
+        /**
+         * Check if the application has an module
+         * @return boolean
+         */
+        public static function hasModule(){
+            return !empty(self::$list);
+        }
 
-		/**
-		 * Check if in module list can have the model, controller, library
-		 * @param  string $class the class name of library, model, controller
-		 * @param string $module the module name
-		 * @param string $type the name of the type "controllers", "libraries", "models"
-		 * @return boolean|string  false or null if no module 
-		 * have this class, return the full path of the class
-		 */
-		protected static function findClassInModuleFullFilePath($class, $module, $type){
-			$logger = self::getLogger();
-		    $class = str_ireplace('.php', '', $class);
-		    $class = ucfirst($class);
-		    $classFile = $class.'.php';
-		    $logger->debug('Checking the class [' . $class . '] in module [' . $module . '] for [' . $type . '] ...');
-		    $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
-		    if (file_exists($filePath)){
-		        $logger->info('Found class [' . $class . '] in module [' . $module . '] for [' . $type . '] the file path is [' .$filePath. ']');
-		        return $filePath;
-		    }
-		    $logger->info('Class [' . $class . '] does not exist in the module [' .$module. '] for [' . $type . ']');
-		    return false;
-		}
+        /**
+         * Check if in module list can have the model, controller, library
+         * @param  string $class the class name of library, model, controller
+         * @param string $module the module name
+         * @param string $type the name of the type "controllers", "libraries", "models"
+         * @return boolean|string  false or null if no module 
+         * have this class, return the full path of the class
+         */
+        protected static function findClassInModuleFullFilePath($class, $module, $type){
+            $logger = self::getLogger();
+            $class = str_ireplace('.php', '', $class);
+            $class = ucfirst($class);
+            $classFile = $class.'.php';
+            $logger->debug('Checking the class [' . $class . '] in module [' . $module . '] for [' . $type . '] ...');
+            $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
+            if (file_exists($filePath)){
+                $logger->info('Found class [' . $class . '] in module [' . $module . '] for [' . $type . '] the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Class [' . $class . '] does not exist in the module [' .$module. '] for [' . $type . ']');
+            return false;
+        }
 
-		/**
-		 * Check if in module list can have the config, view, helper, language
-		 * @param string $name the name of config, view, helper, language
-		 * @param string $module the module name
-		 * @param string $type the name of the type "config", "functions", "views", "lang"
-		 * @param string|null $appLang the application language. This is use only when $type = "lang"
-		 * @return boolean|string  false or null if no module 
-		 * have this resource, return the full path of the resource
-		 */
-		protected static function findNonClassInModuleFullFilePath($name, $module, $type, $appLang = null){
-		    $logger = self::getLogger();
-		    $name = str_ireplace('.php', '', $name);
-		    $file = $name.'.php';
-		    $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
-		    switch($type){
-		        case 'functions':
-		            $name = str_ireplace('function_', '', $name);
-		            $file = 'function_'.$name.'.php';
-		            $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
-		        break;
-		        case 'views':
-		            $name = trim($name, '/\\');
-		            $name = str_ireplace('/', DS, $name);
-		            $file = $name . '.php';
-		            $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
-		        break;
-		        case 'lang':
-		            $name = str_ireplace('lang_', '', $name);
-		            $file = 'lang_'.$name.'.php';
-		            $filePath = MODULE_PATH . $module . DS . $type . DS . $appLang . DS . $file;
-		        break;
-		    }
-		    $logger->debug('Checking resource [' . $name . '] in module [' .$module. '] for [' . $type . '] ...');
-		    if (file_exists($filePath)){
-		        $logger->info('Found resource [' . $name . '] in module [' .$module. '] for [' . $type . '] the file path is [' .$filePath. ']');
-		        return $filePath;
-		    }
-		    $logger->info('Resource [' . $name . '] does not exist in the module [' .$module. '] for [' . $type . ']');
-		    return false;
-		}
+        /**
+         * Check if in module list can have the config, view, helper, language
+         * @param string $name the name of config, view, helper, language
+         * @param string $module the module name
+         * @param string $type the name of the type "config", "functions", "views", "lang"
+         * @param string|null $appLang the application language. This is use only when $type = "lang"
+         * @return boolean|string  false or null if no module 
+         * have this resource, return the full path of the resource
+         */
+        protected static function findNonClassInModuleFullFilePath($name, $module, $type, $appLang = null){
+            $logger = self::getLogger();
+            $name = str_ireplace('.php', '', $name);
+            $file = $name.'.php';
+            $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
+            switch($type){
+                case 'functions':
+                    $name = str_ireplace('function_', '', $name);
+                    $file = 'function_'.$name.'.php';
+                    $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
+                break;
+                case 'views':
+                    $name = trim($name, '/\\');
+                    $name = str_ireplace('/', DS, $name);
+                    $file = $name . '.php';
+                    $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
+                break;
+                case 'lang':
+                    $name = str_ireplace('lang_', '', $name);
+                    $file = 'lang_'.$name.'.php';
+                    $filePath = MODULE_PATH . $module . DS . $type . DS . $appLang . DS . $file;
+                break;
+            }
+            $logger->debug('Checking resource [' . $name . '] in module [' .$module. '] for [' . $type . '] ...');
+            if (file_exists($filePath)){
+                $logger->info('Found resource [' . $name . '] in module [' .$module. '] for [' . $type . '] the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            $logger->info('Resource [' . $name . '] does not exist in the module [' .$module. '] for [' . $type . ']');
+            return false;
+        }
 
-	}
+    }

Spacing +40 added lines, -40 removed lines

@@ -24,7 +24,7 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     */
    
-	class Module extends BaseStaticClass{
+	class Module extends BaseStaticClass {
 		
 		/**
 		 * list of loaded module
@@ -35,24 +35,24 @@ 
 		/**
 		 * Initialise the module list by scanning the directory MODULE_PATH
 		 */
-		public function init(){
+		public function init() {
 			$logger = self::getLogger();
 			$logger->debug('Check if the application contains the modules ...');
 			$moduleDir = opendir(MODULE_PATH);
-			if (is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+			if (is_resource($moduleDir)) {
+				while (($module = readdir($moduleDir)) !== false) {
+					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)) {
 						self::$list[] = $module;
 					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+					else {
+						$logger->info('Skipping [' . $module . '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
 				closedir($moduleDir);
 			}
 			ksort(self::$list);
 			
-			if (! empty(self::$list)){
+			if (!empty(self::$list)) {
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
 			}
 		}
@@ -64,7 +64,7 @@ 
 		 *
 		 * @return object the current instance
 		 */
-		public function add($name){
+		public function add($name) {
 			self::$list[] = $name;
 			return $this;
 		}
@@ -73,9 +73,9 @@ 
 		 * Get the list of the custom autoload configuration from module if exists
 		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
 		 */
-		public static function getModulesAutoloadConfig(){
+		public static function getModulesAutoloadConfig() {
 			$logger = self::getLogger();
-			if (empty(self::$list)){
+			if (empty(self::$list)) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
@@ -88,10 +88,10 @@ 
 			
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if (file_exists($file)){
+				if (file_exists($file)) {
 					$autoload = array();
 					require_once $file;
-					if (! empty($autoload) && is_array($autoload)){
+					if (!empty($autoload) && is_array($autoload)) {
 						$autoloads = array_merge_recursive($autoloads, $autoload);
 						unset($autoload);
 					}
@@ -104,19 +104,19 @@ 
 		 * Get the list of the custom routes configuration from module if exists
 		 * @return array|boolean the routes list or false if no module contains the routes configuration
 		 */
-		public static function getModulesRoutesConfig(){
+		public static function getModulesRoutesConfig() {
 			$logger = self::getLogger();
-			if (empty(self::$list)){
+			if (empty(self::$list)) {
 				$logger->info('No module was loaded skipping.');
 				return false;
 			}
 			$routes = array();
 			foreach (self::$list as $module) {
 				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if (file_exists($file)){
+				if (file_exists($file)) {
 					$route = array();
 					require_once $file;
-					if (! empty($route) && is_array($route)){
+					if (!empty($route) && is_array($route)) {
 						$routes = array_merge($routes, $route);
 						unset($route);
 					}
@@ -131,7 +131,7 @@ 
 		 * @see Module::findClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
 		 */
-		public static function findControllerFullPath($class, $module = null){
+		public static function findControllerFullPath($class, $module = null) {
 			return self::findClassInModuleFullFilePath($class, $module, 'controllers');
 		}
 
@@ -140,7 +140,7 @@ 
 		 * @see Module::findClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this model, return the full path of this model
 		 */
-		public static function findModelFullPath($class, $module = null){
+		public static function findModelFullPath($class, $module = null) {
 			return self::findClassInModuleFullFilePath($class, $module, 'models');
 		}
 
@@ -149,7 +149,7 @@ 
 		 * @see Module::findClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
 		 */
-		public static function findLibraryFullPath($class, $module = null){
+		public static function findLibraryFullPath($class, $module = null) {
 			return self::findClassInModuleFullFilePath($class, $module, 'libraries');
 		}
 
@@ -159,7 +159,7 @@ 
 		 * @see  Module::findNonClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
 		 */
-		public static function findConfigFullPath($configuration, $module = null){
+		public static function findConfigFullPath($configuration, $module = null) {
 			return self::findNonClassInModuleFullFilePath($configuration, $module, 'config');
 		}
 
@@ -168,7 +168,7 @@ 
 		 * @see  Module::findNonClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
 		 */
-		public static function findFunctionFullPath($helper, $module = null){
+		public static function findFunctionFullPath($helper, $module = null) {
 			return self::findNonClassInModuleFullFilePath($helper, $module, 'functions');
 		}
 
@@ -177,7 +177,7 @@ 
 		 * @see  Module::findNonClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this view, path the full path of the view
 		 */
-		public static function findViewFullPath($view, $module = null){
+		public static function findViewFullPath($view, $module = null) {
 			return self::findNonClassInModuleFullFilePath($view, $module, 'views');
 		}
 
@@ -186,7 +186,7 @@ 
 		 * @see  Module::findNonClassInModuleFullFilePath
 		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
 		 */
-		public static function findLanguageFullPath($language, $appLang, $module = null){
+		public static function findLanguageFullPath($language, $appLang, $module = null) {
 			return self::findNonClassInModuleFullFilePath($language, $module, 'lang', $appLang);
 		}
 
@@ -194,7 +194,7 @@ 
 		 * Get the list of module loaded
 		 * @return array the module list
 		 */
-		public static function getModuleList(){
+		public static function getModuleList() {
 			return self::$list;
 		}
 
@@ -202,7 +202,7 @@ 
 		 * Check if the application has an module
 		 * @return boolean
 		 */
-		public static function hasModule(){
+		public static function hasModule() {
 			return !empty(self::$list);
 		}
 
@@ -214,18 +214,18 @@ 
 		 * @return boolean|string  false or null if no module 
 		 * have this class, return the full path of the class
 		 */
-		protected static function findClassInModuleFullFilePath($class, $module, $type){
+		protected static function findClassInModuleFullFilePath($class, $module, $type) {
 			$logger = self::getLogger();
 		    $class = str_ireplace('.php', '', $class);
 		    $class = ucfirst($class);
-		    $classFile = $class.'.php';
+		    $classFile = $class . '.php';
 		    $logger->debug('Checking the class [' . $class . '] in module [' . $module . '] for [' . $type . '] ...');
 		    $filePath = MODULE_PATH . $module . DS . $type . DS . $classFile;
-		    if (file_exists($filePath)){
-		        $logger->info('Found class [' . $class . '] in module [' . $module . '] for [' . $type . '] the file path is [' .$filePath. ']');
+		    if (file_exists($filePath)) {
+		        $logger->info('Found class [' . $class . '] in module [' . $module . '] for [' . $type . '] the file path is [' . $filePath . ']');
 		        return $filePath;
 		    }
-		    $logger->info('Class [' . $class . '] does not exist in the module [' .$module. '] for [' . $type . ']');
+		    $logger->info('Class [' . $class . '] does not exist in the module [' . $module . '] for [' . $type . ']');
 		    return false;
 		}
 
@@ -238,15 +238,15 @@ 
 		 * @return boolean|string  false or null if no module 
 		 * have this resource, return the full path of the resource
 		 */
-		protected static function findNonClassInModuleFullFilePath($name, $module, $type, $appLang = null){
+		protected static function findNonClassInModuleFullFilePath($name, $module, $type, $appLang = null) {
 		    $logger = self::getLogger();
 		    $name = str_ireplace('.php', '', $name);
-		    $file = $name.'.php';
+		    $file = $name . '.php';
 		    $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
-		    switch($type){
+		    switch ($type) {
 		        case 'functions':
 		            $name = str_ireplace('function_', '', $name);
-		            $file = 'function_'.$name.'.php';
+		            $file = 'function_' . $name . '.php';
 		            $filePath = MODULE_PATH . $module . DS . $type . DS . $file;
 		        break;
 		        case 'views':
@@ -257,16 +257,16 @@ 
 		        break;
 		        case 'lang':
 		            $name = str_ireplace('lang_', '', $name);
-		            $file = 'lang_'.$name.'.php';
+		            $file = 'lang_' . $name . '.php';
 		            $filePath = MODULE_PATH . $module . DS . $type . DS . $appLang . DS . $file;
 		        break;
 		    }
-		    $logger->debug('Checking resource [' . $name . '] in module [' .$module. '] for [' . $type . '] ...');
-		    if (file_exists($filePath)){
-		        $logger->info('Found resource [' . $name . '] in module [' .$module. '] for [' . $type . '] the file path is [' .$filePath. ']');
+		    $logger->debug('Checking resource [' . $name . '] in module [' . $module . '] for [' . $type . '] ...');
+		    if (file_exists($filePath)) {
+		        $logger->info('Found resource [' . $name . '] in module [' . $module . '] for [' . $type . '] the file path is [' . $filePath . ']');
 		        return $filePath;
 		    }
-		    $logger->info('Resource [' . $name . '] does not exist in the module [' .$module. '] for [' . $type . ']');
+		    $logger->info('Resource [' . $name . '] does not exist in the module [' . $module . '] for [' . $type . ']');
 		    return false;
 		}
 

core/classes/Config.php

Indentation +148 added lines, -148 removed lines

@@ -1,160 +1,160 @@
 <?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 Config extends BaseStaticClass{
+    class Config extends BaseStaticClass{
 		
-		/**
-		 * The list of loaded configuration
-		 * @var array
-		 */
-		private static $config = array();
+        /**
+         * The list of loaded configuration
+         * @var array
+         */
+        private static $config = array();
 
-		/**
-		 * Initialize the configuration by loading all the configuration from config file
-		 */
-		public static function init(){
-			$logger = self::getLogger();
-			$logger->debug('Initialization of the configuration');
-			self::$config = & load_configurations();
-			self::setBaseUrlUsingServerVar();
-			if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
-				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
-			}
-			$logger->info('Configuration initialized successfully');
-			$logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
-		}
+        /**
+         * Initialize the configuration by loading all the configuration from config file
+         */
+        public static function init(){
+            $logger = self::getLogger();
+            $logger->debug('Initialization of the configuration');
+            self::$config = & load_configurations();
+            self::setBaseUrlUsingServerVar();
+            if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
+                $logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
+            }
+            $logger->info('Configuration initialized successfully');
+            $logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
+        }
 
-		/**
-		 * Get the configuration item value
-		 * @param  string $item    the configuration item name to get
-		 * @param  mixed $default the default value to use if can not find the config item in the list
-		 * @return mixed          the config value if exist or the default value
-		 */
-		public static function get($item, $default = null){
-			$logger = self::getLogger();
-			if(array_key_exists($item, self::$config)){
-				return self::$config[$item];
-			}
-			$logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
-			return $default;
-		}
+        /**
+         * Get the configuration item value
+         * @param  string $item    the configuration item name to get
+         * @param  mixed $default the default value to use if can not find the config item in the list
+         * @return mixed          the config value if exist or the default value
+         */
+        public static function get($item, $default = null){
+            $logger = self::getLogger();
+            if(array_key_exists($item, self::$config)){
+                return self::$config[$item];
+            }
+            $logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
+            return $default;
+        }
 
-		/**
-		 * Set the configuration item value
-		 * @param string $item  the config item name to set
-		 * @param mixed $value the config item value
-		 */
-		public static function set($item, $value){
-			self::$config[$item] = $value;
-		}
+        /**
+         * Set the configuration item value
+         * @param string $item  the config item name to set
+         * @param mixed $value the config item value
+         */
+        public static function set($item, $value){
+            self::$config[$item] = $value;
+        }
 
-		/**
-		 * Get all the configuration values
-		 * @return array the config values
-		 */
-		public static function getAll(){
-			return self::$config;
-		}
+        /**
+         * Get all the configuration values
+         * @return array the config values
+         */
+        public static function getAll(){
+            return self::$config;
+        }
 
-		/**
-		 * Set the configuration values bu merged with the existing configuration
-		 * @param array $config the config values to add in the configuration list
-		 */
-		public static function setAll(array $config = array()){
-			self::$config = array_merge(self::$config, $config);
-		}
+        /**
+         * Set the configuration values bu merged with the existing configuration
+         * @param array $config the config values to add in the configuration list
+         */
+        public static function setAll(array $config = array()){
+            self::$config = array_merge(self::$config, $config);
+        }
 
-		/**
-		 * Delete the configuration item in the list
-		 * @param  string $item the config item name to be deleted
-		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
-		 */
-		public static function delete($item){
-			$logger = self::getLogger();
-			if(array_key_exists($item, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
-				unset(self::$config[$item]);
-				return true;
-			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
-				return false;
-			}
-		}
+        /**
+         * Delete the configuration item in the list
+         * @param  string $item the config item name to be deleted
+         * @return boolean true if the item exists and is deleted successfully otherwise will return false.
+         */
+        public static function delete($item){
+            $logger = self::getLogger();
+            if(array_key_exists($item, self::$config)){
+                $logger->info('Delete config item ['.$item.']');
+                unset(self::$config[$item]);
+                return true;
+            }
+            else{
+                $logger->warning('Config item ['.$item.'] to be deleted does not exists');
+                return false;
+            }
+        }
 
-		/**
-		 * Load the configuration file. This an alias to Loader::config()
-		 * @param  string $config the config name to be loaded
-		 */
-		public static function load($config){
-			Loader::config($config);
-		}
+        /**
+         * Load the configuration file. This an alias to Loader::config()
+         * @param  string $config the config name to be loaded
+         */
+        public static function load($config){
+            Loader::config($config);
+        }
 
-		/**
-		 * Set the configuration for "base_url" if is not set in the configuration
-		 */
-		private static function setBaseUrlUsingServerVar(){
-			$logger = self::getLogger();
-			if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
-					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
-				}
-				$baseUrl = null;
-				$protocol = 'http';
-				if(is_https()){
-					$protocol = 'https';
-				}
-				$protocol .='://';
+        /**
+         * Set the configuration for "base_url" if is not set in the configuration
+         */
+        private static function setBaseUrlUsingServerVar(){
+            $logger = self::getLogger();
+            if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
+                if(ENVIRONMENT == 'production'){
+                    $logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
+                }
+                $baseUrl = null;
+                $protocol = 'http';
+                if(is_https()){
+                    $protocol = 'https';
+                }
+                $protocol .='://';
 
-				if (isset($_SERVER['SERVER_ADDR'])){
-					$baseUrl = $_SERVER['SERVER_ADDR'];
-					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
-					}
-					$serverPort = 80;
-					if (isset($_SERVER['SERVER_PORT'])) {
-						$serverPort = $_SERVER['SERVER_PORT'];
-					}
-					$port = '';
-					if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
-						$port = ':'.$serverPort;
-					}
-					$baseUrl = $protocol . $baseUrl . $port . substr(
-																		$_SERVER['SCRIPT_NAME'], 
-																		0, 
-																		strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
-																	);
-				}
-				else{
-					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
-					$baseUrl = 'http://localhost/';
-				}
-				self::set('base_url', $baseUrl);
-			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
-		}
-	}
+                if (isset($_SERVER['SERVER_ADDR'])){
+                    $baseUrl = $_SERVER['SERVER_ADDR'];
+                    //check if the server is running under IPv6
+                    if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
+                        $baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+                    }
+                    $serverPort = 80;
+                    if (isset($_SERVER['SERVER_PORT'])) {
+                        $serverPort = $_SERVER['SERVER_PORT'];
+                    }
+                    $port = '';
+                    if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
+                        $port = ':'.$serverPort;
+                    }
+                    $baseUrl = $protocol . $baseUrl . $port . substr(
+                                                                        $_SERVER['SCRIPT_NAME'], 
+                                                                        0, 
+                                                                        strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
+                                                                    );
+                }
+                else{
+                    $logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
+                    $baseUrl = 'http://localhost/';
+                }
+                self::set('base_url', $baseUrl);
+            }
+            self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+        }
+    }

Spacing +27 added lines, -27 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Config extends BaseStaticClass{
+	class Config extends BaseStaticClass {
 		
 		/**
 		 * The list of loaded configuration
@@ -35,12 +35,12 @@ 
 		/**
 		 * Initialize the configuration by loading all the configuration from config file
 		 */
-		public static function init(){
+		public static function init() {
 			$logger = self::getLogger();
 			$logger->debug('Initialization of the configuration');
 			self::$config = & load_configurations();
 			self::setBaseUrlUsingServerVar();
-			if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
+			if (ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info', 'all'))) {
 				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
 			}
 			$logger->info('Configuration initialized successfully');
@@ -53,12 +53,12 @@ 
 		 * @param  mixed $default the default value to use if can not find the config item in the list
 		 * @return mixed          the config 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, self::$config)){
+			if (array_key_exists($item, self::$config)) {
 				return self::$config[$item];
 			}
-			$logger->warning('Cannot find config item ['.$item.'] using the default value ['.$default.']');
+			$logger->warning('Cannot find config item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -67,7 +67,7 @@ 
 		 * @param string $item  the config item name to set
 		 * @param mixed $value the config item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			self::$config[$item] = $value;
 		}
 
@@ -75,7 +75,7 @@ 
 		 * Get all the configuration values
 		 * @return array the config values
 		 */
-		public static function getAll(){
+		public static function getAll() {
 			return self::$config;
 		}
 
@@ -83,7 +83,7 @@ 
 		 * Set the configuration values bu merged with the existing configuration
 		 * @param array $config the config values to add in the configuration list
 		 */
-		public static function setAll(array $config = array()){
+		public static function setAll(array $config = array()) {
 			self::$config = array_merge(self::$config, $config);
 		}
 
@@ -92,15 +92,15 @@ 
 		 * @param  string $item the config item name to be deleted
 		 * @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, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
+			if (array_key_exists($item, self::$config)) {
+				$logger->info('Delete config item [' . $item . ']');
 				unset(self::$config[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Config item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -109,39 +109,39 @@ 
 		 * Load the configuration file. This an alias to Loader::config()
 		 * @param  string $config the config name to be loaded
 		 */
-		public static function load($config){
+		public static function load($config) {
 			Loader::config($config);
 		}
 
 		/**
 		 * Set the configuration for "base_url" if is not set in the configuration
 		 */
-		private static function setBaseUrlUsingServerVar(){
+		private static function setBaseUrlUsingServerVar() {
 			$logger = self::getLogger();
-			if (! isset(self::$config['base_url']) || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
+			if (!isset(self::$config['base_url']) || !is_url(self::$config['base_url'])) {
+				if (ENVIRONMENT == 'production') {
 					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
 				}
 				$baseUrl = null;
 				$protocol = 'http';
-				if(is_https()){
+				if (is_https()) {
 					$protocol = 'https';
 				}
-				$protocol .='://';
+				$protocol .= '://';
 
-				if (isset($_SERVER['SERVER_ADDR'])){
+				if (isset($_SERVER['SERVER_ADDR'])) {
 					$baseUrl = $_SERVER['SERVER_ADDR'];
 					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
-						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
+					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
+						$baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
 					}
 					$serverPort = 80;
 					if (isset($_SERVER['SERVER_PORT'])) {
 						$serverPort = $_SERVER['SERVER_PORT'];
 					}
 					$port = '';
-					if($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))){
-						$port = ':'.$serverPort;
+					if ($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))) {
+						$port = ':' . $serverPort;
 					}
 					$baseUrl = $protocol . $baseUrl . $port . substr(
 																		$_SERVER['SCRIPT_NAME'], 
@@ -149,12 +149,12 @@ 
 																		strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
 																	);
 				}
-				else{
+				else {
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
 				self::set('base_url', $baseUrl);
 			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') . '/';
 		}
 	}