tnhfw / tnh-fw

classes/views/home.php

Spacing +28 added lines, -28 removed lines

@@ -8,13 +8,13 @@ 
     <meta name="description" content="A simple PHP framework using HMVC architecture">
     <meta name="author" content="Tony NGUEREZA">
     <title>TNH Framework</title>
-    <link href="<?php echo Assets::css('bootstrap.min');?>" rel="stylesheet" type = "text/css" >
-	<link href="<?php echo Assets::css('font-awesome.min');?>" rel="stylesheet" type = "text/css" >
-    <link href="<?php echo Assets::css('responsive');?>" rel="stylesheet" type = "text/css" >
-	<link rel="icon" href="<?php echo Assets::img('favicon.ico');?>">
+    <link href="<?php echo Assets::css('bootstrap.min'); ?>" rel="stylesheet" type = "text/css" >
+	<link href="<?php echo Assets::css('font-awesome.min'); ?>" rel="stylesheet" type = "text/css" >
+    <link href="<?php echo Assets::css('responsive'); ?>" rel="stylesheet" type = "text/css" >
+	<link rel="icon" href="<?php echo Assets::img('favicon.ico'); ?>">
 	<!--[if lt IE 9]>
-	<script src="<?php echo Assets::js('html5shiv');?>"></script>
-	<script src="<?php echo Assets::js('respond.min');?>"></script>
+	<script src="<?php echo Assets::js('html5shiv'); ?>"></script>
+	<script src="<?php echo Assets::js('respond.min'); ?>"></script>
     <![endif]-->
 	<style type = "text/css">
 		
@@ -28,15 +28,15 @@ 
 			<div class = "col-md-offset-2 col-md-8 col-md-offset-2">
 				<div class = "panel panel-primary">
 					<div class = "panel-heading">
-						<h2>Welcome on <?php echo TNH_NAME;?> v<?php echo TNH_VERSION;?></h2>
+						<h2>Welcome on <?php echo TNH_NAME; ?> v<?php echo TNH_VERSION; ?></h2>
 					</div>
 					<div class = "panel-body">
-						<img src = "<?php echo Assets::img('logo.png');?>" class = "img-responsive" style = "float:left;" />
+						<img src = "<?php echo Assets::img('logo.png'); ?>" class = "img-responsive" style = "float:left;" />
 						<h3>
 							A simple PHP framework using HMVC architecture
 						</h3>
 						<br />
-						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank'));?></p>
+						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank')); ?></p>
 					</div>
 				</div>
 				<div class = "panel panel-primary">
@@ -44,10 +44,10 @@ 
 						<h2>Server information</h2>
 					</div>
 					<div class = "panel-body">
-						<h4>Running on : <b><?php echo php_uname();?></b></h4>
-						<h4>PHP server SAPI : <b><?php echo php_sapi_name();?></b></h4>
-						<h4>PHP Version : <b><?php echo phpversion();?></b></h4>
-						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions());?> extensions)</h4>
+						<h4>Running on : <b><?php echo php_uname(); ?></b></h4>
+						<h4>PHP server SAPI : <b><?php echo php_sapi_name(); ?></b></h4>
+						<h4>PHP Version : <b><?php echo phpversion(); ?></b></h4>
+						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions()); ?> extensions)</h4>
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
 								<tr>
 									<th>Name</th>
@@ -55,10 +55,10 @@ 
 								</tr>
 								<?php foreach (get_loaded_extensions() as $e):?>
 									<tr>
-										<td><?php echo $e;?></td>
-										<td><?php echo phpversion($e);?></td>
+										<td><?php echo $e; ?></td>
+										<td><?php echo phpversion($e); ?></td>
 									</tr>
-								<?php endforeach;?>
+								<?php endforeach; ?>
 							</table>
 					</div>
 				</div>
@@ -67,30 +67,30 @@ 
 						<h2>Framework information</h2>
 					</div>
 					<div class = "panel-body">
-						<h4>Version : <b><?php echo TNH_VERSION;?></b></h4>
-						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION;?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION;?></b></h4>
-						<h4>Build date : <b><?php echo TNH_RELEASE_DATE;?></b></h4>
-						<h4>Author : <b><?php echo TNH_AUTHOR;?></b></h4>
-						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL;?></b></h4>
-						<h4>Loaded files : (<?php echo count(get_included_files());?> files)</h4>
+						<h4>Version : <b><?php echo TNH_VERSION; ?></b></h4>
+						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION; ?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION; ?></b></h4>
+						<h4>Build date : <b><?php echo TNH_RELEASE_DATE; ?></b></h4>
+						<h4>Author : <b><?php echo TNH_AUTHOR; ?></b></h4>
+						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL; ?></b></h4>
+						<h4>Loaded files : (<?php echo count(get_included_files()); ?> files)</h4>
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
 								<tr>
 									<th>Path</th>
 									<th>File</th>
 								</tr>
-								<?php foreach(get_included_files() as $file):?>
+								<?php foreach (get_included_files() as $file):?>
 									<tr>
-										<td><?php echo $file;?></td>
-										<td><?php echo basename($file);?></td>
+										<td><?php echo $file; ?></td>
+										<td><?php echo basename($file); ?></td>
 									</tr>
-								<?php endforeach;?>
+								<?php endforeach; ?>
 							</table>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<script src="<?php echo Assets::js('jquery');?>"></script>
-	<script src="<?php echo Assets::js('bootstrap.min');?>"></script>
+	<script src="<?php echo Assets::js('jquery'); ?>"></script>
+	<script src="<?php echo Assets::js('bootstrap.min'); ?>"></script>
 	</body>
 </html>

index.php

Spacing +1 added lines, -1 removed lines

@@ -243,7 +243,7 @@
 			if (version_compare(PHP_VERSION, '5.3', '>=')) {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 			}
-			else{
+			else {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 			}
 		break;

Braces +1 added lines, -2 removed lines

@@ -242,8 +242,7 @@
 			ini_set('display_errors', 0);
 			if (version_compare(PHP_VERSION, '5.3', '>=')) {
 				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-			}
-			else{
+			} else{
 				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 			}
 		break;

core/bootstrap.php

Spacing +19 added lines, -19 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
+	if (IS_CLI) {
 		$_SESSION = array();
 	}
 		
@@ -60,14 +60,14 @@ 
 	/**
 	 * The Benchmark class
 	 */
-	$BENCHMARK =& class_loader('Benchmark');
+	$BENCHMARK = & class_loader('Benchmark');
 	
 	$BENCHMARK->mark('APP_EXECUTION_START');
 	
 	/**
     * instance of the Log class
     */
-    $LOGGER =& class_loader('Log', 'classes');
+    $LOGGER = & class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
@@ -76,10 +76,10 @@ 
 	/**
 	* Verification of the PHP environment: minimum and maximum version
 	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')) {
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
 	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	else if (version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')) {
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -101,11 +101,11 @@ 
 	
 	//if user have some composer packages
 	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
 	}
-	else{
+	else {
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -120,14 +120,14 @@ 
 	 * Load the EventDispatcher class
 	 * @var EventDispatcher
 	 */
-	$DISPATCHER =& class_loader('EventDispatcher', 'classes');
+	$DISPATCHER = & class_loader('EventDispatcher', 'classes');
 
 	$BENCHMARK->mark('CONFIG_INIT_START');
 	/**
 	* Load configurations and using the 
 	* static method "init()" to initialize the Config class .
 	*/
-	$CONFIG =& class_loader('Config', 'classes');	
+	$CONFIG = & class_loader('Config', 'classes');	
 	$CONFIG->init();
 	$BENCHMARK->mark('CONFIG_INIT_END');
 
@@ -136,7 +136,7 @@ 
 	* Load modules and using the 
 	* static method "init()" to initialize the Module class.
 	*/
-	$MODULE =& class_loader('Module', 'classes');
+	$MODULE = & class_loader('Module', 'classes');
 	$MODULE->init();
 	$BENCHMARK->mark('MODULE_INIT_END');
 
@@ -155,34 +155,34 @@ 
 	/**
 	* Loading Security class
 	*/
-	$SECURITY =& class_loader('Security', 'classes');
+	$SECURITY = & class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
 	* Loading Url class
 	*/
-	$URL =& class_loader('Url', 'classes');
+	$URL = & class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
+	if (get_config('cache_enable', false)) {
 		/**
 		 * Load Cache interface file
 		 */
 		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
 		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
+		if (!$cacheHandler) {
 			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
 		}
 		$CACHE = null;
 		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
+		if (file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')) {
+			$CACHE = & class_loader($cacheHandler, 'classes/cache');
 		}
-		else{
+		else {
 			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
+			$CACHE = & class_loader($cacheHandler);
 		}
 		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+		if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
 			$RESPONSE = & class_loader('Response', 'classes');
 			$RESPONSE->renderFinalPageFromCache($CACHE);
 		}

Braces +3 added lines, -6 removed lines

@@ -78,8 +78,7 @@ 
 	*/
 	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
-	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	} else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -104,8 +103,7 @@ 
 	if(file_exists(VENDOR_PATH . 'autoload.php')){
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
-	}
-	else{
+	} else{
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -176,8 +174,7 @@ 
 		//first check if the cache handler is the system driver
 		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
 			$CACHE =& class_loader($cacheHandler, 'classes/cache');
-		}
-		else{
+		} else{
 			//it's not a system driver use user library
 			$CACHE =& class_loader($cacheHandler);
 		}

core/classes/Config.php

Spacing +28 added lines, -28 removed lines

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

Braces +3 added lines, -6 removed lines

@@ -66,15 +66,13 @@ 
 					//check if the server is running under IPv6
 					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
 						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
-					}
-					else{
+					} else{
 						$baseUrl = $_SERVER['SERVER_ADDR'];
 					}
 					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && ! is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https()) ) ? ':' . $_SERVER['SERVER_PORT'] : '');
 					$baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port
 						. substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
-				}
-				else{
+				} else{
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}
@@ -139,8 +137,7 @@ 
 				$logger->info('Delete config item ['.$item.']');
 				unset(static::$config[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
 				return false;
 			}

core/classes/cache/FileCache.php

Spacing +60 added lines, -60 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class FileCache implements CacheInterface{
+	class FileCache implements CacheInterface {
 		
 		/**
 		 * Whether to enable compression of the cache data file.
@@ -39,12 +39,12 @@ 
 		private static $logger;
 		
 		
-		public function __construct(){
-			if(! $this->isSupported()){
+		public function __construct() {
+			if (!$this->isSupported()) {
 				show_error('The cache for file system is not available. Check the cache directory if is exists or is writable.');
 			}
 			//if Zlib extension is not loaded set compressCacheData to false
-			if(! extension_loaded('zlib')){
+			if (!extension_loaded('zlib')) {
 				$logger = static::getLogger();
 				$logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
@@ -55,9 +55,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::FileCache');
 			}
 			return static::$logger[0];
@@ -68,18 +68,18 @@ 
 		 * @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 . ']');
 			$filePath = $this->getFilePath($key);
-			if(! file_exists($filePath)){
-				$logger->info('No cache file found for the key ['. $key .'], return false');
+			if (!file_exists($filePath)) {
+				$logger->info('No cache file found for the key [' . $key . '], return false');
 				return false;
 			}
-			$logger->info('The cache file [' .$filePath. '] for the key ['. $key .'] exists, check if the cache data is valid');
-			$handle = fopen($filePath,'r');
-			if( ! $handle){
-				$logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$logger->info('The cache file [' . $filePath . '] for the key [' . $key . '] exists, check if the cache data is valid');
+			$handle = fopen($filePath, 'r');
+			if (!$handle) {
+				$logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			// Getting a shared lock 
@@ -87,20 +87,20 @@ 
 		    $data = file_get_contents($filePath);
       		fclose($handle);
       		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+      		if (!$data) {
+      			$logger->error('Can not unserialize the cache data for the key [' . $key . '], return false');
 		         // If unserializing somehow didn't work out, we'll delete the file
 		         unlink($filePath);
 		         return false;
 	      	}
 	      	if (time() > $data['expire']) {
-	      		$logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+	      		$logger->info('The cache data for the key [' . $key . '] already expired delete the cache file [' . $filePath . ']');
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
 		     }
-		     else{
-		     	$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', $data['expire']) . ']');
+		     else {
+		     	$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', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
 			return false;
@@ -114,14 +114,14 @@ 
 		 * @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) . ']');
 			$filePath = $this->getFilePath($key);
-			$handle = fopen($filePath,'w');
-			if( ! $handle){
-				$logger->error('Can not open the file cache [' .$filePath. '] for the key ['. $key .'], return false');
+			$handle = fopen($filePath, 'w');
+			if (!$handle) {
+				$logger->error('Can not open the file cache [' . $filePath . '] for the key [' . $key . '], return false');
 				return false;
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
@@ -134,13 +134,13 @@ 
 									)
 								);		   
 		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+		    if (!$result) {
+		    	$logger->error('Can not write cache data into file [' . $filePath . '] for the key [' . $key . '], return false');
 		    	fclose($handle);
 		    	return false;
 		    }
-		    else{
-		    	$logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+		    else {
+		    	$logger->info('Cache data saved into file [' . $filePath . '] for the key [' . $key . ']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
 				return true;
@@ -154,17 +154,17 @@ 
 		 * @return boolean      true if the cache is delete, 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 . ']');
 			$filePath = $this->getFilePath($key);
-			$logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$logger->info('Found cache file [' .$filePath. '] remove it');
+			else {
+				$logger->info('Found cache file [' . $filePath . '] remove it');
 	      		@unlink($filePath);
 				return true;
 			}
@@ -178,26 +178,26 @@ 
 		 * '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 . ']');
 			$filePath = $this->getFilePath($key);
-			$logger->info('The file path for the key [' .$key. '] is [' .$filePath. ']');
-			if(! file_exists($filePath)){
+			$logger->info('The file path for the key [' . $key . '] is [' . $filePath . ']');
+			if (!file_exists($filePath)) {
 				$logger->info('This cache file does not exists skipping');
 				return false;
 			}
-			else{
-				$logger->info('Found cache file [' .$filePath. '] check the validity');
+			else {
+				$logger->info('Found cache file [' . $filePath . '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-				if(! $data){
+				if (!$data) {
 					$logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
 				}
-				else{
+				else {
 					$logger->info('This cache data is OK check for expire');
-					if(isset($data['expire']) && $data['expire'] > time()){
+					if (isset($data['expire']) && $data['expire'] > time()) {
 						$logger->info('This cache not yet expired return cache informations');
 						$info = array(
 							'mtime' => $data['mtime'],
@@ -206,7 +206,7 @@ 
 							);
 						return $info;
 					}
-					else{
+					else {
 						$logger->info('This cache already expired return false');
 						return false;
 					}
@@ -218,27 +218,27 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			$logger = static::getLogger();
 			$logger->debug('Deleting of expired cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
+		      		if (!$data) {
 		      			$logger->warning('Can not unserialize the cache data for file [' . $file . ']');
 		      		}
-		      		else if(time() > $data['expire']){
+		      		else if (time() > $data['expire']) {
 		      			$logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			@unlink($file);
 		      		}
-		      		else{
+		      		else {
 		      			$logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -248,14 +248,14 @@ 
 		/**
 		 * Remove all file from cache folder
 		 */
-		public function clean(){
+		public function clean() {
 			$logger = static::getLogger();
 			$logger->debug('Deleting of all cache files');
 			$list = glob(CACHE_PATH . '*.cache');
-			if(! $list){
+			if (!$list) {
 				$logger->info('No cache files were found skipping');
 			}
-			else{
+			else {
 				$logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$logger->debug('Processing the cache file [' . $file . ']');
@@ -267,7 +267,7 @@ 
 	    /**
 	     * @return boolean
 	     */
-	    public function isCompressCacheData(){
+	    public function isCompressCacheData() {
 	        return $this->compressCacheData;
 	    }
 
@@ -276,14 +276,14 @@ 
 	     *
 	     * @return self
 	     */
-	    public function setCompressCacheData($status = true){
+	    public function setCompressCacheData($status = true) {
 			//if Zlib extension is not loaded set compressCacheData to false
-			if($status === true && ! extension_loaded('zlib')){
+			if ($status === true && !extension_loaded('zlib')) {
 				$logger = static::getLogger();
 				$logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
 			}
-			else{
+			else {
 				$this->compressCacheData = $status;
 			}
 			return $this;
@@ -294,7 +294,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return CACHE_PATH && is_dir(CACHE_PATH) && is_writable(CACHE_PATH);
 		}
 		
@@ -304,7 +304,7 @@ 
 		* @param $key the cache item key
 		* @return string the full cache file path for this key
 		*/
-		private function getFilePath($key){
+		private function getFilePath($key) {
 			return CACHE_PATH . md5($key) . '.cache';
 		}
 	}
\ No newline at end of file

Braces +11 added lines, -22 removed lines

@@ -98,8 +98,7 @@ 
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
-		     }
-		     else{
+		     } else{
 		     	$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', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
@@ -138,8 +137,7 @@ 
 		    	$logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
 		    	fclose($handle);
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
@@ -162,8 +160,7 @@ 
 			if(! file_exists($filePath)){
 				$logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$logger->info('Found cache file [' .$filePath. '] remove it');
 	      		@unlink($filePath);
 				return true;
@@ -186,16 +183,14 @@ 
 			if(! file_exists($filePath)){
 				$logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$logger->info('Found cache file [' .$filePath. '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
-				}
-				else{
+				} else{
 					$logger->info('This cache data is OK check for expire');
 					if(isset($data['expire']) && $data['expire'] > time()){
 						$logger->info('This cache not yet expired return cache informations');
@@ -205,8 +200,7 @@ 
 							'ttl' => $data['ttl']
 							);
 						return $info;
-					}
-					else{
+					} else{
 						$logger->info('This cache already expired return false');
 						return false;
 					}
@@ -224,8 +218,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$logger->debug('Processing the cache file [' . $file . ']');
@@ -233,12 +226,10 @@ 
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 		      		if(! $data){
 		      			$logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
+		      		} else if(time() > $data['expire']){
 		      			$logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			@unlink($file);
-		      		}
-		      		else{
+		      		} else{
 		      			$logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -254,8 +245,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$logger->debug('Processing the cache file [' . $file . ']');
@@ -282,8 +272,7 @@ 
 				$logger = static::getLogger();
 				$logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
-			}
-			else{
+			} else{
 				$this->compressCacheData = $status;
 			}
 			return $this;

core/classes/cache/CacheInterface.php

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

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

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

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;
 		}