tnhfw / tnh-fw

core/classes/Module.php

Spacing +7 added lines, -7 removed lines

@@ -35,23 +35,23 @@
 		/**
 		 * Initialise the module list by scanning the directory MODULE_PATH
 		 */
-		public function init(){
+		public function init() {
 			$logger = self::getLogger();
 			$logger->debug('Check if the application contains the modules ...');
 			$moduleDir = opendir(MODULE_PATH);
-			if (is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+			if (is_resource($moduleDir)) {
+				while (($module = readdir($moduleDir)) !== false) {
+					if (preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)) {
 						self::$list[] = $module;
-					} else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+					} else {
+						$logger->info('Skipping [' . $module . '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
 				closedir($moduleDir);
 			}
 			ksort(self::$list);
 			
-			if (! empty(self::$list)){
+			if (!empty(self::$list)) {
 				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
 			}
 		}

core/classes/Security.php

Spacing +9 added lines, -9 removed lines

@@ -38,13 +38,13 @@ 
 			$expire = get_config('csrf_expire', 60);
 			$keyExpire = 'csrf_expire';
 			$currentTime = time();
-			if(Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime){
+			if (Session::exists($key) && Session::exists($keyExpire) && Session::get($keyExpire) > $currentTime) {
 				$logger->info('The CSRF token not yet expire just return it');
 				return Session::get($key);
-			} else{
+			} else {
 				$newTime = $currentTime + $expire;
 				$token = sha1(uniqid()) . sha1(uniqid());
-				$logger->info('The CSRF informations are listed below: key [' .$key. '], key expire [' .$keyExpire. '], expire time [' .$expire. '], token [' .$token. ']');
+				$logger->info('The CSRF informations are listed below: key [' . $key . '], key expire [' . $keyExpire . '], expire time [' . $expire . '], token [' . $token . ']');
 				Session::set($keyExpire, $newTime);
 				Session::set($key, $token);
 				return Session::get($key);
@@ -87,23 +87,23 @@ 
 		/**
 		 * This method is used to check the whitelist IP address access
 		 */
-		 public static function checkWhiteListIpAccess(){
+		 public static function checkWhiteListIpAccess() {
 			$logger = self::getLogger();
 			$logger->debug('Validation of the IP address access ...');
 			$logger->debug('Check if whitelist IP access is enabled in the configuration ...');
 			$isEnable = get_config('white_list_ip_enable', false);
-			if($isEnable){
+			if ($isEnable) {
 				$logger->info('Whitelist IP access is enabled in the configuration');
 				$list = get_config('white_list_ip_addresses', array());
-				if(! empty($list)){
+				if (!empty($list)) {
 					//Can't use Loader::functions() at this time because teh "Loader" library is loader after the security prossessing
 					require_once CORE_FUNCTIONS_PATH . 'function_user_agent.php';
 					$ip = get_ip();
-					if((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)){
+					if ((count($list) == 1 && $list[0] == '*') || in_array($ip, $list)) {
 						$logger->info('IP address ' . $ip . ' allowed using the wildcard "*" or the full IP');
 						//wildcard to access all ip address
 						return;
-					} else{
+					} else {
 						// go through all whitelisted ips
 						foreach ($list as $ipaddr) {
 							// find the wild card * in whitelisted ip (f.e. find position in "127.0.*" or "127*")
@@ -128,7 +128,7 @@ 
 						show_error('Access to this application is not allowed');
 					}
 				}
-			} else{
+			} else {
 				$logger->info('Whitelist IP access is not enabled in the configuration, ignore checking');
 			}
 		 }

core/classes/database/DatabaseQueryResult.php

Spacing +6 added lines, -6 removed lines

@@ -24,13 +24,13 @@ 
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
   
-    class DatabaseQueryResult{
+    class DatabaseQueryResult {
   	
         /**
          * The database query result
          * @var mixed
          */
-        private $result  = null;
+        private $result = null;
   	
     
         /**
@@ -56,7 +56,7 @@ 
          *
          * @return mixed
          */
-    public function getResult(){
+    public function getResult() {
         return $this->result;
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return object DatabaseQueryResult
      */
-    public function setResult($result){
+    public function setResult($result) {
         $this->result = $result;
         return $this;
     }
@@ -76,7 +76,7 @@ 
      *
      * @return int
      */
-    public function getNumRows(){
+    public function getNumRows() {
         return $this->numRows;
     }
 
@@ -86,7 +86,7 @@ 
      *
      * @return object DatabaseQueryResult
      */
-    public function setNumRows($numRows){
+    public function setNumRows($numRows) {
         $this->numRows = $numRows;
         return $this;
     }

core/classes/database/DatabaseQueryBuilder.php

Spacing +141 added lines, -141 removed lines

@@ -23,94 +23,94 @@ 
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
-    class DatabaseQueryBuilder{
+    class DatabaseQueryBuilder {
         /**
          * 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 full SQL query statment after build for each command
          * @var string
          */
-        private $query               = null;
+        private $query = null;
   	
         /**
          * The list of SQL valid operators
          * @var array
          */
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = array('=', '!=', '<', '>', '<=', '>=', '<>');
   	
 	
     /**
      * The prefix used in each database table
      * @var string
      */
-    private $prefix              = null;
+    private $prefix = null;
     
 
     /**
      * The PDO instance
      * @var object
      */
-    private $pdo                 = null;
+    private $pdo = null;
 	
         /**
          * The database driver name used
          * @var string
          */
-        private $driver              = null;
+        private $driver = null;
   	
 	
     /**
      * Construct new DatabaseQueryBuilder
      * @param object $pdo the PDO object
      */
-    public function __construct(PDO $pdo = null){
-        if (is_object($pdo)){
+    public function __construct(PDO $pdo = null) {
+        if (is_object($pdo)) {
             $this->setPdo($pdo);
         }
     }
@@ -120,10 +120,10 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current DatabaseQueryBuilder 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->getPrefix() . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
@@ -138,7 +138,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function select($fields){
+    public function select($fields) {
         $select = (is_array($fields) ? implode(', ', $fields) : $fields);
         $this->select = (($this->select == '*' || empty($this->select)) ? $select : $this->select . ', ' . $select);
         return $this;
@@ -149,7 +149,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function distinct($field){
+    public function distinct($field) {
         $distinct = ' DISTINCT ' . $field;
         $this->select = (($this->select == '*' || empty($this->select)) ? $distinct : $this->select . ', ' . $distinct);
         return $this;
@@ -161,7 +161,7 @@ 
          * @param  string $name  if is not null represent the alias used for this field in the result
          * @return object        the current DatabaseQueryBuilder instance
          */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
         return $this->select_min_max_sum_count_avg('COUNT', $field, $name);
     }
     
@@ -171,7 +171,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
         return $this->select_min_max_sum_count_avg('MIN', $field, $name);
     }
 
@@ -181,7 +181,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
         return $this->select_min_max_sum_count_avg('MAX', $field, $name);
     }
 
@@ -191,7 +191,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
         return $this->select_min_max_sum_count_avg('SUM', $field, $name);
     }
 
@@ -201,7 +201,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
         return $this->select_min_max_sum_count_avg('AVG', $field, $name);
     }
 
@@ -215,17 +215,17 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current DatabaseQueryBuilder 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->getPrefix() . $table;
-      if (! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) 
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) 
 													? ($this->getPrefix() . $field1 . ' = ' . $this->getPrefix() . $op) 
 													: ($this->getPrefix() . $field1 . ' ' . $op . ' ' . $this->getPrefix() . $field2));
       }
-      if (empty($this->join)){
+      if (empty($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      } else{
+      } else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -236,7 +236,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -245,7 +245,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -254,7 +254,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -263,7 +263,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -272,7 +272,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -281,7 +281,7 @@ 
      * @see  DatabaseQueryBuilder::join()
      * @return object        the current DatabaseQueryBuilder 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 ');
     }
 
@@ -291,13 +291,13 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current DatabaseQueryBuilder 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 {
-            $this->setWhereStr($field.' IS NULL ', $andOr);
+            $this->setWhereStr($field . ' IS NULL ', $andOr);
         }
         return $this;
     }
@@ -308,13 +308,13 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current DatabaseQueryBuilder 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 {
-            $this->setWhereStr($field.' IS NOT NULL ', $andOr);
+            $this->setWhereStr($field . ' IS NOT NULL ', $andOr);
         }
         return $this;
     }
@@ -329,12 +329,12 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
       $whereStr = '';
-      if (is_array($where)){
+      if (is_array($where)) {
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-      } else{
-        if (is_array($op)){
+      } else {
+        if (is_array($op)) {
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
           $whereStr = $this->getWhereStrForOperator($where, $op, $val, $type, $escape);
@@ -349,7 +349,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -359,7 +359,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -368,7 +368,7 @@ 
      * @see  DatabaseQueryBuilder::where()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -378,11 +378,11 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-        if (empty($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+        if (empty($this->where)) {
         $this->where = $type . ' (';
         } else {
-            if (substr(trim($this->where), -1) == '('){
+            if (substr(trim($this->where), -1) == '(') {
             $this->where .= $type . ' (';
             } else {
                 $this->where .= $andOr . ' ' . $type . ' (';
@@ -396,7 +396,7 @@ 
      * @see  DatabaseQueryBuilder::groupStart()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
         return $this->groupStart('NOT');
     }
 
@@ -405,7 +405,7 @@ 
      * @see  DatabaseQueryBuilder::groupStart()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
         return $this->groupStart('', ' OR');
     }
 
@@ -414,7 +414,7 @@ 
          * @see  DatabaseQueryBuilder::groupStart()
          * @return object        the current DatabaseQueryBuilder instance
          */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
         return $this->groupStart('NOT', ' OR');
     }
 
@@ -422,7 +422,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
         $this->where .= ')';
         return $this;
     }
@@ -436,10 +436,10 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
         $_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 : $this->escape($v, $escape));
@@ -455,7 +455,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -464,7 +464,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
         return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -473,7 +473,7 @@ 
      * @see  DatabaseQueryBuilder::in()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -487,11 +487,11 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder 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 = '';
         }
         $whereStr = $field . ' ' . $type . ' BETWEEN ' . $this->escape($value1, $escape) . ' AND ' . $this->escape($value2, $escape);
@@ -504,7 +504,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -513,7 +513,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -522,7 +522,7 @@ 
      * @see  DatabaseQueryBuilder::between()
      * @return object        the current DatabaseQueryBuilder 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);
     }
 
@@ -535,8 +535,8 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-        if (empty($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+        if (empty($data)) {
         $data = '';
         }
         $this->setWhereStr($field . ' ' . $type . ' LIKE ' . ($this->escape($data, $escape)), $andOr);
@@ -548,7 +548,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
         return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -557,7 +557,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
         return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -566,7 +566,7 @@ 
      * @see  DatabaseQueryBuilder::like()
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
         return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -577,13 +577,13 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function limit($limit, $limitEnd = null){
-      if (empty($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (empty($limit)) {
         $limit = 0;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
-      } else{
+      } else {
         $this->limit = $limit;
       }
       return $this;
@@ -595,10 +595,10 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current DatabaseQueryBuilder instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (stristr($orderBy, ' ') || $orderBy == 'rand()'){
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
         $this->orderBy = empty($this->orderBy) ? $orderBy : $this->orderBy . ', ' . $orderBy;
-      } else{
+      } else {
         $this->orderBy = empty($this->orderBy) 
 						? ($orderBy . ' ' . strtoupper($orderDir)) 
 						: $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
@@ -611,10 +611,10 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current DatabaseQueryBuilder 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;
@@ -628,16 +628,16 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current DatabaseQueryBuilder 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)) {
         $this->having = $this->getHavingStrIfOperatorIsArray($field, $op, $escape);
-      } 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 . ' > ' . ($this->escape($op, $escape));
-      } else{
-        if (is_null($val)){
+      } else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($this->escape($val, $escape));
@@ -651,7 +651,7 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return object  the current DatabaseQueryBuilder instance        
      */
-    public function insert($data = array(), $escape = true){
+    public function insert($data = array(), $escape = true) {
         $columns = array_keys($data);
         $column = implode(', ', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -666,22 +666,22 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return object  the current DatabaseQueryBuilder instance 
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
         $query = 'UPDATE ' . $this->from . ' SET ';
         $values = array();
-        foreach ($data as $column => $val){
+        foreach ($data as $column => $val) {
         $values[] = $column . ' = ' . ($this->escape($val, $escape));
         }
         $query .= implode(', ', $values);
-        if (! empty($this->where)){
+        if (!empty($this->where)) {
         $query .= ' WHERE ' . $this->where;
         }
 
-        if (! empty($this->orderBy)){
+        if (!empty($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
         }
 
-        if (! empty($this->limit)){
+        if (!empty($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
         }
         $this->query = $query;
@@ -692,22 +692,22 @@ 
      * Delete the record in database
      * @return object  the current DatabaseQueryBuilder instance 
      */
-    public function delete(){
+    public function delete() {
         $query = 'DELETE FROM ' . $this->from;
         $isTruncate = $query;
-        if (! empty($this->where)){
+        if (!empty($this->where)) {
             $query .= ' WHERE ' . $this->where;
         }
 
-        if (! empty($this->orderBy)){
+        if (!empty($this->orderBy)) {
             $query .= ' ORDER BY ' . $this->orderBy;
         }
 
-        if (! empty($this->limit)){
+        if (!empty($this->limit)) {
             $query .= ' LIMIT ' . $this->limit;
         }
 
-            if ($isTruncate == $query && $this->driver != 'sqlite'){  
+            if ($isTruncate == $query && $this->driver != 'sqlite') {  
             $query = 'TRUNCATE TABLE ' . $this->from;
             }
         $this->query = $query;
@@ -720,9 +720,9 @@ 
      * @param boolean $escaped whether we can do escape of not 
      * @return mixed       the data after escaped or the same data if not
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
         $data = trim($data);
-        if($escaped){
+        if ($escaped) {
         return $this->pdo->quote($data);
         }
         return $data;  
@@ -733,31 +733,31 @@ 
      * Return the current SQL query string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
         //INSERT, UPDATE, DELETE already set it, if is the SELECT we need set it now
-        if(empty($this->query)){
+        if (empty($this->query)) {
             $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-            if (! empty($this->join)){
+            if (!empty($this->join)) {
             $query .= $this->join;
             }
   		  
-            if (! empty($this->where)){
+            if (!empty($this->where)) {
             $query .= ' WHERE ' . $this->where;
             }
 
-            if (! empty($this->groupBy)){
+            if (!empty($this->groupBy)) {
             $query .= ' GROUP BY ' . $this->groupBy;
             }
 
-            if (! empty($this->having)){
+            if (!empty($this->having)) {
             $query .= ' HAVING ' . $this->having;
             }
 
-            if (! empty($this->orderBy)){
+            if (!empty($this->orderBy)) {
                 $query .= ' ORDER BY ' . $this->orderBy;
             }
 
-            if (! empty($this->limit)){
+            if (!empty($this->limit)) {
             $query .= ' LIMIT ' . $this->limit;
             }
             $this->query = $query;
@@ -770,7 +770,7 @@ 
          * Return the PDO instance
          * @return object
          */
-    public function getPdo(){
+    public function getPdo() {
         return $this->pdo;
     }
 
@@ -779,7 +779,7 @@ 
      * @param PDO $pdo the pdo object
      * @return object DatabaseQueryBuilder
      */
-    public function setPdo(PDO $pdo = null){
+    public function setPdo(PDO $pdo = null) {
         $this->pdo = $pdo;
         return $this;
     }
@@ -788,7 +788,7 @@ 
      * Return the database table prefix
      * @return string
      */
-    public function getPrefix(){
+    public function getPrefix() {
         return $this->prefix;
     }
 
@@ -797,7 +797,7 @@ 
      * @param string $prefix the new prefix
      * @return object DatabaseQueryBuilder
      */
-    public function setPrefix($prefix){
+    public function setPrefix($prefix) {
         $this->prefix = $prefix;
         return $this;
     }
@@ -806,7 +806,7 @@ 
          * Return the database driver
          * @return string
          */
-    public function getDriver(){
+    public function getDriver() {
         return $this->driver;
     }
 
@@ -815,7 +815,7 @@ 
      * @param string $driver the new driver
      * @return object DatabaseQueryBuilder
      */
-    public function setDriver($driver){
+    public function setDriver($driver) {
         $this->driver = $driver;
         return $this;
     }
@@ -824,7 +824,7 @@ 
          * Reset the DatabaseQueryBuilder class attributs to the initial values before each query.
          * @return object  the current DatabaseQueryBuilder instance 
          */
-    public function reset(){
+    public function reset() {
         $this->select   = '*';
         $this->from     = null;
         $this->where    = null;
@@ -843,12 +843,12 @@ 
          *
          * @return string
          */
-    protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true){
+    protected function getHavingStrIfOperatorIsArray($field, $op = null, $escape = true) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-            if (!empty($v)){
-            if (! isset($op[$k])){
+        foreach ($x as $k => $v) {
+            if (!empty($v)) {
+            if (!isset($op[$k])) {
                 $op[$k] = '';
             }
                 $w .= $v . (isset($op[$k]) ? $this->escape($op[$k], $escape) : '');
@@ -864,15 +864,15 @@ 
      *
      * @return string
      */
-    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true){
+    protected function getWhereStrIfIsArray(array $where, $type = '', $andOr = 'AND', $escape = true) {
         $_where = array();
-        foreach ($where as $column => $data){
-        if (is_null($data)){
+        foreach ($where as $column => $data) {
+        if (is_null($data)) {
             $data = '';
         }
         $_where[] = $type . $column . ' = ' . ($this->escape($data, $escape));
         }
-        $where = implode(' '.$andOr.' ', $_where);
+        $where = implode(' ' . $andOr . ' ', $_where);
         return $where;
     }
 
@@ -882,12 +882,12 @@ 
          *
          * @return string
          */
-    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true){
+    protected function getWhereStrIfOperatorIsArray($where, array $op, $type = '', $escape = true) {
         $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]) ? ($this->escape($op[$k], $escape)) : '');
@@ -902,15 +902,15 @@ 
      *
      * @return string
      */
-    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true){
+    protected function getWhereStrForOperator($where, $op = null, $val = null, $type = '', $escape = true) {
         $w = '';
-        if (! in_array((string)$op, $this->operatorList)){
-            if (is_null($op)){
+        if (!in_array((string) $op, $this->operatorList)) {
+            if (is_null($op)) {
             $op = '';
             }
             $w = $type . $where . ' = ' . ($this->escape($op, $escape));
         } else {
-            if (is_null($val)){
+            if (is_null($val)) {
             $val = '';
             }
             $w = $type . $where . $op . ($this->escape($val, $escape));
@@ -923,14 +923,14 @@ 
          * @param string $whereStr the WHERE clause string
          * @param  string  $andOr the separator type used 'AND', 'OR', etc.
          */
-        protected function setWhereStr($whereStr, $andOr = 'AND'){
-        if (empty($this->where)){
+        protected function setWhereStr($whereStr, $andOr = 'AND') {
+        if (empty($this->where)) {
             $this->where = $whereStr;
         } else {
-            if (substr(trim($this->where), -1) == '('){
+            if (substr(trim($this->where), -1) == '(') {
             $this->where = $this->where . ' ' . $whereStr;
             } else {
-            $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
+            $this->where = $this->where . ' ' . $andOr . ' ' . $whereStr;
             }
         }
         }
@@ -946,7 +946,7 @@ 
          * @see  DatabaseQueryBuilder::avg
          * @return object
          */
-    protected function select_min_max_sum_count_avg($clause, $field, $name = null){
+    protected function select_min_max_sum_count_avg($clause, $field, $name = null) {
         $clause = strtoupper($clause);
         $func = $clause . '(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
         $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);

core/classes/database/DatabaseQueryRunner.php

Spacing +46 added lines, -46 removed lines

@@ -23,14 +23,14 @@ 
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      */
-    class DatabaseQueryRunner extends BaseClass{
+    class DatabaseQueryRunner extends BaseClass {
       
    
         /**
          * The last query result
          * @var object
          */
-        private $queryResult       = null;
+        private $queryResult = null;
   	
         /**
          * The benchmark instance
@@ -42,45 +42,45 @@ 
      * The SQL query statment to execute
      * @var string
      */
-    private $query             = null;
+    private $query = null;
     
     /**
      * Indicate if we need return result as list (boolean) 
      * or the data used to replace the placeholder (array)
      * @var array|boolean
      */
-        private $returnAsList     = true;
+        private $returnAsList = true;
      
      
         /**
          * Indicate if we need return result as array or not
          * @var boolean
          */
-        private $returnAsArray     = true;
+        private $returnAsArray = true;
      
         /**
          * The last PDOStatment instance
          * @var object
          */
-        private $pdoStatment       = null;
+        private $pdoStatment = null;
      
         /**
          * The error returned for the last query
          * @var string
          */
-        private $error             = null;
+        private $error = null;
 	
     /**
      * The PDO instance
      * @var object
      */
-    private $pdo                = null;
+    private $pdo = null;
   
     /**
      * The database driver name used
      * @var string
      */
-    private $driver             = null;
+    private $driver = null;
 
 
 	
@@ -91,9 +91,9 @@ 
      * @param boolean $returnAsList if need return as list or just one row
      * @param boolean $returnAsArray whether to return the result as array or not
      */
-    public function __construct(PDO $pdo = null, $query = null, $returnAsList = true, $returnAsArray = false){
+    public function __construct(PDO $pdo = null, $query = null, $returnAsList = true, $returnAsArray = false) {
         parent::__construct();
-        if (is_object($pdo)){
+        if (is_object($pdo)) {
             $this->pdo = $pdo;
         }
         $this->query         = $query;
@@ -108,13 +108,13 @@ 
      * 
      * @return object|void
      */
-    public function execute(){
+    public function execute() {
         //reset instance
         $this->reset();
        
         //for database query execution time
         $benchmarkMarkerKey = $this->getBenchmarkKey();
-        if (! is_object($this->benchmarkInstance)){
+        if (!is_object($this->benchmarkInstance)) {
             $this->benchmarkInstance = & class_loader('Benchmark');
         }
         
@@ -130,18 +130,18 @@ 
                                                                 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')'
                                                               );
 		    //TODO use the configuration value for the high response time currently is 1 second
-        if ($responseTime >= 1 ){
+        if ($responseTime >= 1) {
             $this->logger->warning(
                                     'High response time while processing database query [' . $this->query . ']. 
-                                     The response time is [' .$responseTime. '] sec.'
+                                     The response time is [' .$responseTime . '] sec.'
                                   );
         }
 		
-        if ($this->pdoStatment !== false){
+        if ($this->pdoStatment !== false) {
           $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
-          if($isSqlSELECTQuery){
+          if ($isSqlSELECTQuery) {
               $this->setResultForSelect();              
-          } else{
+          } else {
               $this->setResultForNonSelect();
           }
           return $this->queryResult;
@@ -153,26 +153,26 @@ 
    * Return the result for SELECT query
    * @see DatabaseQueryRunner::execute
    */
-    protected function setResultForSelect(){
+    protected function setResultForSelect() {
       //if need return all result like list of record
       $result = null;
       $numRows = 0;
       $fetchMode = PDO::FETCH_OBJ;
-      if($this->returnAsArray){
+      if ($this->returnAsArray) {
         $fetchMode = PDO::FETCH_ASSOC;
       }
-      if ($this->returnAsList){
+      if ($this->returnAsList) {
           $result = $this->pdoStatment->fetchAll($fetchMode);
-      } else{
+      } else {
           $result = $this->pdoStatment->fetch($fetchMode);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
-      if (in_array($this->driver, array('sqlite', 'pgsql'))){
+      if (in_array($this->driver, array('sqlite', 'pgsql'))) {
         $numRows = count($result);  
-      } else{
+      } else {
         $numRows = $this->pdoStatment->rowCount(); 
       }
-      if(! is_object($this->queryResult)){
+      if (!is_object($this->queryResult)) {
           $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
       }
       $this->queryResult->setResult($result);
@@ -183,19 +183,19 @@ 
    * Return the result for non SELECT query
    * @see DatabaseQueryRunner::execute
    */
-    protected function setResultForNonSelect(){
+    protected function setResultForNonSelect() {
       //Sqlite and pgsql always return 0 when using rowCount()
       $result = false;
       $numRows = 0;
-      if (in_array($this->driver, array('sqlite', 'pgsql'))){
+      if (in_array($this->driver, array('sqlite', 'pgsql'))) {
         $result = true; //to test the result for the query like UPDATE, INSERT, DELETE
         $numRows = 1; //TODO use the correct method to get the exact affected row
-      } else{
+      } else {
           //to test the result for the query like UPDATE, INSERT, DELETE
           $result  = $this->pdoStatment->rowCount() >= 0; 
           $numRows = $this->pdoStatment->rowCount(); 
       }
-      if(! is_object($this->queryResult)){
+      if (!is_object($this->queryResult)) {
           $this->queryResult = & class_loader('DatabaseQueryResult', 'classes/database');
       }
       $this->queryResult->setResult($result);
@@ -226,7 +226,7 @@ 
      *
      * @return object DatabaseQueryResult
      */
-    public function getQueryResult(){
+    public function getQueryResult() {
         return $this->queryResult;
     }
 
@@ -236,7 +236,7 @@ 
      *
      * @return object DatabaseQueryRunner
      */
-    public function setQueryResult(DatabaseQueryResult $queryResult){
+    public function setQueryResult(DatabaseQueryResult $queryResult) {
         $this->queryResult = $queryResult;
         return $this;
     }
@@ -245,7 +245,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
         return $this->query;
     }
     
@@ -254,7 +254,7 @@ 
      * @param string $query the SQL query to set
      * @return object DatabaseQueryRunner
      */
-    public function setQuery($query){
+    public function setQuery($query) {
         $this->query = $query;
         return $this;
     }
@@ -264,7 +264,7 @@ 
      * @param boolean $returnType
      * @return object DatabaseQueryRunner
      */
-    public function setReturnType($returnType){
+    public function setReturnType($returnType) {
         $this->returnAsList = $returnType;
         return $this;
     }
@@ -274,7 +274,7 @@ 
      * @param boolean $status the status if true will return as array
      * @return object DatabaseQueryRunner
      */
-    public function setReturnAsArray($status = true){
+    public function setReturnAsArray($status = true) {
         $this->returnAsArray = $status;
         return $this;
     }
@@ -283,7 +283,7 @@ 
      * Return the error for last query execution
      * @return string
      */
-    public function getQueryError(){
+    public function getQueryError() {
         return $this->error;
     }
 
@@ -291,7 +291,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
         return $this->pdo;
     }
 
@@ -300,7 +300,7 @@ 
      * @param PDO $pdo the pdo object
      * @return object DatabaseQueryRunner
      */
-    public function setPdo(PDO $pdo = null){
+    public function setPdo(PDO $pdo = null) {
         $this->pdo = $pdo;
         return $this;
     }
@@ -309,7 +309,7 @@ 
          * Return the database driver
          * @return string
          */
-    public function getDriver(){
+    public function getDriver() {
         return $this->driver;
     }
 
@@ -318,7 +318,7 @@ 
      * @param string $driver the new driver
      * @return object DatabaseQueryRunner
      */
-    public function setDriver($driver){
+    public function setDriver($driver) {
         $this->driver = $driver;
         return $this;
     }
@@ -328,14 +328,14 @@ 
      * 
      *  @return string
      */
-    protected function getBenchmarkKey(){
+    protected function getBenchmarkKey() {
         return md5($this->query . $this->returnAsList . $this->returnAsArray);
     }
     
     /**
      * Set error for database query execution
      */
-    protected function setQueryRunnerError(){
+    protected function setQueryRunnerError() {
         $error = $this->pdo->errorInfo();
         $this->error = isset($error[2]) ? $error[2] : '';
         $this->logger->error('The database query execution got an error: ' . stringfy_vars($error));
@@ -347,11 +347,11 @@ 
      * Set the Log instance using argument or create new instance
      * @param object $logger the Log instance if not null
      */
-    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
-      if ($logger !== null){
+    protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null) {
+      if ($logger !== null) {
         $this->logger = $logger;
-      } else{
-          $this->logger =& class_loader('Log', 'classes');
+      } else {
+          $this->logger = & class_loader('Log', 'classes');
           $this->logger->setLogger('Library::DatabaseQueryRunner');
       }
     }

core/classes/database/Database.php

Spacing +84 added lines, -84 removed lines

@@ -23,92 +23,92 @@ 
      * 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 extends BaseClass{
+    class Database extends BaseClass {
 	
         /**
          * 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 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 result returned for the last query
          * @var mixed
          */
-    private $result              = array();
+    private $result = 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 cache instance
      * @var object
      */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
     
         /**
          * The DatabaseQueryBuilder instance
          * @var object
          */
-    protected $queryBuilder        = null;
+    protected $queryBuilder = null;
     
     /**
      * The DatabaseQueryRunner instance
      * @var object
      */
-    protected $queryRunner         = null;
+    protected $queryRunner = null;
 
 
     /**
@@ -136,10 +136,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 {
             $this->pdo = new PDO($this->getDsnValueFromConfig(), $config['username'], $config['password']);
             $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
@@ -149,7 +149,7 @@ 
             $this->updateQueryBuilderAndRunnerProperties();
 
             return is_object($this->pdo);
-          } catch (PDOException $e){
+          } catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
@@ -163,7 +163,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
         return $this->numRows;
     }
 
@@ -171,7 +171,7 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
         return $this->insertId;
     }
 
@@ -182,10 +182,10 @@ 
      * 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->queryBuilder->limit(1);
         $query = $this->getAll(true);
-        if ($returnSQLQueryOrResultType === true){
+        if ($returnSQLQueryOrResultType === true) {
         return $query;
         } else {
         return $this->query($query, false, $returnSQLQueryOrResultType == 'array');
@@ -198,9 +198,9 @@ 
      * 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 = $this->queryBuilder->getQuery();
-        if ($returnSQLQueryOrResultType === true){
+        if ($returnSQLQueryOrResultType === true) {
             return $query;
         }
         return $this->query($query, true, $returnSQLQueryOrResultType == 'array');
@@ -212,18 +212,18 @@ 
      * @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){
-        if (empty($data) && ! empty($this->data)){
+    public function insert($data = array(), $escape = true) {
+        if (empty($data) && !empty($this->data)) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->data;
         }
         $query = $this->queryBuilder->insert($data, $escape)->getQuery();
         $result = $this->query($query);
-        if ($result){
+        if ($result) {
         $this->insertId = $this->pdo->lastInsertId();
             //if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
-        return ! ($this->insertId) ? true : $this->insertId;
+        return !($this->insertId) ? true : $this->insertId;
         }
         return false;
     }
@@ -234,8 +234,8 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
-        if (empty($data) && ! empty($this->data)){
+    public function update($data = array(), $escape = true) {
+        if (empty($data) && !empty($this->data)) {
         //as when using $this->setData() may be the data already escaped
         $escape = false;
         $data = $this->data;
@@ -248,7 +248,7 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
             $query = $this->queryBuilder->delete()->getQuery();
         return $this->query($query);
     }
@@ -258,7 +258,7 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
+    public function setCache($ttl = 0) {
         $this->cacheTtl = $ttl;
         $this->temporaryCacheTtl = $ttl;
         return $this;
@@ -269,7 +269,7 @@ 
      * @param  integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-        public function cached($ttl = 0){
+        public function cached($ttl = 0) {
         $this->temporaryCacheTtl = $ttl;
         return $this;
     }
@@ -281,9 +281,9 @@ 
      * @return mixed       the data after escaped or the same data if no
      * need escaped
      */
-    public function escape($data, $escaped = true){
+    public function escape($data, $escaped = true) {
         $data = trim($data);
-        if($escaped){
+        if ($escaped) {
         return $this->pdo->quote($data);
         }
         return $data; 
@@ -293,7 +293,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
         return $this->queryCount;
     }
 
@@ -301,7 +301,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
         return $this->query;
     }
 
@@ -309,7 +309,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
         return $this->databaseName;
     }
 
@@ -317,7 +317,7 @@ 
      * Return the PDO instance
      * @return object
      */
-    public function getPdo(){
+    public function getPdo() {
         return $this->pdo;
     }
 
@@ -326,7 +326,7 @@ 
      * @param object $pdo the pdo object
      * @return object Database
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
         $this->pdo = $pdo;
         return $this;
     }
@@ -335,7 +335,7 @@ 
          * Return the cache instance
          * @return CacheInterface
          */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
         return $this->cacheInstance;
     }
 
@@ -344,7 +344,7 @@ 
      * @param CacheInterface $cache the cache object
      * @return object Database
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
         $this->cacheInstance = $cache;
         return $this;
     }
@@ -354,7 +354,7 @@ 
          * Return the DatabaseQueryBuilder instance
          * @return object DatabaseQueryBuilder
          */
-    public function getQueryBuilder(){
+    public function getQueryBuilder() {
         return $this->queryBuilder;
     }
 
@@ -362,7 +362,7 @@ 
      * Set the DatabaseQueryBuilder instance
      * @param object DatabaseQueryBuilder $queryBuilder the DatabaseQueryBuilder object
      */
-    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder){
+    public function setQueryBuilder(DatabaseQueryBuilder $queryBuilder) {
         $this->queryBuilder = $queryBuilder;
         return $this;
     }
@@ -371,7 +371,7 @@ 
      * Return the DatabaseQueryRunner instance
      * @return object DatabaseQueryRunner
      */
-    public function getQueryRunner(){
+    public function getQueryRunner() {
         return $this->queryRunner;
     }
 
@@ -379,7 +379,7 @@ 
      * Set the DatabaseQueryRunner instance
      * @param object DatabaseQueryRunner $queryRunner the DatabaseQueryRunner object
      */
-    public function setQueryRunner(DatabaseQueryRunner $queryRunner){
+    public function setQueryRunner(DatabaseQueryRunner $queryRunner) {
         $this->queryRunner = $queryRunner;
         return $this;
     }
@@ -388,7 +388,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
         return $this->data;
     }
 
@@ -399,9 +399,9 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value = null, $escape = true){
-        if (is_array($key)){
-            foreach($key as $k => $v){
+    public function setData($key, $value = null, $escape = true) {
+        if (is_array($key)) {
+            foreach ($key as $k => $v) {
                 $this->setData($k, $v, $escape);
             }	
         } else {
@@ -417,7 +417,7 @@ 
          * @param  boolean $returnAsArray return the result as array or not
          * @return mixed         the query result
          */
-    public function query($query, $returnAsList = true, $returnAsArray = false){
+    public function query($query, $returnAsList = true, $returnAsArray = false) {
         $this->reset();
         $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
         //If is the SELECT query
@@ -438,12 +438,12 @@ 
         //if can use cache feature for this query
         $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
     
-        if ($dbCacheStatus && $isSqlSELECTQuery){
+        if ($dbCacheStatus && $isSqlSELECTQuery) {
             $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
             $cacheContent = $this->getCacheContentForQuery($query, $returnAsList, $returnAsArray);  
         }
       
-        if (!$cacheContent){
+        if (!$cacheContent) {
                 //count the number of query execution to server
         $this->queryCount++;
         
@@ -452,19 +452,19 @@ 
                                             ->setReturnAsArray($returnAsArray)
                                             ->execute();
 
-        if (!is_object($queryResult)){
+        if (!is_object($queryResult)) {
             $this->result = false;
             $this->numRows = 0;
             return $this->result;
         }
         $this->result  = $queryResult->getResult();
         $this->numRows = $queryResult->getNumRows();
-        if ($isSqlSELECTQuery && $dbCacheStatus){
+        if ($isSqlSELECTQuery && $dbCacheStatus) {
             $key = $this->getCacheKeyForQuery($this->query, $returnAsList, $returnAsArray);
             $this->setCacheContentForQuery($this->query, $key, $this->result, $cacheExpire);
         }
-        } else if ($isSqlSELECTQuery){
-            $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+        } else if ($isSqlSELECTQuery) {
+            $this->logger->info('The result for query [' . $this->query . '] already cached use it');
             $this->result = $cacheContent;
             $this->numRows = count($this->result);
         }
@@ -478,9 +478,9 @@ 
      * @param boolean $autoConnect whether to connect to database after set the configuration
      * @return object Database
      */
-    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true, $autoConnect = false){
+    public function setDatabaseConfiguration(array $overwriteConfig = array(), $useConfigFile = true, $autoConnect = false) {
         $db = array();
-        if ($useConfigFile && file_exists(CONFIG_PATH . 'database.php')){
+        if ($useConfigFile && 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';
         }
@@ -495,7 +495,7 @@ 
         //determine the port using the hostname like localhost:3307
         //hostname will be "localhost", and port "3307"
         $p = explode(':', $config['hostname']);
-        if (count($p) >= 2){
+        if (count($p) >= 2) {
             $config['hostname'] = $p[0];
             $config['port'] = $p[1];
             }
@@ -509,7 +509,7 @@ 
                                                             array('password' => string_hidden($this->config['password']))
                                                 ))
                             );
-        if($autoConnect){
+        if ($autoConnect) {
                 //Now connect to the database
                 $this->connect();
             }
@@ -520,14 +520,14 @@ 
      * Return the database configuration
      * @return array
      */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
         return $this->config;
     }
 
     /**
      * Close the connexion
      */
-    public function close(){
+    public function close() {
         $this->pdo = null;
     }
 
@@ -535,7 +535,7 @@ 
      * Return the database default configuration
      * @return array
      */
-    protected function getDatabaseDefaultConfiguration(){
+    protected function getDatabaseDefaultConfiguration() {
         return array(
                 'driver' => '',
                 'username' => '',
@@ -553,16 +553,16 @@ 
      * Update the DatabaseQueryBuilder and DatabaseQueryRunner properties
      * @return void
      */
-    protected function updateQueryBuilderAndRunnerProperties(){
+    protected function updateQueryBuilderAndRunnerProperties() {
         //update queryBuilder with some properties needed
-        if (is_object($this->queryBuilder)){
+        if (is_object($this->queryBuilder)) {
         $this->queryBuilder->setDriver($this->config['driver'])
                             ->setPrefix($this->config['prefix'])
                             ->setPdo($this->pdo);
         }
 
         //update queryRunner with some properties needed
-        if (is_object($this->queryRunner)){
+        if (is_object($this->queryRunner)) {
         $this->queryRunner->setDriver($this->config['driver'])
                             ->setPdo($this->pdo);
         }
@@ -573,10 +573,10 @@ 
      * This method is used to get the PDO DSN string using the configured driver
      * @return string|null the DSN string or null if can not find it
      */
-    protected function getDsnValueFromConfig(){
+    protected function getDsnValueFromConfig() {
         $dsn = null;
         $config = $this->getDatabaseConfiguration();
-        if (! empty($config)){
+        if (!empty($config)) {
         $driver = $config['driver'];
         $driverDsnMap = array(
                                 'mysql'  => $this->getDsnValueForDriver('mysql'),
@@ -584,7 +584,7 @@ 
                                 'sqlite' => $this->getDsnValueForDriver('sqlite'),
                                 'oracle' => $this->getDsnValueForDriver('oracle')
                                 );
-        if (isset($driverDsnMap[$driver])){
+        if (isset($driverDsnMap[$driver])) {
             $dsn = $driverDsnMap[$driver];
         }
         }    
@@ -596,17 +596,17 @@ 
      * @param  string $driver the driver name
      * @return string|null         the dsn name
      */
-    protected function getDsnValueForDriver($driver){
+    protected function getDsnValueForDriver($driver) {
         $dsn = '';
         $config = $this->getDatabaseConfiguration();
-        if (empty($config)){
+        if (empty($config)) {
         return null;
         }
         switch ($driver) {
         case 'mysql':
         case 'pgsql':
           $port = '';
-            if (! empty($config['port'])) {
+            if (!empty($config['port'])) {
             $port = 'port=' . $config['port'] . ';';
             }
             $dsn = $driver . ':host=' . $config['hostname'] . ';' . $port . 'dbname=' . $config['database'];
@@ -616,10 +616,10 @@ 
             break;
             case 'oracle':
           $port = '';
-            if (! empty($config['port'])) {
+            if (!empty($config['port'])) {
             $port = ':' . $config['port'];
             }
-            $dsn =  'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
+            $dsn = 'oci:dbname=' . $config['hostname'] . $port . '/' . $config['database'];
             break;
         }
         return $dsn;
@@ -631,9 +631,9 @@ 
      *      
      * @return mixed
      */
-    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheContentForQuery($query, $returnAsList, $returnAsArray) {
         $cacheKey = $this->getCacheKeyForQuery($query, $returnAsList, $returnAsArray);
-        if (! is_object($this->cacheInstance)){
+        if (!is_object($this->cacheInstance)) {
                 //can not call method with reference in argument
                 //like $this->setCacheInstance(& get_instance()->cache);
                 //use temporary variable
@@ -650,9 +650,9 @@ 
      * @param mixed $result the query result to save
      * @param int $expire the cache TTL
      */
-        protected function setCacheContentForQuery($query, $key, $result, $expire){
-        $this->logger->info('Save the result for query [' .$query. '] into cache for future use');
-        if (! is_object($this->cacheInstance)){
+        protected function setCacheContentForQuery($query, $key, $result, $expire) {
+        $this->logger->info('Save the result for query [' . $query . '] into cache for future use');
+        if (!is_object($this->cacheInstance)) {
                     //can not call method with reference in argument
                     //like $this->setCacheInstance(& get_instance()->cache);
                     //use temporary variable
@@ -669,7 +669,7 @@ 
          * 
          *  @return string
          */
-    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray){
+    protected function getCacheKeyForQuery($query, $returnAsList, $returnAsArray) {
         return md5($query . $returnAsList . $returnAsArray);
     }
 
@@ -677,7 +677,7 @@ 
     /**
      * Reset the database class attributs to the initail values before each query.
      */
-    private function reset(){
+    private function reset() {
         //query builder reset
         $this->queryBuilder->reset();
         $this->numRows  = 0;
@@ -690,7 +690,7 @@ 
     /**
      * The class destructor
      */
-    public function __destruct(){
+    public function __destruct() {
         $this->pdo = null;
     }
 

core/classes/Session.php

Spacing +16 added lines, -16 removed lines

@@ -65,15 +65,15 @@ 
 		 * @param  mixed $default the default value to use if can not find the session flash item in the list
 		 * @return mixed          the session flash value if exist or the default value
 		 */
-		public static function getFlash($item, $default = null){
+		public static function getFlash($item, $default = null) {
 			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
 			$return = array_key_exists($key, $_SESSION) ?
 			($_SESSION[$key]) : $default;
-			if(array_key_exists($key, $_SESSION)){
+			if (array_key_exists($key, $_SESSION)) {
 				unset($_SESSION[$key]);
-			} else{
-				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
+			} else {
+				$logger->warning('Cannot find session flash item [' . $key . '] using the default value [' . $default . ']');
 			}
 			return $return;
 		}
@@ -102,13 +102,13 @@ 
 		 * Clear the session item in the list
 		 * @param  string $item the session item name to be deleted
 		 */
-		public static function clear($item){
+		public static function clear($item) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Deleting of session for item ['.$item.' ]');
+			if (array_key_exists($item, $_SESSION)) {
+				$logger->info('Deleting of session for item [' . $item . ' ]');
 				unset($_SESSION[$item]);
-			} else{
-				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
+			} else {
+				$logger->warning('Session item [' . $item . '] to be deleted does not exists');
 			}
 		}
 		
@@ -116,14 +116,14 @@ 
 		 * Clear the session flash item in the list
 		 * @param  string $item the session flash item name to be deleted
 		 */
-		public static function clearFlash($item){
+		public static function clearFlash($item) {
 			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			if(array_key_exists($key, $_SESSION)){
-				$logger->info('Delete session flash for item ['.$item.']');
+			$key = self::SESSION_FLASH_KEY . '_' . $item;
+			if (array_key_exists($key, $_SESSION)) {
+				$logger->info('Delete session flash for item [' . $item . ']');
 				unset($_SESSION[$item]);
-			} else{
-				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
+			} else {
+				$logger->warning('Dession flash item [' . $item . '] to be deleted does not exists');
 			}
 		}
 

core/classes/Url.php

Spacing +6 added lines, -6 removed lines

@@ -44,25 +44,25 @@
 		 * @param  string $path the link path or full URL
 		 * @return string the full link URL
 		 */
-		public static function site_url($path = ''){
-			if(is_url($path)){
+		public static function site_url($path = '') {
+			if (is_url($path)) {
 				return $path;
 			}
 			$path = rtrim($path, '/');
 			$baseUrl = get_config('base_url');
 			$frontController = get_config('front_controller');
 			$url = $baseUrl;
-			if($frontController){
+			if ($frontController) {
 				$url .= $frontController . '/';
 			}
-			if(($suffix = get_config('url_suffix')) && $path){
-				if(strpos($path, '?') !== false){
+			if (($suffix = get_config('url_suffix')) && $path) {
+				if (strpos($path, '?') !== false) {
 					$query = explode('?', $path);
 					$query[0] = str_ireplace($suffix, '', $query[0]);
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
-				} else{
+				} else {
 					$path .= $suffix;
 				}
 			}

core/classes/DBSessionHandler.php

Spacing +29 added lines, -29 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 extends BaseClass implements SessionHandlerInterface{
+    class DBSessionHandler extends BaseClass implements SessionHandlerInterface {
 		
         /**
          * The encryption method to use to encrypt session data in database
@@ -79,7 +79,7 @@ 
          * Create new instance of Database session handler
          * @param object $modelInstance the model instance
          */
-        public function __construct(DBSessionHandlerModel $modelInstance = null){
+        public function __construct(DBSessionHandlerModel $modelInstance = null) {
             parent::__construct();
 			
             //Set Loader instance to use
@@ -87,7 +87,7 @@ 
 	       
             $this->OBJ = & get_instance();
 		    
-            if (is_object($modelInstance)){
+            if (is_object($modelInstance)) {
                 $this->setModelInstance($modelInstance);
             }
         }
@@ -96,7 +96,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;
         }
@@ -105,7 +105,7 @@ 
          * Return the session secret
          * @return string 
          */
-        public function getSessionSecret(){
+        public function getSessionSecret() {
             return $this->sessionSecret;
         }
 
@@ -114,7 +114,7 @@ 
          * Set the initializer vector for openssl 
          * @param string $key the session secret used in base64 format
          */
-        public function setInitializerVector($key){
+        public function setInitializerVector($key) {
             $ivLength = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
             $key = base64_decode($key);
             $this->iv = substr(hash('sha256', $key), 0, $ivLength);
@@ -125,7 +125,7 @@ 
          * Return the initializer vector
          * @return string 
          */
-        public function getInitializerVector(){
+        public function getInitializerVector() {
             return $this->iv;
         }
 
@@ -135,17 +135,17 @@ 
          * @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
             $secret = $this->getSessionSecret();
-            if (empty($secret)){
+            if (empty($secret)) {
                 $secret = get_config('session_secret', null);
                 $this->setSessionSecret($secret);
             }
             $this->logger->info('Session secret: ' . $secret);
 
-            if (! is_object($this->modelInstance)){
+            if (!is_object($this->modelInstance)) {
                 $this->setModelInstanceFromSessionConfig();
             }
             $this->setInitializerVector($secret);
@@ -153,7 +153,7 @@ 
             //set session tables columns
             $this->sessionTableColumns = $this->modelInstance->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));
@@ -169,7 +169,7 @@ 
          * Close the session
          * @return boolean
          */
-        public function close(){
+        public function close() {
             $this->logger->debug('Closing database session handler');
             return true;
         }
@@ -179,7 +179,7 @@ 
          * @param  string $sid the session id to use
          * @return string      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;
@@ -188,13 +188,13 @@ 
 			
             $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 null;
@@ -211,7 +211,7 @@ 
          * @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;
@@ -222,7 +222,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,
@@ -235,7 +235,7 @@ 
                         );
             $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']]);
@@ -251,7 +251,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->modelInstance;
             $instance->delete($sid);
@@ -263,7 +263,7 @@ 
          * @param  integer $maxLifetime the max lifetime
          * @return boolean
          */
-        public function gc($maxLifetime){
+        public function gc($maxLifetime) {
             $instance = $this->modelInstance;
             $time = time() - $maxLifetime;
             $this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
@@ -276,9 +276,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;
         }
@@ -289,7 +289,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());
@@ -309,7 +309,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;
         }
@@ -326,7 +326,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->modelInstance = $modelInstance;
             return $this;
         }
@@ -334,13 +334,13 @@ 
         /**
          * Set the model instance using the configuration for session
          */
-        protected function setModelInstanceFromSessionConfig(){
+        protected function setModelInstanceFromSessionConfig() {
             $modelName = get_config('session_save_path');
             $this->logger->info('The database session model: ' . $modelName);
             $this->loader->model($modelName, 'dbsessionhandlerinstance'); 
             //@codeCoverageIgnoreStart
             if (isset($this->OBJ->dbsessionhandlerinstance) 
-                && ! ($this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel)
+                && !($this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel)
             ) {
                 show_error('To use database session handler, your class model "' . get_class($this->OBJ->dbsessionhandlerinstance) . '" need extends "DBSessionHandlerModel"');
             }