tnhfw / tnh-fw

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/Url.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 					$query[0] = rtrim($query[0], '/');
 					$query[0] .= $suffix;
 					$path = implode('?', $query);
-				}
-				else{
+				} else{
 					$path .= $suffix;
 				}
 			}

core/classes/Config.php

Braces +2 added lines, -4 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;
 			}
@@ -179,8 +178,7 @@ 
 																		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/libraries/FormValidation.php

Braces +4 added lines, -8 removed lines

@@ -234,8 +234,7 @@ 
                 //first check for CSRF
                 if (get_config('csrf_enable', false) && ! 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');
                 }
             }
@@ -255,8 +254,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]);
     			}
 
@@ -624,8 +622,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));
             }
         }
@@ -684,8 +681,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;

core/classes/Security.php

Braces +3 added lines, -6 removed lines

@@ -60,8 +60,7 @@ 
 			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. ']');
@@ -123,8 +122,7 @@ 
 						$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*")
@@ -149,8 +147,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/Loader.php

Braces +15 added lines, -30 removed lines

@@ -107,8 +107,7 @@ 
 			if ($moduleModelFilePath){
 				$logger->info('Found model [' . $class . '] from module [' .$module. '], the file path is [' .$moduleModelFilePath. '] we will used it');
 				$classFilePath = $moduleModelFilePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find model [' . $class . '] from modules using the default location');
 			}
 			$logger->info('The model file path to be loaded is [' . $classFilePath . ']');
@@ -120,12 +119,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Model [' . $class . '] --> ' . $classFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$classFilePath.' exists but does not contain the class ['. $class . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find the model [' . $class . ']');
 			}
 		}
@@ -168,8 +165,7 @@ 
 				$libraryFilePath = CORE_LIBRARY_PATH . $file;
 				$class = ucfirst($class);
 				$logger->info('This library is a system library');
-			}
-			else{
+			} else{
 				$logger->info('This library is not a system library');	
 				//first check if this library is in the module
 				$libraryFilePath = self::getLibraryPathUsingModuleInfo($class);
@@ -214,8 +210,7 @@ 
 			if ($moduleFunctionPath){
 				$logger->info('Found helper [' . $function . '] from module [' .$module. '], the file path is [' .$moduleFunctionPath. '] we will used it');
 				$functionFilePath = $moduleFunctionPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find helper [' . $function . '] from modules using the default location');
 			}
 			if (! $functionFilePath){
@@ -234,8 +229,7 @@ 
 				require_once $functionFilePath;
 				static::$loaded['function_' . $function] = $functionFilePath;
 				$logger->info('Helper [' . $function . '] --> ' . $functionFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find helper file [' . $file . ']');
 			}
 		}
@@ -268,8 +262,7 @@ 
 			if ($moduleConfigPath){
 				$logger->info('Found config [' . $filename . '] from module [' .$module. '], the file path is [' .$moduleConfigPath. '] we will used it');
 				$configFilePath = $moduleConfigPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find config [' . $filename . '] from modules using the default location');
 			}
 			$logger->info('The config file path to be loaded is [' . $configFilePath . ']');
@@ -283,8 +276,7 @@ 
 					$logger->info('The custom application configuration loaded are listed below: ' . stringfy_vars($config));
 					unset($config);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find config file ['. $configFilePath . ']');
 			}
 		}
@@ -323,8 +315,7 @@ 
 			if ($moduleLanguagePath){
 				$logger->info('Found language [' . $language . '] from module [' .$module. '], the file path is [' .$moduleLanguagePath. '] we will used it');
 				$languageFilePath = $moduleLanguagePath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find language [' . $language . '] from modules using the default location');
 			}
 			if (! $languageFilePath){
@@ -377,8 +368,7 @@ 
 					$module = $path[0];
 					$class = ucfirst($path[1]);
 				}
-			}
-			else{
+			} else{
 				$class = ucfirst($class);
 			}
 			if (! $module && !empty($obj->moduleName)){
@@ -499,8 +489,7 @@ 
 				if (isset($path[1])){
 					$instance = strtolower($path[1]);
 				}
-			}
-			else{
+			} else{
 				$instance = strtolower($class);
 			}
 			return $instance;
@@ -522,8 +511,7 @@ 
 			if ($moduleLibraryPath){
 				$logger->info('Found library [' . $class . '] from module [' .$module. '], the file path is [' .$moduleLibraryPath. '] we will used it');
 				$libraryFilePath = $moduleLibraryPath;
-			}
-			else{
+			} else{
 				$logger->info('Cannot find library [' . $class . '] from modules using the default location');
 			}
 			return $libraryFilePath;
@@ -547,12 +535,10 @@ 
 					$obj->{$instance} = $c;
 					static::$loaded[$instance] = $class;
 					$logger->info('Library [' . $class . '] --> ' . $libraryFilePath . ' loaded successfully.');
-				}
-				else{
+				} else{
 					show_error('The file '.$libraryFilePath.' exists but does not contain the class '.$class);
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find library class [' . $class . ']');
 			}
 		}
@@ -578,8 +564,7 @@ 
 				}
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find language [' . $language . ']');
 			}
 		}

core/classes/database/Database.php

Braces +1 added lines, -2 removed lines

@@ -156,8 +156,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;