tnhfw / tnh-fw

core/classes/Database.php

Braces +27 added lines, -54 removed lines

@@ -204,14 +204,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $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;
       }
@@ -229,8 +227,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -336,8 +333,7 @@ 
       }
       if (empty($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -408,8 +404,7 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
            $this->setWhereStr($field.' IS NULL ', $andOr);
       }
       return $this;
@@ -426,8 +421,7 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
           $this->setWhereStr($field.' IS NOT NULL ', $andOr);
       }
       return $this;
@@ -447,8 +441,7 @@ 
       $whereStr = '';
       if (is_array($where)){
         $whereStr = $this->getWhereStrIfIsArray($where, $type, $andOr, $escape);
-      }
-      else{
+      } else{
         if(is_array($op)){
           $whereStr = $this->getWhereStrIfOperatorIsArray($where, $op, $type, $escape);
         } else {
@@ -496,12 +489,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (empty($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if(substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -700,8 +691,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -716,8 +706,7 @@ 
     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);
@@ -733,8 +722,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -761,14 +749,12 @@ 
   	      }
       	}
         $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if(is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($this->escape($op, $escape));
-      }
-      else{
+      } else{
         if(is_null($val)){
           $val = '';
         }
@@ -813,8 +799,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -853,8 +838,7 @@ 
 	  
 	   if($returnSQLQueryOrResultType === true){
       	return $query;
-      }
-      else{
+      } else{
     	   return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -887,8 +871,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -984,8 +967,7 @@ 
 	  
       if ($dbCacheStatus && $isSqlSELECTQuery){
           $cacheContent = $this->getCacheContentForQuery($query, $all, $array);  
-      }
-      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');
       }
      
@@ -1001,8 +983,7 @@ 
                                             $this->temporaryCacheTtl
                                           );
         }
-      }
-      else if ((! $cacheContent && !$isSqlSELECTQuery) || ($cacheContent && !$isSqlSELECTQuery)){
+      } else if ((! $cacheContent && !$isSqlSELECTQuery) || ($cacheContent && !$isSqlSELECTQuery)){
     		$sqlQuery = $this->runSqlQuery($query, $all, $array);
     		if($sqlQuery){
           $this->setQueryResultForNonSelect($sqlQuery, $all, $array);
@@ -1010,8 +991,7 @@ 
         if (! $this->result){
           $this->setQueryError();
         }
-      }
-      else{
+      } else{
         $this->logger->info('The result for query [' .$this->query. '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
@@ -1204,8 +1184,7 @@ 
     protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
       if($logger !== null){
         $this->logger = $logger;
-      }
-      else{
+      } else{
           $this->logger =& class_loader('Log', 'classes');
           $this->logger->setLogger('Library::Database');
       }
@@ -1331,8 +1310,7 @@ 
             $op = '';
           }
           $w = $type . $where . ' = ' . ($this->escape($op, $escape));
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -1349,12 +1327,10 @@ 
       protected function setWhereStr($whereStr, $andOr = 'AND'){
         if (empty($this->where)){
           $this->where = $whereStr;
-        }
-        else{
+        } else{
           if(substr($this->where, -1) == '('){
             $this->where = $this->where . ' ' . $whereStr;
-          }
-          else{
+          } else{
             $this->where = $this->where . ' '.$andOr.' ' . $whereStr;
           }
         }
@@ -1430,15 +1406,13 @@ 
       //if need return all result like list of record
       if ($all){
           $this->result = ($array === false) ? $pdoStatment->fetchAll(PDO::FETCH_OBJ) : $pdoStatment->fetchAll(PDO::FETCH_ASSOC);
-      }
-      else{
+      } else{
           $this->result = ($array === false) ? $pdoStatment->fetch(PDO::FETCH_OBJ) : $pdoStatment->fetch(PDO::FETCH_ASSOC);
       }
       //Sqlite and pgsql always return 0 when using rowCount()
       if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
         $this->numRows = count($this->result);  
-      }
-      else{
+      } else{
         $this->numRows = $pdoStatment->rowCount(); 
       }
     }
@@ -1452,8 +1426,7 @@ 
       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 = $pdoStatment->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
           $this->numRows = $pdoStatment->rowCount(); 
       }

core/libraries/FormValidation.php

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
                 //first check for CSRF
                 if ((get_config('csrf_enable', false) || $this->enableCsrfCheck) && ! Security::validateCSRF()){
                     show_error('Invalide data, Cross Site Request Forgery do his job, the data to validate is corrupted.');
-                }
-                else{
+                } else{
                     $this->logger->info('CSRF is not enabled in configuration or not set manully, no need to check it');
                 }
             }
@@ -231,8 +230,7 @@ 
             foreach ($this->getData() as $inputName => $inputVal) {
     			if(is_array($this->data[$inputName])){
     				$this->data[$inputName] = array_map('trim', $this->data[$inputName]);
-    			}
-    			else{
+    			} else{
     				$this->data[$inputName] = trim($this->data[$inputName]);
     			}
 
@@ -600,8 +598,7 @@ 
                 if ($inputVal == '' && $callbackReturn == true) {
                     $this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
                 }
-            } 
-			else if($inputVal == '') {
+            } else if($inputVal == '') {
 				$this->_setError($inputName, $ruleName, $this->_getLabel($inputName));
             }
         }
@@ -660,8 +657,7 @@ 
                         $this->_setError($inputName, $ruleName . ',post:key', array($this->_getLabel($inputName), $this->_getLabel(str_replace('post:', '', $doNotEqual))));
                         continue;
                     }
-                } 
-				else{
+                } else{
                     if ($inputVal == $doNotEqual) {
                         $this->_setError($inputName, $ruleName . ',string', array($this->_getLabel($inputName), $doNotEqual));
                         continue;