patrickpr / trapdirector

bin/trap_class.php

Braces +119 added lines, -74 removed lines

@@ -71,9 +71,9 @@ 
 		{
 		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
 		    $this->logSetup=true;
+		} else {
+				    $this->logSetup=false;
 		}
-		else 
-		    $this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
@@ -86,7 +86,10 @@ 
 		$this->setupDatabase($trapConfig); // Setup database class
 		
 		$this->getDatabaseOptions(); // Get options in database
-		if ($this->api_use === true) $this->getAPI(); // Setup API
+		if ($this->api_use === true) {
+			$this->getAPI();
+		}
+		// Setup API
 		
 		$this->trap_data=array(
 			'source_ip'	=> 'unknown',
@@ -118,8 +121,7 @@ 
 	        }
 	        $this->logging->log($message,$log_level,'syslog');
 	        return false;
-	    }
-	    else
+	    } else
 	    {
 	        $option_var=$option_array[$option_category][$option_name];
 	        return true;
@@ -185,7 +187,10 @@ 
 	    
         $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName]);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+	    if ($this->api_use === true) {
+	    	return;
+	    }
+	    // In case of API use, no IDO is necessary
         
 	    // IDO Database
 	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
@@ -210,9 +215,11 @@ 
 	protected function getDatabaseOptions()
 	{
 		// Database options
-		if ($this->logSetup == false) // Only if logging was no setup in constructor
+		if ($this->logSetup == false) {
+			// Only if logging was no setup in constructor
 		{
     		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+		}
     		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
     		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
 		}
@@ -221,7 +228,9 @@ 
 	protected function getDBConfigIfSet($element,&$variable)
 	{
 		$value=$this->getDBConfig($element);
-		if ($value != 'null') $variable=$value;
+		if ($value != 'null') {
+			$variable=$value;
+		}
 	}
 	
 	/** 
@@ -309,8 +318,7 @@ 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-		} 
-		else 
+		} else 
 		{		
 			$this->trap_data['source_ip']=$matches[1];
 			$this->trap_data['destination_ip']=$matches[3];
@@ -325,14 +333,12 @@ 
 			if ($ret_code===0 || $ret_code===false) 
 			{
 				$this->logging->log('No match on trap data : '.$vars,WARN,'');
-			}
-			else 
+			} else 
 			{
 			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
-				}
-				else
+				} else
 				{
 					$object= new stdClass;
 					$object->oid =$matches[1];
@@ -503,7 +509,9 @@ 
 	            }
 	            
 	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            if ($inserted_id==false) {
+	            	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            }
 	            $this->trap_id=$inserted_id;
 	            break;
 	        default:
@@ -519,7 +527,9 @@ 
 	{
 		
 		// If action is ignore -> don't send t DB
-		if ($this->trap_to_db === false) return;
+		if ($this->trap_to_db === false) {
+			return;
+		}
 		
 		
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -576,7 +586,9 @@ 
 				}
 
 				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				if ($inserted_id==false) {
+					throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				}
 				$this->trap_id=$inserted_id;
 			break;
 			default: 
@@ -705,8 +717,7 @@ 
     		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
     		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
     		return true;
-	    }
-	    else
+	    } else
 	    {
 	        $api = $this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
@@ -715,8 +726,7 @@ 
 	        {
 	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
 	            return false;
-	        }
-	        else 
+	        } else 
 	        {
 	            $this->logging->log( "Sent result : " .$retmessage,INFO );
 	            return true;
@@ -776,7 +786,9 @@ 
 	/***************** Eval & tokenizer functions ****************/
 	protected function eval_getElement($rule,&$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item]==' ') {
+			$item++;
+		}
 		if (preg_match('/[0-9\.]/',$rule[$item]))
 		{ // number
 	
@@ -803,14 +815,15 @@ 
 			$start=$item;
 			$parenthesis_count=0; 
 			while (($item < strlen($rule)) // Not end of string AND
-			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) {
+				// Closing ')' or embeded ()
 			{ 
 				if ($rule[$item] == '"' )
 				{ // pass through string
 					$item++;
+			}
 					$item=$this->eval_getNext($rule,$item,'"');
-				} 
-				else{
+				} else{
 				    if ($rule[$item] == '(')
 				    {
 				        $parenthesis_count++;
@@ -838,13 +851,17 @@ 
 	protected function eval_getNext($rule,$item,$tok)
 	{
 		while (($rule[$item] != $tok ) && ($item < strlen($rule))) { $item++;}
-		if ($item==strlen($rule)) throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		if ($item==strlen($rule)) {
+			throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		}
 		return $item+1;
 	}
 	
 	protected function eval_getOper($rule,&$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item]==' ') {
+			$item++;
+		}
 		switch ($rule[$item])
 		{
 			case '<':
@@ -880,12 +897,13 @@ 
 	public function evaluation($rule,&$item)
 	{
 	    //echo "Evaluation of ".substr($rule,$item)."\n";
-		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		if ( $rule[$item] == '!') {
+			// If '!' found, negate next expression.
 		{
 		    $negate=true;
-		    $item++;
 		}
-		else
+		    $item++;
+		} else
 		{
 		    $negate=false;
 		}
@@ -893,10 +911,14 @@ 
 		list($type1,$val1) = $this->eval_getElement($rule,$item);
 		//echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
 		
-		if ($item==strlen($rule)) // If only element, return value, but only boolean
+		if ($item==strlen($rule)) {
+			// If only element, return value, but only boolean
 		{
 		  if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-		  if ($negate === true) $val1= ! $val1;
+		}
+		  if ($negate === true) {
+		  	$val1= ! $val1;
+		  }
 		  return $val1;
 		}  
 		
@@ -905,27 +927,34 @@ 
 		//echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
 		// Third element : number, string or ()
-		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+		if ( $rule[$item] == '!') {
+			// starts with a ! so evaluate whats next
 		{
 		    $item++;
-		    if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+		}
+		    if ($typec != 1) {
+		    	throw new Exception("Mixing boolean and comparison : ".$rule);
+		    }
 		    $val2= ! $this->evaluation($rule,$item);
 		    $type2=2; // result is a boolean 
-		}
-		else 
+		} else 
 		{
 		    list($type2,$val2) = $this->eval_getElement($rule,$item);
 		}
 		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
 		
-		if ($type1!=$type2)  // cannot compare different types
+		if ($type1!=$type2) {
+			// cannot compare different types
 		{ 
 		    throw new Exception("Cannot compare string & number : ".$rule);
 		}
-		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+		}
+		if ($typec==1 && $type1 !=2) {
+			// cannot use & or | with string/number
 		{
 		    throw new Exception("Cannot use boolean operators with string & number : ".$rule);
 		}
+		}
 		
 		switch ($comp){
 			case '<':	$retVal= ($val1 < $val2); break;
@@ -939,9 +968,15 @@ 
 			case '&':	$retVal= ($val1 && $val2); break;
 			default:  throw new Exception("Error in expression - unknown comp : ".$comp);
 		}
-		if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+		if ($negate === true) {
+			$retVal = ! $retVal;
+		}
+		// Inverse result if negate before expression
 		
-		if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+		if ($item==strlen($rule)) {
+			return $retVal;
+		}
+		// End of string : return evaluation
 		// check for logical operator :
 		switch ($rule[$item])
 		{
@@ -968,7 +1003,9 @@ 
 					$rule2.=$rule[$item];
 					$item++;
 				}
-				if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				if ($item == strlen ($rule)) {
+					throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				}
 				$rule2.=$rule[$item];
 				$item++;
 				continue;
@@ -988,10 +1025,12 @@ 
 	
 	protected function eval_rule($rule)
 	{
-		if ($rule==null || $rule == '') // Empty rule is always true
+		if ($rule==null || $rule == '') {
+			// Empty rule is always true
 		{
 			return true;
 		}
+		}
 		$matches=array();
 		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
 		{
@@ -1078,20 +1117,17 @@ 
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
-						}
-						else
+						} else
 						{
 						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
 					$this->trap_to_db=($action==-2)?false:true;
-				}
-				else
+				} else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
@@ -1102,14 +1138,12 @@ 
 					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
+					    } else
 					    {
     						$this->add_rule_match($rule['id'],$rule['num_match']+1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
@@ -1119,16 +1153,14 @@ 
 				if (!isset($this->trap_data['source_name']))
 				{
 					$this->trap_data['source_name']=$rule['host_name'];
-				}
-				else
+				} else
 				{
 					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{ 
 			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
@@ -1139,8 +1171,7 @@ 
 		if ($this->trap_data['status']=='error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
-		}
-		else
+		} else
 		{
 		  $this->trap_data['status']='done';
 		}
@@ -1195,8 +1226,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -1240,8 +1270,7 @@ 
 	    if ($this->trapsDB->trapDBType == 'pgsql')
 	    {
 	        $prefix .= 'update_pgsql/schema_';
-	    }
-	    else
+	    } else
 	    {
 	        $prefix .= 'update_sql/schema_';
 	    }
@@ -1287,7 +1316,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))
 	           {
@@ -1299,8 +1331,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;
@@ -1438,8 +1469,7 @@ 
 			    }
 			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
 				return 1;
-			}
-			else
+			} else
 			{
 			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
 			    return 0;
@@ -1455,7 +1485,9 @@ 
               'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
               ', :syntax, :type_enum, :description )';
         
-		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->trapsDB->trapDBType == 'pgsql') {
+			$sql .= 'RETURNING id';
+		}
 		
 		$sqlQuery=$db_conn->prepare($sql);
 		
@@ -1495,7 +1527,9 @@ 
 		        }
 		        
 		        $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-		        if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+		        if ($inserted_id==false) {
+		        	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+		        }
 		        $this->dbOidIndex[$oid]['id']=$inserted_id;
 		        break;
 		    default:
@@ -1748,12 +1782,14 @@ 
 			$name=$match[1]; // Name 
 			$type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
 			
-			if ($type==0) // object type=0 : check if v1 trap
+			if ($type==0) {
+				// object type=0 : check if v1 trap
 			{
 				// Check if next is suboid -> in that case is cannot be a trap
 				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
 				{
 				    $time_check2 += microtime(true) - $time_1;
+			}
 				    $time_check2N++;
 					continue;
 				}		
@@ -1770,9 +1806,11 @@ 
 				// Force as trap.
 				$type=21;
 			}
-			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+			if ($onlyTraps===true && $type!=21) {
+				// if only traps and not a trap, continue
 			{
 			    $time_check3 += microtime(true) - $time_1;
+			}
 				$time_check3N++;
 				continue;
 			}
@@ -1780,7 +1818,10 @@ 
 			$time_num_traps++;
 			
 			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
-			if ($display_progress) echo '#'; // echo a # when trap found
+			if ($display_progress) {
+				echo '#';
+			}
+			// echo a # when trap found
 				
 			// get trap objects & source MIB
 			unset($snmptrans);
@@ -1798,7 +1839,9 @@ 
 			$trapMib=$match[1];
 			
 			$numLine=1;$trapDesc='';
-			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+				$numLine++;
+			}
 			if (isset($snmptrans[$numLine]))
 			{
 			    $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -1820,7 +1863,9 @@ 
 			if (($update==0) && ($check_change===false))
 			{ // Trapd didn't change & force check disabled
 			    $time_objects += microtime(true) - $time_1;
-			    if ($display_progress) echo "C";
+			    if ($display_progress) {
+			    	echo "C";
+			    }
 			    continue;
 			}
 			

bin/trap_in.php

Braces +2 added lines, -4 removed lines

@@ -30,15 +30,13 @@
 
 	$Trap->add_rule_final(microtime(true) - $time1);
 	
-}
-catch (Exception $e) 
+} catch (Exception $e) 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
         $logging = new Logging();
         $logging->log("Caught exception creating Trap class",2);
-    }
-    else
+    } else
     {
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
     }

library/Trapdirector/TrapsController.php

Braces +62 added lines, -30 removed lines

@@ -87,10 +87,11 @@ 
 		try 
 		{
 			$dbconn = IcingaDbConnection::fromResourceName($DBname);
-		} 
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) {
+				return array(2,$DBname);
+			}
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -98,10 +99,11 @@ 
 			try 
 			{
 				$db=$dbconn->getConnection();
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
@@ -113,25 +115,32 @@ 
 				$version=$db->fetchRow($query);
 				if ( ($version == null) || ! property_exists($version,'value') )
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) {
+						return array(4,$DBname);
+					}
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) {
+						return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					}
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) {
+			return array(0,'');
+		}
 		return $dbconn;
 	}
 
@@ -142,31 +151,41 @@ 
 	 */
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test = false) {
+			return $this->trapDB;
+		}
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
 		if ( ! $dbresource )
 		{	
-			if ($test) return array(1,'');
+			if ($test) {
+				return array(1,'');
+			}
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
 		$retDB=$this->getDbByName($dbresource,$test,true);
-		if ($test == true) return $retDB;
+		if ($test == true) {
+			return $retDB;
+		}
 		$this->trapDB=$retDB;
 		return $this->trapDB;
 	}
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test = false) {
+			return $this->icingaDB;
+		}
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
 		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) {
+		    	return array(1,'No database in config.ini');
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
@@ -174,10 +193,11 @@ 
 		try
 		{
 		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) {
+		    	return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
@@ -197,8 +217,7 @@ 
 		    {
 		        return array(4,"$dbresource does not look like an IDO database");
 		    }
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
 		}
@@ -446,8 +465,7 @@ 
 				if (isset($common_services[$service->name2]['num']))
 				{
 					$common_services[$service->name2]['num'] +=1;
-				}
-				else
+				} else
 				{
 					$common_services[$service->name2]['num']=1;
 					$common_services[$service->name2]['name']=$service->name;
@@ -591,7 +609,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if($condition === null) {
+			return null;
+		}
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -619,7 +639,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition ==null) return 0;
+		if($condition ==null) {
+			return 0;
+		}
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -643,18 +665,28 @@ 
 				array('value'=>'value'))
 			->where('name=?',$element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row==null) {
+			// value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			
 			$this->addDBConfigValue($element,$default[$element]);
 			return $default[$element];
 		}
-		if ($return_row->value == null) // value id empty
+		if ($return_row->value == null) {
+			// value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			$this->setDBConfigValue($element,$default[$element]);
 			return $default[$element];			
 		}

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;