tnhfw / tnh-fw

tests/include/autoloader.php

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 		if(isset($classesMap[$class])){
 			if(file_exists($classesMap[$class])){
 				require_once $classesMap[$class];
-			}
-			else{
+			} else{
 				echo 'File for class ' . $class . ' not found';
 			}
 		}

core/common.php

Braces +9 added lines, -18 removed lines

@@ -226,16 +226,14 @@ 
 							);
 			if (isset($http_status[$code])){
 				$text = $http_status[$code];
-			}
-			else{
+			} else{
 				show_error('No HTTP status text found for your code please check it.');
 			}
 		}
 		
 		if (strpos(php_sapi_name(), 'cgi') === 0){
 			header('Status: ' . $code . ' ' . $text, TRUE);
-		}
-		else{
+		} else{
 			$proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 			header($proto . ' ' . $code . ' ' . $text, TRUE, $code);
 		}
@@ -277,11 +275,9 @@ 
 		*/
 		if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off'){
 			return true;
-		}
-		else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
+		} else if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https'){
 			return true;
-		}
-		else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
+		} else if (isset($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off'){
 			return true;
 		}
 		return false;
@@ -324,8 +320,7 @@ 
 	function php_exception_handler($ex){
 		if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))){
 			show_error('An exception is occured in file '. $ex->getFile() .' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception #' . $ex->getCode());
-		}
-		else{
+		} else{
 			save_to_log('error', 'An exception is occured in file ' . $ex->getFile() . ' at line ' . $ex->getLine() . ' raison : ' . $ex->getMessage(), 'PHP Exception');
 		}
 		return true;
@@ -447,15 +442,13 @@ 
 	function clean_input($str){
 		if (is_array($str)){
 			$str = array_map('clean_input', $str);
-		}
-		else if (is_object($str)){
+		} else if (is_object($str)){
 			$obj = $str;
 			foreach ($str as $var => $value) {
 				$obj->$var = clean_input($value);
 			}
 			$str = $obj;
-		}
-		else{
+		} else{
 			$str = htmlspecialchars(strip_tags($str), ENT_QUOTES, 'UTF-8');
 		}
 		return $str;
@@ -528,8 +521,7 @@ 
 					session_save_path($sessionSavePath);
 					$logger->info('Session save path: ' . $sessionSavePath);
 				}
-			}
-			else if ($sessionHandler == 'database'){
+			} else if ($sessionHandler == 'database'){
 				//load database session handle library
 				//Database Session handler Model
 				require_once CORE_CLASSES_MODEL_PATH . 'DBSessionHandlerModel.php';
@@ -537,8 +529,7 @@ 
 				$DBS =& class_loader('DBSessionHandler', 'classes');
 				session_set_save_handler($DBS, true);
 				$logger->info('session save path: ' . get_config('session_save_path'));
-			}
-			else{
+			} else{
 				show_error('Invalid session handler configuration');
 			}
 			$lifetime = get_config('session_cookie_lifetime', 0);

core/classes/model/Model.php

Braces +32 added lines, -64 removed lines

@@ -143,8 +143,7 @@ 
         public function __construct(Database $db = null){
             if (is_object($db)){
                 $this->setDatabaseInstance($db);
-            }
-            else{
+            } else{
                 $obj = & get_instance();
         		if (isset($obj->database) && is_object($obj->database)){
                     /**
@@ -260,8 +259,7 @@ 
                 $this->trigger('after_create', $insert_id);
 				//if the table doesn't have the auto increment field or sequence, the value of 0 will be returned 
 				return ! $insert_id ? true : $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -298,8 +296,7 @@ 
                 $result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -322,8 +319,7 @@ 
 				$result = $this->_database->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -340,8 +336,7 @@ 
                 if (is_array($args[1])){
                     $data = array_pop($args);
                 }
-            }
-            else if (count($args) == 3){
+            } else if (count($args) == 3){
                 if (is_array($args[2])){
                     $data = array_pop($args);
                 }
@@ -354,8 +349,7 @@ 
 				$result = $this->_database->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -385,8 +379,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -409,8 +402,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -431,8 +423,7 @@ 
             {
                 $this->getQueryBuilder()->from($this->_table);	
 				$result = $this->_database->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->from($this->_table); 
 				$result = $this->_database->delete();
@@ -494,8 +485,7 @@ 
             if (count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -647,8 +637,7 @@ 
             if (is_object($row))
             {
                 $row->created_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['created_at'] = date('Y-m-d H:i:s');
             }
@@ -660,8 +649,7 @@ 
             if (is_object($row))
             {
                 $row->updated_at = date('Y-m-d H:i:s');
-            }
-            else
+            } else
             {
                 $row['updated_at'] = date('Y-m-d H:i:s');
             }
@@ -688,8 +676,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -709,8 +696,7 @@ 
 					if (isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if (isset($row[$attr])){
 						unset($row[$attr]);
@@ -810,8 +796,7 @@ 
                 {
                     $this->getQueryBuilder()->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->getQueryBuilder()->orderBy($criteria, $order);
             }
@@ -842,8 +827,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -853,15 +837,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get($row->{$options['primary_key']});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get($row[$options['primary_key']]);
                     }
@@ -881,8 +863,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -892,15 +873,13 @@ 
                 {
                     if (is_object($this->loaderInstance)){
                         $this->loaderInstance->model($options['model'], $relationship . '_model');
-                    }
-                    else{
+                    } else{
                         Loader::model($options['model'], $relationship . '_model');    
                     }
                     if (is_object($row))
                     {
                         $row->{$relationship} = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row->{$this->primary_key});
-                    }
-                    else
+                    } else
                     {
                         $row[$relationship] = $this->{$relationship . '_model'}->get_many_by($options['primary_key'], $row[$this->primary_key]);
                     }
@@ -946,8 +925,7 @@ 
                 $fv = null;
                 if (is_object($this->formValidationInstance)){
                     $fv = $this->formValidationInstance;
-                }
-                else{
+                } else{
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -959,13 +937,11 @@ 
                 if ($fv->run())
                 {
                     return $data;
-                }
-                else
+                } else
                 {
                     return FALSE;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -982,14 +958,12 @@ 
 				if (is_array($filter))
 				{
 					$this->getQueryBuilder()->in($field, $filter);
-				}
-				else
+				} else
 				{
 					if (is_int($field))
 					{
 						$this->getQueryBuilder()->where($filter);
-					}
-					else
+					} else
 					{
 						$this->getQueryBuilder()->where($field, $filter);
 					}
@@ -1006,33 +980,27 @@ 
             if (count($params) == 1 && is_array($params[0]))
             {
                 $this->_set_where_array($params[0]);
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->getQueryBuilder()->where($params[0]);
-            }
-        	else if (count($params) == 2)
+            } else if (count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }
-    		}
-    		else if (count($params) == 3)
+    		} else if (count($params) == 3)
     		{
     			$this->getQueryBuilder()->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->getQueryBuilder()->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->getQueryBuilder()->where($params[0], $params[1]);
                 }

core/classes/Response.php

Braces +10 added lines, -20 removed lines

@@ -152,8 +152,7 @@ 
 			if(! headers_sent()){
 				header('Location: '.$url);
 				exit;
-			}
-			else{
+			} else{
 				echo '<script>
 						location.href = "'.$url.'";
 					</script>';
@@ -202,12 +201,10 @@ 
 					if($moduleViewPath){
 						$path = $moduleViewPath;
 						$logger->info('Found view [' . $view . '] in module [' .$mod. '], the file path is [' .$moduleViewPath. '] we will used it');
-					}
-					else{
+					} else{
 						$logger->info('Cannot find view [' . $view . '] in module [' .$mod. '] using the default location');
 					}
-				}
-				else{
+				} else{
 					$logger->info('The current request does not use module using the default location.');
 				}
 			}
@@ -326,8 +323,7 @@ 
 					$logger->info('The cache page content is not yet expire for the URL [' . $url . '] send 304 header to browser');
 					self::sendHeaders(304);
 					return;
-				}
-				else{
+				} else{
 					$logger->info('The cache page content is expired or the browser don\'t send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $url . '] send cache headers to tell the browser');
 					self::sendHeaders(200);
 					//get the cache content
@@ -347,15 +343,13 @@ 
 						//compress the output if is available
 						if (self::$_canCompressOutput){
 							ob_start('ob_gzhandler');
-						}
-						else{
+						} else{
 							ob_start();
 						}
 						echo $content;
 						ob_end_flush();
 						return;
-					}
-					else{
+					} else{
 						$logger->info('The page cache content for the URL [' . $url . '] is not valid may be already expired');
 						$cache->delete($pageCacheKey);
 					}
@@ -396,16 +390,14 @@ 
 				//compress the output if is available
 				if (self::$_canCompressOutput){
 					ob_start('ob_gzhandler');
-				}
-				else{
+				} else{
 					ob_start();
 				}
 				require_once $path;
 				$output = ob_get_clean();
 				self::sendHeaders(404);
 				echo $output;
-			}
-			else{
+			} else{
 				show_error('The 404 view [' .$path. '] does not exist');
 			}
 		}
@@ -420,8 +412,7 @@ 
 				//compress the output if exists
 				if (self::$_canCompressOutput){
 					ob_start('ob_gzhandler');
-				}
-				else{
+				} else{
 					ob_start();
 				}
 				extract($data);
@@ -429,8 +420,7 @@ 
 				$output = ob_get_clean();
 				self::sendHeaders(503);
 				echo $output;
-			}
-			else{
+			} else{
 				//can't use show_error() at this time because some dependencies not yet loaded and to prevent loop
 				set_http_status_header(503);
 				echo 'The error view [' . $path . '] does not exist';

core/classes/Module.php

Braces +8 added lines, -16 removed lines

@@ -61,8 +61,7 @@ 
 				while(($module = readdir($moduleDir)) !== false){
 					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
 						self::$list[] = $module;
-					}
-					else{
+					} else{
 						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
 					}
 				}
@@ -152,8 +151,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -179,8 +177,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -205,8 +202,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -232,8 +228,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -259,8 +254,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -288,8 +282,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
 				return false;
 			}
@@ -316,8 +309,7 @@ 
 			if(file_exists($filePath)){
 				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
 				return $filePath;
-			}
-			else{
+			} else{
 				$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
 				return false;
 			}

core/libraries/Upload.php

Braces +2 added lines, -4 removed lines

@@ -477,8 +477,7 @@ 
                     if (mkdir($destination_directory, 0775, true)) {
                         $this->destination_directory = $destination_directory;
                         chdir($destination_directory);
-                    }
-                    else{
+                    } else{
                         $this->logger->warning('Can not create the upload directory [' .$destination_directory. ']');
                     }
                 }
@@ -630,8 +629,7 @@ 
                 // set original filename if not have a new name
                 if (empty($this->filename)) {
                     $this->filename = $this->file_array[$this->input]['name'];
-                }
-                else{
+                } else{
                     // Replace %s for extension in filename
                     // Before: /[\w\d]*(.[\d\w]+)$/i
                     // After: /^[\s[:alnum:]\-\_\.]*\.([\d\w]+)$/iu

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');
     }
   }