tnhfw / tnh-fw

core/classes/cache/CacheInterface.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	interface CacheInterface{
 

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * 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

core/classes/cache/ApcCache.php

Indentation +14 added lines, -14 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	class ApcCache implements CacheInterface{
 
@@ -90,13 +90,13 @@ 
 			$logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
 			if($result === false){
-		    	$logger->error('Can not write cache data for the key ['. $key .'], return false');
-		    	return false;
-		    }
-		    else{
-		    	$logger->info('Cache data saved for the key ['. $key .']');
-		    	return true;
-		    }
+				$logger->error('Can not write cache data for the key ['. $key .'], return false');
+				return false;
+			}
+			else{
+				$logger->info('Cache data saved for the key ['. $key .']');
+				return true;
+			}
 		}
 
 
@@ -116,7 +116,7 @@ 
 			}
 			else{
 				$logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key);
+		  		return apc_delete($key);
 			}
 			return false;
 		}
@@ -184,11 +184,11 @@ 
 		}
 		
 		/**
-		* Return the array of cache information
-		*
-		* @param string $key the cache key to get the cache information 
-		* @return array
-		*/
+		 * Return the array of cache information
+		 *
+		 * @param string $key the cache key to get the cache information 
+		 * @return array
+		 */
 		private function _getCacheInfo($key){
 			$caches = apc_cache_info('user');
 			if(! empty($caches['cache_list'])){

Spacing +37 added lines, -37 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,8 +33,8 @@ 
 		private static $logger;
 		
 		
-		public function __construct(){
-			if(! $this->isSupported()){
+		public function __construct() {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 		}
@@ -43,9 +43,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(static::$logger == null){
-				static::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (static::$logger == null) {
+				static::$logger[0] = & class_loader('Log', 'classes');
 				static::$logger[0]->setLogger('Library::ApcCache');
 			}
 			return static::$logger[0];
@@ -56,22 +56,22 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
+		public function get($key) {
 			$logger = static::getLogger();
-			$logger->debug('Getting cache data for key ['. $key .']');
+			$logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -84,17 +84,17 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$logger = static::getLogger();
 			$expire = time() + $ttl;
-			$logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -106,16 +106,16 @@ 
 		 * @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){
+		public function delete($key) {
 			$logger = static::getLogger();
-			$logger->debug('Deleting of cache data for key [' .$key. ']');
+			$logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key);
 			}
 			return false;
@@ -129,11 +129,11 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
+		public function getInfo($key) {
 			$logger = static::getLogger();
-			$logger->debug('Getting of cache info for key [' .$key. ']');
+			$logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -141,7 +141,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -151,7 +151,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -159,15 +159,15 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$logger = static::getLogger();
 			$logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -179,7 +179,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 		
@@ -189,12 +189,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
 			if($success === false){
 				$logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -92,8 +91,7 @@ 
 			if($result === false){
 		    	$logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -113,8 +111,7 @@ 
 			if($cacheInfo === false){
 				$logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key);
 			}
@@ -140,8 +137,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -166,8 +162,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

core/classes/model/Model.php

Indentation +858 added lines, -858 removed lines

@@ -1,572 +1,572 @@ 
 <?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.
-    */
-
-
-    /**
-     * A base model with a series of CRUD functions (powered by CI's query builder),
-     * validation-in-model support, event callbacks and more.
-     *
-     * @link http://github.com/jamierumbelow/codeigniter-base-model
-     * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
-     */
-
-    abstract class Model{
-
-        /* --------------------------------------------------------------
+	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.
+	 */
+
+
+	/**
+	 * A base model with a series of CRUD functions (powered by CI's query builder),
+	 * validation-in-model support, event callbacks and more.
+	 *
+	 * @link http://github.com/jamierumbelow/codeigniter-base-model
+	 * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
+	 */
+
+	abstract class Model{
+
+		/* --------------------------------------------------------------
          * VARIABLES
          * ------------------------------------------------------------ */
 
-        /**
-         * This model's default database table. Automatically
-         * guessed by pluralising the model name.
-         */
-        protected $_table;
-
-        /**
-         * The database connection object. Will be set to the default
-         * connection. This allows individual models to use different DBs
-         * without overwriting CI's global $this->db connection.
-         */
-        protected $_database;
-
-        /**
-         * This model's default primary key or unique identifier.
-         * Used by the get(), update() and delete() functions.
-         */
-        protected $primary_key = 'id';
-
-        /**
-         * Support for soft deletes and this model's 'deleted' key
-         */
-        protected $soft_delete = false;
-        protected $soft_delete_key = 'is_deleted';
-        protected $_temporary_with_deleted = FALSE;
-        protected $_temporary_only_deleted = FALSE;
-
-        /**
-         * The various callbacks available to the model. Each are
-         * simple lists of method names (methods will be run on $this).
-         */
-        protected $before_create = array();
-        protected $after_create = array();
-        protected $before_update = array();
-        protected $after_update = array();
-        protected $before_get = array();
-        protected $after_get = array();
-        protected $before_delete = array();
-        protected $after_delete = array();
-
-        protected $callback_parameters = array();
-
-        /**
-         * Protected, non-modifiable attributes
-         */
-        protected $protected_attributes = array();
-
-        /**
-         * Relationship arrays. Use flat strings for defaults or string
-         * => array to customise the class name and primary key
-         */
-        protected $belongs_to = array();
-        protected $has_many = array();
-
-        protected $_with = array();
-
-        /**
-         * An array of validation rules. This needs to be the same format
-         * as validation rules passed to the Form_validation library.
-         */
-        protected $validate = array();
-
-        /**
-         * Optionally skip the validation. Used in conjunction with
-         * skip_validation() to skip data validation for any future calls.
-         */
-        protected $skip_validation = FALSE;
-
-        /**
-         * By default we return our results as objects. If we need to override
-         * this, we can, or, we could use the `as_array()` and `as_object()` scopes.
-         */
-        protected $return_type = 'object';
-        protected $_temporary_return_type = NULL;
+		/**
+		 * This model's default database table. Automatically
+		 * guessed by pluralising the model name.
+		 */
+		protected $_table;
+
+		/**
+		 * The database connection object. Will be set to the default
+		 * connection. This allows individual models to use different DBs
+		 * without overwriting CI's global $this->db connection.
+		 */
+		protected $_database;
+
+		/**
+		 * This model's default primary key or unique identifier.
+		 * Used by the get(), update() and delete() functions.
+		 */
+		protected $primary_key = 'id';
+
+		/**
+		 * Support for soft deletes and this model's 'deleted' key
+		 */
+		protected $soft_delete = false;
+		protected $soft_delete_key = 'is_deleted';
+		protected $_temporary_with_deleted = FALSE;
+		protected $_temporary_only_deleted = FALSE;
+
+		/**
+		 * The various callbacks available to the model. Each are
+		 * simple lists of method names (methods will be run on $this).
+		 */
+		protected $before_create = array();
+		protected $after_create = array();
+		protected $before_update = array();
+		protected $after_update = array();
+		protected $before_get = array();
+		protected $after_get = array();
+		protected $before_delete = array();
+		protected $after_delete = array();
+
+		protected $callback_parameters = array();
+
+		/**
+		 * Protected, non-modifiable attributes
+		 */
+		protected $protected_attributes = array();
+
+		/**
+		 * Relationship arrays. Use flat strings for defaults or string
+		 * => array to customise the class name and primary key
+		 */
+		protected $belongs_to = array();
+		protected $has_many = array();
+
+		protected $_with = array();
+
+		/**
+		 * An array of validation rules. This needs to be the same format
+		 * as validation rules passed to the Form_validation library.
+		 */
+		protected $validate = array();
+
+		/**
+		 * Optionally skip the validation. Used in conjunction with
+		 * skip_validation() to skip data validation for any future calls.
+		 */
+		protected $skip_validation = FALSE;
+
+		/**
+		 * By default we return our results as objects. If we need to override
+		 * this, we can, or, we could use the `as_array()` and `as_object()` scopes.
+		 */
+		protected $return_type = 'object';
+		protected $_temporary_return_type = NULL;
     	
     	
-    	/**
+		/**
     		The database cache time 
-    	*/
-    	protected $dbCacheTime = 0;
+		 */
+		protected $dbCacheTime = 0;
 
-        /* --------------------------------------------------------------
+		/* --------------------------------------------------------------
          * GENERIC METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Initialise the model, tie into the CodeIgniter superobject and
-         * try our best to guess the table name.
-         */
-        public function __construct(){
-            $obj = & get_instance();
-    		if(!isset($obj->database)){
-    			show_error('You must load the database library before to use the model class');
-            }
-            /**
-             * NOTE: Need use "clone" because some Model need have the personal instance of the database library
-             * to prevent duplication
-             */
-    		$this->_database = clone $obj->database;
+		/**
+		 * Initialise the model, tie into the CodeIgniter superobject and
+		 * try our best to guess the table name.
+		 */
+		public function __construct(){
+			$obj = & get_instance();
+			if(!isset($obj->database)){
+				show_error('You must load the database library before to use the model class');
+			}
+			/**
+			 * NOTE: Need use "clone" because some Model need have the personal instance of the database library
+			 * to prevent duplication
+			 */
+			$this->_database = clone $obj->database;
     				
-            array_unshift($this->before_create, 'protect_attributes');
-            array_unshift($this->before_update, 'protect_attributes');
-            $this->_temporary_return_type = $this->return_type;
-            if($this->dbCacheTime > 0){
-                $this->_database->setCache($this->dbCacheTime);
-            }
-        }
-
-        /* --------------------------------------------------------------
+			array_unshift($this->before_create, 'protect_attributes');
+			array_unshift($this->before_update, 'protect_attributes');
+			$this->_temporary_return_type = $this->return_type;
+			if($this->dbCacheTime > 0){
+				$this->_database->setCache($this->dbCacheTime);
+			}
+		}
+
+		/* --------------------------------------------------------------
          * CRUD INTERFACE
          * ------------------------------------------------------------ */
 
-        /**
-         * Fetch a single record based on the primary key. Returns an object.
-         */
-        public function get($primary_value)
-        {
-    		return $this->get_by($this->primary_key, $primary_value);
-        }
-
-        /**
-         * Fetch a single record based on an arbitrary WHERE call. Can be
-         * any valid value to $this->_database->where().
-         */
-        public function get_by()
-        {
-            $where = func_get_args();
-
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-
-    		$this->_set_where($where);
-
-            $this->trigger('before_get');
+		/**
+		 * Fetch a single record based on the primary key. Returns an object.
+		 */
+		public function get($primary_value)
+		{
+			return $this->get_by($this->primary_key, $primary_value);
+		}
+
+		/**
+		 * Fetch a single record based on an arbitrary WHERE call. Can be
+		 * any valid value to $this->_database->where().
+		 */
+		public function get_by()
+		{
+			$where = func_get_args();
+
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+
+			$this->_set_where($where);
+
+			$this->trigger('before_get');
 			$type = $this->_temporary_return_type == 'array' ? 'array':false;
-            $row = $this->_database->from($this->_table)->get($type);
-            $this->_temporary_return_type = $this->return_type;
-            $row = $this->trigger('after_get', $row);
-            $this->_with = array();
-            return $row;
-        }
-
-        /**
-         * Fetch an array of records based on an array of primary values.
-         */
-        public function get_many($values)
-        {
-            $this->_database->in($this->primary_key, $values);
-            return $this->get_all();
-        }
-
-        /**
-         * Fetch an array of records based on an arbitrary WHERE call.
-         */
-        public function get_many_by()
-        {
-            $where = func_get_args();
-            $this->_set_where($where);
-            return $this->get_all();
-        }
-
-        /**
-         * Fetch all the records in the table. Can be used as a generic call
-         * to $this->_database->get() with scoped methods.
-         */
-        public function get_all()
-        {
-            $this->trigger('before_get');
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
+			$row = $this->_database->from($this->_table)->get($type);
+			$this->_temporary_return_type = $this->return_type;
+			$row = $this->trigger('after_get', $row);
+			$this->_with = array();
+			return $row;
+		}
+
+		/**
+		 * Fetch an array of records based on an array of primary values.
+		 */
+		public function get_many($values)
+		{
+			$this->_database->in($this->primary_key, $values);
+			return $this->get_all();
+		}
+
+		/**
+		 * Fetch an array of records based on an arbitrary WHERE call.
+		 */
+		public function get_many_by()
+		{
+			$where = func_get_args();
+			$this->_set_where($where);
+			return $this->get_all();
+		}
+
+		/**
+		 * Fetch all the records in the table. Can be used as a generic call
+		 * to $this->_database->get() with scoped methods.
+		 */
+		public function get_all()
+		{
+			$this->trigger('before_get');
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
 			$type = $this->_temporary_return_type == 'array' ? 'array':false;
-            $result = $this->_database->from($this->_table)->getAll($type);
-            $this->_temporary_return_type = $this->return_type;
-
-            foreach ($result as $key => &$row)
-            {
-                $row = $this->trigger('after_get', $row, ($key == count($result) - 1));
-            }
-            $this->_with = array();
-            return $result;
-        }
-
-        /**
-         * Insert a new row into the table. $data should be an associative array
-         * of data to be inserted. Returns newly created ID.
-         */
-        public function insert($data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-
-            if ($data !== FALSE)
-            {
-                $data = $this->trigger('before_create', $data);
-                $this->_database->from($this->_table)->insert($data, $escape);
-                $insert_id = $this->_database->insertId();
-                $this->trigger('after_create', $insert_id);
-                return $insert_id;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Insert multiple rows into the table. Returns an array of multiple IDs.
-         */
-        public function insert_many($data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $ids = array();
-            foreach ($data as $key => $row)
-            {
-                $ids[] = $this->insert($row, $skip_validation, $escape);
-            }
-            return $ids;
-        }
-
-        /**
-         * Updated a record based on the primary value.
-         */
-        public function update($primary_value, $data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-
-            if ($data !== FALSE)
-            {
-                $result = $this->_database->where($this->primary_key, $primary_value)
-                                   ->from($this->_table)
-                                   ->update($data, $escape);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Update many records, based on an array of primary values.
-         */
-        public function update_many($primary_values, $data = array(), $skip_validation = FALSE, $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            if ($skip_validation === FALSE)
-            {
-                $data = $this->validate($data);
-            }
-            if ($data !== FALSE)
-            {
-                $result = $this->_database->in($this->primary_key, $primary_values)
-                                   ->from($this->_table)
-                                   ->update($data, $escape);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Updated a record based on an arbitrary WHERE clause.
-         */
-        public function update_by()
-        {
-            $args = func_get_args();
-            $data = array();
-            if(count($args) == 2){
-                if(is_array($args[1])){
-                    $data = array_pop($args);
-                }
-            }
-            else if(count($args) == 3){
-                if(is_array($args[2])){
-                    $data = array_pop($args);
-                }
-            }
-            $data = $this->trigger('before_update', $data);
-            if ($this->validate($data) !== FALSE)
-            {
-                $this->_set_where($args);
-                $result = $this->_database->from($this->_table)->update($data);
-                $this->trigger('after_update', array($data, $result));
-                return $result;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        /**
-         * Update all records
-         */
-        public function update_all($data = array(), $escape = true)
-        {
-            $data = $this->trigger('before_update', $data);
-            $result = $this->_database->from($this->_table)->update($data, $escape);
-            $this->trigger('after_update', array($data, $result));
-            return $result;
-        }
-
-        /**
-         * Delete a row from the table by the primary value
-         */
-        public function delete($id)
-        {
-            $this->trigger('before_delete', $id);
-            $this->_database->where($this->primary_key, $id);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-        /**
-         * Delete a row from the database table by an arbitrary WHERE clause
-         */
-        public function delete_by()
-        {
-            $where = func_get_args();
-    	    $where = $this->trigger('before_delete', $where);
-            $this->_set_where($where);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-        /**
-         * Delete many rows from the database table by multiple primary values
-         */
-        public function delete_many($primary_values)
-        {
-            $primary_values = $this->trigger('before_delete', $primary_values);
-            $this->_database->in($this->primary_key, $primary_values);
-            if ($this->soft_delete)
-            {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
-            {
-                $result = $this->_database->from($this->_table)->delete();
-            }
-            $this->trigger('after_delete', $result);
-            return $result;
-        }
-
-
-        /**
-         * Truncates the table
-         */
-        public function truncate()
-        {
-            $result = $this->_database->from($this->_table)->delete();
-            return $result;
-        }
-
-        /* --------------------------------------------------------------
+			$result = $this->_database->from($this->_table)->getAll($type);
+			$this->_temporary_return_type = $this->return_type;
+
+			foreach ($result as $key => &$row)
+			{
+				$row = $this->trigger('after_get', $row, ($key == count($result) - 1));
+			}
+			$this->_with = array();
+			return $result;
+		}
+
+		/**
+		 * Insert a new row into the table. $data should be an associative array
+		 * of data to be inserted. Returns newly created ID.
+		 */
+		public function insert($data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+
+			if ($data !== FALSE)
+			{
+				$data = $this->trigger('before_create', $data);
+				$this->_database->from($this->_table)->insert($data, $escape);
+				$insert_id = $this->_database->insertId();
+				$this->trigger('after_create', $insert_id);
+				return $insert_id;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Insert multiple rows into the table. Returns an array of multiple IDs.
+		 */
+		public function insert_many($data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$ids = array();
+			foreach ($data as $key => $row)
+			{
+				$ids[] = $this->insert($row, $skip_validation, $escape);
+			}
+			return $ids;
+		}
+
+		/**
+		 * Updated a record based on the primary value.
+		 */
+		public function update($primary_value, $data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+
+			if ($data !== FALSE)
+			{
+				$result = $this->_database->where($this->primary_key, $primary_value)
+								   ->from($this->_table)
+								   ->update($data, $escape);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Update many records, based on an array of primary values.
+		 */
+		public function update_many($primary_values, $data = array(), $skip_validation = FALSE, $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			if ($skip_validation === FALSE)
+			{
+				$data = $this->validate($data);
+			}
+			if ($data !== FALSE)
+			{
+				$result = $this->_database->in($this->primary_key, $primary_values)
+								   ->from($this->_table)
+								   ->update($data, $escape);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Updated a record based on an arbitrary WHERE clause.
+		 */
+		public function update_by()
+		{
+			$args = func_get_args();
+			$data = array();
+			if(count($args) == 2){
+				if(is_array($args[1])){
+					$data = array_pop($args);
+				}
+			}
+			else if(count($args) == 3){
+				if(is_array($args[2])){
+					$data = array_pop($args);
+				}
+			}
+			$data = $this->trigger('before_update', $data);
+			if ($this->validate($data) !== FALSE)
+			{
+				$this->_set_where($args);
+				$result = $this->_database->from($this->_table)->update($data);
+				$this->trigger('after_update', array($data, $result));
+				return $result;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+
+		/**
+		 * Update all records
+		 */
+		public function update_all($data = array(), $escape = true)
+		{
+			$data = $this->trigger('before_update', $data);
+			$result = $this->_database->from($this->_table)->update($data, $escape);
+			$this->trigger('after_update', array($data, $result));
+			return $result;
+		}
+
+		/**
+		 * Delete a row from the table by the primary value
+		 */
+		public function delete($id)
+		{
+			$this->trigger('before_delete', $id);
+			$this->_database->where($this->primary_key, $id);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+		/**
+		 * Delete a row from the database table by an arbitrary WHERE clause
+		 */
+		public function delete_by()
+		{
+			$where = func_get_args();
+			$where = $this->trigger('before_delete', $where);
+			$this->_set_where($where);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+		/**
+		 * Delete many rows from the database table by multiple primary values
+		 */
+		public function delete_many($primary_values)
+		{
+			$primary_values = $this->trigger('before_delete', $primary_values);
+			$this->_database->in($this->primary_key, $primary_values);
+			if ($this->soft_delete)
+			{
+				$result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+			}
+			else
+			{
+				$result = $this->_database->from($this->_table)->delete();
+			}
+			$this->trigger('after_delete', $result);
+			return $result;
+		}
+
+
+		/**
+		 * Truncates the table
+		 */
+		public function truncate()
+		{
+			$result = $this->_database->from($this->_table)->delete();
+			return $result;
+		}
+
+		/* --------------------------------------------------------------
          * RELATIONSHIPS
          * ------------------------------------------------------------ */
 
-        public function with($relationship)
-        {
-            $this->_with[] = $relationship;
-            if (!in_array('relate', $this->after_get))
-            {
-                $this->after_get[] = 'relate';
-            }
-            return $this;
-        }
-
-        public function relate($row)
-        {
-    		if (empty($row))
-            {
-    		    return $row;
-            }
-
-            foreach ($this->belongs_to as $key => $value)
-            {
-                if (is_string($value))
-                {
-                    $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
-                {
-                    $relationship = $key;
-                    $options = $value;
-                }
-
-                if (in_array($relationship, $this->_with))
-                {
-                    Loader::model($options['model'], $relationship . '_model');
-                    if (is_object($row))
-                    {
-                        $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
-                    {
-                        $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
-                    }
-                }
-            }
-
-            foreach ($this->has_many as $key => $value)
-            {
-                if (is_string($value))
-                {
-                    $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
-                {
-                    $relationship = $key;
-                    $options = $value;
-                }
-
-                if (in_array($relationship, $this->_with))
-                {
-                    Loader::model($options['model'], $relationship . '_model');
-                    if (is_object($row))
-                    {
-                        $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
-                    {
-                        $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
-                    }
-                }
-            }
-            return $row;
-        }
-
-        /* --------------------------------------------------------------
+		public function with($relationship)
+		{
+			$this->_with[] = $relationship;
+			if (!in_array('relate', $this->after_get))
+			{
+				$this->after_get[] = 'relate';
+			}
+			return $this;
+		}
+
+		public function relate($row)
+		{
+			if (empty($row))
+			{
+				return $row;
+			}
+
+			foreach ($this->belongs_to as $key => $value)
+			{
+				if (is_string($value))
+				{
+					$relationship = $value;
+					$options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+				}
+				else
+				{
+					$relationship = $key;
+					$options = $value;
+				}
+
+				if (in_array($relationship, $this->_with))
+				{
+					Loader::model($options['model'], $relationship . '_model');
+					if (is_object($row))
+					{
+						$row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
+					}
+					else
+					{
+						$row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
+					}
+				}
+			}
+
+			foreach ($this->has_many as $key => $value)
+			{
+				if (is_string($value))
+				{
+					$relationship = $value;
+					$options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+				}
+				else
+				{
+					$relationship = $key;
+					$options = $value;
+				}
+
+				if (in_array($relationship, $this->_with))
+				{
+					Loader::model($options['model'], $relationship . '_model');
+					if (is_object($row))
+					{
+						$row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
+					}
+					else
+					{
+						$row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
+					}
+				}
+			}
+			return $row;
+		}
+
+		/* --------------------------------------------------------------
          * UTILITY METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Retrieve and generate a form_dropdown friendly array
-         */
-        public function dropdown()
-        {
-            $args = func_get_args();
-            if(count($args) == 2)
-            {
-                list($key, $value) = $args;
-            }
-            else
-            {
-                $key = $this->primary_key;
-                $value = $args[0];
-            }
-            $this->trigger('before_dropdown', array( $key, $value ));
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, FALSE);
-            }
-            $result = $this->_database->select(array($key, $value))
-                               ->from($this->_table)
-                               ->getAll();
-            $options = array();
-            foreach ($result as $row)
-            {
-                $options[$row->{$key}] = $row->{$value};
-            }
-            $options = $this->trigger('after_dropdown', $options);
-            return $options;
-        }
-
-        /**
-         * Fetch a count of rows based on an arbitrary WHERE call.
-         */
-        public function count_by()
-        {
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-            $where = func_get_args();
-            $this->_set_where($where);
-            $this->_database->from($this->_table)->getAll();
-            return $this->_database->numRows();
-        }
-
-        /**
-         * Fetch a total count of rows, disregarding any previous conditions
-         */
-        public function count_all()
-        {
-            if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
-            {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
-            }
-            $this->_database->from($this->_table)->getAll();
-            return $this->_database->numRows();
-        }
+		/**
+		 * Retrieve and generate a form_dropdown friendly array
+		 */
+		public function dropdown()
+		{
+			$args = func_get_args();
+			if(count($args) == 2)
+			{
+				list($key, $value) = $args;
+			}
+			else
+			{
+				$key = $this->primary_key;
+				$value = $args[0];
+			}
+			$this->trigger('before_dropdown', array( $key, $value ));
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, FALSE);
+			}
+			$result = $this->_database->select(array($key, $value))
+							   ->from($this->_table)
+							   ->getAll();
+			$options = array();
+			foreach ($result as $row)
+			{
+				$options[$row->{$key}] = $row->{$value};
+			}
+			$options = $this->trigger('after_dropdown', $options);
+			return $options;
+		}
+
+		/**
+		 * Fetch a count of rows based on an arbitrary WHERE call.
+		 */
+		public function count_by()
+		{
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+			$where = func_get_args();
+			$this->_set_where($where);
+			$this->_database->from($this->_table)->getAll();
+			return $this->_database->numRows();
+		}
+
+		/**
+		 * Fetch a total count of rows, disregarding any previous conditions
+		 */
+		public function count_all()
+		{
+			if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
+			{
+				$this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+			}
+			$this->_database->from($this->_table)->getAll();
+			return $this->_database->numRows();
+		}
 		
 		/**
-		* Enabled cache temporary
-		*/
+		 * Enabled cache temporary
+		 */
 		public function cached($ttl = 0){
 		  if($ttl > 0){
 			$this->_database = $this->_database->cached($ttl);
@@ -574,339 +574,339 @@ 
 		  return $this;
 		}
 
-        /**
-         * Tell the class to skip the insert validation
-         */
-        public function skip_validation()
-        {
-            $this->skip_validation = TRUE;
-            return $this;
-        }
-
-        /**
-         * Get the skip validation status
-         */
-        public function get_skip_validation()
-        {
-            return $this->skip_validation;
-        }
-
-        /**
-         * Return the next auto increment of the table. Only tested on MySQL.
-         */
-        public function get_next_id()
-        {
-            return (int) $this->_database->select('AUTO_INCREMENT')
-                ->from('information_schema.TABLES')
-                ->where('TABLE_NAME', $this->_table)
-                ->where('TABLE_SCHEMA', $this->_database->getDatabaseName())->get()->AUTO_INCREMENT;
-        }
-
-        /**
-         * Getter for the table name
-         */
-        public function table()
-        {
-            return $this->_table;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * Tell the class to skip the insert validation
+		 */
+		public function skip_validation()
+		{
+			$this->skip_validation = TRUE;
+			return $this;
+		}
+
+		/**
+		 * Get the skip validation status
+		 */
+		public function get_skip_validation()
+		{
+			return $this->skip_validation;
+		}
+
+		/**
+		 * Return the next auto increment of the table. Only tested on MySQL.
+		 */
+		public function get_next_id()
+		{
+			return (int) $this->_database->select('AUTO_INCREMENT')
+				->from('information_schema.TABLES')
+				->where('TABLE_NAME', $this->_table)
+				->where('TABLE_SCHEMA', $this->_database->getDatabaseName())->get()->AUTO_INCREMENT;
+		}
+
+		/**
+		 * Getter for the table name
+		 */
+		public function table()
+		{
+			return $this->_table;
+		}
+
+		/* --------------------------------------------------------------
          * GLOBAL SCOPES
          * ------------------------------------------------------------ */
 
-        /**
-         * Return the next call as an array rather than an object
-         */
-        public function as_array()
-        {
-            $this->_temporary_return_type = 'array';
-            return $this;
-        }
-
-        /**
-         * Return the next call as an object rather than an array
-         */
-        public function as_object()
-        {
-            $this->_temporary_return_type = 'object';
-            return $this;
-        }
-
-        /**
-         * Don't care about soft deleted rows on the next call
-         */
-        public function with_deleted()
-        {
-            $this->_temporary_with_deleted = TRUE;
-            return $this;
-        }
-
-        /**
-         * Only get deleted rows on the next call
-         */
-        public function only_deleted()
-        {
-            $this->_temporary_only_deleted = TRUE;
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * Return the next call as an array rather than an object
+		 */
+		public function as_array()
+		{
+			$this->_temporary_return_type = 'array';
+			return $this;
+		}
+
+		/**
+		 * Return the next call as an object rather than an array
+		 */
+		public function as_object()
+		{
+			$this->_temporary_return_type = 'object';
+			return $this;
+		}
+
+		/**
+		 * Don't care about soft deleted rows on the next call
+		 */
+		public function with_deleted()
+		{
+			$this->_temporary_with_deleted = TRUE;
+			return $this;
+		}
+
+		/**
+		 * Only get deleted rows on the next call
+		 */
+		public function only_deleted()
+		{
+			$this->_temporary_only_deleted = TRUE;
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * OBSERVERS
          * ------------------------------------------------------------ */
 
-        /**
-         * MySQL DATETIME created_at and updated_at
-         */
-        public function created_at($row)
-        {
-            if (is_object($row))
-            {
-                $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
-            {
-                $row['created_at'] = date('Y-m-d H:i:s');
-            }
-
-            return $row;
-        }
-
-        public function updated_at($row)
-        {
-            if (is_object($row))
-            {
-                $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
-            {
-                $row['updated_at'] = date('Y-m-d H:i:s');
-            }
-            return $row;
-        }
-
-        /**
-         * Serialises data for you automatically, allowing you to pass
-         * through objects and let it handle the serialisation in the background
-         */
-        public function serialize($row)
-        {
-            foreach ($this->callback_parameters as $column)
-            {
-                $row[$column] = serialize($row[$column]);
-            }
-            return $row;
-        }
-
-        public function unserialize($row)
-        {
-            foreach ($this->callback_parameters as $column)
-            {
-                if (is_array($row))
-                {
-                    $row[$column] = unserialize($row[$column]);
-                }
-                else
-                {
-                    $row->$column = unserialize($row->$column);
-                }
-            }
-            return $row;
-        }
-
-        /**
-         * Protect attributes by removing them from $row array
-         */
-        public function protect_attributes($row)
-        {
-            foreach ($this->protected_attributes as $attr)
-            {
-                if (is_object($row))
-                {
+		/**
+		 * MySQL DATETIME created_at and updated_at
+		 */
+		public function created_at($row)
+		{
+			if (is_object($row))
+			{
+				$row->created_at = date('Y-m-d H:i:s');
+			}
+			else
+			{
+				$row['created_at'] = date('Y-m-d H:i:s');
+			}
+
+			return $row;
+		}
+
+		public function updated_at($row)
+		{
+			if (is_object($row))
+			{
+				$row->updated_at = date('Y-m-d H:i:s');
+			}
+			else
+			{
+				$row['updated_at'] = date('Y-m-d H:i:s');
+			}
+			return $row;
+		}
+
+		/**
+		 * Serialises data for you automatically, allowing you to pass
+		 * through objects and let it handle the serialisation in the background
+		 */
+		public function serialize($row)
+		{
+			foreach ($this->callback_parameters as $column)
+			{
+				$row[$column] = serialize($row[$column]);
+			}
+			return $row;
+		}
+
+		public function unserialize($row)
+		{
+			foreach ($this->callback_parameters as $column)
+			{
+				if (is_array($row))
+				{
+					$row[$column] = unserialize($row[$column]);
+				}
+				else
+				{
+					$row->$column = unserialize($row->$column);
+				}
+			}
+			return $row;
+		}
+
+		/**
+		 * Protect attributes by removing them from $row array
+		 */
+		public function protect_attributes($row)
+		{
+			foreach ($this->protected_attributes as $attr)
+			{
+				if (is_object($row))
+				{
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
-                {
+				}
+				else
+				{
 					if(isset($row[$attr])){
 						unset($row[$attr]);
 					}
-                }
-            }
-            return $row;
-        }
+				}
+			}
+			return $row;
+		}
 		
 		 /**
-         * Return the database instance
-         * @return Database the database instance
-         */
-        public function getDatabaseInstance(){
-            return $this->_database;
-        }
-
-        /* --------------------------------------------------------------
+		  * Return the database instance
+		  * @return Database the database instance
+		  */
+		public function getDatabaseInstance(){
+			return $this->_database;
+		}
+
+		/* --------------------------------------------------------------
          * QUERY BUILDER DIRECT ACCESS METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * A wrapper to $this->_database->orderBy()
-         */
-        public function order_by($criteria, $order = 'ASC')
-        {
-            if ( is_array($criteria) )
-            {
-                foreach ($criteria as $key => $value)
-                {
-                    $this->_database->orderBy($key, $value);
-                }
-            }
-            else
-            {
-                $this->_database->orderBy($criteria, $order);
-            }
-            return $this;
-        }
-
-        /**
-         * A wrapper to $this->_database->limit()
-         */
-        public function limit($offset = 0, $limit = 10)
-        {
-            $this->_database->limit($offset, $limit);
-            return $this;
-        }
-
-        /* --------------------------------------------------------------
+		/**
+		 * A wrapper to $this->_database->orderBy()
+		 */
+		public function order_by($criteria, $order = 'ASC')
+		{
+			if ( is_array($criteria) )
+			{
+				foreach ($criteria as $key => $value)
+				{
+					$this->_database->orderBy($key, $value);
+				}
+			}
+			else
+			{
+				$this->_database->orderBy($criteria, $order);
+			}
+			return $this;
+		}
+
+		/**
+		 * A wrapper to $this->_database->limit()
+		 */
+		public function limit($offset = 0, $limit = 10)
+		{
+			$this->_database->limit($offset, $limit);
+			return $this;
+		}
+
+		/* --------------------------------------------------------------
          * INTERNAL METHODS
          * ------------------------------------------------------------ */
 
-        /**
-         * Trigger an event and call its observers. Pass through the event name
-         * (which looks for an instance variable $this->event_name), an array of
-         * parameters to pass through and an optional 'last in interation' boolean
-         */
-        protected function trigger($event, $data = FALSE, $last = TRUE)
-        {
-            if (isset($this->$event) && is_array($this->$event))
-            {
-                foreach ($this->$event as $method)
-                {
-                    if (strpos($method, '('))
-                    {
-                        preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
-
-                        $method = $matches[1];
-                        $this->callback_parameters = explode(',', $matches[3]);
-                    }
-                    $data = call_user_func_array(array($this, $method), array($data, $last));
-                }
-            }
-            return $data;
-        }
-
-        /**
-         * Run validation on the passed data
-         */
-        protected function validate(array $data)
-        {
-            if($this->skip_validation)
-            {
-                return $data;
-            }
-            if(!empty($this->validate))
-            {
-                foreach($data as $key => $val)
-                {
-                    $_POST[$key] = $val;
-                }
-                Loader::library('FormValidation');
-                if(is_array($this->validate))
-                {
-                    $this->formvalidation->setRules($this->validate);
-
-                    if ($this->formvalidation->run())
-                    {
-                        return $data;
-                    }
-                    else
-                    {
-                        return FALSE;
-                    }
-                }
-                else {
-                    return $data;
-                }
-            }
-            else
-            {
-                return $data;
-            }
-        }
-
-
-        /**
-         * Set WHERE parameters, cleverly
-         */
-        protected function _set_where($params)
-        {
-            if (count($params) == 1 && is_array($params[0]))
-            {
-                foreach ($params[0] as $field => $filter)
-                {
-                    if (is_array($filter))
-                    {
-                        $this->_database->in($field, $filter);
-                    }
-                    else
-                    {
-                        if (is_int($field))
-                        {
-                            $this->_database->where($filter);
-                        }
-                        else
-                        {
-                            $this->_database->where($field, $filter);
-                        }
-                    }
-                }
-            }
-            else if (count($params) == 1)
-            {
-                $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
-    		{
-                if (is_array($params[1]))
-                {
-                    $this->_database->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->_database->where($params[0], $params[1]);
-                }
-    		}
-    		else if(count($params) == 3)
-    		{
-    			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
-            {
-                if (is_array($params[1]))
-                {
-                    $this->_database->in($params[0], $params[1]);
-                }
-                else
-                {
-                    $this->_database->where($params[0], $params[1]);
-                }
-            }
-        }
-
-        /**
+		/**
+		 * Trigger an event and call its observers. Pass through the event name
+		 * (which looks for an instance variable $this->event_name), an array of
+		 * parameters to pass through and an optional 'last in interation' boolean
+		 */
+		protected function trigger($event, $data = FALSE, $last = TRUE)
+		{
+			if (isset($this->$event) && is_array($this->$event))
+			{
+				foreach ($this->$event as $method)
+				{
+					if (strpos($method, '('))
+					{
+						preg_match('/([a-zA-Z0-9\_\-]+)(\(([a-zA-Z0-9\_\-\., ]+)\))?/', $method, $matches);
+
+						$method = $matches[1];
+						$this->callback_parameters = explode(',', $matches[3]);
+					}
+					$data = call_user_func_array(array($this, $method), array($data, $last));
+				}
+			}
+			return $data;
+		}
+
+		/**
+		 * Run validation on the passed data
+		 */
+		protected function validate(array $data)
+		{
+			if($this->skip_validation)
+			{
+				return $data;
+			}
+			if(!empty($this->validate))
+			{
+				foreach($data as $key => $val)
+				{
+					$_POST[$key] = $val;
+				}
+				Loader::library('FormValidation');
+				if(is_array($this->validate))
+				{
+					$this->formvalidation->setRules($this->validate);
+
+					if ($this->formvalidation->run())
+					{
+						return $data;
+					}
+					else
+					{
+						return FALSE;
+					}
+				}
+				else {
+					return $data;
+				}
+			}
+			else
+			{
+				return $data;
+			}
+		}
+
+
+		/**
+		 * Set WHERE parameters, cleverly
+		 */
+		protected function _set_where($params)
+		{
+			if (count($params) == 1 && is_array($params[0]))
+			{
+				foreach ($params[0] as $field => $filter)
+				{
+					if (is_array($filter))
+					{
+						$this->_database->in($field, $filter);
+					}
+					else
+					{
+						if (is_int($field))
+						{
+							$this->_database->where($filter);
+						}
+						else
+						{
+							$this->_database->where($field, $filter);
+						}
+					}
+				}
+			}
+			else if (count($params) == 1)
+			{
+				$this->_database->where($params[0]);
+			}
+			else if(count($params) == 2)
+			{
+				if (is_array($params[1]))
+				{
+					$this->_database->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->_database->where($params[0], $params[1]);
+				}
+			}
+			else if(count($params) == 3)
+			{
+				$this->_database->where($params[0], $params[1], $params[2]);
+			}
+			else
+			{
+				if (is_array($params[1]))
+				{
+					$this->_database->in($params[0], $params[1]);
+				}
+				else
+				{
+					$this->_database->where($params[0], $params[1]);
+				}
+			}
+		}
+
+		/**
             Shortcut to controller
-        */
-        public function __get($key){
-            return get_instance()->{$key};
-        }
+		 */
+		public function __get($key){
+			return get_instance()->{$key};
+		}
 
-    }
+	}

Spacing +34 added lines, -34 removed lines

@@ -33,7 +33,7 @@ 
      * @copyright Copyright (c) 2012, Jamie Rumbelow <http://jamierumbelow.net>
      */
 
-    abstract class Model{
+    abstract class Model {
 
         /* --------------------------------------------------------------
          * VARIABLES
@@ -128,9 +128,9 @@ 
          * Initialise the model, tie into the CodeIgniter superobject and
          * try our best to guess the table name.
          */
-        public function __construct(){
+        public function __construct() {
             $obj = & get_instance();
-    		if(!isset($obj->database)){
+    		if (!isset($obj->database)) {
     			show_error('You must load the database library before to use the model class');
             }
             /**
@@ -142,7 +142,7 @@ 
             array_unshift($this->before_create, 'protect_attributes');
             array_unshift($this->before_update, 'protect_attributes');
             $this->_temporary_return_type = $this->return_type;
-            if($this->dbCacheTime > 0){
+            if ($this->dbCacheTime > 0) {
                 $this->_database->setCache($this->dbCacheTime);
             }
         }
@@ -169,13 +169,13 @@ 
 
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
 
     		$this->_set_where($where);
 
             $this->trigger('before_get');
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $row = $this->_database->from($this->_table)->get($type);
             $this->_temporary_return_type = $this->return_type;
             $row = $this->trigger('after_get', $row);
@@ -211,9 +211,9 @@ 
             $this->trigger('before_get');
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
-			$type = $this->_temporary_return_type == 'array' ? 'array':false;
+			$type = $this->_temporary_return_type == 'array' ? 'array' : false;
             $result = $this->_database->from($this->_table)->getAll($type);
             $this->_temporary_return_type = $this->return_type;
 
@@ -319,13 +319,13 @@ 
         {
             $args = func_get_args();
             $data = array();
-            if(count($args) == 2){
-                if(is_array($args[1])){
+            if (count($args) == 2) {
+                if (is_array($args[1])) {
                     $data = array_pop($args);
                 }
             }
-            else if(count($args) == 3){
-                if(is_array($args[2])){
+            else if (count($args) == 3) {
+                if (is_array($args[2])) {
                     $data = array_pop($args);
                 }
             }
@@ -363,7 +363,7 @@ 
             $this->_database->where($this->primary_key, $id);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -384,7 +384,7 @@ 
             $this->_set_where($where);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -403,7 +403,7 @@ 
             $this->_database->in($this->primary_key, $primary_values);
             if ($this->soft_delete)
             {
-                $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
+                $result = $this->_database->from($this->_table)->update(array($this->soft_delete_key => TRUE));
             }
             else
             {
@@ -449,7 +449,7 @@ 
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $value . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -476,7 +476,7 @@ 
                 if (is_string($value))
                 {
                     $relationship = $value;
-                    $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
+                    $options = array('primary_key' => $this->_table . '_id', 'model' => $value . '_model');
                 }
                 else
                 {
@@ -510,7 +510,7 @@ 
         public function dropdown()
         {
             $args = func_get_args();
-            if(count($args) == 2)
+            if (count($args) == 2)
             {
                 list($key, $value) = $args;
             }
@@ -519,7 +519,7 @@ 
                 $key = $this->primary_key;
                 $value = $args[0];
             }
-            $this->trigger('before_dropdown', array( $key, $value ));
+            $this->trigger('before_dropdown', array($key, $value));
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
                 $this->_database->where($this->soft_delete_key, FALSE);
@@ -543,7 +543,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $where = func_get_args();
             $this->_set_where($where);
@@ -558,7 +558,7 @@ 
         {
             if ($this->soft_delete && $this->_temporary_with_deleted !== TRUE)
             {
-                $this->_database->where($this->soft_delete_key, (bool)$this->_temporary_only_deleted);
+                $this->_database->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted);
             }
             $this->_database->from($this->_table)->getAll();
             return $this->_database->numRows();
@@ -567,8 +567,8 @@ 
 		/**
 		* Enabled cache temporary
 		*/
-		public function cached($ttl = 0){
-		  if($ttl > 0){
+		public function cached($ttl = 0) {
+		  if ($ttl > 0) {
 			$this->_database = $this->_database->cached($ttl);
 		  }
 		  return $this;
@@ -722,13 +722,13 @@ 
             {
                 if (is_object($row))
                 {
-					if(isset($row->$attr)){
+					if (isset($row->$attr)) {
 						unset($row->$attr);
 					}
                 }
                 else
                 {
-					if(isset($row[$attr])){
+					if (isset($row[$attr])) {
 						unset($row[$attr]);
 					}
                 }
@@ -740,7 +740,7 @@ 
          * Return the database instance
          * @return Database the database instance
          */
-        public function getDatabaseInstance(){
+        public function getDatabaseInstance() {
             return $this->_database;
         }
 
@@ -753,7 +753,7 @@ 
          */
         public function order_by($criteria, $order = 'ASC')
         {
-            if ( is_array($criteria) )
+            if (is_array($criteria))
             {
                 foreach ($criteria as $key => $value)
                 {
@@ -809,18 +809,18 @@ 
          */
         protected function validate(array $data)
         {
-            if($this->skip_validation)
+            if ($this->skip_validation)
             {
                 return $data;
             }
-            if(!empty($this->validate))
+            if (!empty($this->validate))
             {
-                foreach($data as $key => $val)
+                foreach ($data as $key => $val)
                 {
                     $_POST[$key] = $val;
                 }
                 Loader::library('FormValidation');
-                if(is_array($this->validate))
+                if (is_array($this->validate))
                 {
                     $this->formvalidation->setRules($this->validate);
 
@@ -874,7 +874,7 @@ 
             {
                 $this->_database->where($params[0]);
             }
-        	else if(count($params) == 2)
+        	else if (count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
@@ -885,7 +885,7 @@ 
                     $this->_database->where($params[0], $params[1]);
                 }
     		}
-    		else if(count($params) == 3)
+    		else if (count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
     		}
@@ -905,7 +905,7 @@ 
         /**
             Shortcut to controller
         */
-        public function __get($key){
+        public function __get($key) {
             return get_instance()->{$key};
         }
 

Braces +29 added lines, -58 removed lines

@@ -243,8 +243,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
                 return $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -281,8 +280,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -305,8 +303,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -323,8 +320,7 @@ 
                 if(is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if(count($args) == 3){
+            } else if(count($args) == 3){
                 if(is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -336,8 +332,7 @@ 
                 $result = $this->_database->from($this->_table)->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -364,8 +359,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -385,8 +379,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -404,8 +397,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -450,8 +442,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -463,8 +454,7 @@ 
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -477,8 +467,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -490,8 +479,7 @@ 
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -513,8 +501,7 @@ 
             if(count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -662,8 +649,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -676,8 +662,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -704,8 +689,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -725,8 +709,7 @@ 
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if(isset($row[$attr])){
 						unset($row[$attr]);
@@ -759,8 +742,7 @@ 
                 {
                     $this->_database->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->_database->orderBy($criteria, $order);
             }
@@ -827,17 +809,14 @@ 
                     if ($this->formvalidation->run())
                     {
                         return $data;
-                    }
-                    else
+                    } else
                     {
                         return FALSE;
                     }
-                }
-                else {
+                } else {
                     return $data;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -856,46 +835,38 @@ 
                     if (is_array($filter))
                     {
                         $this->_database->in($field, $filter);
-                    }
-                    else
+                    } else
                     {
                         if (is_int($field))
                         {
                             $this->_database->where($filter);
-                        }
-                        else
+                        } else
                         {
                             $this->_database->where($field, $filter);
                         }
                     }
                 }
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
+            } else if(count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }
-    		}
-    		else if(count($params) == 3)
+    		} else if(count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }

core/classes/model/DBSessionHandlerModel.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
 	 * DB session handler class

Spacing +2 added lines, -2 removed lines

@@ -45,11 +45,11 @@
 		 */
 		protected $sessionTableColumns = array();
 
-		public function __construct(){
+		public function __construct() {
 			parent::__construct();
 		}
 
-		public function getSessionTableColumns(){
+		public function getSessionTableColumns() {
 			return $this->sessionTableColumns;
 		}
 

core/classes/Url.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 
 	class Url{

Spacing +25 added lines, -25 removed lines

@@ -25,15 +25,15 @@ 
 	*/
 
 
-	class Url{
+	class Url {
 
 		/**
 		 * Return the link using base_url config without front controller "index.php"
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function base_url($path = ''){
-			if(is_url($path)){
+		public static function base_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			return get_config('base_url') . $path;
@@ -44,26 +44,26 @@ 
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function site_url($path = ''){
-			if(is_url($path)){
+		public static function site_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			$path = rtrim($path, '/');
 			$baseUrl = get_config('base_url');
 			$frontController = get_config('front_controller');
 			$url = $baseUrl;
-			if($frontController){
+			if ($frontController) {
 				$url .= $frontController . '/';
 			}
-			if(($suffix = get_config('url_suffix')) && $path){
-				if(strpos($path, '?') !== false){
+			if (($suffix = get_config('url_suffix')) && $path) {
+				if (strpos($path, '?') !== false) {
 					$query = explode('?', $path);
 					$query[0] = str_ireplace($suffix, '', $query[0]);
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
 				}
-				else{
+				else {
 					$path .= $suffix;
 				}
 			}
@@ -74,10 +74,10 @@ 
 		 * Return the current site URL
 		 * @return string
 		 */
-		public static function current(){
+		public static function current() {
 			$current = '/';
 			$requestUri = get_instance()->request->requestUri();
-			if($requestUri){
+			if ($requestUri) {
 				$current = $requestUri;
 			}
 			return static::domain() . $current;
@@ -90,18 +90,18 @@ 
 		 * @param  boolean $lowercase whether to set the final text to lowe case or not
 		 * @return string the friendly generated text
 		 */
-		public static function title($str = null, $separator = '-', $lowercase = true){
+		public static function title($str = null, $separator = '-', $lowercase = true) {
 			$str = trim($str);
-			$from = array('ç','À','Á','Â','Ã','Ä','Å','à','á','â','ã','ä','å','Ò','Ó','Ô','Õ','Ö','Ø','ò','ó','ô','õ','ö','ø','È','É','Ê','Ë','è','é','ê','ë','Ç','ç','Ì','Í','Î','Ï','ì','í','î','ï','Ù','Ú','Û','Ü','ù','ú','û','ü','ÿ','Ñ','ñ');
-			$to = array('c','a','a','a','a','a','a','a','a','a','a','a','a','o','o','o','o','o','o','o','o','o','o','o','o','e','e','e','e','e','e','e','e','e','e','i','i','i','i','i','i','i','i','u','u','u','u','u','u','u','u','y','n','n');
+			$from = array('ç', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'à', 'á', 'â', 'ã', 'ä', 'å', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'È', 'É', 'Ê', 'Ë', 'è', 'é', 'ê', 'ë', 'Ç', 'ç', 'Ì', 'Í', 'Î', 'Ï', 'ì', 'í', 'î', 'ï', 'Ù', 'Ú', 'Û', 'Ü', 'ù', 'ú', 'û', 'ü', 'ÿ', 'Ñ', 'ñ');
+			$to = array('c', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'y', 'n', 'n');
 			$str = str_replace($from, $to, $str);
 			$str = preg_replace('#([^a-z0-9]+)#i', $separator, $str);
 			$str = str_replace('--', $separator, $str);
 			//if after process we get something like one-two-three-, need truncate the last separator "-"
-			if(substr($str, -1) == $separator){
+			if (substr($str, -1) == $separator) {
 				$str = substr($str, 0, -1);
 			}
-			if($lowercase){
+			if ($lowercase) {
 				$str = strtolower($str);
 			}
 			return $str;
@@ -111,36 +111,36 @@ 
 		 * Get the current application domain with protocol
 		 * @return string the domain name
 		 */
-		public static function domain(){
+		public static function domain() {
 			$obj = & get_instance();
 			$domain = 'localhost';
 			$port = $obj->request->server('SERVER_PORT');
 			$protocol = is_https() ? 'https' : 'http';
 			
-			if($obj->request->server('HTTP_HOST')){
+			if ($obj->request->server('HTTP_HOST')) {
 				$domain = $obj->request->server('HTTP_HOST');
 			}
-			else if($obj->request->server('SERVER_NAME')){
+			else if ($obj->request->server('SERVER_NAME')) {
 				$domain = $obj->request->server('SERVER_NAME');
 			}
-			else if($obj->request->server('SERVER_ADDR')){
+			else if ($obj->request->server('SERVER_ADDR')) {
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
-			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){
+			if ($port && (is_https() && $port != 443 || !is_https() && $port != 80)) {
 				//some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
 				//of the domain like https://my.domain.com:787
-				if(is_https() && $port != 80){
-					$domain .= ':'.$port;
+				if (is_https() && $port != 80) {
+					$domain .= ':' . $port;
 				}
 			}
-			return $protocol.'://'.$domain;
+			return $protocol . '://' . $domain;
 		}
 
 		/**
 		 * Get the current request query string
 		 * @return string
 		 */
-		public static function queryString(){
+		public static function queryString() {
 			return get_instance()->request->server('QUERY_STRING');
 		}
 	}
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -62,8 +62,7 @@ 
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
-				}
-				else{
+				} else{
 					$path .= $suffix;
 				}
 			}
@@ -119,11 +118,9 @@ 
 			
 			if($obj->request->server('HTTP_HOST')){
 				$domain = $obj->request->server('HTTP_HOST');
-			}
-			else if($obj->request->server('SERVER_NAME')){
+			} else if($obj->request->server('SERVER_NAME')){
 				$domain = $obj->request->server('SERVER_NAME');
-			}
-			else if($obj->request->server('SERVER_ADDR')){
+			} else if($obj->request->server('SERVER_ADDR')){
 				$domain = $obj->request->server('SERVER_ADDR');
 			}
 			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){

core/classes/Session.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	class Session{
 		
 		/**

Spacing +31 added lines, -31 removed lines

@@ -23,7 +23,7 @@ 
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
-	class Session{
+	class Session {
 		
 		/**
 		 * The session flash key to use
@@ -41,9 +41,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(static::$logger == null){
-				static::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (static::$logger == null) {
+				static::$logger[0] = & class_loader('Log', 'classes');
 				static::$logger[0]->setLogger('Library::Session');
 			}
 			return static::$logger[0];
@@ -55,14 +55,14 @@ 
 		 * @param  mixed $default the default value to use if can not find the session item in the list
 		 * @return mixed          the session value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = static::getLogger();
-			$logger->debug('Getting session data for item [' .$item. '] ...');
-			if(array_key_exists($item, $_SESSION)){
+			$logger->debug('Getting session data for item [' . $item . '] ...');
+			if (array_key_exists($item, $_SESSION)) {
 				$logger->info('Found session data for item [' . $item . '] the vaue is : [' . stringfy_vars($_SESSION[$item]) . ']');
 				return $_SESSION[$item];
 			}
-			$logger->warning('Cannot find session item [' . $item . '] using the default value ['. $default . ']');
+			$logger->warning('Cannot find session item [' . $item . '] using the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -71,7 +71,7 @@ 
 		 * @param string $item  the session item name to set
 		 * @param mixed $value the session item value
 		 */
-		public static function set($item, $value){
+		public static function set($item, $value) {
 			$logger = static::getLogger();
 			$logger->debug('Setting session data for item [' . $item . '], value [' . stringfy_vars($value) . ']');
 			$_SESSION[$item] = $value;
@@ -83,16 +83,16 @@ 
 		 * @param  mixed $default the default value to use if can not find the session flash item in the list
 		 * @return mixed          the session flash value if exist or the default value
 		 */
-		public static function getFlash($item, $default = null){
+		public static function getFlash($item, $default = null) {
 			$logger = static::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$return = array_key_exists($key, $_SESSION) ?
 			($_SESSION[$key]) : $default;
-			if(array_key_exists($key, $_SESSION)){
+			if (array_key_exists($key, $_SESSION)) {
 				unset($_SESSION[$key]);
 			}
-			else{
-				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
+			else {
+				$logger->warning('Cannot find session flash item [' . $key . '] using the default value [' . $default . ']');
 			}
 			return $return;
 		}
@@ -102,8 +102,8 @@ 
 		 * @param  string  $item the session flash item name
 		 * @return boolean 
 		 */
-		public static function hasFlash($item){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function hasFlash($item) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			return array_key_exists($key, $_SESSION);
 		}
 
@@ -112,8 +112,8 @@ 
 		 * @param string $item  the session flash item name to set
 		 * @param mixed $value the session flash item value
 		 */
-		public static function setFlash($item, $value){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+		public static function setFlash($item, $value) {
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$_SESSION[$key] = $value;
 		}
 
@@ -121,14 +121,14 @@ 
 		 * Clear the session item in the list
 		 * @param  string $item the session item name to be deleted
 		 */
-		public static function clear($item){
+		public static function clear($item) {
 			$logger = static::getLogger();
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Deleting of session for item ['.$item.' ]');
+			if (array_key_exists($item, $_SESSION)) {
+				$logger->info('Deleting of session for item [' . $item . ' ]');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Session item [' . $item . '] to be deleted does not exists');
 			}
 		}
 		
@@ -136,15 +136,15 @@ 
 		 * Clear the session flash item in the list
 		 * @param  string $item the session flash item name to be deleted
 		 */
-		public static function clearFlash($item){
+		public static function clearFlash($item) {
 			$logger = static::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			if(array_key_exists($key, $_SESSION)){
-				$logger->info('Delete session flash for item ['.$item.']');
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
+			if (array_key_exists($key, $_SESSION)) {
+				$logger->info('Delete session flash for item [' . $item . ']');
 				unset($_SESSION[$item]);
 			}
-			else{
-				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Dession flash item [' . $item . '] to be deleted does not exists');
 			}
 		}
 
@@ -153,14 +153,14 @@ 
 		 * @param  string  $item the session item name
 		 * @return boolean 
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_SESSION);
 		}
 
 		/**
 		 * Destroy all session data values
 		 */
-		public static function clearAll(){
+		public static function clearAll() {
 			session_unset();
 			session_destroy();
 		}

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 			($_SESSION[$key]) : $default;
 			if(array_key_exists($key, $_SESSION)){
 				unset($_SESSION[$key]);
-			}
-			else{
+			} else{
 				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
 			}
 			return $return;
@@ -126,8 +125,7 @@ 
 			if(array_key_exists($item, $_SESSION)){
 				$logger->info('Deleting of session for item ['.$item.' ]');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
 			}
 		}
@@ -142,8 +140,7 @@ 
 			if(array_key_exists($key, $_SESSION)){
 				$logger->info('Delete session flash for item ['.$item.']');
 				unset($_SESSION[$item]);
-			}
-			else{
+			} else{
 				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
 			}
 		}

core/classes/Router.php

Indentation +15 added lines, -15 removed lines

@@ -22,23 +22,23 @@ 
 	 * 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 Router {
 		
 		/**
-		* @var array $pattern: The list of URIs to validate against
-		*/
+		 * @var array $pattern: The list of URIs to validate against
+		 */
 		private $pattern = array();
 
 		/**
-		* @var array $callback: The list of callback to call
-		*/
+		 * @var array $callback: The list of callback to call
+		 */
 		private $callback = array();
 
 		/**
-		* @var string $uriTrim: The char to remove from the URIs
-		*/
+		 * @var string $uriTrim: The char to remove from the URIs
+		 */
 		protected $uriTrim = '/\^$';
 
 		/**
@@ -94,9 +94,9 @@ 
 		 */
 		public function __construct(){
 			$this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Router');
-	        $routesPath = CONFIG_PATH . 'routes.php';
-	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
+			$this->logger->setLogger('Library::Router');
+			$routesPath = CONFIG_PATH . 'routes.php';
+			$this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
 			if(file_exists($routesPath)){
 				 $this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
 				require_once $routesPath;
@@ -147,11 +147,11 @@ 
 		}
 
 		/**
-		* Add the URI and callback to the list of URIs to validate
-		*
-		* @param string $uri the request URI
-		* @param object $callback the callback function
-		*/
+		 * Add the URI and callback to the list of URIs to validate
+		 *
+		 * @param string $uri the request URI
+		 * @param object $callback the callback function
+		 */
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
 			if(in_array($uri, $this->pattern)){

Spacing +60 added lines, -60 removed lines

@@ -92,39 +92,39 @@ 
 		/**
 		 * Construct the new Router instance
 		 */
-		public function __construct(){
-			$this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+			$this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Router');
 	        $routesPath = CONFIG_PATH . 'routes.php';
 	        $this->logger->debug('Loading of routes configuration file --> ' . $routesPath . ' ...');
-			if(file_exists($routesPath)){
-				 $this->logger->info('Found routes configuration file --> ' . $routesPath. ' now load it');
+			if (file_exists($routesPath)) {
+				 $this->logger->info('Found routes configuration file --> ' . $routesPath . ' now load it');
 				require_once $routesPath;
-				if(! empty($route) && is_array($route)){
+				if (!empty($route) && is_array($route)) {
 					$this->routes = $route;
 					unset($route);
 				}
-				else{
+				else {
 					show_error('No routing configuration found in [' . $routesPath . ']');
 				}
 			}
-			else{
+			else {
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
 			//loading routes for module
 			$this->logger->debug('Loading of modules routes ... ');
 			$modulesRoutes = Module::getModulesRoutes();
-			if($modulesRoutes && is_array($modulesRoutes)){
+			if ($modulesRoutes && is_array($modulesRoutes)) {
 				$this->routes = array_merge($this->routes, $modulesRoutes);
 				$this->logger->info('Routes for all modules loaded successfully');
 			}
-			else{
+			else {
 				$this->logger->info('No routes found for all modules skipping.');
 			}
 			$this->logger->info('The routes configuration are listed below: ' . stringfy_vars($this->routes));
 
-			foreach($this->routes as $pattern => $callback){
+			foreach ($this->routes as $pattern => $callback) {
 				$this->add($pattern, $callback);
 			}
 			
@@ -132,14 +132,14 @@ 
 			$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 			$this->logger->debug('Check if URL suffix is enabled in the configuration');
 			//remove url suffix from the request URI
-			if($suffix = get_config('url_suffix')){
-				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
+			if ($suffix = get_config('url_suffix')) {
+				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']');
 				$uri = str_ireplace($suffix, '', $uri);
 			}
-			else{
+			else {
 				$this->logger->info('URL suffix is not enabled in the configuration');
 			}
-			if(strpos($uri, '?') !== false){
+			if (strpos($uri, '?') !== false) {
 				$uri = substr($uri, 0, strpos($uri, '?'));
 			}
 			$uri = trim($uri, $this->uriTrim);
@@ -154,7 +154,7 @@ 
 		*/
 		public function add($uri, $callback) {
 			$uri = trim($uri, $this->uriTrim);
-			if(in_array($uri, $this->pattern)){
+			if (in_array($uri, $this->pattern)) {
 				$this->logger->warning('The route [' . $uri . '] already added, may be adding again can have route conflict');
 			}
 			$this->pattern[] = $uri;
@@ -165,7 +165,7 @@ 
 		 * Get the module name
 		 * @return string
 		 */
-		public function getModule(){
+		public function getModule() {
 			return $this->module;
 		}
 		
@@ -173,7 +173,7 @@ 
 		 * Get the controller name
 		 * @return string
 		 */
-		public function getController(){
+		public function getController() {
 			return $this->controller;
 		}
 
@@ -181,7 +181,7 @@ 
 		 * Get the controller file path
 		 * @return string
 		 */
-		public function getControllerPath(){
+		public function getControllerPath() {
 			return $this->controllerPath;
 		}
 
@@ -189,7 +189,7 @@ 
 		 * Get the controller method
 		 * @return string
 		 */
-		public function getMethod(){
+		public function getMethod() {
 			return $this->method;
 		}
 
@@ -197,7 +197,7 @@ 
 		 * Get the request arguments
 		 * @return array
 		 */
-		public function getArgs(){
+		public function getArgs() {
 			return $this->args;
 		}
 
@@ -205,7 +205,7 @@ 
 		 * Get the URL segments array
 		 * @return array
 		 */
-		public function getSegments(){
+		public function getSegments() {
 			return $this->segments;
 		}
 
@@ -214,27 +214,27 @@ 
 		 * otherwise send 404 error.
 		 */
 		public function run() {
-			$benchmark =& class_loader('Benchmark');
+			$benchmark = & class_loader('Benchmark');
 			$benchmark->mark('ROUTING_PROCESS_START');
 			$this->logger->debug('Routing process start ...');
 			$segment = $this->segments;
 			$baseUrl = get_config('base_url');
 			//check if the app is not in DOCUMENT_ROOT
-			if(isset($segment[0]) && stripos($baseUrl, $segment[0]) != false){
+			if (isset($segment[0]) && stripos($baseUrl, $segment[0]) != false) {
 				array_shift($segment);
 				$this->segments = $segment;
 			}
 			$this->logger->debug('Check if the request URI contains the front controller');
-			if(isset($segment[0]) && $segment[0] == SELF){
+			if (isset($segment[0]) && $segment[0] == SELF) {
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
 			}
-			else{
+			else {
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
-			$this->logger->info('The final Request URI is [' . $uri . ']' );
+			$this->logger->info('The final Request URI is [' . $uri . ']');
 			//generic routes
 			$pattern = array(':num', ':alpha', ':alnum', ':any');
 			$replace = array('[0-9]+', '[a-zA-Z]+', '[a-zA-Z0-9]+', '.*');
@@ -248,20 +248,20 @@ 
 					array_shift($args);
 					//check if this contains an module
 					$moduleControllerMethod = explode('#', $this->callback[$index]);
-					if(is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2){
-						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
+					if (is_array($moduleControllerMethod) && count($moduleControllerMethod) >= 2) {
+						$this->logger->info('The current request use the module [' . $moduleControllerMethod[0] . ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
 					}
-					else{
+					else {
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
-					if(is_array($moduleControllerMethod)){
-						if(isset($moduleControllerMethod[0])){
+					if (is_array($moduleControllerMethod)) {
+						if (isset($moduleControllerMethod[0])) {
 							$this->controller = $moduleControllerMethod[0];	
 						}
-						if(isset($moduleControllerMethod[1])){
+						if (isset($moduleControllerMethod[1])) {
 							$this->method = $moduleControllerMethod[1];
 						}
 						$this->args = $args;
@@ -271,73 +271,73 @@ 
 				}
 			}
 			//first if the controller is not set and the module is set use the module name as the controller
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After loop in predefined routes configuration, the module name is set but the controller is not set, so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//if can not determine the module/controller/method via the defined routes configuration we will use
 			//the URL like http://domain.com/module/controller/method/arg1/arg2
-			if(! $this->getController()){
+			if (!$this->getController()) {
 				$this->logger->info('Cannot determine the routing information using the predefined routes configuration, will use the request URI parameters');
 				$nbSegment = count($segment);
 				//if segment is null so means no need to perform
-				if($nbSegment > 0){
+				if ($nbSegment > 0) {
 					//get the module list
 					$modules = Module::getModuleList();
 					//first check if no module
-					if(! $modules){
+					if (!$modules) {
 						$this->logger->info('No module was loaded will skip the module checking');
 						//the application don't use module
 						//controller
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->controller = $segment[0];
 							array_shift($segment);
 						}
 						//method
-						if(isset($segment[0])){
+						if (isset($segment[0])) {
 							$this->method = $segment[0];
 							array_shift($segment);
 						}
 						//args
 						$this->args = $segment;
 					}
-					else{
+					else {
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
-						if(in_array($segment[0], $modules)){
+						if (in_array($segment[0], $modules)) {
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
 							$this->module = $segment[0];
 							array_shift($segment);
 							//check if the second arg is the controller from module
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								//check if the request use the same module name and controller
 								$path = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-								if(! $path){
+								if (!$path) {
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
 								}
-								else{
+								else {
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
 							}
 							//check for method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
 							//the remaining is for args
 							$this->args = $segment;
 						}
-						else{
+						else {
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->controller = $segment[0];
 								array_shift($segment);
 							}
 							//method
-							if(isset($segment[0])){
+							if (isset($segment[0])) {
 								$this->method = $segment[0];
 								array_shift($segment);
 							}
@@ -347,18 +347,18 @@ 
 					}
 				}
 			}
-			if(! $this->getController() && $this->getModule()){
+			if (!$this->getController() && $this->getModule()) {
 				$this->logger->info('After using the request URI the module name is set but the controller is not set so we will use module as the controller');
 				$this->controller = $this->getModule();
 			}
 			//did we set the controller, so set the controller path
-			if($this->getController() && ! $this->getControllerPath()){
+			if ($this->getController() && !$this->getControllerPath()) {
 				$this->logger->debug('Setting the file path for the controller [' . $this->getController() . ']');
 				//if it is the module controller
-				if($this->getModule()){
+				if ($this->getModule()) {
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
 				}
-				else{
+				else {
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -368,20 +368,20 @@ 
 			$this->logger->debug('Loading controller [' . $controller . '], the file path is [' . $classFilePath . ']...');
 			$benchmark->mark('ROUTING_PROCESS_END');
 			$e404 = false;
-			if(file_exists($classFilePath)){
+			if (file_exists($classFilePath)) {
 				require_once $classFilePath;
-				if(! class_exists($controller, false)){
+				if (!class_exists($controller, false)) {
 					$e404 = true;
-					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
+					$this->logger->info('The controller file [' . $classFilePath . '] exists but does not contain the class [' . $controller . ']');
 				}
-				else{
+				else {
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
-					if(! method_exists($controllerInstance, $controllerMethod)){
+					if (!method_exists($controllerInstance, $controllerMethod)) {
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
 					}
-					else{
+					else {
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -391,12 +391,12 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}
-			if($e404){
-				$response =& class_loader('Response', 'classes');
+			if ($e404) {
+				$response = & class_loader('Response', 'classes');
 				$response->send404();
 			}
 		}

Braces +13 added lines, -26 removed lines

@@ -103,12 +103,10 @@ 
 				if(! empty($route) && is_array($route)){
 					$this->routes = $route;
 					unset($route);
-				}
-				else{
+				} else{
 					show_error('No routing configuration found in [' . $routesPath . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the routes configuration file [' . $routesPath . ']');
 			}
 			
@@ -118,8 +116,7 @@ 
 			if($modulesRoutes && is_array($modulesRoutes)){
 				$this->routes = array_merge($this->routes, $modulesRoutes);
 				$this->logger->info('Routes for all modules loaded successfully');
-			}
-			else{
+			} else{
 				$this->logger->info('No routes found for all modules skipping.');
 			}
 			$this->logger->info('The routes configuration are listed below: ' . stringfy_vars($this->routes));
@@ -135,8 +132,7 @@ 
 			if($suffix = get_config('url_suffix')){
 				$this->logger->info('URL suffix is enabled in the configuration, the value is [' . $suffix . ']' );
 				$uri = str_ireplace($suffix, '', $uri);
-			}
-			else{
+			} else{
 				$this->logger->info('URL suffix is not enabled in the configuration');
 			}
 			if(strpos($uri, '?') !== false){
@@ -229,8 +225,7 @@ 
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
-			}
-			else{
+			} else{
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
@@ -252,8 +247,7 @@ 
 						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
-					}
-					else{
+					} else{
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
@@ -300,8 +294,7 @@ 
 						}
 						//args
 						$this->args = $segment;
-					}
-					else{
+					} else{
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
 						if(in_array($segment[0], $modules)){
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
@@ -315,8 +308,7 @@ 
 								if(! $path){
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
-								}
-								else{
+								} else{
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
@@ -328,8 +320,7 @@ 
 							}
 							//the remaining is for args
 							$this->args = $segment;
-						}
-						else{
+						} else{
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
 							if(isset($segment[0])){
@@ -357,8 +348,7 @@ 
 				//if it is the module controller
 				if($this->getModule()){
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-				}
-				else{
+				} else{
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -373,15 +363,13 @@ 
 				if(! class_exists($controller, false)){
 					$e404 = true;
 					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
-				}
-				else{
+				} else{
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
 					if(! method_exists($controllerInstance, $controllerMethod)){
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
-					}
-					else{
+					} else{
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -390,8 +378,7 @@ 
 						$obj->response->renderFinalPage();
 					}
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}

core/classes/Lang.php

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 * For application languages management
@@ -68,8 +68,8 @@ 
 		 * Construct new Lang instance
 		 */
 		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Lang');
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
 			//determine the current language

Spacing +24 added lines, -24 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * For application languages management
 	 */
-	class Lang{
+	class Lang {
 		
 		/**
 		 * The supported available language for this application.
@@ -67,8 +67,8 @@ 
 		/**
 		 * Construct new Lang instance
 		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+	        $this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
@@ -76,15 +76,15 @@ 
 			$language = null;
 			//if the language exists in cookie use it
 			$cfgKey = get_config('language_cookie_name');
-			$this->logger->debug('Getting current language from cookie [' .$cfgKey. ']');
+			$this->logger->debug('Getting current language from cookie [' . $cfgKey . ']');
 			$objCookie = & class_loader('Cookie');
 			$cookieLang = $objCookie->get($cfgKey);
-			if($cookieLang && $this->isValid($cookieLang)){
+			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. ']');
+				$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(). ']');
+			else {
+				$this->logger->info('Language from cookie [' . $cfgKey . '] is not set, use the default value [' . $this->getDefault() . ']');
 				$this->current = $this->getDefault();
 			}
 		}
@@ -94,7 +94,7 @@ 
 		 *
 		 * @return array the language message list
 		 */
-		public function getAll(){
+		public function getAll() {
 			return $this->languages;
 		}
 
@@ -104,7 +104,7 @@ 
 		 * @param string $key the language key to identify
 		 * @param string $value the language message value
 		 */
-		public function set($key, $value){
+		public function set($key, $value) {
 			$this->languages[$key] = $value;
 		}
 
@@ -116,11 +116,11 @@ 
 		 *
 		 * @return string the language message value
 		 */
-		public function get($key, $default = 'LANGUAGE_ERROR'){
-			if(isset($this->languages[$key])){
+		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. ']');
+			$this->logger->warning('Language key  [' . $key . '] does not exist use the default value [' . $default . ']');
 			return $default;
 		}
 
@@ -131,10 +131,10 @@ 
 		 *
 		 * @return boolean true if the language directory exists, false or not
 		 */
-		public function isValid($language){
+		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)){
+			foreach ($searchDir as $dir) {
+				if (file_exists($dir . $language) && is_dir($dir . $language)) {
 					return true;
 				}
 			}
@@ -146,7 +146,7 @@ 
 		 *
 		 * @return string the default language
 		 */
-		public function getDefault(){
+		public function getDefault() {
 			return $this->default;
 		}
 
@@ -155,7 +155,7 @@ 
 		 *
 		 * @return string the current language
 		 */
-		public function getCurrent(){
+		public function getCurrent() {
 			return $this->current;
 		}
 
@@ -165,14 +165,14 @@ 
 		 * @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])){
+		public function addLang($name, $description) {
+			if (isset($this->availables[$name])) {
 				return; //already added cost in performance
 			}
-			if($this->isValid($name)){
+			if ($this->isValid($name)) {
 				$this->availables[$name] = $description;
 			}
-			else{
+			else {
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}
@@ -182,7 +182,7 @@ 
 		 *
 		 * @return array the list of the application language
 		 */
-		public function getSupported(){
+		public function getSupported() {
 			return $this->availables;
 		}
 
@@ -191,7 +191,7 @@ 
 		 *
 		 * @param array $langs the languages array of the messages to be added
 		 */
-		public function addLangMessages(array $langs){
+		public function addLangMessages(array $langs) {
 			foreach ($langs as $key => $value) {
 				$this->set($key, $value);
 			}

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 			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{
+			} else{
 				$this->logger->info('Language from cookie [' .$cfgKey. '] is not set, use the default value [' .$this->getDefault(). ']');
 				$this->current = $this->getDefault();
 			}
@@ -171,8 +170,7 @@ 
 			}
 			if($this->isValid($name)){
 				$this->availables[$name] = $description;
-			}
-			else{
+			} else{
 				show_error('The language [' . $name . '] is not valid or does not exists.');
 			}
 		}

core/classes/Security.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Security{
 		

Spacing +22 added lines, -22 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Security{
+	class Security {
 		
 		/**
 		 * The logger instance
@@ -36,9 +36,9 @@ 
 		 * Get the logger singleton instance
 		 * @return Log the logger instance
 		 */
-		private static function getLogger(){
-			if(static::$logger == null){
-				static::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (static::$logger == null) {
+				static::$logger[0] = & class_loader('Log', 'classes');
 				static::$logger[0]->setLogger('Library::Security');
 			}
 			return static::$logger[0];
@@ -49,7 +49,7 @@ 
 		 * This method is used to generate the CSRF token
 		 * @return string the generated CSRF token
 		 */
-		public static function generateCSRF(){
+		public static function generateCSRF() {
 			$logger = static::getLogger();
 			$logger->debug('Generation of CSRF ...');
 			
@@ -57,14 +57,14 @@ 
 			$expire = get_config('csrf_expire', 60);
 			$keyExpire = 'csrf_expire';
 			$currentTime = time();
-			if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
+			if (Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime) {
 				$logger->info('The CSRF token not yet expire just return it');
 				return Session::get($key);
 			}
-			else{
+			else {
 				$newTime = $currentTime + $expire;
 				$token = sha1(uniqid()) . sha1(uniqid());
-				$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
+				$logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . '], token [' . $token . ']');
 				Session::set($keyExpire, $newTime);
 				Session::set($key, $token);
 				return Session::get($key);
@@ -75,7 +75,7 @@ 
 		 * This method is used to check the CSRF if is valid, not yet expire, etc.
 		 * @return boolean true if valid, false if not valid
 		 */
-		public static function validateCSRF(){
+		public static function validateCSRF() {
 			$logger = static::getLogger();
 			$logger->debug('Validation of CSRF ...');
 				
@@ -83,23 +83,23 @@ 
 			$expire = get_config('csrf_expire', 60);
 			$keyExpire = 'csrf_expire';
 			$currentTime = time();
-			$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. ']');
-			if(! Session::exists($key) || Session::get($keyExpire) <= $currentTime){
+			$logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . ']');
+			if (!Session::exists($key) || Session::get($keyExpire) <= $currentTime) {
 				$logger->warning('The CSRF session data is not valide');
 				return false;
 			}
-			else{
+			else {
 				//perform form data
 				//need use request->query() for best retrieve
 				//super instance
 				$obj = & get_instance();
 				$token = $obj->request->query($key);
-				if(! $token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime){
-					$logger->warning('The CSRF data [' .$token. '] is not valide may be attacker do his job');
+				if (!$token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime) {
+					$logger->warning('The CSRF data [' . $token . '] is not valide may be attacker do his job');
 					return false;
 				}
-				else{
-					$logger->info('The CSRF data [' .$token. '] is valide the form data is safe continue');
+				else {
+					$logger->info('The CSRF data [' . $token . '] is valide the form data is safe continue');
 					//remove the token from session
 					Session::clear($key);
 					Session::clear($keyExpire);
@@ -111,24 +111,24 @@ 
 		/**
 		 * This method is used to check the whitelist IP address access
 		 */
-		 public static function checkWhiteListIpAccess(){
+		 public static function checkWhiteListIpAccess() {
 			$logger = static::getLogger();
 			$logger->debug('Validation of the IP address access ...');
 			$logger->debug('Check if whitelist IP access is enabled in the configuration ...');
 			$isEnable = get_config('white_list_ip_enable', false);
-			if($isEnable){
+			if ($isEnable) {
 				$logger->info('Whitelist IP access is enabled in the configuration');
 				$list = get_config('white_list_ip_addresses', array());
-				if(! empty($list)){
+				if (!empty($list)) {
 					//Can't use Loader::functions() at this time because teh "Loader" library is loader after the security prossessing
 					require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 					$ip = get_ip();
-					if(count($list) == 1 && $list[0] == '*' || in_array($ip, $list)){
+					if (count($list) == 1 && $list[0] == '*' || in_array($ip, $list)) {
 						$logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
 						//wildcard to access all ip address
 						return;
 					}
-					else{
+					else {
 						// go through all whitelisted ips
 						foreach ($list as $ipaddr) {
 							// find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -154,7 +154,7 @@ 
 					}
 				}
 			}
-			else{
+			else {
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
 			if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
 				$logger->info('The CSRF token not yet expire just return it');
 				return Session::get($key);
-			}
-			else{
+			} else{
 				$newTime = $currentTime + $expire;
 				$token = sha1(uniqid()) . sha1(uniqid());
 				$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
@@ -87,8 +86,7 @@ 
 			if(! Session::exists($key) || Session::get($keyExpire) <= $currentTime){
 				$logger->warning('The CSRF session data is not valide');
 				return false;
-			}
-			else{
+			} else{
 				//perform form data
 				//need use request->query() for best retrieve
 				//super instance
@@ -97,8 +95,7 @@ 
 				if(! $token || $token !== Session::get($key) || Session::get($keyExpire) <= $currentTime){
 					$logger->warning('The CSRF data [' .$token. '] is not valide may be attacker do his job');
 					return false;
-				}
-				else{
+				} else{
 					$logger->info('The CSRF data [' .$token. '] is valide the form data is safe continue');
 					//remove the token from session
 					Session::clear($key);
@@ -127,8 +124,7 @@ 
 						$logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
 						//wildcard to access all ip address
 						return;
-					}
-					else{
+					} else{
 						// go through all whitelisted ips
 						foreach ($list as $ipaddr) {
 							// find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -153,8 +149,7 @@ 
 						show_error('Access to this application is not allowed');
 					}
 				}
-			}
-			else{
+			} else{
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }