tnhfw / tnh-fw

tests/include/autoloader.php

Braces +1 added lines, -2 removed lines

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

tests/include/common.php

Braces +2 added lines, -4 removed lines

@@ -178,15 +178,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;

core/classes/DBSessionHandler.php

Braces +4 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->setLogger($logger);
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::DBSessionHandler');
 	        }
@@ -197,8 +196,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -237,8 +235,7 @@ 
 			if($this->getLoader()){
 				$this->getLoader()->functions('user_agent'); 
 				$this->getLoader()->library('Browser'); 
-			}
-			else{
+			} else{
             	Loader::functions('user_agent');
             	Loader::library('Browser');
             }
@@ -264,8 +261,7 @@ 
 				//update
 				unset($params[$columns['sid']]);
 				$instance->update($sid, $params);
-			}
-			else{
+			} else{
 				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
 				$instance->insert($params);
 			}

core/classes/model/Model.php

Braces +33 added lines, -66 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)){
                     /**
@@ -256,8 +255,7 @@ 
                 $insert_id = $this->_database->insertId();
                 $this->trigger('after_create', $insert_id);
                 return $insert_id;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -294,8 +292,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -318,8 +315,7 @@ 
                                    ->update($data, $escape);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -336,8 +332,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);
                 }
@@ -349,8 +344,7 @@ 
                 $result = $this->_database->from($this->_table)->update($data);
                 $this->trigger('after_update', array($data, $result));
                 return $result;
-            }
-            else
+            } else
             {
                 return FALSE;
             }
@@ -377,8 +371,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -398,8 +391,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -417,8 +409,7 @@ 
             if ($this->soft_delete)
             {
                 $result = $this->_database->from($this->_table)->update(array( $this->soft_delete_key => TRUE ));
-            }
-            else
+            } else
             {
                 $result = $this->_database->from($this->_table)->delete();
             }
@@ -463,8 +454,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $value . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -474,15 +464,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']]);
                     }
@@ -495,8 +483,7 @@ 
                 {
                     $relationship = $value;
                     $options = array( 'primary_key' => $this->_table . '_id', 'model' => $value . '_model' );
-                }
-                else
+                } else
                 {
                     $relationship = $key;
                     $options = $value;
@@ -506,15 +493,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]);
                     }
@@ -536,8 +521,7 @@ 
             if(count($args) == 2)
             {
                 list($key, $value) = $args;
-            }
-            else
+            } else
             {
                 $key = $this->primary_key;
                 $value = $args[0];
@@ -685,8 +669,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');
             }
@@ -699,8 +682,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');
             }
@@ -727,8 +709,7 @@ 
                 if (is_array($row))
                 {
                     $row[$column] = unserialize($row[$column]);
-                }
-                else
+                } else
                 {
                     $row->$column = unserialize($row->$column);
                 }
@@ -748,8 +729,7 @@ 
 					if(isset($row->$attr)){
 						unset($row->$attr);
 					}
-                }
-                else
+                } else
                 {
 					if(isset($row[$attr])){
 						unset($row[$attr]);
@@ -828,8 +808,7 @@ 
                 {
                     $this->_database->orderBy($key, $value);
                 }
-            }
-            else
+            } else
             {
                 $this->_database->orderBy($criteria, $order);
             }
@@ -887,8 +866,7 @@ 
                 $fv = null;
                 if(is_object($this->formValidationInstance)){
                     $fv = $this->formValidationInstance;
-                }
-                else{
+                } else{
                     Loader::library('FormValidation');
                     $fv = $this->formvalidation;
                     $this->setFormValidation($fv);
@@ -901,17 +879,14 @@ 
                     if ($fv->run())
                     {
                         return $data;
-                    }
-                    else
+                    } else
                     {
                         return FALSE;
                     }
-                }
-                else {
+                } else {
                     return $data;
                 }
-            }
-            else
+            } else
             {
                 return $data;
             }
@@ -930,46 +905,38 @@ 
                     if (is_array($filter))
                     {
                         $this->_database->in($field, $filter);
-                    }
-                    else
+                    } else
                     {
                         if (is_int($field))
                         {
                             $this->_database->where($filter);
-                        }
-                        else
+                        } else
                         {
                             $this->_database->where($field, $filter);
                         }
                     }
                 }
-            }
-            else if (count($params) == 1)
+            } else if (count($params) == 1)
             {
                 $this->_database->where($params[0]);
-            }
-        	else if(count($params) == 2)
+            } else if(count($params) == 2)
     		{
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }
-    		}
-    		else if(count($params) == 3)
+    		} else if(count($params) == 3)
     		{
     			$this->_database->where($params[0], $params[1], $params[2]);
-    		}
-            else
+    		} else
             {
                 if (is_array($params[1]))
                 {
                     $this->_database->in($params[0], $params[1]);
-                }
-                else
+                } else
                 {
                     $this->_database->where($params[0], $params[1]);
                 }

core/classes/Loader.php

Braces +18 added lines, -36 removed lines

@@ -148,8 +148,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -169,8 +168,7 @@ 
 					$searchModuleName = $path[0];
 					$class = ucfirst($path[1]);
 				}
-			}
-			else{
+			} else{
 				$class = ucfirst($class);
 			}
 
@@ -181,8 +179,7 @@ 
 			if($moduleModelFilePath){
 				$logger->info('Found model [' . $class . '] from module [' .$searchModuleName. '], 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 . ']');
@@ -194,12 +191,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 . ']');
 			}
 		}
@@ -227,8 +222,7 @@ 
 					if(isset($path[1])){
 						$instance = strtolower($path[1]);
 					}
-				}
-				else{
+				} else{
 					$instance = strtolower($class);
 				}
 			}
@@ -254,8 +248,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
 				$logger->debug('Checking library [' . $class . '] from module list ...');
@@ -267,8 +260,7 @@ 
 						$searchModuleName = $path[0];
 						$class = ucfirst($path[1]);
 					}
-				}
-				else{
+				} else{
 					$class = ucfirst($class);
 				}
 				if(! $searchModuleName && !empty($obj->moduleName)){
@@ -278,8 +270,7 @@ 
 				if($moduleLibraryPath){
 					$logger->info('Found library [' . $class . '] from module [' .$searchModuleName. '], 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');
 				}
 			}
@@ -303,12 +294,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 . ']');
 			}
 		}
@@ -352,8 +341,7 @@ 
 			if($moduleFunctionPath){
 				$logger->info('Found helper [' . $function . '] from module [' .$searchModuleName. '], 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){
@@ -372,8 +360,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 . ']');
 			}
 		}
@@ -417,8 +404,7 @@ 
 			if($moduleConfigPath){
 				$logger->info('Found config [' . $filename . '] from module [' .$searchModuleName. '], 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 . ']');
@@ -426,12 +412,10 @@ 
 				require_once $configFilePath;
 				if(! empty($config) && is_array($config)){
 					Config::setAll($config);
-				}
-				else{
+				} else{
 					show_error('No configuration found in ['. $configFilePath . ']');
 				}
-			}
-			else{
+			} else{
 				show_error('Unable to find config file ['. $configFilePath . ']');
 			}
 			static::$loaded['config_' . $filename] = $configFilePath;
@@ -489,8 +473,7 @@ 
 			if($moduleLanguagePath){
 				$logger->info('Found language [' . $language . '] from module [' .$searchModuleName. '], 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){
@@ -517,8 +500,7 @@ 
 				}
 				static::$loaded['lang_' . $language] = $languageFilePath;
 				$logger->info('Language [' . $language . '] --> ' . $languageFilePath . ' loaded successfully.');
-			}
-			else{
+			} else{
 				show_error('Unable to find language file [' . $file . ']');
 			}
 		}

core/classes/cache/FileCache.php

Braces +12 added lines, -24 removed lines

@@ -48,8 +48,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::FileCache');
 	        }
@@ -95,8 +94,7 @@ 
 		        // Unlinking when the file was expired
 		        unlink($filePath);
 		        return false;
-		     }
-		     else{
+		     } else{
 		     	$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
 		     	return $data['data'];
 		     }
@@ -134,8 +132,7 @@ 
 		    	$this->logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
 		    	fclose($handle);
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
 		    	fclose($handle);
 				chmod($filePath, 0640);
@@ -157,8 +154,7 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] remove it');
 	      		@unlink($filePath);
 				return true;
@@ -180,16 +176,14 @@ 
 			if(! file_exists($filePath)){
 				$this->logger->info('This cache file does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache file [' .$filePath. '] check the validity');
 	      		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$this->logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
 					return false;
-				}
-				else{
+				} else{
 					$this->logger->info('This cache data is OK check for expire');
 					if(isset($data['expire']) && $data['expire'] > time()){
 						$this->logger->info('This cache not yet expired return cache informations');
@@ -199,8 +193,7 @@ 
 							'ttl' => $data['ttl']
 							);
 						return $info;
-					}
-					else{
+					} else{
 						$this->logger->info('This cache already expired return false');
 						return false;
 					}
@@ -217,8 +210,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove if expired');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -226,12 +218,10 @@ 
 		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 		      		if(! $data){
 		      			$this->logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
+		      		} else if(time() > $data['expire']){
 		      			$this->logger->info('The cache data for file [' . $file . '] already expired remove it');
 		      			@unlink($file);
-		      		}
-		      		else{
+		      		} else{
 		      			$this->logger->info('The cache data for file [' . $file . '] not yet expired skip it');
 		      		}
 				}
@@ -246,8 +236,7 @@ 
 			$list = glob(CACHE_PATH . '*.cache');
 			if(! $list){
 				$this->logger->info('No cache files were found skipping');
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($list) . '] cache files to remove');
 				foreach ($list as $file) {
 					$this->logger->debug('Processing the cache file [' . $file . ']');
@@ -274,8 +263,7 @@ 
 				
 				$this->logger->warning('The zlib extension is not loaded set cache compress data to FALSE');
 				$this->compressCacheData = false;
-			}
-			else{
+			} else{
 				$this->compressCacheData = $status;
 			}
 			return $this;

core/classes/cache/ApcCache.php

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,7 @@ 
 			if($success === false){
 				$this->logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -89,8 +87,7 @@ 
 			if($result === false){
 		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -109,8 +106,7 @@ 
 			if($cacheInfo === false){
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key);
 			}
@@ -135,8 +131,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -160,8 +155,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$this->logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

core/classes/Database.php

Braces +42 added lines, -84 removed lines

@@ -188,8 +188,7 @@ 
          */
         if(is_object($logger)){
           $this->logger = $logger;
-        }
-        else{
+        } else{
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
@@ -236,11 +235,9 @@ 
                 $dsn = $config['driver'] . ':host=' . $config['hostname'] . ';'
                 . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
                 . 'dbname=' . $config['database'];
-            }
-            else if ($config['driver'] == 'sqlite'){
+            } else if ($config['driver'] == 'sqlite'){
               $dsn = 'sqlite:' . $config['database'];
-            }
-            else if($config['driver'] == 'oracle'){
+            } else if($config['driver'] == 'oracle'){
               $dsn = 'oci:dbname=' . $config['host'] . '/' . $config['database'];
             }
             
@@ -249,14 +246,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;
       }
@@ -274,8 +269,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -381,8 +375,7 @@ 
       }
       if (is_null($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -453,12 +446,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 ';
           }
       }
@@ -476,12 +467,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 ';
           }
       }
@@ -508,8 +497,7 @@ 
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
         $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
+      } else{
         if(is_array($op)){
           $x = explode('?', $where);
           $w = '';
@@ -522,14 +510,12 @@ 
             }
           }
           $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
+        } else if (! in_array((string)$op, $this->operatorList)){
           if(is_null($op)){
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -538,12 +524,10 @@ 
       }
       if (is_null($this->where)){
         $this->where = $where;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $where;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $where;
         }
       }
@@ -587,12 +571,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (is_null($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if(substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -656,12 +638,10 @@ 
         $keys = implode(', ', $_keys);
         if (is_null($this->where)){
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-        }
-        else{
+        } else{
           if(substr($this->where, -1) == '('){
             $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-          else{
+          } else{
             $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
           }
         }
@@ -715,12 +695,10 @@ 
       }
       if (is_null($this->where)){
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
+        } else{
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -770,12 +748,10 @@ 
       $like = $escape ? $this->escape($data) : $data;
       if (is_null($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;
         }
       }
@@ -822,8 +798,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -838,12 +813,10 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (! is_null($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');
         }
       }
@@ -858,8 +831,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -886,14 +858,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 = '';
         }
@@ -938,8 +908,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -978,8 +947,7 @@ 
 	  
 	  if($returnSQLQueryOrResultType === true){
     	return $query;
-      }
-      else{
+      } else{
     	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -997,8 +965,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));
@@ -1013,8 +980,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -1032,8 +998,7 @@ 
         foreach ($this->getData() as $column => $val){
           $values[] = $column . ' = ' . $val;
         }
-      }
-      else{
+      } else{
         foreach ($data as $column => $val){
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
@@ -1127,14 +1092,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');
       }
 
@@ -1148,8 +1111,7 @@ 
         $bench = null;
         if(is_object($this->benchmarkInstance)){
           $bench = $this->benchmarkInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1169,8 +1131,7 @@ 
 		    	//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);
             }
           }
@@ -1178,15 +1139,13 @@ 
             $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 = $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){
     			$this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
@@ -1198,8 +1157,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);