tnhfw / tnh-fw

core/classes/database/DatabaseQueryBuilder.php

Braces +7 added lines, -14 removed lines

@@ -225,8 +225,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;
@@ -334,8 +333,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 {
@@ -585,8 +583,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -601,8 +598,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);
@@ -618,8 +614,7 @@ 
     public function groupBy($field){
       if (is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -636,14 +631,12 @@ 
     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)){
+      } 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 = '';
         }

core/classes/database/DatabaseQueryRunner.php

Braces +5 added lines, -10 removed lines

@@ -149,8 +149,7 @@ 
           $isSqlSELECTQuery = stristr($this->query, 'SELECT') !== false;
           if($isSqlSELECTQuery){
               $this->setResultForSelect();              
-          }
-          else{
+          } else{
               $this->setResultForNonSelect();
           }
           return $this->queryResult;
@@ -172,15 +171,13 @@ 
       }
       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'))){
         $numRows = count($result);  
-      }
-      else{
+      } else{
         $numRows = $this->pdoStatment->rowCount(); 
       }
       if(! is_object($this->queryResult)){
@@ -201,8 +198,7 @@ 
       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(); 
@@ -380,8 +376,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::DatabaseQueryRunner');
       }

core/classes/database/Database.php

Braces +4 added lines, -8 removed lines

@@ -151,8 +151,7 @@ 
             $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;
@@ -671,8 +670,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');
       }
@@ -685,8 +683,7 @@ 
 	protected function setQueryBuilderFromParamOrCreateNewInstance(DatabaseQueryBuilder $queryBuilder = null){
 	  if ($queryBuilder !== null){
         $this->queryBuilder = $queryBuilder;
-	  }
-	  else{
+	  } else{
 		  $this->queryBuilder =& class_loader('DatabaseQueryBuilder', 'classes/database');
 	  }
 	}
@@ -698,8 +695,7 @@ 
   protected function setQueryRunnerFromParamOrCreateNewInstance(DatabaseQueryRunner $queryRunner = null){
     if ($queryRunner !== null){
         $this->queryRunner = $queryRunner;
-    }
-    else{
+    } else{
       $this->queryRunner =& class_loader('DatabaseQueryRunner', 'classes/database');
     }
   }

core/classes/Router.php

Braces +10 added lines, -20 removed lines

@@ -192,8 +192,7 @@ 
 				$this->logger->info('The request URI contains the front controller');
 				array_shift($segment);
 				$this->segments = $segment;
-			}
-			else{
+			} else{
 				$this->logger->info('The request URI does not contain the front controller');
 			}
 			$uri = implode('/', $segment);
@@ -215,8 +214,7 @@ 
 						$this->logger->info('The current request use the module [' .$moduleControllerMethod[0]. ']');
 						$this->module = $moduleControllerMethod[0];
 						$moduleControllerMethod = explode('@', $moduleControllerMethod[1]);
-					}
-					else{
+					} else{
 						$this->logger->info('The current request does not use the module');
 						$moduleControllerMethod = explode('@', $this->callback[$index]);
 					}
@@ -263,8 +261,7 @@ 
 						}
 						//args
 						$this->args = $segment;
-					}
-					else{
+					} else{
 						$this->logger->info('The application contains a loaded module will check if the current request is found in the module list');
 						if(in_array($segment[0], $modules)){
 							$this->logger->info('Found, the current request use the module [' . $segment[0] . ']');
@@ -278,8 +275,7 @@ 
 								if(! $path){
 									$this->logger->info('The controller [' . $this->getController() . '] not found in the module, may be will use the module [' . $this->getModule() . '] as controller');
 									$this->controller = $this->getModule();
-								}
-								else{
+								} else{
 									$this->controllerPath = $path;
 									array_shift($segment);
 								}
@@ -291,8 +287,7 @@ 
 							}
 							//the remaining is for args
 							$this->args = $segment;
-						}
-						else{
+						} else{
 							$this->logger->info('The current request information is not found in the module list');
 							//controller
 							if(isset($segment[0])){
@@ -320,8 +315,7 @@ 
 				//if it is the module controller
 				if($this->getModule()){
 					$this->controllerPath = Module::findControllerFullPath(ucfirst($this->getController()), $this->getModule());
-				}
-				else{
+				} else{
 					$this->controllerPath = APPS_CONTROLLER_PATH . ucfirst($this->getController()) . '.php';
 				}
 			}
@@ -336,15 +330,13 @@ 
 				if(! class_exists($controller, false)){
 					$e404 = true;
 					$this->logger->info('The controller file [' .$classFilePath. '] exists but does not contain the class [' . $controller . ']');
-				}
-				else{
+				} else{
 					$controllerInstance = new $controller();
 					$controllerMethod = $this->getMethod();
 					if(! method_exists($controllerInstance, $controllerMethod)){
 						$e404 = true;
 						$this->logger->info('The controller [' . $controller . '] exist but does not contain the method [' . $controllerMethod . ']');
-					}
-					else{
+					} else{
 						$this->logger->info('Routing data is set correctly now GO!');
 						call_user_func_array(array($controllerInstance, $controllerMethod), $this->getArgs());
 						$obj = & get_instance();
@@ -353,8 +345,7 @@ 
 						$obj->response->renderFinalPage();
 					}
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('The controller file path [' . $classFilePath . '] does not exist');
 				$e404 = true;
 			}
@@ -430,8 +421,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::Router');
       }

core/classes/Log.php

Braces +9 added lines, -18 removed lines

@@ -215,20 +215,15 @@ 
 			//the default value is NONE, so means no need test for NONE
 			if($level == 'fatal'){
 				$value = self::FATAL;
-			}
-			else if($level == 'error'){
+			} else if($level == 'error'){
 				$value = self::ERROR;
-			}
-			else if($level == 'warning' || $level == 'warn'){
+			} else if($level == 'warning' || $level == 'warn'){
 				$value = self::WARNING;
-			}
-			else if($level == 'info'){
+			} else if($level == 'info'){
 				$value = self::INFO;
-			}
-			else if($level == 'debug'){
+			} else if($level == 'debug'){
 				$value = self::DEBUG;
-			}
-			else if($level == 'all'){
+			} else if($level == 'all'){
 				$value = self::ALL;
 			}
 			return $value;
@@ -245,17 +240,13 @@ 
 			//the default value is NONE, so means no need test for NONE
 			if($level == self::FATAL){
 				$value = 'FATAL';
-			}
-			else if($level == self::ERROR){
+			} else if($level == self::ERROR){
 				$value = 'ERROR';
-			}
-			else if($level == self::WARNING){
+			} else if($level == self::WARNING){
 				$value = 'WARNING';
-			}
-			else if($level == self::INFO){
+			} else if($level == self::INFO){
 				$value = 'INFO';
-			}
-			else if($level == self::DEBUG){
+			} else if($level == self::DEBUG){
 				$value = 'DEBUG';
 			}
 			//no need for ALL