tnhfw / tnh-fw

tests/hmvc/models/DBSessionModel.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	class DBSessionModel extends DBSessionHandlerModel{
+	class DBSessionModel extends DBSessionHandlerModel {
 		
 		protected $_table = 'ses';
 		protected $primary_key = 's_id';
@@ -14,14 +14,14 @@ 
 			'skey' => 'test_id' //VARCHAR(255) 
 		);
 		
-		public function deleteByTime($time){
+		public function deleteByTime($time) {
 			$this->_database->from($this->_table)
 						->where('s_time', '<', $time)
 						->delete();
 		}
 
 		
-		public function getKeyValue(){
+		public function getKeyValue() {
 			$user_id = 0;
 			return $user_id;
 		}

tests/include/common.php

Spacing +36 added lines, -36 removed lines

@@ -29,14 +29,14 @@ 
 		//put the first letter of class to upper case 
 		$class = ucfirst($class);
 		static $classes = array();
-		if(isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log'){
+		if (isset($classes[$class]) /*hack for duplicate log Logger name*/ && $class != 'Log') {
 			return $classes[$class];
 		}
 		$found = false;
 		foreach (array(ROOT_PATH, CORE_PATH) as $path) {
 			$file = $path . $dir . '/' . $class . '.php';
-			if(file_exists($file)){
-				if(class_exists($class, false) == false){
+			if (file_exists($file)) {
+				if (class_exists($class, false) == false) {
 					require_once $file;
 				}
 				//already found
@@ -44,7 +44,7 @@ 
 				break;
 			}
 		}
-		if(! $found){
+		if (!$found) {
 			//can't use show_error() at this time because some dependencies not yet loaded
 			set_http_status_header(503);
 			echo 'Cannot find the class [' . $class . ']';
@@ -54,7 +54,7 @@ 
 		/*
 		   TODO use the best method to get the Log instance
 		 */
-		if($class == 'Log'){
+		if ($class == 'Log') {
 			//can't use the instruction like "return new Log()" 
 			//because we need return the reference instance of the loaded class.
 			$log = new Log();
@@ -72,7 +72,7 @@ 
 
 	function & class_loaded($class = null){
 		static $list = array();
-		if($class != null){
+		if ($class != null) {
 			$list[strtolower($class)] = $class;
 		}
 		return $list;
@@ -80,7 +80,7 @@ 
 
 	function & load_configurations(array $overwrite_values = array()){
 		static $config;
-		if(empty($config)){
+		if (empty($config)) {
 			$file = CONFIG_PATH . 'config.php';
 			require_once $file;
 		
@@ -94,50 +94,50 @@ 
 	/**
 	*  @test
 	*/
-	function get_config($key, $default = null){
+	function get_config($key, $default = null) {
 		static $cfg;
-		if(empty($cfg)){
+		if (empty($cfg)) {
 			$cfg[0] = & load_configurations();
 		}
 		return array_key_exists($key, $cfg[0]) ? $cfg[0][$key] : $default;
 	}
 
-	function save_to_log($level, $message, $logger = null){
+	function save_to_log($level, $message, $logger = null) {
 		return true;
 	}
 
 	
-	function set_http_status_header($code = 200, $text = null){
+	function set_http_status_header($code = 200, $text = null) {
 		return true;
 	}
 
 	
-	function show_error($msg, $title = 'error', $logging = true){
+	function show_error($msg, $title = 'error', $logging = true) {
 		//show only and continue to help track of some error occured
-		echo 'TNHFW Error: '.$msg . "\n";
+		echo 'TNHFW Error: ' . $msg . "\n";
 	}
 
-	function is_https(){
+	function is_https() {
 		return false;
 	}
 	
 	/**
 	*  @test
 	*/
-	function is_url($url){
+	function is_url($url) {
 		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
 	}
 		
-	function php_exception_handler($ex){
-		throw new RuntimeException('PHP Exception : '.$ex->getMessage().' | '.$ex->getFile().' | '.$ex->getLine());
+	function php_exception_handler($ex) {
+		throw new RuntimeException('PHP Exception : ' . $ex->getMessage() . ' | ' . $ex->getFile() . ' | ' . $ex->getLine());
 	}
 	
 	
-	function php_error_handler($errno , $errstr, $errfile , $errline, array $errcontext = array()){
-		throw new RuntimeException('TNHFW Exception Error : '.$errstr.' | '.$errfile.' | '.$errline);
+	function php_error_handler($errno, $errstr, $errfile, $errline, array $errcontext = array()) {
+		throw new RuntimeException('TNHFW Exception Error : ' . $errstr . ' | ' . $errfile . ' | ' . $errline);
 	}
 
-	function php_shudown_handler(){
+	function php_shudown_handler() {
 		return true;
 	}
 
@@ -145,11 +145,11 @@ 
 	/**
 	*  @test
 	*/
-	function attributes_to_string(array $attributes){
+	function attributes_to_string(array $attributes) {
 		$str = ' ';
 		//we check that the array passed as an argument is not empty.
-		if(! empty($attributes)){
-			foreach($attributes as $key => $value){
+		if (!empty($attributes)) {
+			foreach ($attributes as $key => $value) {
 				$key = trim(htmlspecialchars($key));
 				$value = trim(htmlspecialchars($value));
 				/*
@@ -159,35 +159,35 @@ 
 				* 	$attr = array('placeholder' => 'I am a "puple"')
 				* 	$str = attributes_to_string($attr); => placeholder = "I am a \"puple\""
 				 */
-				if($value && strpos('"', $value) !== false){
+				if ($value && strpos('"', $value) !== false) {
 					$value = addslashes($value);
 				}
-				$str .= $key.' = "'.$value.'" ';
+				$str .= $key . ' = "' . $value . '" ';
 			}
 		}
 		//remove the space after using rtrim()
 		return rtrim($str);
 	}
 
-	function stringfy_vars($var){
+	function stringfy_vars($var) {
 		return print_r($var, true);
 	}
 
 	/**
 	*  @test
 	*/
-	function clean_input($str){
-		if(is_array($str)){
+	function clean_input($str) {
+		if (is_array($str)) {
 			$str = array_map('clean_input', $str);
 		}
-		else if(is_object($str)){
+		else if (is_object($str)) {
 			$obj = $str;
 			foreach ($str as $var => $value) {
 				$obj->$var = clean_input($value);
 			}
 			$str = $obj;
 		}
-		else{
+		else {
 			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
 		}
 		return $str;
@@ -196,11 +196,11 @@ 
 	/**
 	*  @test
 	*/
-	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
+	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*') {
 		//get the string length
 		$len = strlen($str);
 		//if str is empty
-		if($len <= 0){
+		if ($len <= 0) {
 			return str_repeat($hiddenChar, 6);
 		}
 		//if the length is less than startCount and endCount
@@ -208,14 +208,14 @@ 
 		//or startCount is negative or endCount is negative
 		//return the full string hidden
 		
-		if((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)){
+		if ((($startCount + $endCount) > $len) || ($startCount == 0 && $endCount == 0) || ($startCount < 0 || $endCount < 0)) {
 			return str_repeat($hiddenChar, $len);
 		}
 		//the start non hidden string
 		$startNonHiddenStr = substr($str, 0, $startCount);
 		//the end non hidden string
 		$endNonHiddenStr = null;
-		if($endCount > 0){
+		if ($endCount > 0) {
 			$endNonHiddenStr = substr($str, - $endCount);
 		}
 		//the hidden string
@@ -224,12 +224,12 @@ 
 		return $startNonHiddenStr . $hiddenStr . $endNonHiddenStr;
 	}
 	
-	function set_session_config(){
+	function set_session_config() {
 		return true;
 	}
 	
 	function & get_instance(){
-		if(! Controller::get_instance()){
+		if (!Controller::get_instance()) {
 			$c = new Controller();
 		}
 		return Controller::get_instance();

tests/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	* Custom application path for tests 
 	*/
-	define('APPS_PATH', TESTS_PATH .'hmvc' . DS);
+	define('APPS_PATH', TESTS_PATH . 'hmvc' . DS);
 
 	/**
 	* The path to the controller directory of your application.
@@ -196,7 +196,7 @@ 
 	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
 	* in HMVC architecture (hierichical, controllers, models, views).
 	*/
-	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS .'hmvc' . DS . 'modules' . DS);
+	define('MODULE_PATH', dirname(realpath(__FILE__)) . DS . 'hmvc' . DS . 'modules' . DS);
 
 	/**
 	* The path to the directory of sources external to your application.
@@ -235,7 +235,7 @@ 
 	//Fix to allow test as if application is running in CLI mode $_SESSION global variable is not available
 	$_SESSION = array();
 	
-	if(! isset($_SERVER['REMOTE_ADDR'])){ 
+	if (!isset($_SERVER['REMOTE_ADDR'])) { 
 		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 	}
 
@@ -243,7 +243,7 @@ 
 	require_once  'include/autoloader.php';
 	
 	//check for composer autoload file if exists include it
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		require_once VENDOR_PATH . 'autoload.php';
 		
 		//define the class alias for vstream

tests/tnhfw/CommonTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,20 +24,20 @@
 		}
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
+		public function testFunctionGetConfigKeyNotExist() {
 			$key = 'foo';
 			$cfg = get_config($key);
 			$this->assertNull($cfg);
 		}
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+		public function testFunctionGetConfigKeyNotExistUsingDefaultValue() {
 			$key = 'foo';
 			$expected = 'bar';
 			$cfg = get_config($key, $expected);
 			$this->assertEquals($cfg, $expected);
 		}
 		
-		public function testFunctionGetConfigAfterSet(){
+		public function testFunctionGetConfigAfterSet() {
 			$key = 'foo';
 			$expected = 'bar';
 			$c = new Config();

core/classes/Database.php

Spacing +257 added lines, -257 removed lines

@@ -23,158 +23,158 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
 	/**
 	 * The PDO instance
 	 * @var object
 	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
 	*/
-	private $databaseName        = null;
+	private $databaseName = null;
     
 	/**
 	 * The SQL SELECT statment
 	 * @var string
 	*/
-	private $select              = '*';
+	private $select = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
 	*/
-    private $from                = null;
+    private $from = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
 	*/
-    private $where               = null;
+    private $where = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
 	*/
-    private $limit               = null;
+    private $limit = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
 	*/
-    private $join                = null;
+    private $join = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
 	*/
-    private $orderBy             = null;
+    private $orderBy = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
 	*/
-    private $groupBy             = null;
+    private $groupBy = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
 	*/
-    private $having              = null;
+    private $having = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
 	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
 	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
 	*/
-    private $query               = null;
+    private $query = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
 	*/
-    private $prefix              = null;
+    private $prefix = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
 	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = array('=', '!=', '<', '>', '<=', '>=', '<>');
     
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
 	*/
-	private $cacheTtl              = 0;
+	private $cacheTtl = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
 	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
 	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
 	*/
-    private $data                = array();
+    private $data = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
 	*/
-    private $config              = array();
+    private $config = array();
 	
 	/**
 	 * The logger instance
 	 * @var Log
 	 */
-    private $logger              = null;
+    private $logger = null;
 
 
     /**
     * The cache instance
     * @var CacheInterface
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
      /**
     * The benchmark instance
     * @var Benchmark
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 
 
     /**
@@ -182,25 +182,25 @@ 
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      * @param object $logger the log instance
      */
-    public function __construct($overwriteConfig = array(), Log $logger = null){
+    public function __construct($overwriteConfig = array(), Log $logger = null) {
         /**
          * instance of the Log class
          */
-        if(is_object($logger)){
+        if (is_object($logger)) {
           $this->logger = $logger;
         }
-        else{
-            $this->logger =& class_loader('Log', 'classes');
+        else {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
 
         $db = array();
-      	if(file_exists(CONFIG_PATH . 'database.php')){
+      	if (file_exists(CONFIG_PATH . 'database.php')) {
           //here don't use require_once because somewhere user can create database instance directly
       	  require CONFIG_PATH . 'database.php';
         }
           
-				if(! empty($overwriteConfig)){
+				if (!empty($overwriteConfig)) {
 				  $db = array_merge($db, $overwriteConfig);
 				}
         $config = array();
@@ -213,12 +213,12 @@ 
 				$config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
 				$config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
         $port = '';
-        if(strstr($config['hostname'], ':')){
+        if (strstr($config['hostname'], ':')) {
           $p = explode(':', $config['hostname']);
           $port = isset($p[1]) ? $p[1] : '';
           $config['hostname'] = isset($p[0]) ? $p[0] : '';
         }
-				$config['port']      = $port;
+				$config['port'] = $port;
 				
 		  	$this->setDatabaseConfiguration($config);
     		$this->temporaryCacheTtl = $this->cacheTtl;
@@ -228,10 +228,10 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $driverDsnMap = array(
               'mysql' => 'mysql:host=' . $config['hostname'] . ';' 
                           . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '') 
@@ -252,13 +252,13 @@ 
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
       }
-      else{
+      else {
         show_error('Database configuration is not set.');
         return false;
       }
@@ -269,15 +269,15 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current Database instance
      */
-    public function from($table){
-      if(is_array($table)){
+    public function from($table) {
+      if (is_array($table)) {
         $froms = '';
-        foreach($table as $key){
+        foreach ($table as $key) {
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
       }
-      else{
+      else {
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -288,7 +288,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current Database instance
      */
-    public function select($fields){
+    public function select($fields) {
       $select = (is_array($fields) ? implode(', ', $fields) : $fields);
       $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
       return $this;
@@ -299,7 +299,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current Database instance
      */
-    public function distinct($field){
+    public function distinct($field) {
       $distinct = ' DISTINCT ' . $field;
       $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
 
@@ -312,7 +312,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
       $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -324,7 +324,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
       $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -336,7 +336,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
       $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -348,7 +348,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
       $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -360,7 +360,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
       $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -375,16 +375,16 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current Database instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
       $on = $field1;
       $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
       }
-      if (is_null($this->join)){
+      if (is_null($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
-      else{
+      else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -395,7 +395,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
+    public function innerJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'INNER ');
     }
 
@@ -404,7 +404,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT ');
 	}
 
@@ -413,7 +413,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT ');
     }
 
@@ -422,7 +422,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function fullOuterJoin($table, $field1, $op = null, $field2 = '') {
     	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
     }
 
@@ -431,7 +431,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
     }
 
@@ -440,7 +440,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
     }
 
@@ -450,18 +450,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
         	$this->whereIsNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NULL ';
           }
       }
       return $this;
@@ -473,18 +473,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNotNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
           $this->whereIsNotNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NOT NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NOT NULL ';
           }
       }
       return $this;
@@ -500,24 +500,24 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current Database instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($where)){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($where)) {
         $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
+        foreach ($where as $column => $data) {
+          if (is_null($data)) {
             $data = '';
           }
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
-        $where = implode(' '.$andOr.' ', $_where);
+        $where = implode(' ' . $andOr . ' ', $_where);
       }
-      else{
-        if(is_array($op)){
+      else {
+        if (is_array($op)) {
           $x = explode('?', $where);
           $w = '';
-          foreach($x as $k => $v){
-            if(! empty($v)){
-                if(isset($op[$k]) && is_null($op[$k])){
+          foreach ($x as $k => $v) {
+            if (!empty($v)) {
+                if (isset($op[$k]) && is_null($op[$k])) {
                   $op[$k] = '';
                 }
                 $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -525,28 +525,28 @@ 
           }
           $where = $w;
         }
-        else if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
+        else if (!in_array((string) $op, $this->operatorList)) {
+          if (is_null($op)) {
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
         }
-        else{
-          if(is_null($val)){
+        else {
+          if (is_null($val)) {
             $val = '';
           }
         	$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
         }
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $where;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $where;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $where;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $where;
         }
       }
       return $this;
@@ -557,7 +557,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
+    public function orWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, '', 'OR', $escape);
     }
 
@@ -567,7 +567,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
+    public function notWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
     }
 
@@ -576,7 +576,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
+    public function orNotWhere($where, $op = null, $val = null, $escape = true) {
     	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
     }
 
@@ -586,15 +586,15 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current Database instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (is_null($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+      if (is_null($this->where)) {
         $this->where = $type . ' (';
       }
-      else{
-          if(substr($this->where, -1) == '('){
+      else {
+          if (substr($this->where, -1) == '(') {
             $this->where .= $type . ' (';
           }
-          else{
+          else {
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -606,7 +606,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
       return $this->groupStart('NOT');
     }
 
@@ -615,7 +615,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
       return $this->groupStart('', ' OR');
     }
 
@@ -624,7 +624,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
       return $this->groupStart('NOT', ' OR');
     }
 
@@ -632,7 +632,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current Database instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
       $this->where .= ')';
       return $this;
     }
@@ -646,25 +646,25 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($keys)){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($keys)) {
         $_keys = array();
-        foreach ($keys as $k => $v){
-          if(is_null($v)){
+        foreach ($keys as $k => $v) {
+          if (is_null($v)) {
             $v = '';
           }
           $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
         }
         $keys = implode(', ', $_keys);
-        if (is_null($this->where)){
+        if (is_null($this->where)) {
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
         }
-        else{
-          if(substr($this->where, -1) == '('){
-            $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+        else {
+          if (substr($this->where, -1) == '(') {
+            $this->where = $this->where . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
-          else{
-            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+          else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
         }
       }
@@ -676,7 +676,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function notIn($field, array $keys, $escape = true){
+    public function notIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'AND', $escape);
     }
 
@@ -685,7 +685,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -694,7 +694,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orNotIn($field, array $keys, $escape = true){
+    public function orNotIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'OR', $escape);
     }
 
@@ -708,21 +708,21 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
+    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($value1)) {
         $value1 = '';
       }
-      if(is_null($value2)){
+      if (is_null($value2)) {
         $value2 = '';
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
-        else{
+        else {
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -734,7 +734,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function notBetween($field, $value1, $value2, $escape = true){
+    public function notBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
     }
 
@@ -743,7 +743,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orBetween($field, $value1, $value2, $escape = true){
+    public function orBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, '', 'OR', $escape);
     }
 
@@ -752,7 +752,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
+    public function orNotBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
     }
 
@@ -765,20 +765,20 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($data)) {
         $data = '';
       }
       $like = $escape ? $this->escape($data) : $data;
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
       return $this;
@@ -789,7 +789,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
       return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -798,7 +798,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -807,7 +807,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -818,14 +818,14 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current Database instance
      */
-    public function limit($limit, $limitEnd = null){
-      if(is_null($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (is_null($limit)) {
         return;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
       }
-      else{
+      else {
         $this->limit = $limit;
       }
       return $this;
@@ -837,16 +837,16 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current Database instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! is_null($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (!is_null($orderDir)) {
+        $this->orderBy = !$this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
       }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+      else {
+        if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
+          $this->orderBy = !$this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
         }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+        else {
+          $this->orderBy = !$this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
       return $this;
@@ -857,11 +857,11 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current Database instance
      */
-    public function groupBy($field){
-      if(is_array($field)){
+    public function groupBy($field) {
+      if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
       }
-      else{
+      else {
         $this->groupBy = $field;
       }
       return $this;
@@ -875,13 +875,13 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+      if (is_array($op)) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
+        foreach ($x as $k => $v) {
+  	      if (!empty($v)) {
+            if (isset($op[$k]) && is_null($op[$k])) {
               $op[$k] = '';
             }
   	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -889,14 +889,14 @@ 
       	}
         $this->having = $w;
       }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
+      else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
       }
-      else{
-        if(is_null($val)){
+      else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
@@ -908,7 +908,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -916,15 +916,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -935,14 +935,14 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->limit = 1;
       $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+        return $this->query($query, false, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -952,37 +952,37 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
       $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! is_null($this->join)){
+      if (!is_null($this->join)) {
         $query .= $this->join;
       }
 	  
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->groupBy)){
+      if (!is_null($this->groupBy)) {
         $query .= ' GROUP BY ' . $this->groupBy;
       }
 
-      if (! is_null($this->having)){
+      if (!is_null($this->having)) {
         $query .= ' HAVING ' . $this->having;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
           $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if(! is_null($this->limit)){
+      if (!is_null($this->limit)) {
       	$query .= ' LIMIT ' . $this->limit;
       }
 	  
-	  if($returnSQLQueryOrResultType === true){
+	  if ($returnSQLQueryOrResultType === true) {
     	return $query;
       }
-      else{
-    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -992,15 +992,15 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
+    public function insert($data = array(), $escape = true) {
       $column = array();
       $val = array();
-      if(! $data && $this->getData()){
+      if (!$data && $this->getData()) {
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
       }
-      else{
+      else {
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1009,14 +1009,14 @@ 
       $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
       $query = $this->query($query);
 
-      if ($query){
-        if(! $this->pdo){
+      if ($query) {
+        if (!$this->pdo) {
           $this->connect();
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
       }
-      else{
+      else {
 		  return false;
       }
     }
@@ -1027,29 +1027,29 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
       $query = 'UPDATE ' . $this->from . ' SET ';
       $values = array();
-      if(! $data && $this->getData()){
-        foreach ($this->getData() as $column => $val){
+      if (!$data && $this->getData()) {
+        foreach ($this->getData() as $column => $val) {
           $values[] = $column . ' = ' . $val;
         }
       }
-      else{
-        foreach ($data as $column => $val){
+      else {
+        foreach ($data as $column => $val) {
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
       }
       $query .= (is_array($data) ? implode(', ', $values) : $data);
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if (! is_null($this->limit)){
+      if (!is_null($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
       }
       return $this->query($query);
@@ -1059,22 +1059,22 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
     	$query = 'DELETE FROM ' . $this->from;
 
-    	if (! is_null($this->where)){
+    	if (!is_null($this->where)) {
     		$query .= ' WHERE ' . $this->where;
       	}
 
-    	if (! is_null($this->orderBy)){
+    	if (!is_null($this->orderBy)) {
     	  $query .= ' ORDER BY ' . $this->orderBy;
       	}
 
-    	if (! is_null($this->limit)){
+    	if (!is_null($this->limit)) {
     		$query .= ' LIMIT ' . $this->limit;
       	}
 
-    	if($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite'){  
+    	if ($query == 'DELETE FROM ' . $this->from && $this->config['driver'] != 'sqlite') {  
     		$query = 'TRUNCATE TABLE ' . $this->from;
       }
     	return $this->query($query);
@@ -1087,13 +1087,13 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
-      if(is_array($all)){
+      if (is_array($all)) {
         $x = explode('?', $query);
         $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
+        foreach ($x as $k => $v) {
+          if (!empty($v)) {
             $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
           }
         }
@@ -1102,7 +1102,7 @@ 
 
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+      $this->logger->info('Execute SQL query [' . $this->query . '], return type: ' . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' . ($all ? 'YES' : 'NO'));
       //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
@@ -1124,34 +1124,34 @@ 
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
+      if ($dbCacheStatus && $sqlSELECTQuery) {
         $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
         $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
+        if (is_object($this->cacheInstance)) {
           $cacheInstance = $this->cacheInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
       }
-      else{
+      else {
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       
-      if (! $cacheContent && $sqlSELECTQuery){
+      if (!$cacheContent && $sqlSELECTQuery) {
 		    //for database query execution time
         $benchmarkMarkerKey = md5($query . $all . $array);
         $bench = null;
-        if(is_object($this->benchmarkInstance)){
+        if (is_object($this->benchmarkInstance)) {
           $bench = $this->benchmarkInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1162,64 +1162,64 @@ 
     		//get response time for this query
         $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
-        if ($sqlQuery){
+        if ($sqlQuery) {
             //if need return all result like list of record
-            if ($all){
+            if ($all) {
     				    $this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
     		    }
-            else{
+            else {
 				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
-            if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+            if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
               $this->numRows = count($this->result);  
             }
-            else{
+            else {
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
-          if ($dbCacheStatus && $sqlSELECTQuery){
-              $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+          if ($dbCacheStatus && $sqlSELECTQuery) {
+              $this->logger->info('Save the result for query [' . $this->query . '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
         }
-        else{
+        else {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      else if ((!$cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)) {
     		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
+    		if ($queryStr) {
           //Sqlite and pgsql always return 0 when using rowCount()
-          if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
+          if (in_array($this->config['driver'], array('sqlite', 'pgsql'))) {
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
           }
-          else{
+          else {
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
     		}
-        if (! $this->result){
+        if (!$this->result) {
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      else {
+        $this->logger->info('The result for query [' . $this->query . '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
       }
       $this->queryCount++;
-      if(! $this->result){
+      if (!$this->result) {
         $this->logger->info('No result where found for the query [' . $query . ']');
       }
       return $this->result;
@@ -1230,8 +1230,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
 		    $this->temporaryCacheTtl = $ttl;
       }
@@ -1243,8 +1243,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-	public function cached($ttl = 0){
-      if($ttl > 0){
+	public function cached($ttl = 0) {
+      if ($ttl > 0) {
         $this->temporaryCacheTtl = $ttl;
       }
 	  return $this;
@@ -1255,11 +1255,11 @@ 
      * @param  mixed $data the data to be escaped
      * @return mixed       the data after escaped
      */
-    public function escape($data){
-      if(is_null($data)){
+    public function escape($data) {
+      if (is_null($data)) {
         return null;
       }
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       return $this->pdo->quote(trim($data));
@@ -1269,7 +1269,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -1277,7 +1277,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -1285,7 +1285,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -1293,7 +1293,7 @@ 
      * Return the database configuration
      * @return array
      */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
       return $this->config;
     }
 
@@ -1301,7 +1301,7 @@ 
      * set the database configuration
      * @param array $config the configuration
      */
-    public function setDatabaseConfiguration(array $config){
+    public function setDatabaseConfiguration(array $config) {
       $this->config = array_merge($this->config, $config);
       $this->prefix = $this->config['prefix'];
       $this->databaseName = $this->config['database'];
@@ -1313,7 +1313,7 @@ 
      * Return the PDO instance
      * @return PDO
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -1321,7 +1321,7 @@ 
      * Set the PDO instance
      * @param PDO $pdo the pdo object
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -1331,7 +1331,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -1339,7 +1339,7 @@ 
      * Set the log instance
      * @param Log $logger the log object
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -1348,7 +1348,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -1356,7 +1356,7 @@ 
      * Set the cache instance
      * @param CacheInterface $cache the cache object
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -1365,7 +1365,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -1373,7 +1373,7 @@ 
      * Set the benchmark instance
      * @param Benchmark $cache the cache object
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -1382,7 +1382,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -1393,7 +1393,7 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value, $escape = true){
+    public function setData($key, $value, $escape = true) {
       $this->data[$key] = $escape ? $this->escape($value) : $value;
       return $this;
     }
@@ -1402,7 +1402,7 @@ 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
-  private function reset(){
+  private function reset() {
     $this->select   = '*';
     $this->from     = null;
     $this->where    = null;
@@ -1422,7 +1422,7 @@ 
   /**
    * The class destructor
    */
-  function __destruct(){
+  function __destruct() {
     $this->pdo = null;
   }
 

core/libraries/Upload.php

Spacing +47 added lines, -47 removed lines

@@ -37,7 +37,7 @@ 
     *    @package FileUpload
     *    @version 1.5
     */
-    class Upload{
+    class Upload {
 
         /**
         *   Version
@@ -69,7 +69,7 @@ 
         *    @version    1.0
         *    @var        array
         */
-        private $file_array    = array();
+        private $file_array = array();
 
         /**
         *    If the file you are trying to upload already exists it will
@@ -119,7 +119,7 @@ 
         *    @version    1.0
         *    @var        float
         */
-        private $max_file_size= 0.0;
+        private $max_file_size = 0.0;
 
         /**
         *    List of allowed mime types
@@ -217,12 +217,12 @@ 
         *    @return    object
         *    @method    object    __construct
         */
-        public function __construct(){
-            $this->logger =& class_loader('Log', 'classes');
+        public function __construct() {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Upload');
 
             Loader::lang('file_upload');
-            $obj =& get_instance();
+            $obj = & get_instance();
 
             $this->error_messages = array(
                 'upload_err_ini_size' => $obj->lang->get('fu_upload_err_ini_size'),
@@ -239,15 +239,15 @@ 
             );
 
             $this->file = array(
-                'status'                =>    false,    // True: success upload
-                'mime'                  =>    '',       // Empty string
-                'filename'              =>    '',       // Empty string
-                'original'              =>    '',       // Empty string
-                'size'                  =>    0,        // 0 Bytes
-                'sizeFormated'          =>    '0B',     // 0 Bytes
-                'destination'           =>    './',     // Default: ./
-                'allowed_mime_types'    =>    array(),  // Allowed mime types
-                'error'                 =>    null,        // File error
+                'status'                =>    false, // True: success upload
+                'mime'                  =>    '', // Empty string
+                'filename'              =>    '', // Empty string
+                'original'              =>    '', // Empty string
+                'size'                  =>    0, // 0 Bytes
+                'sizeFormated'          =>    '0B', // 0 Bytes
+                'destination'           =>    './', // Default: ./
+                'allowed_mime_types'    =>    array(), // Allowed mime types
+                'error'                 =>    null, // File error
             );
 
             // Change dir to current dir
@@ -259,7 +259,7 @@ 
             } elseif (isset($HTTP_POST_FILES) && is_array($HTTP_POST_FILES)) {
                 $this->file_array = $HTTP_POST_FILES;
             }
-            $this->logger->info('The upload file information are : ' .stringfy_vars($this->file_array));
+            $this->logger->info('The upload file information are : ' . stringfy_vars($this->file_array));
         }
         /**
         *    Set input.
@@ -275,7 +275,7 @@ 
         */
         public function setInput($input)
         {
-            if (!empty($input) && (is_string($input) || is_numeric($input) )) {
+            if (!empty($input) && (is_string($input) || is_numeric($input))) {
                 $this->input = $input;
             }
             return $this;
@@ -311,7 +311,7 @@ 
         */
         public function setAutoFilename()
         {
-            $this->filename = sha1(mt_rand(1, 9999).uniqid());
+            $this->filename = sha1(mt_rand(1, 9999) . uniqid());
             $this->filename .= time();
             return $this;
         }
@@ -332,7 +332,7 @@ 
                 $php_size = $this->sizeInBytes(ini_get('upload_max_filesize'));
                 // Calculate difference
                 if ($php_size < $file_size) {
-                    $this->logger->warning('The upload max file size you set [' .$file_size. '] is greather than the PHP configuration for upload max file size [' .$php_size. ']');
+                    $this->logger->warning('The upload max file size you set [' . $file_size . '] is greather than the PHP configuration for upload max file size [' . $php_size . ']');
                 }
                 $this->max_file_size = $file_size;
             }
@@ -350,7 +350,7 @@ 
         public function setAllowedMimeTypes(array $mimes)
         {
             if (count($mimes) > 0) {
-                array_map(array($this , 'setAllowMimeType'), $mimes);
+                array_map(array($this, 'setAllowMimeType'), $mimes);
             }
             return $this;
         }
@@ -415,7 +415,7 @@ 
         {
             if (!empty($name) && is_string($name)) {
                 if (array_key_exists($name, $this->mime_helping)) {
-                    return $this->setAllowedMimeTypes($this->mime_helping[ $name ]);
+                    return $this->setAllowedMimeTypes($this->mime_helping[$name]);
                 }
             }
             return $this;
@@ -434,8 +434,8 @@ 
         */
         public function setUploadFunction($function)
         {
-            if (!empty($function) && (is_array($function) || is_string($function) )) {
-                if (is_callable( $function)) {
+            if (!empty($function) && (is_array($function) || is_string($function))) {
+                if (is_callable($function)) {
                     $this->upload_function = $function;
                 }
             }
@@ -488,8 +488,8 @@ 
                             chdir($destination_directory);
                         }
                     }
-                    else{
-                        $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
+                    else {
+                        $this->logger->warning('Can not create the upload directory [' . $destination_directory . ']');
                     }
                 }
             }
@@ -539,7 +539,7 @@ 
         public function isFilename($filename)
         {
             $filename = basename($filename);
-            return (!empty($filename) && (is_string( $filename) || is_numeric($filename)));
+            return (!empty($filename) && (is_string($filename) || is_numeric($filename)));
         }
         /**
         *    Validate mime type with allowed mime types,
@@ -581,11 +581,11 @@ 
         */
         public function isDirpath($path)
         {
-            if (!empty( $path) && (is_string( $path) || is_numeric($path) )) {
+            if (!empty($path) && (is_string($path) || is_numeric($path))) {
                 if (DIRECTORY_SEPARATOR == '/') {
-                    return (preg_match( '/^[^*?"<>|:]*$/' , $path) == 1 );
+                    return (preg_match('/^[^*?"<>|:]*$/', $path) == 1);
                 } else {
-                    return (preg_match( "/^[^*?\"<>|:]*$/" , substr($path,2) ) == 1);
+                    return (preg_match("/^[^*?\"<>|:]*$/", substr($path, 2)) == 1);
                 }
             }
             return false;
@@ -613,10 +613,10 @@ 
         */
         public function getInfo()
         {
-            return (object)$this->file;
+            return (object) $this->file;
         }
 
-        public function isUploaded(){
+        public function isUploaded() {
             return isset($this->file_array[$this->input])
             &&
             is_uploaded_file($this->file_array[$this->input]['tmp_name']);
@@ -629,9 +629,9 @@ 
         *    @return    boolean
         *    @method    boolean    save
         */
-        public function save(){
+        public function save() {
             //check if file upload is  allowed in the configuration
-            if(! ini_get('file_uploads')){
+            if (!ini_get('file_uploads')) {
                 $this->setError($this->error_messages['file_uploads']);
                 return false;
             }
@@ -641,7 +641,7 @@ 
                     if (empty($this->filename)) {
                         $this->filename = $this->file_array[$this->input]['name'];
                     }
-                    else{
+                    else {
                         // Replace %s for extension in filename
                         // Before: /[\w\d]*(.[\d\w]+)$/i
                         // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu
@@ -652,7 +652,7 @@ 
                             '$1',
                             $this->file_array[$this->input]['name']
                         );
-                        $this->filename = $this->filename.'.'.$extension;
+                        $this->filename = $this->filename . '.' . $extension;
                     }
 
                     // set file info
@@ -665,10 +665,10 @@ 
                     $this->file['filename']     = $this->filename;
                     $this->file['error']        = $this->file_array[$this->input]['error'];
 
-                    $this->logger->info('The upload file information to process is : ' .stringfy_vars($this->file));
+                    $this->logger->info('The upload file information to process is : ' . stringfy_vars($this->file));
 
                     //check for php upload error
-                    if(is_numeric($this->file['error']) && $this->file['error'] > 0){
+                    if (is_numeric($this->file['error']) && $this->file['error'] > 0) {
                         $this->setError($this->getPhpUploadErrorMessageByCode($this->file['error']));
                         return false;
                     }
@@ -697,8 +697,8 @@ 
                     }
 
                     // Execute input callback
-                    if (!empty( $this->callbacks['input'])) {
-                        call_user_func($this->callbacks['input'], (object)$this->file);
+                    if (!empty($this->callbacks['input'])) {
+                        call_user_func($this->callbacks['input'], (object) $this->file);
                     }
                    
 
@@ -710,8 +710,8 @@ 
                     );
 
                     // Execute output callback
-                    if (!empty( $this->callbacks['output'])) {
-                        call_user_func($this->callbacks['output'], (object)$this->file);
+                    if (!empty($this->callbacks['output'])) {
+                        call_user_func($this->callbacks['output'], (object) $this->file);
                     }
                     return $this->file['status'];
                 }
@@ -730,10 +730,10 @@ 
         */
         public function sizeFormat($size, $precision = 2)
         {
-            if($size > 0){
+            if ($size > 0) {
                 $base       = log($size) / log(1024);
                 $suffixes   = array('B', 'K', 'M', 'G', 'T');
-                return round(pow(1024, $base - floor($base)), $precision) . ( isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
+                return round(pow(1024, $base - floor($base)), $precision) . (isset($suffixes[floor($base)]) ? $suffixes[floor($base)] : '');
             }
             return null;
         }
@@ -757,14 +757,14 @@ 
             if (array_key_exists('unit', $matches)) {
                 $unit = strtoupper($matches['unit']);
             }
-            return (floatval($matches['size']) * pow(1024, $units[$unit]) ) ;
+            return (floatval($matches['size']) * pow(1024, $units[$unit]));
         }
 
         /**
          * Get the upload error message
          * @return string
          */
-        public function getError(){
+        public function getError() {
             return $this->error;
         }
 
@@ -772,7 +772,7 @@ 
          * Set the upload error message
          * @param string $message the upload error message to set
          */
-        public function setError($message){
+        public function setError($message) {
             $this->logger->info('The upload got error : ' . $message);
             $this->error = $message;
         }
@@ -782,7 +782,7 @@ 
          * @param  int $code the error code
          * @return string the error message
          */
-        private function getPhpUploadErrorMessageByCode($code){
+        private function getPhpUploadErrorMessageByCode($code) {
             $codeMessageMaps = array(
                 1 => $this->error_messages['upload_err_ini_size'],
                 2 => $this->error_messages['upload_err_form_size'],

tests/tnhfw/classes/DBSessionHandlerTest.php

Spacing +8 added lines, -8 removed lines

@@ -47,7 +47,7 @@ 
 
 		
 		
-		public function testUsingSessionConfiguration(){
+		public function testUsingSessionConfiguration() {
 			//using value in the configuration
 			static::$config->set('session_save_path', 'DBSessionModel');
 			static::$config->set('session_secret', $this->secret);
@@ -73,7 +73,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenDataIsExpired(){
+		public function testWhenDataIsExpired() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -86,7 +86,7 @@ 
 			$this->assertFalse($dbsh->read('foo'));
 		}
 		
-		public function testWhenDataAlreadyExistDoUpdate(){
+		public function testWhenDataAlreadyExistDoUpdate() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -99,7 +99,7 @@ 
 			$this->assertEquals($dbsh->read('foo'), '445');	
 		}
 		
-		public function testUsingCustomModelInstance(){
+		public function testUsingCustomModelInstance() {
 			$dbsh = new DBSessionHandler($this->model);
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -127,7 +127,7 @@ 
 		}
 			
 			
-		public function testUsingCustomLogInstance(){
+		public function testUsingCustomLogInstance() {
 			$dbsh = new DBSessionHandler($this->model, new Log());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -154,7 +154,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testUsingCustomLoaderInstance(){
+		public function testUsingCustomLoaderInstance() {
 			$dbsh = new DBSessionHandler($this->model, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -182,7 +182,7 @@ 
 		}
 		
 		
-		public function testWhenModelInsanceIsNotSet(){
+		public function testWhenModelInsanceIsNotSet() {
 			$dbsh = new DBSessionHandler(null, null, new Loader());
 			$dbsh->setSessionSecret($this->secret);
 			
@@ -210,7 +210,7 @@ 
 			$this->assertEquals($dbsh->decode($encoded), 'foo');
 		}
 		
-		public function testWhenModelTableColumnsIsNotSet(){
+		public function testWhenModelTableColumnsIsNotSet() {
 			//session table is empty
 			$this->model->setSessionTableColumns(array());
 			$dbsh = new DBSessionHandler($this->model);

core/classes/Config.php

Spacing +29 added lines, -29 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,10 +42,10 @@ 
 		 * The signleton of the logger
 		 * @return Object the Log instance
 		 */
-		private static function getLogger(){
-			if(self::$logger == null){
+		private static function getLogger() {
+			if (self::$logger == null) {
 				$logger = array();
-				$logger[0] =& class_loader('Log', 'classes');
+				$logger[0] = & class_loader('Log', 'classes');
 				$logger[0]->setLogger('Library::Config');
 				self::$logger = $logger[0];
 			}
@@ -57,7 +57,7 @@ 
 		 * @param Log $logger the log object
 		 * @return Log the log instance
 		 */
-		public static function setLogger($logger){
+		public static function setLogger($logger) {
 			self::$logger = $logger;
 			return self::$logger;
 		}
@@ -65,35 +65,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');
 			self::$config = & load_configurations();
-			if(! self::$config['base_url'] || ! is_url(self::$config['base_url'])){
-				if(ENVIRONMENT == 'production'){
+			if (!self::$config['base_url'] || !is_url(self::$config['base_url'])) {
+				if (ENVIRONMENT == 'production') {
 					$logger->warning('Application base URL is not set or invalid, please set application base URL to increase the application loading time');
 				}
 				$baseUrl = null;
-				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);
 			}
-			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') .'/';
-			if(ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info','all'))){
+			self::$config['base_url'] = rtrim(self::$config['base_url'], '/') . '/';
+			if (ENVIRONMENT == 'production' && in_array(strtolower(self::$config['log_level']), array('debug', 'info', 'all'))) {
 				$logger->warning('You are in production environment, please set log level to WARNING, ERROR, FATAL to increase the application performance');
 			}
 			$logger->info('Configuration initialized successfully');
@@ -106,12 +106,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, self::$config)){
+			if (array_key_exists($item, self::$config)) {
 				return self::$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;
 		}
 
@@ -120,7 +120,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) {
 			self::$config[$item] = $value;
 		}
 
@@ -128,7 +128,7 @@ 
 		 * Get all the configuration values
 		 * @return array the config values
 		 */
-		public static function getAll(){
+		public static function getAll() {
 			return self::$config;
 		}
 
@@ -136,7 +136,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()) {
 			self::$config = array_merge(self::$config, $config);
 		}
 
@@ -145,15 +145,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, self::$config)){
-				$logger->info('Delete config item ['.$item.']');
+			if (array_key_exists($item, self::$config)) {
+				$logger->info('Delete config item [' . $item . ']');
 				unset(self::$config[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Config item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -162,7 +162,7 @@ 
 		 * Load the configuration file. This an alias to Loader::config()
 		 * @param  string $config the config name to be loaded
 		 */
-		public static function load($config){
+		public static function load($config) {
 			Loader::config($config);
 		}
 	}

core/classes/DBSessionHandler.php

Spacing +45 added lines, -45 removed lines

@@ -27,11 +27,11 @@ 
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
 	 */
-	if( !interface_exists('SessionHandlerInterface')){
+	if (!interface_exists('SessionHandlerInterface')) {
 		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
 	}
 
-	class DBSessionHandler implements SessionHandlerInterface{
+	class DBSessionHandler implements SessionHandlerInterface {
 		
 		/**
 		 * The encryption method to use to encrypt session data in database
@@ -81,25 +81,25 @@ 
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null) {
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->setLogger($logger);
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
 
-	        if(is_object($loader)){
+	        if (is_object($loader)) {
 	          $this->setLoader($loader);
 	        }
 		    $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
+			if (is_object($modelInstance)) {
 				$this->setModelInstance($modelInstance);
 			}
 		}
@@ -108,7 +108,7 @@ 
 		 * Set the session secret used to encrypt the data in database 
 		 * @param string $secret the base64 string secret
 		 */
-		public function setSessionSecret($secret){
+		public function setSessionSecret($secret) {
 			$this->sessionSecret = $secret;
 			return $this;
 		}
@@ -117,7 +117,7 @@ 
 		 * Return the session secret
 		 * @return string 
 		 */
-		public function getSessionSecret(){
+		public function getSessionSecret() {
 			return $this->sessionSecret;
 		}
 
@@ -126,7 +126,7 @@ 
 		 * Set the initializer vector for openssl 
 		 * @param string $key the session secret used
 		 */
-		public function setInitializerVector($key){
+		public function setInitializerVector($key) {
 			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
 			$key = base64_decode($key);
 			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
@@ -137,7 +137,7 @@ 
 		 * Return the initializer vector
 		 * @return string 
 		 */
-		public function getInitializerVector(){
+		public function getInitializerVector() {
 			return $this->iv;
 		}
 
@@ -147,16 +147,16 @@ 
 		 * @param  string $sessionName the session name
 		 * @return boolean 
 		 */
-		public function open($savePath, $sessionName){
+		public function open($savePath, $sessionName) {
 			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
 			//try to check if session secret is set before
-			if(! $this->getSessionSecret()){
+			if (!$this->getSessionSecret()) {
 				$secret = get_config('session_secret', false);
 				$this->setSessionSecret($secret);
 			}
 			$this->logger->info('Session secret: ' . $this->getSessionSecret());
 
-			if(! $this->getModelInstance()){
+			if (!$this->getModelInstance()) {
 				$this->setModelInstanceFromConfig();
 			}
 			$this->setInitializerVector($this->getSessionSecret());
@@ -164,7 +164,7 @@ 
 			//set session tables columns
 			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
 
-			if(empty($this->sessionTableColumns)){
+			if (empty($this->sessionTableColumns)) {
 				show_error('The session handler is "database" but the table columns not set');
 			}
 			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
@@ -180,7 +180,7 @@ 
 		 * Close the session
 		 * @return boolean
 		 */
-		public function close(){
+		public function close() {
 			$this->logger->debug('Closing database session handler');
 			return true;
 		}
@@ -190,28 +190,28 @@ 
 		 * @param  string $sid the session id to use
 		 * @return mixed      the session data in serialiaze format
 		 */
-		public function read($sid){
+		public function read($sid) {
 			$this->logger->debug('Reading database session data for SID: ' . $sid);
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			
 			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
+			if ($data && isset($data->{$columns['sdata']})) {
 				//checking inactivity 
 				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
+				if ($data->{$columns['stime']} < $timeInactivity) {
 					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
 					$this->destroy($sid);
 					return false;
@@ -228,16 +228,16 @@ 
 		 * @param  mixed $data the session data to save in serialize format
 		 * @return boolean 
 		 */
-		public function write($sid, $data){
+		public function write($sid, $data) {
 			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
 			$instance = $this->getModelInstance();
 			$columns = $this->sessionTableColumns;
 
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
 			}
-			else{
+			else {
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -245,7 +245,7 @@ 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
 			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+			$browser = $this->OBJ->browser->getPlatform() . ', ' . $this->OBJ->browser->getBrowser() . ' ' . $this->OBJ->browser->getVersion();
 			$data = $this->encode($data);
 			$params = array(
 							$columns['sid'] => $sid,
@@ -258,13 +258,13 @@ 
 						);
 			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
 			$exists = $instance->get($sid);
-			if($exists){
+			if ($exists) {
 				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
 			}
-			else{
+			else {
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}
@@ -277,7 +277,7 @@ 
 		 * @param  string $sid the session id value
 		 * @return boolean
 		 */
-		public function destroy($sid){
+		public function destroy($sid) {
 			$this->logger->debug('Destroy of session data for SID: ' . $sid);
 			$instance = $this->modelInstanceName;
 			$instance->delete($sid);
@@ -289,7 +289,7 @@ 
 		 * @param  integer $maxLifetime the max lifetime
 		 * @return boolean
 		 */
-		public function gc($maxLifetime){
+		public function gc($maxLifetime) {
 			$instance = $this->modelInstanceName;
 			$time = time() - $maxLifetime;
 			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
@@ -302,9 +302,9 @@ 
 		 * @param  mixed $data the session data to encode
 		 * @return mixed the encoded session data
 		 */
-		public function encode($data){
+		public function encode($data) {
 			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+			$dataEncrypted = openssl_encrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
 			$output = base64_encode($dataEncrypted);
 			return $output;
 		}
@@ -315,7 +315,7 @@ 
 		 * @param  mixed $data the data to decode
 		 * @return mixed       the decoded data
 		 */
-		public function decode($data){
+		public function decode($data) {
 			$key = base64_decode($this->sessionSecret);
 			$data = base64_decode($data);
 			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
@@ -327,7 +327,7 @@ 
          * Return the loader instance
          * @return object Loader the loader instance
          */
-        public function getLoader(){
+        public function getLoader() {
             return $this->loader;
         }
 
@@ -335,7 +335,7 @@ 
          * set the loader instance for future use
          * @param object Loader $loader the loader object
          */
-         public function setLoader($loader){
+         public function setLoader($loader) {
             $this->loader = $loader;
             return $this;
         }
@@ -344,7 +344,7 @@ 
          * Return the model instance
          * @return object DBSessionHandlerModel the model instance
          */
-        public function getModelInstance(){
+        public function getModelInstance() {
             return $this->modelInstanceName;
         }
 
@@ -352,7 +352,7 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+         public function setModelInstance(DBSessionHandlerModel $modelInstance) {
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
@@ -361,7 +361,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -369,7 +369,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -377,18 +377,18 @@ 
 	    /**
 	     * Set the model instance using the configuration for session
 	     */
-	    private function setModelInstanceFromConfig(){
+	    private function setModelInstanceFromConfig() {
 	    	$modelName = get_config('session_save_path');
 			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
+			if ($this->getLoader()) {
 				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
 			}
 			//@codeCoverageIgnoreStart
-			else{
+			else {
             	Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            if (isset($this->OBJ->dbsessionhandlerinstance) && !$this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel) {
+				show_error('To use database session handler, your class model "' . get_class($this->OBJ->dbsessionhandlerinstance) . '" need extends "DBSessionHandlerModel"');
 			}  
 			//@codeCoverageIgnoreEnd