tnhfw / tnh-fw

core/classes/Lang.php

Indentation +205 added lines, -205 removed lines

@@ -1,208 +1,208 @@
 <?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.
-	*/
-
-	/**
-	 * For application languages management
-	 */
-	class Lang{
+    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.
+     */
+
+    /**
+     * For application languages management
+     */
+    class Lang{
 		
-		/**
-		 * The supported available language for this application.
-		 * @example "en" => "english" 
-		 * @see Lang::addLang()
-		 * @var array
-		 */
-		protected $availables = array();
-
-		/**
-		 * The all messages language
-		 * @var array
-		 */
-		protected $languages = array();
-
-		/**
-		 * The default language to use if can not
-		 *  determine the client language
-		 *  
-		 * @example $default = 'en'
-		 * @var string
-		 */
-		protected $default = null;
-
-		/**
-		 * The current client language
-		 * @var string
-		 */
-		protected $current = null;
-
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
-
-		/**
-		 * Construct new Lang instance
-		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Lang');
-
-			$this->default = get_config('default_language', 'en');
-			$this->logger->debug('Setting the supported languages');
+        /**
+         * The supported available language for this application.
+         * @example "en" => "english" 
+         * @see Lang::addLang()
+         * @var array
+         */
+        protected $availables = array();
+
+        /**
+         * The all messages language
+         * @var array
+         */
+        protected $languages = array();
+
+        /**
+         * The default language to use if can not
+         *  determine the client language
+         *  
+         * @example $default = 'en'
+         * @var string
+         */
+        protected $default = null;
+
+        /**
+         * The current client language
+         * @var string
+         */
+        protected $current = null;
+
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
+
+        /**
+         * Construct new Lang instance
+         */
+        public function __construct(){
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::Lang');
+
+            $this->default = get_config('default_language', 'en');
+            $this->logger->debug('Setting the supported languages');
 			
-			//add the supported languages ('key', 'display name')
-			$languages = get_config('languages', null);
-			if(! empty($languages)){
-				foreach($languages as $key => $displayName){
-					$this->addLang($key, $displayName);
-				}
-			}
-			unset($languages);
-
-			//if the language exists in cookie use it
-			$cfgKey = get_config('language_cookie_name');
-			$this->logger->debug('Getting current language from cookie [' .$cfgKey. ']');
-			$objCookie = & class_loader('Cookie');
-			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang && $this->isValid($cookieLang)){
-				$this->current = $cookieLang;
-				$this->logger->info('Language from cookie [' .$cfgKey. '] is valid so we will set the language using the cookie value [' .$cookieLang. ']');
-			}
-			else{
-				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
-				$this->current = $this->getDefault();
-			}
-		}
-
-		/**
-		 * Get the all languages messages
-		 *
-		 * @return array the language message list
-		 */
-		public function getAll(){
-			return $this->languages;
-		}
-
-		/**
-		 * Set the language message
-		 *
-		 * @param string $key the language key to identify
-		 * @param string $value the language message value
-		 */
-		public function set($key, $value){
-			$this->languages[$key] = $value;
-		}
-
-		/**
-		 * Get the language message for the given key. If can't find return the default value
-		 *
-		 * @param  string $key the message language key
-		 * @param  string $default the default value to return if can not found the language message key
-		 *
-		 * @return string the language message value
-		 */
-		public function get($key, $default = 'LANGUAGE_ERROR'){
-			if(isset($this->languages[$key])){
-				return $this->languages[$key];
-			}
-			$this->logger->warning('Language key  [' .$key. '] does not exist use the default value [' .$default. ']');
-			return $default;
-		}
-
-		/**
-		 * Check whether the language file for given name exists
-		 *
-		 * @param  string  $language the language name like "fr", "en", etc.
-		 *
-		 * @return boolean true if the language directory exists, false or not
-		 */
-		public function isValid($language){
-			$searchDir = array(CORE_LANG_PATH, APP_LANG_PATH);
-			foreach($searchDir as $dir){
-				if(file_exists($dir . $language) && is_dir($dir . $language)){
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * Get the default language value like "en" , "fr", etc.
-		 *
-		 * @return string the default language
-		 */
-		public function getDefault(){
-			return $this->default;
-		}
-
-		/**
-		 * Get the current language defined by cookie or the default value
-		 *
-		 * @return string the current language
-		 */
-		public function getCurrent(){
-			return $this->current;
-		}
-
-		/**
-		 * Add new supported or available language
-		 *
-		 * @param string $name the short language name like "en", "fr".
-		 * @param string $description the human readable description of this language
-		 */
-		public function addLang($name, $description){
-			if(isset($this->availables[$name])){
-				return; //already added cost in performance
-			}
-			if($this->isValid($name)){
-				$this->availables[$name] = $description;
-			}
-			else{
-				show_error('The language [' . $name . '] is not valid or does not exists.');
-			}
-		}
-
-		/**
-		 * Get the list of the application supported language
-		 *
-		 * @return array the list of the application language
-		 */
-		public function getSupported(){
-			return $this->availables;
-		}
-
-		/**
-		 * Add new language messages
-		 *
-		 * @param array $langs the languages array of the messages to be added
-		 */
-		public function addLangMessages(array $langs){
-			foreach ($langs as $key => $value) {
-				$this->set($key, $value);
-			}
-		}
-	}
+            //add the supported languages ('key', 'display name')
+            $languages = get_config('languages', null);
+            if(! empty($languages)){
+                foreach($languages as $key => $displayName){
+                    $this->addLang($key, $displayName);
+                }
+            }
+            unset($languages);
+
+            //if the language exists in cookie use it
+            $cfgKey = get_config('language_cookie_name');
+            $this->logger->debug('Getting current language from cookie [' .$cfgKey. ']');
+            $objCookie = & class_loader('Cookie');
+            $cookieLang = $objCookie->get($cfgKey);
+            if($cookieLang && $this->isValid($cookieLang)){
+                $this->current = $cookieLang;
+                $this->logger->info('Language from cookie [' .$cfgKey. '] is valid so we will set the language using the cookie value [' .$cookieLang. ']');
+            }
+            else{
+                $this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
+                $this->current = $this->getDefault();
+            }
+        }
+
+        /**
+         * Get the all languages messages
+         *
+         * @return array the language message list
+         */
+        public function getAll(){
+            return $this->languages;
+        }
+
+        /**
+         * Set the language message
+         *
+         * @param string $key the language key to identify
+         * @param string $value the language message value
+         */
+        public function set($key, $value){
+            $this->languages[$key] = $value;
+        }
+
+        /**
+         * Get the language message for the given key. If can't find return the default value
+         *
+         * @param  string $key the message language key
+         * @param  string $default the default value to return if can not found the language message key
+         *
+         * @return string the language message value
+         */
+        public function get($key, $default = 'LANGUAGE_ERROR'){
+            if(isset($this->languages[$key])){
+                return $this->languages[$key];
+            }
+            $this->logger->warning('Language key  [' .$key. '] does not exist use the default value [' .$default. ']');
+            return $default;
+        }
+
+        /**
+         * Check whether the language file for given name exists
+         *
+         * @param  string  $language the language name like "fr", "en", etc.
+         *
+         * @return boolean true if the language directory exists, false or not
+         */
+        public function isValid($language){
+            $searchDir = array(CORE_LANG_PATH, APP_LANG_PATH);
+            foreach($searchDir as $dir){
+                if(file_exists($dir . $language) && is_dir($dir . $language)){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Get the default language value like "en" , "fr", etc.
+         *
+         * @return string the default language
+         */
+        public function getDefault(){
+            return $this->default;
+        }
+
+        /**
+         * Get the current language defined by cookie or the default value
+         *
+         * @return string the current language
+         */
+        public function getCurrent(){
+            return $this->current;
+        }
+
+        /**
+         * Add new supported or available language
+         *
+         * @param string $name the short language name like "en", "fr".
+         * @param string $description the human readable description of this language
+         */
+        public function addLang($name, $description){
+            if(isset($this->availables[$name])){
+                return; //already added cost in performance
+            }
+            if($this->isValid($name)){
+                $this->availables[$name] = $description;
+            }
+            else{
+                show_error('The language [' . $name . '] is not valid or does not exists.');
+            }
+        }
+
+        /**
+         * Get the list of the application supported language
+         *
+         * @return array the list of the application language
+         */
+        public function getSupported(){
+            return $this->availables;
+        }
+
+        /**
+         * Add new language messages
+         *
+         * @param array $langs the languages array of the messages to be added
+         */
+        public function addLangMessages(array $langs){
+            foreach ($langs as $key => $value) {
+                $this->set($key, $value);
+            }
+        }
+    }

core/functions/function_lang.php

Indentation +46 added lines, -46 removed lines

@@ -1,52 +1,52 @@
 <?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.
+     */
 
-	if(! function_exists('__')){
-		/**
-		 * function for the shortcut to Lang::get()
-		 * @param  string $key the language key to retrieve
-		 * @param mixed $default the default value to return if can not find the value
-		 * for the given key
-		 * @return string  the language value
-		 */
-		function __($key, $default = 'LANGUAGE_ERROR'){
-			return get_instance()->lang->get($key, $default);
-		}
+    if(! function_exists('__')){
+        /**
+         * function for the shortcut to Lang::get()
+         * @param  string $key the language key to retrieve
+         * @param mixed $default the default value to return if can not find the value
+         * for the given key
+         * @return string  the language value
+         */
+        function __($key, $default = 'LANGUAGE_ERROR'){
+            return get_instance()->lang->get($key, $default);
+        }
 
-	}
+    }
 
 
-	if(! function_exists('get_languages')){
-		/**
-		 * function for the shortcut to Lang::getSupported()
-		 * 
-		 * @return array all the supported languages
-		 */
-		function get_languages(){
-			return get_instance()->lang->getSupported();
-		}
+    if(! function_exists('get_languages')){
+        /**
+         * function for the shortcut to Lang::getSupported()
+         * 
+         * @return array all the supported languages
+         */
+        function get_languages(){
+            return get_instance()->lang->getSupported();
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

core/libraries/Email.php

Indentation +730 added lines, -730 removed lines

@@ -1,739 +1,739 @@
 <?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
-	{
-		/**
-		 * @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
+    {
+        /**
+         * @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;
 		
-		/**
+        /**
          * The logger instance
          * @var Log
          */
-		private $logger;
+        private $logger;
 
-		/**
-		 * __construct
-		 *
-		 * Resets the class properties.
-		 */
-		public function __construct()
-		{
-			$this->logger =& class_loader('Log', 'classes');
+        /**
+         * __construct
+         *
+         * Resets the class properties.
+         */
+        public function __construct()
+        {
+            $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Email');
-			$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;
-		}
+            $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);
+        }
+    }

core/libraries/Cookie.php

Indentation +101 added lines, -101 removed lines

@@ -1,112 +1,112 @@
 <?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{
+    class Cookie{
 		
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Cookie');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Cookie');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * 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);
+        }
 
-	}
+    }

core/libraries/StringHash.php

Indentation +58 added lines, -58 removed lines

@@ -1,65 +1,65 @@
 <?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 StringHash{
+    class StringHash{
 		 
-		 //blowfish
-		private static $algo = '$2a';
+            //blowfish
+        private static $algo = '$2a';
 		
-		//cost parameter
-		private static $cost = '$10';
+        //cost parameter
+        private static $cost = '$10';
 
-		/**
-		 * Get the unique salt for the string hash
-		 * @return string the unique generated salt
-		 */
-		private static function uniqueSalt() {
-			return substr(sha1(mt_rand()), 0, 22);
-		}
+        /**
+         * Get the unique salt for the string hash
+         * @return string the unique generated salt
+         */
+        private static function uniqueSalt() {
+            return substr(sha1(mt_rand()), 0, 22);
+        }
 
-		/**
-		 * Hash the given string
-		 * @param  string $value the plain string text to be hashed
-		 * @return string           the hashed string
-		 */
-		public static function hash($value) {
-			return crypt($value, self::$algo .
-					self::$cost .
-					'$' . self::uniqueSalt());
-		}
+        /**
+         * Hash the given string
+         * @param  string $value the plain string text to be hashed
+         * @return string           the hashed string
+         */
+        public static function hash($value) {
+            return crypt($value, self::$algo .
+                    self::$cost .
+                    '$' . self::uniqueSalt());
+        }
 
-		/**
-		 * Check if the hash and plain string is valid
-		 * @param  string $hash     the hashed string
-		 * @param  string $plain the plain text
-		 * @return boolean  true if is valid or false if not
-		 */
-		public static function check($hash, $plain) {
-			$full_salt = substr($hash, 0, 29);
-			$new_hash = crypt($plain, $full_salt);
-			return ($hash === $new_hash);
-		}	
-	}
\ No newline at end of file
+        /**
+         * Check if the hash and plain string is valid
+         * @param  string $hash     the hashed string
+         * @param  string $plain the plain text
+         * @return boolean  true if is valid or false if not
+         */
+        public static function check($hash, $plain) {
+            $full_salt = substr($hash, 0, 29);
+            $new_hash = crypt($plain, $full_salt);
+            return ($hash === $new_hash);
+        }	
+    }
\ No newline at end of file

core/libraries/Benchmark.php

Indentation +81 added lines, -81 removed lines

@@ -1,89 +1,89 @@
 <?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.
+     */
 
-	/**
-	 * Class for Benchmark
-	 */
-	class Benchmark{
-		/**
-		 * The markers for excution time
-		 * @var array
-		 */
-		private $markersTime = array();
+    /**
+     * Class for Benchmark
+     */
+    class Benchmark{
+        /**
+         * The markers for excution time
+         * @var array
+         */
+        private $markersTime = array();
 		
-		/**
-		 * The markers for memory usage
-		 * @var array
-		 */
-		private $markersMemory = array();
+        /**
+         * The markers for memory usage
+         * @var array
+         */
+        private $markersMemory = array();
 		
-		/**
-		 * This method is used to mark one point for benchmark (execution time and memory usage)
-		 * @param  string $name the marker name
-		 */
-		public function mark($name){
-			//Marker for execution time
-			$this->markersTime[$name] = microtime(true);
-			//Marker for memory usage
-			$this->markersMemory[$name] = memory_get_usage(true);
-		}
+        /**
+         * This method is used to mark one point for benchmark (execution time and memory usage)
+         * @param  string $name the marker name
+         */
+        public function mark($name){
+            //Marker for execution time
+            $this->markersTime[$name] = microtime(true);
+            //Marker for memory usage
+            $this->markersMemory[$name] = memory_get_usage(true);
+        }
 		
-		/**
-		 * This method is used to get the total excution time in second between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total execution time
-		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total excution time in second between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total execution time
+         */
+        public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersTime[$endMarkerName])){
-				$this->markersTime[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
-		}
+            if(! isset($this->markersTime[$endMarkerName])){
+                $this->markersTime[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
+        }
 		
-		/**
-		 * This method is used to get the total memory usage in byte between two markers
-		 * @param  string  $startMarkerName the marker for start point
-		 * @param  string  $endMarkerName   the marker for end point
-		 * @param  integer $decimalCount   the number of decimal
-		 * @return string         the total memory usage
-		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
-				return 0;
-			}
+        /**
+         * This method is used to get the total memory usage in byte between two markers
+         * @param  string  $startMarkerName the marker for start point
+         * @param  string  $endMarkerName   the marker for end point
+         * @param  integer $decimalCount   the number of decimal
+         * @return string         the total memory usage
+         */
+        public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
+            if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+                return 0;
+            }
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
-				$this->markersMemory[$endMarkerName] = microtime(true);
-			}
-			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
-		}
-	}
+            if(! isset($this->markersMemory[$endMarkerName])){
+                $this->markersMemory[$endMarkerName] = microtime(true);
+            }
+            return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);
+        }
+    }

core/libraries/PDF.php

Indentation +78 added lines, -78 removed lines

@@ -1,87 +1,87 @@
 <?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{
+    /**
+     * PDF library to generate PDF document using the library DOMPDF
+     */
+    class PDF{
 		
-		/**
-		 * The dompdf instance
-		 * @var Dompdf
-		 */
-		private $dompdf = null;
+        /**
+         * The dompdf instance
+         * @var Dompdf
+         */
+        private $dompdf = null;
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private $logger;
 		
-		/**
-		 * Create PDF library instance
-		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::PDF');
+        /**
+         * Create PDF library instance
+         */
+        public function __construct(){
+            $this->logger =& class_loader('Log', 'classes');
+            $this->logger->setLogger('Library::PDF');
 
-			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;
+        }
 		
-	}
+    }

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{
 
         /**
-        *   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(
@@ -210,13 +210,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(){
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
@@ -260,17 +260,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) )) {
@@ -279,18 +279,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)) {
@@ -299,14 +299,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());
@@ -314,14 +314,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);
@@ -337,14 +337,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) {
@@ -353,14 +353,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)) {
@@ -369,14 +369,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)) {
@@ -385,14 +385,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)) {
@@ -402,13 +402,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)) {
@@ -419,17 +419,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) )) {
@@ -440,13 +440,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();
@@ -454,15 +454,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) {
@@ -486,14 +486,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)) {
@@ -502,14 +502,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)) {
@@ -518,29 +518,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) {
@@ -549,26 +549,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) )) {
@@ -581,26 +581,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;
@@ -618,13 +618,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
@@ -681,15 +681,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){
@@ -702,14 +702,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';
@@ -761,7 +761,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;
@@ -773,7 +773,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;

core/constants.php

Indentation +72 added lines, -72 removed lines

@@ -1,81 +1,81 @@
 <?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 constants.php
-	 *    
-	 *  This file contains the declaration of most of the constants used in the system, 
-	 *  for example: the version, the name of the framework, 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
-	 *  @filesource
-	 */
+    /**
+     *  @file constants.php
+     *    
+     *  This file contains the declaration of most of the constants used in the system, 
+     *  for example: the version, the name of the framework, 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
+     *  @filesource
+     */
 
-	/**
-	 *  The framework name
-	 */
-	define('TNH_NAME', 'TNH Framework');
+    /**
+     *  The framework name
+     */
+    define('TNH_NAME', 'TNH Framework');
 
-	/**
-	 *  The version of the framework in X.Y.Z format (Major, minor and bugs). 
-	 *  If there is the presence of the word "dev", it means that 
-	 *  it is a version under development.
-	 */
-	define('TNH_VERSION', '1.0.0-dev');
+    /**
+     *  The version of the framework in X.Y.Z format (Major, minor and bugs). 
+     *  If there is the presence of the word "dev", it means that 
+     *  it is a version under development.
+     */
+    define('TNH_VERSION', '1.0.0-dev');
 
-	/**
-	 *  The date of publication or release of the framework
-	 */
-	define('TNH_RELEASE_DATE', '2017/02/05');
+    /**
+     *  The date of publication or release of the framework
+     */
+    define('TNH_RELEASE_DATE', '2017/02/05');
 
-	/**
-	 *  The author of the framework, the person who developed the framework.
-	 */
-	define('TNH_AUTHOR', 'Tony NGUEREZA');
+    /**
+     *  The author of the framework, the person who developed the framework.
+     */
+    define('TNH_AUTHOR', 'Tony NGUEREZA');
 
-	/**
-	 *  Email address of the author of the framework.
-	 */
-	define('TNH_AUTHOR_EMAIL', 'nguerezatony@gmail.com');
+    /**
+     *  Email address of the author of the framework.
+     */
+    define('TNH_AUTHOR_EMAIL', 'nguerezatony@gmail.com');
 
-	/**
-	 *  The minimum PHP version required to use the framework. 
-	 *  If the version of PHP installed is lower, then the application will not work.
-	 *  Note: we use the PHP version_compare function to compare the required version with 
-	 *  the version installed on your system.
-	 */
-	define('TNH_REQUIRED_PHP_MIN_VERSION', '5.4');
+    /**
+     *  The minimum PHP version required to use the framework. 
+     *  If the version of PHP installed is lower, then the application will not work.
+     *  Note: we use the PHP version_compare function to compare the required version with 
+     *  the version installed on your system.
+     */
+    define('TNH_REQUIRED_PHP_MIN_VERSION', '5.4');
 
-	/**
-	 *  The maximum version of PHP required to use the framework. 
-	 *  If the version of PHP installed is higher than the required one, then the application will not work.
-	 */
-	define('TNH_REQUIRED_PHP_MAX_VERSION', '7.1');
\ No newline at end of file
+    /**
+     *  The maximum version of PHP required to use the framework. 
+     *  If the version of PHP installed is higher than the required one, then the application will not work.
+     */
+    define('TNH_REQUIRED_PHP_MAX_VERSION', '7.1');
\ No newline at end of file