patrickpr / trapdirector

application/clicommands/StatusCommand.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 			$query = $dataBase->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
 			printf("Number of rules : %s\n", $dataBase->fetchOne($query) );
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			printf('Error in DB : %s\n', $e->getMessage());
 		}	   

application/clicommands/TrapsCommand.php

Braces +3 added lines, -6 removed lines

@@ -42,14 +42,12 @@ 
 			if ($days=='<default>')
 			{
 				$trap->eraseOldTraps();
-			}
-			else
+			} else
 			{
 				$trap->eraseOldTraps($days);
 			}
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}	   
@@ -74,8 +72,7 @@ 
 		try 
 		{
 			$trap->reset_services();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{
 			echo 'ERROR : '. $e->getMessage();
 		}

library/Trapdirector/Tables/TrapTableHostList.php

Braces +9 added lines, -3 removed lines

@@ -256,7 +256,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" ".$column." LIKE  '%".$this->filter_query."%' ";
 			}
@@ -264,10 +266,14 @@ 
 		}
 		if ($this->filter_done == 1)
 		{
-			if ($sql != '') $sql.=' AND ';
+			if ($sql != '') {
+				$sql.=' AND ';
+			}
 			$sql.="(status != 'done')";
 		}
-		if ($sql != '') $query->where($sql);		
+		if ($sql != '') {
+			$query->where($sql);
+		}
         return $query;
     }	
 

library/Trapdirector/Tables/HandlerTableList.php

Braces +3 added lines, -6 removed lines

@@ -99,13 +99,11 @@ 
 								if (isset($oidName['name']))
 								{
 									$val=$oidName['name'];
-								}
-								else
+								} else
 								{
 									$val = $row->$rowkey;
 								}								
-							}
-							else
+							} else
 							{
 								$val = $row->$rowkey;
 							}
@@ -114,8 +112,7 @@ 
 							if ($row->$rowkey == null)
 							{
 								$val = $row->host_group_name;
-							}
-							else
+							} else
 							{
 								$val = $row->$rowkey;
 							}

library/Trapdirector/Tables/TrapTableList.php

Braces +9 added lines, -3 removed lines

@@ -214,7 +214,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}
@@ -222,10 +224,14 @@ 
 		}
 		if ($this->filter_done == 1)
 		{
-			if ($sql != '') $sql.=' AND ';
+			if ($sql != '') {
+				$sql.=' AND ';
+			}
 			$sql.="(status != 'done')";
 		}
-		if ($sql != '') $query->where($sql);		
+		if ($sql != '') {
+			$query->where($sql);
+		}
         return $query;
     }	
 

library/Trapdirector/Config/MIBLoader.php

Braces +12 added lines, -7 removed lines

@@ -94,7 +94,9 @@ 
 					array('id' => 'id'))
 				->where("oid = '".$trap."'") ;
 		$id=$dbconn->fetchRow($query);
-		if ( ($id == null) || ! property_exists($id,'id') ) return null;
+		if ( ($id == null) || ! property_exists($id,'id') ) {
+			return null;
+		}
 		
 		$query=$dbconn->select()
 		        ->from(
@@ -107,7 +109,9 @@ 
 		            'o.trap_id='.$id->id )
 		        ->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
-		if ( count($listObjects)==0 ) return null;
+		if ( count($listObjects)==0 ) {
+			return null;
+		}
 		
 		foreach ($listObjects as $val)
 		{
@@ -128,7 +132,10 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
+	    if (!preg_match('/^\./',$oid)) {
+	    	$oid = '.' . $oid;
+	    }
+	    // Add a leading '.'
 		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
 		$dbconn = $this->db->getConnection();
 
@@ -166,8 +173,7 @@ 
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
-		}
-		else
+		} else
 		{
 			$retArray['type']=$translate;
 			$retArray['type_enum']='';			
@@ -233,8 +239,7 @@ 
 	    if ($oid===null)
 	    {
 	        $where="c.id = '$id'";
-	    }
-	    else
+	    } else
 	    {
 	        $where="c.oid = '$oid'";
 	    }

library/Trapdirector/TrapsProcess/Logging.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
         switch ($outputType)
         {
             case 'file':
-                if ($outputFile == null) throw new Exception("File logging without file !");
+                if ($outputFile == null) {
+                	throw new Exception("File logging without file !");
+                }
                 $this->setFile($outputFile);
                 $this->setDestination('file');
                 break;

application/controllers/ReceivedController.php

Braces +7 added lines, -9 removed lines

@@ -76,9 +76,10 @@ 
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 			return;
@@ -109,8 +110,7 @@ 
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$db->fetchAll($query);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 		}
@@ -118,8 +118,7 @@ 
 		if ($trapDetail == null ) 
 		{
 			$this->view->data=false;
-		}
-		else
+		} else
 		{
 			$this->view->data=true;
 			// Store result in array.
@@ -205,8 +204,7 @@ 
 			$ip=$postData['IP'];
 			$oid=$postData['OID'];
 			$action=$postData['action'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;

application/clicommands/MibCommand.php

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
 		if ($pid == 1)
 		{
 		    $trap->setLogging($logLevel,'display');
-		}
-		else
+		} else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
@@ -74,8 +73,7 @@ 
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
-		    }
-		    else
+		    } else
 		    {  // son process : close all file descriptors and go to a new session
 		        fclose($file);		        
 // 		        $sid = posix_setsid();
@@ -85,8 +83,7 @@ 
                 try
                 {
                     $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
                 }
@@ -103,8 +100,7 @@ 
 			$trap->mibClass->update_mib_database(true,$forceCheck);
 			echo "Done\n";
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}
@@ -147,8 +143,7 @@ 
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
             echo 'Deleted '. $query . " traps and objects\n";
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in DB : ' . $e->getMessage();
 		}