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

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

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');
 	}
 	
@@ -122,7 +122,7 @@ 
 	* 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');
 
@@ -131,7 +131,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');
 
@@ -150,36 +150,36 @@ 
 	/**
 	* 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');
-			if ($RESPONSE->renderFinalPageFromCache($CACHE)){
+			if ($RESPONSE->renderFinalPageFromCache($CACHE)) {
 				return;
 			}
 		}

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/Session.php

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

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(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Session');
 			}
 			return self::$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 = self::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 = self::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 = self::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 = self::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 = self::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();
 		}

core/classes/Lang.php

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.');
 			}
 		}

Spacing +26 added lines, -26 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,8 +76,8 @@ 
 			
 			//add the supported languages ('key', 'display name')
 			$languages = get_config('languages', null);
-			if(! empty($languages)){
-				foreach($languages as $key => $displayName){
+			if (!empty($languages)) {
+				foreach ($languages as $key => $displayName) {
 					$this->addLang($key, $displayName);
 				}
 			}
@@ -85,15 +85,15 @@ 
 
 			//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();
 			}
 		}
@@ -103,7 +103,7 @@ 
 		 *
 		 * @return array the language message list
 		 */
-		public function getAll(){
+		public function getAll() {
 			return $this->languages;
 		}
 
@@ -113,7 +113,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;
 		}
 
@@ -125,11 +125,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;
 		}
 
@@ -140,10 +140,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;
 				}
 			}
@@ -155,7 +155,7 @@ 
 		 *
 		 * @return string the default language
 		 */
-		public function getDefault(){
+		public function getDefault() {
 			return $this->default;
 		}
 
@@ -164,7 +164,7 @@ 
 		 *
 		 * @return string the current language
 		 */
-		public function getCurrent(){
+		public function getCurrent() {
 			return $this->current;
 		}
 
@@ -174,14 +174,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.');
 			}
 		}
@@ -191,7 +191,7 @@ 
 		 *
 		 * @return array the list of the application language
 		 */
-		public function getSupported(){
+		public function getSupported() {
 			return $this->availables;
 		}
 
@@ -200,7 +200,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);
 			}

core/classes/Request.php

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 			$this->header = array();
 			if(function_exists('apache_request_headers')){
 				$this->header = apache_request_headers();
-			}
-			else if(function_exists('getallheaders')){
+			} else if(function_exists('getallheaders')){
 				$this->header = getallheaders();
 			}
 		}

Spacing +27 added lines, -27 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Request{
+	class Request {
 		
 		/**
 		 * The value for the super global $_GET
@@ -90,21 +90,21 @@ 
 		/**
 		 * Construct new request instance
 		 */
-		public function __construct(){
+		public function __construct() {
 			$this->get = $_GET;
 			$this->post = $_POST;
 			$this->server = $_SERVER;
 			$this->query = $_REQUEST;
 			$this->cookie = $_COOKIE;
 			$this->file = $_FILES;
-			$this->session =& class_loader('Session', 'classes');
+			$this->session = & class_loader('Session', 'classes');
 			$this->method = $this->server('REQUEST_METHOD');
 			$this->requestUri = $this->server('REQUEST_URI');
 			$this->header = array();
-			if(function_exists('apache_request_headers')){
+			if (function_exists('apache_request_headers')) {
 				$this->header = apache_request_headers();
 			}
-			else if(function_exists('getallheaders')){
+			else if (function_exists('getallheaders')) {
 				$this->header = getallheaders();
 			}
 		}
@@ -113,7 +113,7 @@ 
 		 * Get the request method
 		 * @return string
 		 */
-		public function method(){
+		public function method() {
 			return $this->method;
 		}
 		
@@ -121,7 +121,7 @@ 
 		 * Get the request URI
 		 * @return string
 		 */
-		public function requestUri(){
+		public function requestUri() {
 			return $this->requestUri;
 		}
 
@@ -131,13 +131,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function query($key = null, $xss = true){
-			if(empty($key)){
+		public function query($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->query) : $this->query;
 			}
 			$query = array_key_exists($key, $this->query) ? $this->query[$key] : null;
-			if($xss){
+			if ($xss) {
 				$query = clean_input($query);
 			}
 			return $query;
@@ -149,13 +149,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function get($key = null, $xss = true){
-			if(empty($key)){
+		public function get($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->get) : $this->get;
 			}
 			$get = array_key_exists($key, $this->get) ? $this->get[$key] : null;
-			if($xss){
+			if ($xss) {
 				$get = clean_input($get);
 			}
 			return $get;
@@ -167,13 +167,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function post($key = null, $xss = true){
-			if(empty($key)){
+		public function post($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->post) : $this->post;
 			}
 			$post = array_key_exists($key, $this->post) ? $this->post[$key] : null;
-			if($xss){
+			if ($xss) {
 				$post = clean_input($post);
 			}
 			return $post;
@@ -185,13 +185,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function server($key = null, $xss = true){
-			if(empty($key)){
+		public function server($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->server) : $this->server;
 			}
 			$server = array_key_exists($key, $this->server) ? $this->server[$key] : null;
-			if($xss){
+			if ($xss) {
 				$server = clean_input($server);
 			}
 			return $server;
@@ -203,13 +203,13 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function cookie($key = null, $xss = true){
-			if(empty($key)){
+		public function cookie($key = null, $xss = true) {
+			if (empty($key)) {
 				//return all
 				return $xss ? clean_input($this->cookie) : $this->cookie;
 			}
 			$cookie = array_key_exists($key, $this->cookie) ? $this->cookie[$key] : null;
-			if($xss){
+			if ($xss) {
 				$cookie = clean_input($cookie);
 			}
 			return $cookie;
@@ -220,7 +220,7 @@ 
 		 * @param  string  $key the item key to be fetched
 		 * @return array|mixed       the item value if the key exists or all array if the key does not exists or is empty
 		 */
-		public function file($key){
+		public function file($key) {
 			$file = array_key_exists($key, $this->file) ? $this->file[$key] : null;
 			return $file;
 		}
@@ -231,9 +231,9 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return array|mixed       the item value if the key exists or null if the key does not exists
 		 */
-		public function session($key, $xss = true){
+		public function session($key, $xss = true) {
 			$session = $this->session->get($key);
-			if($xss){
+			if ($xss) {
 				$session = clean_input($session);
 			}
 			return $session;
@@ -245,9 +245,9 @@ 
 		 * @param  boolean $xss if need apply some XSS attack rule on the value
 		 * @return mixed       the item value if the key exists or null if the key does not exists
 		 */
-		public function header($key, $xss = true){
+		public function header($key, $xss = true) {
 			$header = array_key_exists($key, $this->header) ? $this->header[$key] : null;
-			if($xss){
+			if ($xss) {
 				$header = clean_input($header);
 			}
 			return $header;

core/libraries/PDF.php

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * PDF library to generate PDF document using the library DOMPDF
 	 */
-	class PDF{
+	class PDF {
 		
 		/**
 		 * The dompdf instance
@@ -44,11 +44,11 @@ 
 		/**
 		 * Create PDF library instance
 		 */
-		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
+		public function __construct() {
+	        $this->logger = & class_loader('Log', 'classes');
 	        $this->logger->setLogger('Library::PDF');
 
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
+			require_once VENDOR_PATH . 'dompdf/dompdf_config.inc.php';
 			$this->dompdf = new Dompdf();
 		}
 
@@ -62,15 +62,15 @@ 
 		 * @return string|void               if $stream is true send PDF document to browser for download, else return the generated PDF
 		 * content like to join in Email attachment of for other purpose use.
 		 */
-		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait'){
-			$this->logger->info('Generating of PDF document: filename [' .$filename. '], stream [' .($stream ? 'TRUE':'FALSE'). '], paper [' .$paper. '], orientation [' .$orientation. ']');
+		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait') {
+			$this->logger->info('Generating of PDF document: filename [' . $filename . '], stream [' . ($stream ? 'TRUE' : 'FALSE') . '], paper [' . $paper . '], orientation [' . $orientation . ']');
 			$this->dompdf->load_html($html);
 			$this->dompdf->set_paper($paper, $orientation);
 			$this->dompdf->render();
-			if($stream){
+			if ($stream) {
 				$this->dompdf->stream($filename);
 			}
-			else{
+			else {
 				return $this->dompdf->output();
 			}
 		}
@@ -80,7 +80,7 @@ 
 		*
 		* @return object the dompdf instance
 		*/
-		public function getDompdf(){
+		public function getDompdf() {
 			return $this->dompdf;
 		}
 		

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			$this->dompdf->render();
 			if($stream){
 				$this->dompdf->stream($filename);
-			}
-			else{
+			} else{
 				return $this->dompdf->output();
 			}
 		}

core/libraries/Email.php

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 			foreach ($emails as $name => $email) {
 				if(is_numeric($name)){
 					$this->setTo($email);
-				}
-				else{
+				} else{
 					$this->setTo($email, $name);
 				}
 			}

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
 		 */
 		public function __construct()
 		{
-			$this->logger =& class_loader('Log', 'classes');
+			$this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Email');
 			$this->reset();
 		}
@@ -148,10 +148,10 @@ 
 		public function setTos(array $emails)
 		{
 			foreach ($emails as $name => $email) {
-				if(is_numeric($name)){
+				if (is_numeric($name)) {
 					$this->setTo($email);
 				}
-				else{
+				else {
 					$this->setTo($email, $name);
 				}
 			}
@@ -281,8 +281,8 @@ 
 		 */
 		public function addAttachment($path, $filename = null, $data = null)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filename = empty($filename) ? basename($path) : $filename;
 			$filename = $this->encodeUtf8($this->filterOther((string) $filename));
@@ -304,13 +304,13 @@ 
 		 */
 		public function getAttachmentData($path)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filesize = filesize($path);
 			$handle = fopen($path, "r");
 			$attachment = null;
-			if(is_resource($handle)){
+			if (is_resource($handle)) {
 				$attachment = fread($handle, $filesize);
 				fclose($handle);
 			}