tnhfw / tnh-fw

core/classes/Config.php

Braces +3 added lines, -6 removed lines

@@ -128,8 +128,7 @@ 
 				$logger->info('Delete config item ['.$item.']');
 				unset(self::$config[$item]);
 				return true;
-			}
-			else{
+			} else{
 				$logger->warning('Config item ['.$item.'] to be deleted does not exists');
 				return false;
 			}
@@ -156,15 +155,13 @@ 
 					//check if the server is running under IPv6
 					if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE){
 						$baseUrl = '['.$_SERVER['SERVER_ADDR'].']';
-					}
-					else{
+					} else{
 						$baseUrl = $_SERVER['SERVER_ADDR'];
 					}
 					$port = ((isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != '80' && ! is_https() || $_SERVER['SERVER_PORT'] != '443' && is_https()) ) ? ':' . $_SERVER['SERVER_PORT'] : '');
 					$baseUrl = (is_https() ? 'https' : 'http').'://' . $baseUrl . $port
 						. substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
-				}
-				else{
+				} else{
 					$logger->warning('Can not determine the application base URL automatically, use http://localhost as default');
 					$baseUrl = 'http://localhost/';
 				}

core/classes/EventDispatcher.php

Braces +8 added lines, -16 removed lines

@@ -59,8 +59,7 @@ 
 			if(! isset($this->listeners[$eventName])){
 				$this->logger->info('This event does not have the registered event listener before, adding new one');
 				$this->listeners[$eventName] = array();
-			}
-			else{
+			} else{
 				$this->logger->info('This event already have the registered listener, add this listener to the list');
 			}
 			$this->listeners[$eventName][] = $listener;
@@ -78,12 +77,10 @@ 
 				if(false !== $index = array_search($listener, $this->listeners[$eventName], true)){
 					$this->logger->info('Found the listener at index [' .$index. '] remove it');
 					unset($this->listeners[$eventName][$index]);
-				}
-				else{
+				} else{
 					$this->logger->info('Cannot found this listener in the event listener list');
 				}
-			}
-			else{
+			} else{
 				$this->logger->info('This event does not have this listener ignore remove');
 			}
 		}
@@ -98,8 +95,7 @@ 
 			if($eventName !== null && isset($this->listeners[$eventName])){
 				$this->logger->info('The event name is set of exist in the listener just remove all event listener for this event');
 				unset($this->listeners[$eventName]);
-			}
-			else{
+			} else{
 				$this->logger->info('The event name is not set or does not exist in the listener, so remove all event listener');
 				$this->listeners = array();
 			}
@@ -132,8 +128,7 @@ 
 			if($event->returnBack){
 				$this->logger->info('This event need return back, return the result for future use');
 				return $this->dispatchToListerners($event);
-			}
-			else{
+			} else{
 				$this->logger->info('This event no need return back the result, just dispatch it');
 				$this->dispatchToListerners($event);
 			}
@@ -153,8 +148,7 @@ 
 					return $event;
 				}
 				return;
-			}
-			else{
+			} else{
 				$this->logger->info('Found the registered event listener for the event [' .$event->name. '] the list are: ' . stringfy_vars($list));
 			}
 			foreach($list as $listener){
@@ -162,12 +156,10 @@ 
 					$returnedEvent = call_user_func_array($listener, array($event));
 					if($returnedEvent instanceof EventInfo){
 						$event = $returnedEvent;
-					}
-					else{
+					} else{
 						show_error('This event [' .$event->name. '] need you return the event object after processing');
 					}
-				}
-				else{
+				} else{
 					call_user_func_array($listener, array($event));
 				}
 				if($event->stop){

core/classes/Database.php

Braces +37 added lines, -74 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,12 +404,10 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
           }
       }
@@ -431,12 +425,10 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NOT NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
           }
       }
@@ -494,8 +486,7 @@ 
             $op = '';
           }
           $w = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -512,12 +503,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;
           }
         }
@@ -537,8 +526,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 {
@@ -586,12 +574,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 . ' (';
           }
       }
@@ -749,12 +735,10 @@ 
       $like = $escape ? $this->escape($data) : $data;
       if (empty($this->where)){
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
@@ -801,8 +785,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -817,12 +800,10 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (! empty($orderDir)){
         $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
+      } else{
         if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
           $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
+        } else{
           $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
@@ -837,8 +818,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -865,14 +845,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 . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
+      } else{
         if(is_null($val)){
           $val = '';
         }
@@ -917,8 +895,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -957,8 +934,7 @@ 
 	  
 	   if($returnSQLQueryOrResultType === true){
       	return $query;
-      }
-      else{
+      } else{
     	   return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -976,8 +952,7 @@ 
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
-      }
-      else{
+      } else{
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -992,8 +967,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -1011,8 +985,7 @@ 
         foreach ($this->getData() as $column => $val){
           $values[] = $column . ' = ' . $val;
         }
-      }
-      else{
+      } else{
         foreach ($data as $column => $val){
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
@@ -1106,14 +1079,12 @@ 
         $cacheKey = md5($query . $all . $array);
         if(is_object($this->cacheInstance)){
           $cacheInstance = $this->cacheInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+      } else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
@@ -1127,8 +1098,7 @@ 
         $bench = null;
         if(is_object($this->benchmarkInstance)){
           $bench = $this->benchmarkInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1146,15 +1116,13 @@ 
             //if need return all result like list of record
             if ($all){
     				    $this->result = ($array === false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
+    		    } else{
 				        $this->result = ($array === false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
             //Sqlite and pgsql always return 0 when using rowCount()
             if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
               $this->numRows = count($this->result);  
-            }
-            else{
+            } else{
               $this->numRows = $sqlQuery->rowCount(); 
             }
 
@@ -1162,23 +1130,20 @@ 
               $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
               $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
-        }
-        else{
+        } else{
           $error = $this->pdo->errorInfo();
           $this->error = isset($error[2]) ? $error[2] : '';
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      } else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
     		$queryStr = $this->pdo->query($this->query);
     		if($queryStr){
           //Sqlite and pgsql always return 0 when using rowCount()
           if(in_array($this->config['driver'], array('sqlite', 'pgsql'))){
             $this->result = 1; //to test the result for the query like UPDATE, INSERT, DELETE
             $this->numRows = 1;  
-          }
-          else{
+          } else{
               $this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
               $this->numRows = $queryStr->rowCount(); 
           }
@@ -1189,8 +1154,7 @@ 
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else{
+      } else{
         $this->logger->info('The result for query [' .$this->query. '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
@@ -1382,8 +1346,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');
       }

core/classes/Controller.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
 		protected function setLoggerFromParamOrCreateNewInstance(Log $logger = null){
 			if($logger !== null){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 				$this->logger->setLogger('MainController');
 	        }