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/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;

library/Trapdirector/TrapsProcess/Plugins.php

Braces +10 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
         if ($pluginDir == '')
         {
             $this->pluginDir=dirname(__DIR__).'/Plugins';
-        }
-        else 
+        } else 
         {
             $this->pluginDir=$pluginDir;
         }
@@ -94,8 +93,7 @@ 
         {
             $this->logClass->log('No enabled plugins',DEBUG);
             return;
-        }
-        else
+        } else
         {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
             $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
             
@@ -233,9 +231,11 @@ 
      */
     public function registerPlugin(string $pluginName)
     {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+        if ( ! isset($this->pluginsList[$pluginName]) ) {
+        	// Plugin isn't enable, create entry
         {
             $pluginListElmt = array();
+        }
             $pluginListElmt['object'] = null; // class not loaded
             $pluginListElmt['enabled'] = false;
             $this->pluginsList[$pluginName] = $pluginListElmt;
@@ -282,8 +282,7 @@ 
                             . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
                     }
                     
-                }
-                else
+                } else
                 {
                     $this->functionList[$fname]=array();
                     $this->functionList[$fname]['plugin'] = $pluginName;
@@ -326,11 +325,13 @@ 
                 $retDisplay .= $e->getMessage() . ' / ';
             }
         }
-        if ($checkEnabled === false) // Load all php files in plugin dir
+        if ($checkEnabled === false) {
+        	// Load all php files in plugin dir
         {
             foreach (glob($this->pluginDir."/*.php") as $filename)
             {             
                 $pluginName=basename($filename,'.php');
+        }
                 if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
                 {
                     $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
@@ -348,8 +349,7 @@ 
         if ($retDisplay == '')
         {
             return 'All plugins loaded OK';
-        }
-        else
+        } else
         {
             return $retDisplay;
         }

library/Trapdirector/TrapsProcess/Database.php

Braces +8 added lines, -9 removed lines

@@ -153,8 +153,7 @@ 
         if ($value != null && isset($value['id']))
         {   // Entry exists -> update
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
-        }
-        else
+        } else
         {   // Entry does no exists -> create
             $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
         }
@@ -222,8 +221,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -267,8 +265,7 @@ 
         if ($this->trapDBType == 'pgsql')
         {
             $prefix .= 'update_pgsql/schema_';
-        }
-        else
+        } else
         {
             $prefix .= 'update_sql/schema_';
         }
@@ -312,7 +309,10 @@ 
             $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             while (($line=fgets($input_stream)) !== false)
             {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
+                if (preg_match('/^#/', $line)) {
+                	continue;
+                }
+                // ignore comment lines
                 $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
                 if (preg_match('/; *$/', $newline))
                 {
@@ -325,8 +325,7 @@ 
                     if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
                     {
                         $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
+                    } else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;

library/Trapdirector/Plugins/NetworkRule.php

Braces +3 added lines, -1 removed lines

@@ -116,7 +116,9 @@
         {
             throw new Exception('Invalid number of parameters : ' . count($param));
         }
-        if ($param[0] == 'true') return true;
+        if ($param[0] == 'true') {
+        	return true;
+        }
         return false;
     }
 }

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;
 
@@ -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'";
 	    }