tnhfw / tnh-fw

core/classes/Request.php

Indentation +230 added lines, -230 removed lines

@@ -1,255 +1,255 @@
 <?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 Request {
+    class Request {
 		
-		/**
-		 * The value for the super global $_GET
-		 * @var array
-		 */
-		public $get = null;
+        /**
+         * The value for the super global $_GET
+         * @var array
+         */
+        public $get = null;
 
-		/**
-		 * The value for the super global $_POST
-		 * @var array
-		 */
-		public $post = null;
+        /**
+         * The value for the super global $_POST
+         * @var array
+         */
+        public $post = null;
 
-		/**
-		 * The value for the super global $_SERVER
-		 * @var array
-		 */
-		public $server = null;
+        /**
+         * The value for the super global $_SERVER
+         * @var array
+         */
+        public $server = null;
 
-		/**
-		 * The value for the super global $_COOKIE
-		 * @var array
-		 */
-		public $cookie = null;
+        /**
+         * The value for the super global $_COOKIE
+         * @var array
+         */
+        public $cookie = null;
 
-		/**
-		 * The value for the super global $_FILES
-		 * @var array
-		 */
-		public $file = null;
+        /**
+         * The value for the super global $_FILES
+         * @var array
+         */
+        public $file = null;
 
-		/**
-		 * The value for the super global $_REQUEST
-		 * @var array
-		 */
-		public $query = null;
+        /**
+         * The value for the super global $_REQUEST
+         * @var array
+         */
+        public $query = null;
 		
-		/**
-		 * The session instance
-		 * @var Session
-		 */
-		public $session = null;
+        /**
+         * The session instance
+         * @var Session
+         */
+        public $session = null;
 		
-		/**
-		 * The request headers
-		 * @var array
-		 */
-		public $header = null;
+        /**
+         * The request headers
+         * @var array
+         */
+        public $header = null;
 
-		/**
-		 * The current request method 'GET', 'POST', 'PUT', etc.
-		 * @var null
-		 */
-		private $method = null;
+        /**
+         * The current request method 'GET', 'POST', 'PUT', etc.
+         * @var null
+         */
+        private $method = null;
 
-		/**
-		 * The current request URI
-		 * @var string
-		 */
-		private $requestUri = null;
+        /**
+         * The current request URI
+         * @var string
+         */
+        private $requestUri = null;
 		
 		
-		/**
-		 * Construct new request instance
-		 */
-		public function __construct(){
-			$this->get = $_GET;
-			$this->post = $_POST;
-			$this->server = $_SERVER;
-			$this->query = $_REQUEST;
-			$this->cookie = $_COOKIE;
-			$this->file = $_FILES;
-			$this->session =& class_loader('Session', 'classes');
-			$this->method = $this->server('REQUEST_METHOD');
-			$this->requestUri = $this->server('REQUEST_URI');
-			$this->header = array();
-			if(function_exists('apache_request_headers')){
-				$this->header = apache_request_headers();
-			} else if(function_exists('getallheaders')){
-				$this->header = getallheaders();
-			}
-		}
+        /**
+         * Construct new request instance
+         */
+        public function __construct(){
+            $this->get = $_GET;
+            $this->post = $_POST;
+            $this->server = $_SERVER;
+            $this->query = $_REQUEST;
+            $this->cookie = $_COOKIE;
+            $this->file = $_FILES;
+            $this->session =& class_loader('Session', 'classes');
+            $this->method = $this->server('REQUEST_METHOD');
+            $this->requestUri = $this->server('REQUEST_URI');
+            $this->header = array();
+            if(function_exists('apache_request_headers')){
+                $this->header = apache_request_headers();
+            } else if(function_exists('getallheaders')){
+                $this->header = getallheaders();
+            }
+        }
 
-		/**
-		 * Get the request method
-		 * @return string
-		 */
-		public function method() {
-			return $this->method;
-		}
+        /**
+         * Get the request method
+         * @return string
+         */
+        public function method() {
+            return $this->method;
+        }
 		
-		/**
-		 * Get the request URI
-		 * @return string
-		 */
-		public function requestUri() {
-			return $this->requestUri;
-		}
+        /**
+         * Get the request URI
+         * @return string
+         */
+        public function requestUri() {
+            return $this->requestUri;
+        }
 
-		/**
-		 * Get the value from $_REQUEST for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function query($key = null, $xss = true) {
-			if (empty($key)) {
-				//return all
-				return $xss ? clean_input($this->query) : $this->query;
-			}
-			$query = array_key_exists($key, $this->query) ? $this->query[$key] : null;
-			if ($xss) {
-				$query = clean_input($query);
-			}
-			return $query;
-		}
+        /**
+         * Get the value from $_REQUEST for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function query($key = null, $xss = true) {
+            if (empty($key)) {
+                //return all
+                return $xss ? clean_input($this->query) : $this->query;
+            }
+            $query = array_key_exists($key, $this->query) ? $this->query[$key] : null;
+            if ($xss) {
+                $query = clean_input($query);
+            }
+            return $query;
+        }
 		
-		/**
-		 * Get the value from $_GET for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function get($key = null, $xss = true) {
-			if (empty($key)) {
-				//return all
-				return $xss ? clean_input($this->get) : $this->get;
-			}
-			$get = array_key_exists($key, $this->get) ? $this->get[$key] : null;
-			if ($xss) {
-				$get = clean_input($get);
-			}
-			return $get;
-		}
+        /**
+         * Get the value from $_GET for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function get($key = null, $xss = true) {
+            if (empty($key)) {
+                //return all
+                return $xss ? clean_input($this->get) : $this->get;
+            }
+            $get = array_key_exists($key, $this->get) ? $this->get[$key] : null;
+            if ($xss) {
+                $get = clean_input($get);
+            }
+            return $get;
+        }
 		
-		/**
-		 * Get the value from $_POST for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function post($key = null, $xss = true) {
-			if (empty($key)) {
-				//return all
-				return $xss ? clean_input($this->post) : $this->post;
-			}
-			$post = array_key_exists($key, $this->post) ? $this->post[$key] : null;
-			if ($xss) {
-				$post = clean_input($post);
-			}
-			return $post;
-		}
+        /**
+         * Get the value from $_POST for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function post($key = null, $xss = true) {
+            if (empty($key)) {
+                //return all
+                return $xss ? clean_input($this->post) : $this->post;
+            }
+            $post = array_key_exists($key, $this->post) ? $this->post[$key] : null;
+            if ($xss) {
+                $post = clean_input($post);
+            }
+            return $post;
+        }
 		
-		/**
-		 * Get the value from $_SERVER for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function server($key = null, $xss = true) {
-			if (empty($key)) {
-				//return all
-				return $xss ? clean_input($this->server) : $this->server;
-			}
-			$server = array_key_exists($key, $this->server) ? $this->server[$key] : null;
-			if ($xss) {
-				$server = clean_input($server);
-			}
-			return $server;
-		}
+        /**
+         * Get the value from $_SERVER for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function server($key = null, $xss = true) {
+            if (empty($key)) {
+                //return all
+                return $xss ? clean_input($this->server) : $this->server;
+            }
+            $server = array_key_exists($key, $this->server) ? $this->server[$key] : null;
+            if ($xss) {
+                $server = clean_input($server);
+            }
+            return $server;
+        }
 		
-		/**
-		 * Get the value from $_COOKIE for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function cookie($key = null, $xss = true) {
-			if (empty($key)) {
-				//return all
-				return $xss ? clean_input($this->cookie) : $this->cookie;
-			}
-			$cookie = array_key_exists($key, $this->cookie) ? $this->cookie[$key] : null;
-			if ($xss) {
-				$cookie = clean_input($cookie);
-			}
-			return $cookie;
-		}
+        /**
+         * Get the value from $_COOKIE for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function cookie($key = null, $xss = true) {
+            if (empty($key)) {
+                //return all
+                return $xss ? clean_input($this->cookie) : $this->cookie;
+            }
+            $cookie = array_key_exists($key, $this->cookie) ? $this->cookie[$key] : null;
+            if ($xss) {
+                $cookie = clean_input($cookie);
+            }
+            return $cookie;
+        }
 		
-		/**
-		 * Get the value from $_FILES for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
-		 */
-		public function file($key) {
-			$file = array_key_exists($key, $this->file) ? $this->file[$key] : null;
-			return $file;
-		}
+        /**
+         * Get the value from $_FILES for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
+         */
+        public function file($key) {
+            $file = array_key_exists($key, $this->file) ? $this->file[$key] : null;
+            return $file;
+        }
 		
-		/**
-		 * Get the value from $_SESSION for given key. if the key is empty will return the all values
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return array|mixed       the item value if the key exists or null if the key does not exists
-		 */
-		public function session($key, $xss = true) {
-			$session = $this->session->get($key);
-			if ($xss) {
-				$session = clean_input($session);
-			}
-			return $session;
-		}
+        /**
+         * Get the value from $_SESSION for given key. if the key is empty will return the all values
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return array|mixed       the item value if the key exists or null if the key does not exists
+         */
+        public function session($key, $xss = true) {
+            $session = $this->session->get($key);
+            if ($xss) {
+                $session = clean_input($session);
+            }
+            return $session;
+        }
 
-		/**
-		 * Get the value from header array for given key.
-		 * @param  string  $key the item key to be fetched
-		 * @param  boolean $xss if need apply some XSS attack rule on the value
-		 * @return mixed       the item value if the key exists or null if the key does not exists
-		 */
-		public function header($key, $xss = true) {
-			$header = array_key_exists($key, $this->header) ? $this->header[$key] : null;
-			if ($xss) {
-				$header = clean_input($header);
-			}
-			return $header;
-		}
+        /**
+         * Get the value from header array for given key.
+         * @param  string  $key the item key to be fetched
+         * @param  boolean $xss if need apply some XSS attack rule on the value
+         * @return mixed       the item value if the key exists or null if the key does not exists
+         */
+        public function header($key, $xss = true) {
+            $header = array_key_exists($key, $this->header) ? $this->header[$key] : null;
+            if ($xss) {
+                $header = clean_input($header);
+            }
+            return $header;
+        }
 		
-	}
+    }

core/classes/cache/CacheInterface.php

Indentation +70 added lines, -70 removed lines

@@ -1,84 +1,84 @@
 <?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.
+     */
 	
-	interface CacheInterface {
+    interface CacheInterface {
 
-		/**
-		 * This is used to get the cache data using the key
-		 * @param  string $key the key to identify the cache data
-		 * @return mixed      the cache data if exists else return false
-		 */
-		public function get($key);
+        /**
+         * This is used to get the cache data using the key
+         * @param  string $key the key to identify the cache data
+         * @return mixed      the cache data if exists else return false
+         */
+        public function get($key);
 
 
-		/**
-		 * Save data to the cache
-		 * @param string  $key  the key to identify this cache data
-		 * @param mixed  $data the cache data to be saved
-		 * @param integer $ttl  the cache life time
-		 * @return boolean true if success otherwise will return false
-		 */
-		public function set($key, $data, $ttl = 0);
+        /**
+         * Save data to the cache
+         * @param string  $key  the key to identify this cache data
+         * @param mixed  $data the cache data to be saved
+         * @param integer $ttl  the cache life time
+         * @return boolean true if success otherwise will return false
+         */
+        public function set($key, $data, $ttl = 0);
 
 
-		/**
-		 * Delete the cache data for given key
-		 * @param  string $key the key for cache to be deleted
-		 * @return boolean      true if the cache is deleted, false if can't delete 
-		 * the cache or the cache with the given key not exist
-		 */
-		public function delete($key);
+        /**
+         * Delete the cache data for given key
+         * @param  string $key the key for cache to be deleted
+         * @return boolean      true if the cache is deleted, false if can't delete 
+         * the cache or the cache with the given key not exist
+         */
+        public function delete($key);
 		
 		
-		/**
-		 * Get the cache information for given key
-		 * @param  string $key the key for cache to get the information for
-		 * @return boolean|array    the cache information. The associative array and must contains the following information:
-		 * 'mtime' => creation time of the cache (Unix timestamp),
-		 * 'expire' => expiration time of the cache (Unix timestamp),
-		 * 'ttl' => the time to live of the cache in second
-		 */
-		public function getInfo($key);
+        /**
+         * Get the cache information for given key
+         * @param  string $key the key for cache to get the information for
+         * @return boolean|array    the cache information. The associative array and must contains the following information:
+         * 'mtime' => creation time of the cache (Unix timestamp),
+         * 'expire' => expiration time of the cache (Unix timestamp),
+         * 'ttl' => the time to live of the cache in second
+         */
+        public function getInfo($key);
 
 
-		/**
-		 * Used to delete expired cache data
-		 */
-		public function deleteExpiredCache();
+        /**
+         * Used to delete expired cache data
+         */
+        public function deleteExpiredCache();
 
-		/**
-		 * Remove all cache data
-		 */
-		public function clean();
+        /**
+         * Remove all cache data
+         */
+        public function clean();
 		
 		
-		/**
-		 * Check whether the cache feature for the handle is supported
-		 *
-		 * @return bool
-		 */
-		public function isSupported();
-	}
+        /**
+         * Check whether the cache feature for the handle is supported
+         *
+         * @return bool
+         */
+        public function isSupported();
+    }

core/classes/EventDispatcher.php

Indentation +155 added lines, -155 removed lines

@@ -1,167 +1,167 @@
 <?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.
+     */
 
-	/**
-	 * This class represent the event dispatcher management, permit to record the listener and 
-	 * also to dispatch the event
-	 */
+    /**
+     * This class represent the event dispatcher management, permit to record the listener and 
+     * also to dispatch the event
+     */
 	
-	class EventDispatcher extends BaseClass {
+    class EventDispatcher extends BaseClass {
 		
-		/**
-		 * The list of the registered listeners
-		 * @var array
-		 */
-		private $listeners = array();
+        /**
+         * The list of the registered listeners
+         * @var array
+         */
+        private $listeners = array();
 		
 
-		public function __construct() {
-			parent::__construct();
-		}
+        public function __construct() {
+            parent::__construct();
+        }
 
-		/**
-		 * Register new listener
-		 * @param string   $eventName the name of the event to register for
-		 * @param callable $listener  the function or class method to receive the event information after dispatch
-		 */
-		public function addListener($eventName, callable $listener){
-			$this->logger->debug('Adding new event listener for the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(! isset($this->listeners[$eventName])){
-				$this->logger->info('This event does not have the registered event listener before, adding new one');
-				$this->listeners[$eventName] = array();
-			} else{
-				$this->logger->info('This event already have the registered listener, add this listener to the list');
-			}
-			$this->listeners[$eventName][] = $listener;
-		}
+        /**
+         * Register new listener
+         * @param string   $eventName the name of the event to register for
+         * @param callable $listener  the function or class method to receive the event information after dispatch
+         */
+        public function addListener($eventName, callable $listener){
+            $this->logger->debug('Adding new event listener for the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
+            if(! isset($this->listeners[$eventName])){
+                $this->logger->info('This event does not have the registered event listener before, adding new one');
+                $this->listeners[$eventName] = array();
+            } else{
+                $this->logger->info('This event already have the registered listener, add this listener to the list');
+            }
+            $this->listeners[$eventName][] = $listener;
+        }
 		
-		/**
-		 * Remove the event listener from list
-		 * @param  string   $eventName the event name
-		 * @param  callable $listener  the listener callback
-		 */
-		public function removeListener($eventName, callable $listener){
-			$this->logger->debug('Removing of the event listener, the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
-			if(isset($this->listeners[$eventName])){
-				$this->logger->info('This event have the listeners, check if this listener exists');
-				if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
-					$this->logger->info('Found the listener at index [' .$index. '] remove it');
-					unset($this->listeners[$eventName][$index]);
-				} else{
-					$this->logger->info('Cannot found this listener in the event listener list');
-				}
-			} else{
-				$this->logger->info('This event does not have this listener ignore remove');
-			}
-		}
+        /**
+         * Remove the event listener from list
+         * @param  string   $eventName the event name
+         * @param  callable $listener  the listener callback
+         */
+        public function removeListener($eventName, callable $listener){
+            $this->logger->debug('Removing of the event listener, the event name [' .$eventName. '], listener [' .stringfy_vars($listener). ']');
+            if(isset($this->listeners[$eventName])){
+                $this->logger->info('This event have the listeners, check if this listener exists');
+                if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
+                    $this->logger->info('Found the listener at index [' .$index. '] remove it');
+                    unset($this->listeners[$eventName][$index]);
+                } else{
+                    $this->logger->info('Cannot found this listener in the event listener list');
+                }
+            } else{
+                $this->logger->info('This event does not have this listener ignore remove');
+            }
+        }
 		
-		/**
-		 * Remove all the event listener. If event name is null will remove all listeners, else will just 
-		 * remove all listeners for this event
-		 * @param  string $eventName the event name
-		 */
-		public function removeAllListener($eventName = null){
-			$this->logger->debug('Removing of all event listener, the event name [' .$eventName. ']');
-			if($eventName !== null && isset($this->listeners[$eventName])){
-				$this->logger->info('The event name is set of exist in the listener just remove all event listener for this event');
-				unset($this->listeners[$eventName]);
-			} else{
-				$this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
-				$this->listeners = array();
-			}
-		}
+        /**
+         * Remove all the event listener. If event name is null will remove all listeners, else will just 
+         * remove all listeners for this event
+         * @param  string $eventName the event name
+         */
+        public function removeAllListener($eventName = null){
+            $this->logger->debug('Removing of all event listener, the event name [' .$eventName. ']');
+            if($eventName !== null && isset($this->listeners[$eventName])){
+                $this->logger->info('The event name is set of exist in the listener just remove all event listener for this event');
+                unset($this->listeners[$eventName]);
+            } else{
+                $this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
+                $this->listeners = array();
+            }
+        }
 		
-		/**
-		 * Get the list of listener for this event
-		 * @param string $eventName the event name
-		 * @return array the listeners for this event or empty array if this event does not contain any listener
-		 */
-		public function getListeners($eventName) {
-			return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
-		}
+        /**
+         * Get the list of listener for this event
+         * @param string $eventName the event name
+         * @return array the listeners for this event or empty array if this event does not contain any listener
+         */
+        public function getListeners($eventName) {
+            return isset($this->listeners[$eventName]) ? $this->listeners[$eventName] : array();
+        }
 		
-		/**
-		 * Dispatch the event to the registered listeners.
-		 * @param  mixed|object $event the event information
-		 * @return void|object if event need return, will return the final EventInfo object.
-		 */	
-		public function dispatch($event){
-			if(! $event || !$event instanceof EventInfo){
-				$this->logger->info('The event is not set or is not an instance of "EventInfo" create the default "EventInfo" object to use instead of.');
-				$event = new EventInfo((string) $event);
-			}			
-			$this->logger->debug('Dispatch to the event listener, the event [' .stringfy_vars($event). ']');
-			if(isset($event->stop) && $event->stop){
-				$this->logger->info('This event need stopped, no need call any listener');
-				return;
-			}
-			if($event->returnBack){
-				$this->logger->info('This event need return back, return the result for future use');
-				return $this->dispatchToListerners($event);
-			} else{
-				$this->logger->info('This event no need return back the result, just dispatch it');
-				$this->dispatchToListerners($event);
-			}
-		}
+        /**
+         * Dispatch the event to the registered listeners.
+         * @param  mixed|object $event the event information
+         * @return void|object if event need return, will return the final EventInfo object.
+         */	
+        public function dispatch($event){
+            if(! $event || !$event instanceof EventInfo){
+                $this->logger->info('The event is not set or is not an instance of "EventInfo" create the default "EventInfo" object to use instead of.');
+                $event = new EventInfo((string) $event);
+            }			
+            $this->logger->debug('Dispatch to the event listener, the event [' .stringfy_vars($event). ']');
+            if(isset($event->stop) && $event->stop){
+                $this->logger->info('This event need stopped, no need call any listener');
+                return;
+            }
+            if($event->returnBack){
+                $this->logger->info('This event need return back, return the result for future use');
+                return $this->dispatchToListerners($event);
+            } else{
+                $this->logger->info('This event no need return back the result, just dispatch it');
+                $this->dispatchToListerners($event);
+            }
+        }
 		
-		/**
-		 * Dispatch the event to the registered listeners.
-		 * @param  object EventInfo $event  the event information
-		 * @return void|object if event need return, will return the final EventInfo instance.
-		 */	
-		private function dispatchToListerners(EventInfo $event){
-			$eBackup = $event;
-			$list = $this->getListeners($event->name);
-			if(empty($list)){
-				$this->logger->info('No event listener is registered for the event [' .$event->name. '] skipping.');
-				if($event->returnBack){
-					return $event;
-				}
-				return;
-			} else{
-				$this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
-			}
-			foreach($list as $listener){
-				if($eBackup->returnBack){
-					$returnedEvent = call_user_func_array($listener, array($event));
-					if($returnedEvent instanceof EventInfo){
-						$event = $returnedEvent;
-					} else{
-						show_error('This event [' .$event->name. '] need you return the event object after processing');
-					}
-				} else{
-					call_user_func_array($listener, array($event));
-				}
-				if($event->stop){
-					break;
-				}
-			}
-			//only test for original event may be during the flow some listeners change this parameter
-			if($eBackup->returnBack){
-				return $event;
-			}
-		}
-	}
+        /**
+         * Dispatch the event to the registered listeners.
+         * @param  object EventInfo $event  the event information
+         * @return void|object if event need return, will return the final EventInfo instance.
+         */	
+        private function dispatchToListerners(EventInfo $event){
+            $eBackup = $event;
+            $list = $this->getListeners($event->name);
+            if(empty($list)){
+                $this->logger->info('No event listener is registered for the event [' .$event->name. '] skipping.');
+                if($event->returnBack){
+                    return $event;
+                }
+                return;
+            } else{
+                $this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
+            }
+            foreach($list as $listener){
+                if($eBackup->returnBack){
+                    $returnedEvent = call_user_func_array($listener, array($event));
+                    if($returnedEvent instanceof EventInfo){
+                        $event = $returnedEvent;
+                    } else{
+                        show_error('This event [' .$event->name. '] need you return the event object after processing');
+                    }
+                } else{
+                    call_user_func_array($listener, array($event));
+                }
+                if($event->stop){
+                    break;
+                }
+            }
+            //only test for original event may be during the flow some listeners change this parameter
+            if($eBackup->returnBack){
+                return $event;
+            }
+        }
+    }

core/classes/Loader.php

Indentation +580 added lines, -580 removed lines

@@ -1,612 +1,612 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
-	class Loader extends BaseStaticClass {
+    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 Loader extends BaseStaticClass {
 		
-		/**
-		 * List of loaded resources
-		 * @var array
-		 */
-		public static $loaded = array();
+        /**
+         * List of loaded resources
+         * @var array
+         */
+        public static $loaded = array();
 		
 
-		public function __construct() {
-			//add the resources already loaded during application bootstrap
-			//in the list to prevent duplicate or loading the resources again.
-			static::$loaded = class_loaded();
+        public function __construct() {
+            //add the resources already loaded during application bootstrap
+            //in the list to prevent duplicate or loading the resources again.
+            static::$loaded = class_loaded();
 			
-			//Load resources from autoload configuration
-			$this->loadResourcesFromAutoloadConfig();
-		}
+            //Load resources from autoload configuration
+            $this->loadResourcesFromAutoloadConfig();
+        }
 
 		
-		/**
-		 * Load the model class
-		 *
-		 * @param  string $class    the class name to be loaded
-		 * @param  string $instance the name of the instance to use in super object
-		 *
-		 * @return void
-		 */
-		public static function model($class, $instance = null) {
-			$logger = static::getLogger();
-			$class = str_ireplace('.php', '', $class);
-			$class = trim($class, '/\\');
-			$file = ucfirst($class) . '.php';
-			$logger->debug('Loading model [' . $class . '] ...');
-			//************
-			if (!$instance) {
-				$instance = self::getModelLibraryInstanceName($class);
-			}
-			//****************
-			if (isset(static::$loaded[$instance])) {
-				$logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$classFilePath = APPS_MODEL_PATH . $file;
-			//first check if this model is in the module
-			$logger->debug('Checking model [' . $class . '] from module list ...');
-			//check if the request class contains module name
-			$moduleInfo = self::getModuleInfoForModelLibrary($class);
-			$module = $moduleInfo['module'];
-			$class  = $moduleInfo['class'];
+        /**
+         * Load the model class
+         *
+         * @param  string $class    the class name to be loaded
+         * @param  string $instance the name of the instance to use in super object
+         *
+         * @return void
+         */
+        public static function model($class, $instance = null) {
+            $logger = static::getLogger();
+            $class = str_ireplace('.php', '', $class);
+            $class = trim($class, '/\\');
+            $file = ucfirst($class) . '.php';
+            $logger->debug('Loading model [' . $class . '] ...');
+            //************
+            if (!$instance) {
+                $instance = self::getModelLibraryInstanceName($class);
+            }
+            //****************
+            if (isset(static::$loaded[$instance])) {
+                $logger->info('Model [' . $class . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $classFilePath = APPS_MODEL_PATH . $file;
+            //first check if this model is in the module
+            $logger->debug('Checking model [' . $class . '] from module list ...');
+            //check if the request class contains module name
+            $moduleInfo = self::getModuleInfoForModelLibrary($class);
+            $module = $moduleInfo['module'];
+            $class  = $moduleInfo['class'];
 			
-			$moduleModelFilePath = Module::findModelFullPath($class, $module);
-			if ($moduleModelFilePath){
-				$logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
-				$classFilePath = $moduleModelFilePath;
-			} else{
-				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
-			}
-			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
-			if (file_exists($classFilePath)){
-				require_once $classFilePath;
-				if (class_exists($class)){
-					$c = new $class();
-					$obj = & get_instance();
-					$obj->{$instance} = $c;
-					static::$loaded[$instance] = $class;
-					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				} else{
-					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
-				}
-			} else{
-				show_error('Unable to find the model [' . $class . ']');
-			}
-		}
+            $moduleModelFilePath = Module::findModelFullPath($class, $module);
+            if ($moduleModelFilePath){
+                $logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
+                $classFilePath = $moduleModelFilePath;
+            } else{
+                $logger->info('Cannot find model [' . $class . '] from modules using the default location');
+            }
+            $logger->info('The model file path to be loaded is [' . $classFilePath . ']');
+            if (file_exists($classFilePath)){
+                require_once $classFilePath;
+                if (class_exists($class)){
+                    $c = new $class();
+                    $obj = & get_instance();
+                    $obj->{$instance} = $c;
+                    static::$loaded[$instance] = $class;
+                    $logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
+                } else{
+                    show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
+                }
+            } else{
+                show_error('Unable to find the model [' . $class . ']');
+            }
+        }
 
 		
-		/**
-		 * Load the library class
-		 *
-		 * @param  string $class    the library class name to be loaded
-		 * @param  string $instance the instance name to use in super object
-		 * @param mixed $params the arguments to pass to the constructor
-		 *
-		 * @return void
-		 */
-		public static function library($class, $instance = null, array $params = array()) {
-			$logger = static::getLogger();
-			$class = str_ireplace('.php', '', $class);
-			$class = trim($class, '/\\');
-			$file = ucfirst($class) . '.php';
-			$logger->debug('Loading library [' . $class . '] ...');
-			if (!$instance) {
-				$instance = self::getModelLibraryInstanceName($class);
-			}
-			if (isset(static::$loaded[$instance])) {
-				$logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$obj = & get_instance();
-			//Check and load Database library
-			if (strtolower($class) == 'database') {
-				$logger->info('This is the Database library ...');
-				$obj->{$instance} = & class_loader('Database', 'classes/database', $params);
-				static::$loaded[$instance] = $class;
-				$logger->info('Library Database loaded successfully.');
-				return;
-			}
-			$libraryFilePath = null;
-			$logger->debug('Check if this is a system library ...');
-			if (file_exists(CORE_LIBRARY_PATH . $file)){
-				$libraryFilePath = CORE_LIBRARY_PATH . $file;
-				$class = ucfirst($class);
-				$logger->info('This library is a system library');
-			} else{
-				$logger->info('This library is not a system library');	
-				//first check if this library is in the module
-				$libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
-				//***************
-			}
-			if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
-				$libraryFilePath = LIBRARY_PATH . $file;
-			}
-			$logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
-			//*************************
-			self::loadLibrary($libraryFilePath, $class, $instance, $params);
-		}
+        /**
+         * Load the library class
+         *
+         * @param  string $class    the library class name to be loaded
+         * @param  string $instance the instance name to use in super object
+         * @param mixed $params the arguments to pass to the constructor
+         *
+         * @return void
+         */
+        public static function library($class, $instance = null, array $params = array()) {
+            $logger = static::getLogger();
+            $class = str_ireplace('.php', '', $class);
+            $class = trim($class, '/\\');
+            $file = ucfirst($class) . '.php';
+            $logger->debug('Loading library [' . $class . '] ...');
+            if (!$instance) {
+                $instance = self::getModelLibraryInstanceName($class);
+            }
+            if (isset(static::$loaded[$instance])) {
+                $logger->info('Library [' . $class . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $obj = & get_instance();
+            //Check and load Database library
+            if (strtolower($class) == 'database') {
+                $logger->info('This is the Database library ...');
+                $obj->{$instance} = & class_loader('Database', 'classes/database', $params);
+                static::$loaded[$instance] = $class;
+                $logger->info('Library Database loaded successfully.');
+                return;
+            }
+            $libraryFilePath = null;
+            $logger->debug('Check if this is a system library ...');
+            if (file_exists(CORE_LIBRARY_PATH . $file)){
+                $libraryFilePath = CORE_LIBRARY_PATH . $file;
+                $class = ucfirst($class);
+                $logger->info('This library is a system library');
+            } else{
+                $logger->info('This library is not a system library');	
+                //first check if this library is in the module
+                $libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
+                //***************
+            }
+            if (! $libraryFilePath && file_exists(LIBRARY_PATH . $file)){
+                $libraryFilePath = LIBRARY_PATH . $file;
+            }
+            $logger->info('The library file path to be loaded is [' . $libraryFilePath . ']');
+            //*************************
+            self::loadLibrary($libraryFilePath, $class, $instance, $params);
+        }
 
-		/**
-		 * Load the helper
-		 *
-		 * @param  string $function the helper name to be loaded
-		 *
-		 * @return void
-		 */
-		public static function functions($function) {
-			$logger = static::getLogger();
-			$function = str_ireplace('.php', '', $function);
-			$function = trim($function, '/\\');
-			$function = str_ireplace('function_', '', $function);
-			$file = 'function_' . $function . '.php';
-			$logger->debug('Loading helper [' . $function . '] ...');
-			if (isset(static::$loaded['function_' . $function])) {
-				$logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$functionFilePath = null;
-			//first check if this helper is in the module
-			$logger->debug('Checking helper [' . $function . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForFunction($function);
-			$module    = $moduleInfo['module'];
-			$function  = $moduleInfo['function'];
-			if(! empty($moduleInfo['file'])){
-				$file = $moduleInfo['file'];
-			}
-			$moduleFunctionPath = Module::findFunctionFullPath($function, $module);
-			if ($moduleFunctionPath){
-				$logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
-				$functionFilePath = $moduleFunctionPath;
-			} else{
-				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
-			}
-			if (! $functionFilePath){
-				$searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
-				foreach($searchDir as $dir){
-					$filePath = $dir . $file;
-					if (file_exists($filePath)){
-						$functionFilePath = $filePath;
-						//is already found not to continue
-						break;
-					}
-				}
-			}
-			$logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
-			if ($functionFilePath){
-				require_once $functionFilePath;
-				static::$loaded['function_' . $function] = $functionFilePath;
-				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
-			} else{
-				show_error('Unable to find helper file [' . $file . ']');
-			}
-		}
+        /**
+         * Load the helper
+         *
+         * @param  string $function the helper name to be loaded
+         *
+         * @return void
+         */
+        public static function functions($function) {
+            $logger = static::getLogger();
+            $function = str_ireplace('.php', '', $function);
+            $function = trim($function, '/\\');
+            $function = str_ireplace('function_', '', $function);
+            $file = 'function_' . $function . '.php';
+            $logger->debug('Loading helper [' . $function . '] ...');
+            if (isset(static::$loaded['function_' . $function])) {
+                $logger->info('Helper [' . $function . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $functionFilePath = null;
+            //first check if this helper is in the module
+            $logger->debug('Checking helper [' . $function . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForFunction($function);
+            $module    = $moduleInfo['module'];
+            $function  = $moduleInfo['function'];
+            if(! empty($moduleInfo['file'])){
+                $file = $moduleInfo['file'];
+            }
+            $moduleFunctionPath = Module::findFunctionFullPath($function, $module);
+            if ($moduleFunctionPath){
+                $logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
+                $functionFilePath = $moduleFunctionPath;
+            } else{
+                $logger->info('Cannot find helper [' . $function . '] from modules using the default location');
+            }
+            if (! $functionFilePath){
+                $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH);
+                foreach($searchDir as $dir){
+                    $filePath = $dir . $file;
+                    if (file_exists($filePath)){
+                        $functionFilePath = $filePath;
+                        //is already found not to continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The helper file path to be loaded is [' . $functionFilePath . ']');
+            if ($functionFilePath){
+                require_once $functionFilePath;
+                static::$loaded['function_' . $function] = $functionFilePath;
+                $logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
+            } else{
+                show_error('Unable to find helper file [' . $file . ']');
+            }
+        }
 
-		/**
-		 * Load the configuration file
-		 *
-		 * @param  string $filename the configuration filename located at CONFIG_PATH or MODULE_PATH/config
-		 *
-		 * @return void
-		 */
-		public static function config($filename) {
-			$logger = static::getLogger();
-			$filename = str_ireplace('.php', '', $filename);
-			$filename = trim($filename, '/\\');
-			$filename = str_ireplace('config_', '', $filename);
-			$file = 'config_' . $filename . '.php';
-			$logger->debug('Loading configuration [' . $filename . '] ...');
-			if (isset(static::$loaded['config_' . $filename])) {
-				$logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			$configFilePath = CONFIG_PATH . $file;
-			//first check if this config is in the module
-			$logger->debug('Checking config [' . $filename . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForConfig($filename);
-			$module    = $moduleInfo['module'];
-			$filename  = $moduleInfo['filename'];
-			$moduleConfigPath = Module::findConfigFullPath($filename, $module);
-			if ($moduleConfigPath){
-				$logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
-				$configFilePath = $moduleConfigPath;
-			} else{
-				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
-			}
-			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
-			$config = array();
-			if (file_exists($configFilePath)){
-				require_once $configFilePath;
-				if (! empty($config) && is_array($config)){
-					Config::setAll($config);
-					static::$loaded['config_' . $filename] = $configFilePath;
-					$logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
-					$logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
-					unset($config);
-				}
-			} else{
-				show_error('Unable to find config file ['. $configFilePath . ']');
-			}
-		}
+        /**
+         * Load the configuration file
+         *
+         * @param  string $filename the configuration filename located at CONFIG_PATH or MODULE_PATH/config
+         *
+         * @return void
+         */
+        public static function config($filename) {
+            $logger = static::getLogger();
+            $filename = str_ireplace('.php', '', $filename);
+            $filename = trim($filename, '/\\');
+            $filename = str_ireplace('config_', '', $filename);
+            $file = 'config_' . $filename . '.php';
+            $logger->debug('Loading configuration [' . $filename . '] ...');
+            if (isset(static::$loaded['config_' . $filename])) {
+                $logger->info('Configuration [' . $file . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            $configFilePath = CONFIG_PATH . $file;
+            //first check if this config is in the module
+            $logger->debug('Checking config [' . $filename . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForConfig($filename);
+            $module    = $moduleInfo['module'];
+            $filename  = $moduleInfo['filename'];
+            $moduleConfigPath = Module::findConfigFullPath($filename, $module);
+            if ($moduleConfigPath){
+                $logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
+                $configFilePath = $moduleConfigPath;
+            } else{
+                $logger->info('Cannot find config [' . $filename . '] from modules using the default location');
+            }
+            $logger->info('The config file path to be loaded is [' . $configFilePath . ']');
+            $config = array();
+            if (file_exists($configFilePath)){
+                require_once $configFilePath;
+                if (! empty($config) && is_array($config)){
+                    Config::setAll($config);
+                    static::$loaded['config_' . $filename] = $configFilePath;
+                    $logger->info('Configuration [' . $configFilePath . '] loaded successfully.');
+                    $logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
+                    unset($config);
+                }
+            } else{
+                show_error('Unable to find config file ['. $configFilePath . ']');
+            }
+        }
 
 
-		/**
-		 * Load the language
-		 *
-		 * @param  string $language the language name to be loaded
-		 *
-		 * @return void
-		 */
-		public static function lang($language) {
-			$logger = static::getLogger();
-			$language = str_ireplace('.php', '', $language);
-			$language = trim($language, '/\\');
-			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_' . $language . '.php';
-			$logger->debug('Loading language [' . $language . '] ...');
-			if (isset(static::$loaded['lang_' . $language])) {
-				$logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
-				return;
-			}
-			//get the current language
-			$appLang = self::getAppLang();
-			$languageFilePath = null;
-			//first check if this language is in the module
-			$logger->debug('Checking language [' . $language . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForLanguage($language);
-			$module    = $moduleInfo['module'];
-			$language  = $moduleInfo['language'];
-			if(! empty($moduleInfo['file'])){
-				$file = $moduleInfo['file'];
-			}
-			$moduleLanguagePath = Module::findLanguageFullPath($language, $appLang, $module);
-			if ($moduleLanguagePath){
-				$logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
-				$languageFilePath = $moduleLanguagePath;
-			} else{
-				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
-			}
-			if (! $languageFilePath){
-				$searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
-				foreach($searchDir as $dir){
-					$filePath = $dir . $appLang . DS . $file;
-					if (file_exists($filePath)){
-						$languageFilePath = $filePath;
-						//already found no need continue
-						break;
-					}
-				}
-			}
-			$logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
-			self::loadLanguage($languageFilePath, $language);
-		}
+        /**
+         * Load the language
+         *
+         * @param  string $language the language name to be loaded
+         *
+         * @return void
+         */
+        public static function lang($language) {
+            $logger = static::getLogger();
+            $language = str_ireplace('.php', '', $language);
+            $language = trim($language, '/\\');
+            $language = str_ireplace('lang_', '', $language);
+            $file = 'lang_' . $language . '.php';
+            $logger->debug('Loading language [' . $language . '] ...');
+            if (isset(static::$loaded['lang_' . $language])) {
+                $logger->info('Language [' . $language . '] already loaded no need to load it again, cost in performance');
+                return;
+            }
+            //get the current language
+            $appLang = self::getAppLang();
+            $languageFilePath = null;
+            //first check if this language is in the module
+            $logger->debug('Checking language [' . $language . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForLanguage($language);
+            $module    = $moduleInfo['module'];
+            $language  = $moduleInfo['language'];
+            if(! empty($moduleInfo['file'])){
+                $file = $moduleInfo['file'];
+            }
+            $moduleLanguagePath = Module::findLanguageFullPath($language, $appLang, $module);
+            if ($moduleLanguagePath){
+                $logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
+                $languageFilePath = $moduleLanguagePath;
+            } else{
+                $logger->info('Cannot find language [' . $language . '] from modules using the default location');
+            }
+            if (! $languageFilePath){
+                $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH);
+                foreach($searchDir as $dir){
+                    $filePath = $dir . $appLang . DS . $file;
+                    if (file_exists($filePath)){
+                        $languageFilePath = $filePath;
+                        //already found no need continue
+                        break;
+                    }
+                }
+            }
+            $logger->info('The language file path to be loaded is [' . $languageFilePath . ']');
+            self::loadLanguage($languageFilePath, $language);
+        }
 
-		/**
-		 * Return the current app language by default will use the value from cookie 
-		 * if can not found will use the default value from configuration
-		 * @return string the app language like "en", "fr"
-		 */
-		protected static function getAppLang() {
-			//determine the current language
-			$appLang = get_config('default_language');
-			//if the language exists in the cookie use it
-			$cfgKey = get_config('language_cookie_name');
-			$objCookie = & class_loader('Cookie');
-			$cookieLang = $objCookie->get($cfgKey);
-			if ($cookieLang) {
-				$appLang = $cookieLang;
-			}
-			return $appLang;
-		}
-		/**
-		 * Get the module information for the model and library to load
-		 * @param  string $class the full class name like moduleName/className, className,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'class' => 'class_name'
-		 * )
-		 */
-		protected static function getModuleInfoForModelLibrary($class){
-			$module = null;
-			$obj = & get_instance();
-			if (strpos($class, '/') !== false){
-				$path = explode('/', $class);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
-					$module = $path[0];
-					$class = ucfirst($path[1]);
-				}
-			} else{
-				$class = ucfirst($class);
-			}
-			if (! $module && !empty($obj->moduleName)){
-				$module = $obj->moduleName;
-			}
-			return array(
-						'class' => $class,
-						'module' => $module
-					);
-		}
+        /**
+         * Return the current app language by default will use the value from cookie 
+         * if can not found will use the default value from configuration
+         * @return string the app language like "en", "fr"
+         */
+        protected static function getAppLang() {
+            //determine the current language
+            $appLang = get_config('default_language');
+            //if the language exists in the cookie use it
+            $cfgKey = get_config('language_cookie_name');
+            $objCookie = & class_loader('Cookie');
+            $cookieLang = $objCookie->get($cfgKey);
+            if ($cookieLang) {
+                $appLang = $cookieLang;
+            }
+            return $appLang;
+        }
+        /**
+         * Get the module information for the model and library to load
+         * @param  string $class the full class name like moduleName/className, className,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'class' => 'class_name'
+         * )
+         */
+        protected static function getModuleInfoForModelLibrary($class){
+            $module = null;
+            $obj = & get_instance();
+            if (strpos($class, '/') !== false){
+                $path = explode('/', $class);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())){
+                    $module = $path[0];
+                    $class = ucfirst($path[1]);
+                }
+            } else{
+                $class = ucfirst($class);
+            }
+            if (! $module && !empty($obj->moduleName)){
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'class' => $class,
+                        'module' => $module
+                    );
+        }
 
-		/**
-		 * Get the module information for the function to load
-		 * @param  string $function the function name like moduleName/functionName, functionName,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'function' => 'function'
-		 * 	'file' => 'file'
-		 * )
-		 */
-		protected static function getModuleInfoForFunction($function) {
-			$module = null;
-			$file = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($function, '/') !== false) {
-				$path = explode('/', $function);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
-					$module = $path[0];
-					$function = 'function_' . $path[1];
-					$file = $path[0] . DS . $function . '.php';
-				}
-			}
-			if (!$module && !empty($obj->moduleName)) {
-				$module = $obj->moduleName;
-			}
-			return array(
-						'function' => $function,
-						'module' => $module,
-						'file' => $file
-					);
-		}
+        /**
+         * Get the module information for the function to load
+         * @param  string $function the function name like moduleName/functionName, functionName,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'function' => 'function'
+         * 	'file' => 'file'
+         * )
+         */
+        protected static function getModuleInfoForFunction($function) {
+            $module = null;
+            $file = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($function, '/') !== false) {
+                $path = explode('/', $function);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
+                    $module = $path[0];
+                    $function = 'function_' . $path[1];
+                    $file = $path[0] . DS . $function . '.php';
+                }
+            }
+            if (!$module && !empty($obj->moduleName)) {
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'function' => $function,
+                        'module' => $module,
+                        'file' => $file
+                    );
+        }
 
-		/**
-		 * Get the module information for the language to load
-		 * @param  string $language the language name like moduleName/languageName, languageName,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'language' => 'language'
-		 * 	'file' => 'file'
-		 * )
-		 */
-		protected static function getModuleInfoForLanguage($language) {
-			$module = null;
-			$file = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($language, '/') !== false) {
-				$path = explode('/', $language);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
-					$module = $path[0];
-					$language = 'lang_' . $path[1] . '.php';
-					$file = $path[0] . DS . $language;
-				}
-			}
-			if (!$module && !empty($obj->moduleName)) {
-				$module = $obj->moduleName;
-			}
-			return array(
-						'language' => $language,
-						'module' => $module,
-						'file' => $file
-					);
-		}
+        /**
+         * Get the module information for the language to load
+         * @param  string $language the language name like moduleName/languageName, languageName,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'language' => 'language'
+         * 	'file' => 'file'
+         * )
+         */
+        protected static function getModuleInfoForLanguage($language) {
+            $module = null;
+            $file = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($language, '/') !== false) {
+                $path = explode('/', $language);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
+                    $module = $path[0];
+                    $language = 'lang_' . $path[1] . '.php';
+                    $file = $path[0] . DS . $language;
+                }
+            }
+            if (!$module && !empty($obj->moduleName)) {
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'language' => $language,
+                        'module' => $module,
+                        'file' => $file
+                    );
+        }
 
 
-		/**
-		 * Get the module information for the config to load
-		 * @param  string $filename the filename of the configuration file,
-		 * @return array        the module information
-		 * array(
-		 * 	'module'=> 'module_name'
-		 * 	'filename' => 'filename'
-		 * )
-		 */
-		protected static function getModuleInfoForConfig($filename) {
-			$module = null;
-			$obj = & get_instance();
-			//check if the request class contains module name
-			if (strpos($filename, '/') !== false) {
-				$path = explode('/', $filename);
-				if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
-					$module = $path[0];
-					$filename = $path[1] . '.php';
-				}
-			}
-			if (!$module && !empty($obj->moduleName)) {
-				$module = $obj->moduleName;
-			}
-			return array(
-						'filename' => $filename,
-						'module' => $module
-					);
-		}
+        /**
+         * Get the module information for the config to load
+         * @param  string $filename the filename of the configuration file,
+         * @return array        the module information
+         * array(
+         * 	'module'=> 'module_name'
+         * 	'filename' => 'filename'
+         * )
+         */
+        protected static function getModuleInfoForConfig($filename) {
+            $module = null;
+            $obj = & get_instance();
+            //check if the request class contains module name
+            if (strpos($filename, '/') !== false) {
+                $path = explode('/', $filename);
+                if (isset($path[0]) && in_array($path[0], Module::getModuleList())) {
+                    $module = $path[0];
+                    $filename = $path[1] . '.php';
+                }
+            }
+            if (!$module && !empty($obj->moduleName)) {
+                $module = $obj->moduleName;
+            }
+            return array(
+                        'filename' => $filename,
+                        'module' => $module
+                    );
+        }
 
-		/**
-		 * Get the name of model or library instance if is null
-		 * @param  string $class the class name to determine the instance
-		 * @return string        the instance name
-		 */
-		protected static function getModelLibraryInstanceName($class){
-			//for module
-			$instance = null;
-			if (strpos($class, '/') !== false){
-				$path = explode('/', $class);
-				if (isset($path[1])){
-					$instance = strtolower($path[1]);
-				}
-			} else{
-				$instance = strtolower($class);
-			}
-			return $instance;
-		}
+        /**
+         * Get the name of model or library instance if is null
+         * @param  string $class the class name to determine the instance
+         * @return string        the instance name
+         */
+        protected static function getModelLibraryInstanceName($class){
+            //for module
+            $instance = null;
+            if (strpos($class, '/') !== false){
+                $path = explode('/', $class);
+                if (isset($path[1])){
+                    $instance = strtolower($path[1]);
+                }
+            } else{
+                $instance = strtolower($class);
+            }
+            return $instance;
+        }
 
-		/**
-		 * Get the library file path using the module information
-		 * @param  string $class the class name
-		 * @return string|null        the library file path otherwise null will be returned
-		 */
-		protected static function getLibraryPathUsingModuleInfo($class) {
-			$logger = static::getLogger();
-			$libraryFilePath = null;
-			$logger->debug('Checking library [' . $class . '] from module list ...');
-			$moduleInfo = self::getModuleInfoForModelLibrary($class);
-			$module = $moduleInfo['module'];
-			$class  = $moduleInfo['class'];
-			$moduleLibraryPath = Module::findLibraryFullPath($class, $module);
-			if ($moduleLibraryPath){
-				$logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
-				$libraryFilePath = $moduleLibraryPath;
-			} else{
-				$logger->info('Cannot find library [' . $class . '] from modules using the default location');
-			}
-			return $libraryFilePath;
-		}
+        /**
+         * Get the library file path using the module information
+         * @param  string $class the class name
+         * @return string|null        the library file path otherwise null will be returned
+         */
+        protected static function getLibraryPathUsingModuleInfo($class) {
+            $logger = static::getLogger();
+            $libraryFilePath = null;
+            $logger->debug('Checking library [' . $class . '] from module list ...');
+            $moduleInfo = self::getModuleInfoForModelLibrary($class);
+            $module = $moduleInfo['module'];
+            $class  = $moduleInfo['class'];
+            $moduleLibraryPath = Module::findLibraryFullPath($class, $module);
+            if ($moduleLibraryPath){
+                $logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
+                $libraryFilePath = $moduleLibraryPath;
+            } else{
+                $logger->info('Cannot find library [' . $class . '] from modules using the default location');
+            }
+            return $libraryFilePath;
+        }
 
-		/**
-		 * Load the library 
-		 * @param  string $libraryFilePath the file path of the library to load
-		 * @param  string $class           the class name
-		 * @param  string $instance        the instance
-		 * @param  array  $params          the parameter to use
-		 * @return void
-		 */
-		protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
-			if ($libraryFilePath){
-				$logger = static::getLogger();
-				require_once $libraryFilePath;
-				if (class_exists($class)){
-					$c = $params ? new $class($params) : new $class();
-					$obj = & get_instance();
-					$obj->{$instance} = $c;
-					static::$loaded[$instance] = $class;
-					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				} else{
-					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
-				}
-			} else{
-				show_error('Unable to find library class [' . $class . ']');
-			}
-		}
+        /**
+         * Load the library 
+         * @param  string $libraryFilePath the file path of the library to load
+         * @param  string $class           the class name
+         * @param  string $instance        the instance
+         * @param  array  $params          the parameter to use
+         * @return void
+         */
+        protected static function loadLibrary($libraryFilePath, $class, $instance, $params = array()){
+            if ($libraryFilePath){
+                $logger = static::getLogger();
+                require_once $libraryFilePath;
+                if (class_exists($class)){
+                    $c = $params ? new $class($params) : new $class();
+                    $obj = & get_instance();
+                    $obj->{$instance} = $c;
+                    static::$loaded[$instance] = $class;
+                    $logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
+                } else{
+                    show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
+                }
+            } else{
+                show_error('Unable to find library class [' . $class . ']');
+            }
+        }
 
-		/**
-		 * Load the language 
-		 * @param  string $languageFilePath the file path of the language to load
-		 * @param  string $language           the language name
-		 * @return void
-		 */
-		protected static function loadLanguage($languageFilePath, $language) {
-			if ($languageFilePath) {
-				$logger = static::getLogger();
-				$lang = array();
-				require_once $languageFilePath;
-				if (!empty($lang) && is_array($lang)) {
-					$logger->info('Language file  [' . $languageFilePath . '] contains the valid languages keys add them to language list');
-					//Note: may be here the class 'Lang' not yet loaded
-					$langObj = & class_loader('Lang', 'classes');
-					$langObj->addLangMessages($lang);
-					//free the memory
-					unset($lang);
-				}
-				static::$loaded['lang_' . $language] = $languageFilePath;
-				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			} else{
-				show_error('Unable to find language [' . $language . ']');
-			}
-		}
+        /**
+         * Load the language 
+         * @param  string $languageFilePath the file path of the language to load
+         * @param  string $language           the language name
+         * @return void
+         */
+        protected static function loadLanguage($languageFilePath, $language) {
+            if ($languageFilePath) {
+                $logger = static::getLogger();
+                $lang = array();
+                require_once $languageFilePath;
+                if (!empty($lang) && is_array($lang)) {
+                    $logger->info('Language file  [' . $languageFilePath . '] contains the valid languages keys add them to language list');
+                    //Note: may be here the class 'Lang' not yet loaded
+                    $langObj = & class_loader('Lang', 'classes');
+                    $langObj->addLangMessages($lang);
+                    //free the memory
+                    unset($lang);
+                }
+                static::$loaded['lang_' . $language] = $languageFilePath;
+                $logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
+            } else{
+                show_error('Unable to find language [' . $language . ']');
+            }
+        }
 
-		/**
-		 * Get all the autoload using the configuration file
-		 * @return array
-		 */
-		private function getResourcesFromAutoloadConfig() {
-			$autoloads = array();
-			$autoloads['config']    = array();
-			$autoloads['languages'] = array();
-			$autoloads['libraries'] = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			//loading of the resources from autoload configuration file
-			if (file_exists(CONFIG_PATH . 'autoload.php')) {
-				$autoload = array();
-				require_once CONFIG_PATH . 'autoload.php';
-				if (!empty($autoload) && is_array($autoload)) {
-					$autoloads = array_merge($autoloads, $autoload);
-					unset($autoload);
-				}
-			}
-			//loading autoload configuration for modules
-			$modulesAutoloads = Module::getModulesAutoloadConfig();
-			if (!empty($modulesAutoloads) && is_array($modulesAutoloads)) {
-				$autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
-			}
-			return $autoloads;
-		}
+        /**
+         * Get all the autoload using the configuration file
+         * @return array
+         */
+        private function getResourcesFromAutoloadConfig() {
+            $autoloads = array();
+            $autoloads['config']    = array();
+            $autoloads['languages'] = array();
+            $autoloads['libraries'] = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            //loading of the resources from autoload configuration file
+            if (file_exists(CONFIG_PATH . 'autoload.php')) {
+                $autoload = array();
+                require_once CONFIG_PATH . 'autoload.php';
+                if (!empty($autoload) && is_array($autoload)) {
+                    $autoloads = array_merge($autoloads, $autoload);
+                    unset($autoload);
+                }
+            }
+            //loading autoload configuration for modules
+            $modulesAutoloads = Module::getModulesAutoloadConfig();
+            if (!empty($modulesAutoloads) && is_array($modulesAutoloads)) {
+                $autoloads = array_merge_recursive($autoloads, $modulesAutoloads);
+            }
+            return $autoloads;
+        }
 
-		/**
-		 * Load the autoload configuration
-		 * @return void
-		 */
-		private function loadResourcesFromAutoloadConfig() {
-			$autoloads = array();
-			$autoloads['config']    = array();
-			$autoloads['languages'] = array();
-			$autoloads['libraries'] = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
+        /**
+         * Load the autoload configuration
+         * @return void
+         */
+        private function loadResourcesFromAutoloadConfig() {
+            $autoloads = array();
+            $autoloads['config']    = array();
+            $autoloads['languages'] = array();
+            $autoloads['libraries'] = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
 
-			$list = $this->getResourcesFromAutoloadConfig();
-			$autoloads = array_merge($autoloads, $list);
+            $list = $this->getResourcesFromAutoloadConfig();
+            $autoloads = array_merge($autoloads, $list);
 			
-			//config autoload
-			$this->loadAutoloadResourcesArray('config', $autoloads['config']);
+            //config autoload
+            $this->loadAutoloadResourcesArray('config', $autoloads['config']);
 			
-			//languages autoload
-			$this->loadAutoloadResourcesArray('lang', $autoloads['languages']);
+            //languages autoload
+            $this->loadAutoloadResourcesArray('lang', $autoloads['languages']);
 			
-			//libraries autoload
-			$this->loadAutoloadResourcesArray('library', $autoloads['libraries']);
+            //libraries autoload
+            $this->loadAutoloadResourcesArray('library', $autoloads['libraries']);
 
-			//models autoload
-			$this->loadAutoloadResourcesArray('model', $autoloads['models']);
+            //models autoload
+            $this->loadAutoloadResourcesArray('model', $autoloads['models']);
 			
-			//functions autoload
-			$this->loadAutoloadResourcesArray('functions', $autoloads['functions']);
-		}
+            //functions autoload
+            $this->loadAutoloadResourcesArray('functions', $autoloads['functions']);
+        }
 
-		/**
-		 * Load the resources autoload array
-		 * @param  string $method    this object method name to call
-		 * @param  array  $resources the resource to load
-		 * @return void            
-		 */
-		private function loadAutoloadResourcesArray($method, array $resources) {
-			foreach ($resources as $name) {
-				$this->{$method}($name);
-			}
-		}
-	}
+        /**
+         * Load the resources autoload array
+         * @param  string $method    this object method name to call
+         * @param  array  $resources the resource to load
+         * @return void            
+         */
+        private function loadAutoloadResourcesArray($method, array $resources) {
+            foreach ($resources as $name) {
+                $this->{$method}($name);
+            }
+        }
+    }

core/classes/model/DBSessionHandlerModel.php

Indentation +32 added lines, -32 removed lines

@@ -42,41 +42,41 @@
 				'sbrowser' => '', //VARCHAR(255) 
 				'skey' => '' //VARCHAR(255) 
 			);
-		 */
-		protected $sessionTableColumns = array();
+         */
+        protected $sessionTableColumns = array();
 
-		public function __construct(Database $db = null) {
-			parent::__construct($db);
-		}
+        public function __construct(Database $db = null) {
+            parent::__construct($db);
+        }
 
-		/**
-		 * Return the session database table columns
-		 * @return array 
-		 */
-		public function getSessionTableColumns() {
-			return $this->sessionTableColumns;
-		}
+        /**
+         * Return the session database table columns
+         * @return array 
+         */
+        public function getSessionTableColumns() {
+            return $this->sessionTableColumns;
+        }
 
-		/**
-		 * Set the session database table columns
-		 * @param array $columns the columns definition
-		 */
-		public function setSessionTableColumns(array $columns) {
-			$this->sessionTableColumns = $columns;
-			return $this;
-		}
+        /**
+         * Set the session database table columns
+         * @param array $columns the columns definition
+         */
+        public function setSessionTableColumns(array $columns) {
+            $this->sessionTableColumns = $columns;
+            return $this;
+        }
 
-		/**
-		 * Delete the expire session
-		 * @param  int $time the unix timestamp
-		 * @return int       affected rows
-		 */
-		abstract public function deleteByTime($time);
+        /**
+         * Delete the expire session
+         * @param  int $time the unix timestamp
+         * @return int       affected rows
+         */
+        abstract public function deleteByTime($time);
 
 		
-		/**
-		 * How to get the value of the table column key. Generally is the session key
-		 * @return mixed the key value like used to identify the data
-		 */
-		abstract public function getKeyValue();
-	}
+        /**
+         * How to get the value of the table column key. Generally is the session key
+         * @return mixed the key value like used to identify the data
+         */
+        abstract public function getKeyValue();
+    }

core/classes/Lang.php

Indentation +196 added lines, -196 removed lines

@@ -1,199 +1,199 @@
 <?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 extends BaseClass {
+    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 extends BaseClass {
 		
-		/**
-		 * 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;
-
-		/**
-		 * Construct new Lang instance
-		 */
-		public function __construct() {
-			parent::__construct();
-
-			$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;
+
+        /**
+         * Construct new Lang instance
+         */
+        public function __construct() {
+            parent::__construct();
+
+            $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/classes/Config.php

Indentation +146 added lines, -146 removed lines

@@ -1,158 +1,158 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+     */
 
-	class Config extends BaseStaticClass {
+    class Config extends BaseStaticClass {
 		
-		/**
-		 * The list of loaded configuration
-		 * @var array
-		 */
-		private static $config = array();
+        /**
+         * The list of loaded configuration
+         * @var array
+         */
+        private static $config = array();
 
-		/**
-		 * Initialize the configuration by loading all the configuration from config file
-		 */
-		public static function init() {
-			$logger = self::getLogger();
-			$logger->debug('Initialization of the configuration');
-			self::$config = & load_configurations();
-			self::setBaseUrlUsingServerVar();
-			if (ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info', 'all'))) {
-				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
-			}
-			$logger->info('Configuration initialized successfully');
-			$logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
-		}
+        /**
+         * Initialize the configuration by loading all the configuration from config file
+         */
+        public static function init() {
+            $logger = self::getLogger();
+            $logger->debug('Initialization of the configuration');
+            self::$config = & load_configurations();
+            self::setBaseUrlUsingServerVar();
+            if (ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info', 'all'))) {
+                $logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
+            }
+            $logger->info('Configuration initialized successfully');
+            $logger->info('The application configuration are listed below: ' . stringfy_vars(self::$config));
+        }
 
-		/**
-		 * Get the configuration item value
-		 * @param  string $item    the configuration item name to get
-		 * @param  mixed $default the default value to use if can not find the config item in the list
-		 * @return mixed          the config value if exist or the default value
-		 */
-		public static function get($item, $default = null) {
-			$logger = self::getLogger();
-			if (array_key_exists($item, self::$config)) {
-				return self::$config[$item];
-			}
-			$logger->warning('Cannot find config item [' . $item . '] using the default value [' . $default . ']');
-			return $default;
-		}
+        /**
+         * Get the configuration item value
+         * @param  string $item    the configuration item name to get
+         * @param  mixed $default the default value to use if can not find the config item in the list
+         * @return mixed          the config value if exist or the default value
+         */
+        public static function get($item, $default = null) {
+            $logger = self::getLogger();
+            if (array_key_exists($item, self::$config)) {
+                return self::$config[$item];
+            }
+            $logger->warning('Cannot find config item [' . $item . '] using the default value [' . $default . ']');
+            return $default;
+        }
 
-		/**
-		 * Set the configuration item value
-		 * @param string $item  the config item name to set
-		 * @param mixed $value the config item value
-		 */
-		public static function set($item, $value) {
-			self::$config[$item] = $value;
-		}
+        /**
+         * Set the configuration item value
+         * @param string $item  the config item name to set
+         * @param mixed $value the config item value
+         */
+        public static function set($item, $value) {
+            self::$config[$item] = $value;
+        }
 
-		/**
-		 * Get all the configuration values
-		 * @return array the config values
-		 */
-		public static function getAll() {
-			return self::$config;
-		}
+        /**
+         * Get all the configuration values
+         * @return array the config values
+         */
+        public static function getAll() {
+            return self::$config;
+        }
 
-		/**
-		 * Set the configuration values bu merged with the existing configuration
-		 * @param array $config the config values to add in the configuration list
-		 */
-		public static function setAll(array $config = array()) {
-			self::$config = array_merge(self::$config, $config);
-		}
+        /**
+         * Set the configuration values bu merged with the existing configuration
+         * @param array $config the config values to add in the configuration list
+         */
+        public static function setAll(array $config = array()) {
+            self::$config = array_merge(self::$config, $config);
+        }
 
-		/**
-		 * Delete the configuration item in the list
-		 * @param  string $item the config item name to be deleted
-		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
-		 */
-		public static function delete($item){
-			$logger = self::getLogger();
-			if(array_key_exists($item, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
-				unset(self::$config[$item]);
-				return true;
-			} else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
-				return false;
-			}
-		}
+        /**
+         * Delete the configuration item in the list
+         * @param  string $item the config item name to be deleted
+         * @return boolean true if the item exists and is deleted successfully otherwise will return false.
+         */
+        public static function delete($item){
+            $logger = self::getLogger();
+            if(array_key_exists($item, self::$config)){
+                $logger->info('Delete config item ['.$item.']');
+                unset(self::$config[$item]);
+                return true;
+            } else{
+                $logger->warning('Config item ['.$item.'] to be deleted does not exists');
+                return false;
+            }
+        }
 
-		/**
-		 * Load the configuration file. This an alias to Loader::config()
-		 * @param  string $config the config name to be loaded
-		 */
-		public static function load($config) {
-			Loader::config($config);
-		}
+        /**
+         * Load the configuration file. This an alias to Loader::config()
+         * @param  string $config the config name to be loaded
+         */
+        public static function load($config) {
+            Loader::config($config);
+        }
 
-		/**
-		 * Set the configuration for "base_url" if is not set in the configuration
-		 */
-		private static function setBaseUrlUsingServerVar() {
-			$logger = self::getLogger();
-			if (!isset(self::$config['base_url']) || !is_url(self::$config['base_url'])) {
-				if (ENVIRONMENT == 'production') {
-					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
-				}
-				$baseUrl = null;
-				$protocol = 'http';
-				if (is_https()) {
-					$protocol = 'https';
-				}
-				$protocol .= '://';
+        /**
+         * Set the configuration for "base_url" if is not set in the configuration
+         */
+        private static function setBaseUrlUsingServerVar() {
+            $logger = self::getLogger();
+            if (!isset(self::$config['base_url']) || !is_url(self::$config['base_url'])) {
+                if (ENVIRONMENT == 'production') {
+                    $logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
+                }
+                $baseUrl = null;
+                $protocol = 'http';
+                if (is_https()) {
+                    $protocol = 'https';
+                }
+                $protocol .= '://';
 
-				if (isset($_SERVER['SERVER_ADDR'])) {
-					$baseUrl = $_SERVER['SERVER_ADDR'];
-					//check if the server is running under IPv6
-					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
-						$baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
-					}
-					$serverPort = 80;
-					if (isset($_SERVER['SERVER_PORT'])) {
-						$serverPort = $_SERVER['SERVER_PORT'];
-					}
-					$port = '';
-					if ($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))) {
-						$port = ':' . $serverPort;
-					}
-					$baseUrl = $protocol . $baseUrl . $port . substr(
-																		$_SERVER['SCRIPT_NAME'], 
-																		0, 
-																		strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
-																	);
-				} else{
-					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
-					$baseUrl = 'http://localhost/';
-				}
-				self::set('base_url', $baseUrl);
-			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
-		}
-	}
+                if (isset($_SERVER['SERVER_ADDR'])) {
+                    $baseUrl = $_SERVER['SERVER_ADDR'];
+                    //check if the server is running under IPv6
+                    if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE) {
+                        $baseUrl = '[' . $_SERVER['SERVER_ADDR'] . ']';
+                    }
+                    $serverPort = 80;
+                    if (isset($_SERVER['SERVER_PORT'])) {
+                        $serverPort = $_SERVER['SERVER_PORT'];
+                    }
+                    $port = '';
+                    if ($serverPort && ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80))) {
+                        $port = ':' . $serverPort;
+                    }
+                    $baseUrl = $protocol . $baseUrl . $port . substr(
+                                                                        $_SERVER['SCRIPT_NAME'], 
+                                                                        0, 
+                                                                        strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))
+                                                                    );
+                } else{
+                    $logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
+                    $baseUrl = 'http://localhost/';
+                }
+                self::set('base_url', $baseUrl);
+            }
+            self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
+        }
+    }

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 +727 added lines, -727 removed lines

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