patrickpr / trapdirector

bin/trap_class.php

Indentation +597 added lines, -597 removed lines

@@ -60,7 +60,7 @@ 
 	
 	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
 	{
-	    // Paths of ini files
+		// Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
 		$this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";		
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
@@ -69,18 +69,18 @@ 
 		$this->logging = new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-		    $this->logSetup=true;
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
 		}
 		else 
-		    $this->logSetup=false;
+			$this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
 		$trapConfig=parse_ini_file($this->trap_module_config,true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -110,27 +110,27 @@ 
 	 */
 	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
 	{
-	    if (!isset($option_array[$option_category][$option_name]))
-	    {
-	        if ($message === null)
-	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
-	        }
-	        $this->logging->log($message,$log_level,'syslog');
-	        return false;
-	    }
-	    else
-	    {
-	        $option_var=$option_array[$option_category][$option_name];
-	        return true;
-	    }
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+			}
+			$this->logging->log($message,$log_level,'syslog');
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
 	}
 	
 	/** 
 	 * Get options from ini file and database
 	 * Setup the database class with options.
 	 * @param array : ini file array
-	*/
+	 */
 	protected function getMainOptions($trap_config)
 	{
 		$trap_config=parse_ini_file($this->trap_module_config,true);
@@ -153,55 +153,55 @@ 
 		// API options
 		if ($this->getOptionIfSet($trap_config,'config','icingaAPI_host', $this->api_hostname))
 		{
-		    $this->api_use=true;
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_password', $this->api_password);
+			$this->api_use=true;
+			$this->getOptionIfSet($trap_config,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trap_config,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trap_config,'config','icingaAPI_password', $this->api_password);
 		}
 	}
 	
 	
 	protected function setupDatabase($trapConfig)
 	{
-	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
 	    
 	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
-	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName]);
+		$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']))
-	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
-	    }
-	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];		
 
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
 	}
 	
 	/**
@@ -212,9 +212,9 @@ 
 		// Database options
 		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);
+			$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
 		}
 	}
 
@@ -225,10 +225,10 @@ 
 	}
 	
 	/** 
-	*   Get data from db_config
-	*	@param $element string name of param
-	*	@return mixed : value (or null)
-	*/	
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */	
 	protected function getDBConfig($element)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -246,15 +246,15 @@ 
 	}
 	
 	/** OBSOLETE Send log. Throws exception on critical error
-	*	@param	string $message Message to log
-	*	@param	int $level 1=critical 2=warning 3=trace 4=debug
-	*	@param  string $destination file/syslog/display
-	*	@return void
-	**/	
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 **/	
 	public function trapLog( $message, $level, $destination ='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
-	    $this->logging->log($message, $level, $destination);
+		$this->logging->log($message, $level, $destination);
 	}
 	
 	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
@@ -264,19 +264,19 @@ 
 	
 	protected function getAPI()
 	{
-	    if ($this->icinga2api == null)
-	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
-	    }
-	    return $this->icinga2api;
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+		}
+		return $this->icinga2api;
 	}
 	
 	
 	/** 
 	 * read data from stream
-	*	@param $stream string input stream, defaults to "php://stdin"
-	*	@return mixed array trap data or exception with error
-	*/
+	 *	@param $stream string input stream, defaults to "php://stdin"
+	 *	@return mixed array trap data or exception with error
+	 */
 	public function read_trap($stream='php://stdin')
 	{
 		//Read data from snmptrapd from stdin
@@ -284,7 +284,7 @@ 
 
 		if ($input_stream === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
 			$this->logging->log("Error reading stdin !",ERROR,'');
 			return null; // note : exception thrown by logging
 		}
@@ -293,21 +293,21 @@ 
 		$this->receivingHost=chop(fgets($input_stream));
 		if ($this->receivingHost === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
 			$this->logging->log("Error reading Host !",ERROR,''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
 			$this->logging->log("Error reading IP !",ERROR,''); 
 		}
 		$matches=array();
 		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
 		if ($ret_code===0 || $ret_code===false) 
 		{
-		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
+			$this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
 		} 
 		else 
@@ -328,7 +328,7 @@ 
 			}
 			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'))
+				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];				
 				}
@@ -344,7 +344,7 @@ 
 
 		if ($this->trap_data['trap_oid']=='unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
 			$this->logging->log('no trap oid found',ERROR,'');
 		} 
 
@@ -374,9 +374,9 @@ 
 
 	/** 
 	 * Translate oid into array(MIB,Name)
-	* @param $oid string oid to translate
-	* @return mixed : null if not found or array(MIB,Name)
-	*/
+	 * @param $oid string oid to translate
+	 * @return mixed : null if not found or array(MIB,Name)
+	 */
 	public function translateOID($oid)
 	{
 		// try from database
@@ -409,7 +409,7 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$matches=array();
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code === false) {
@@ -422,9 +422,9 @@ 
 	
 	/** 
 	 * Erase old trap records 
-	*	@param integer $days : erase traps when more than $days old
-	*	@return integer : number of lines deleted
-	**/
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
 	public function eraseOldTraps($days=0)
 	{
 		if ($days==0)
@@ -449,72 +449,72 @@ 
 	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
 	{
 	    
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
 	    
-	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+		// add date time
+		$insert_col ='date_received,status';
+		$insert_val = "'" . date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
-	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
-	    }
-	    if ($trapoid !=null)
-	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
-	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+		if ($sourceIP !=null)
+		{
+			$insert_col .=',source_ip';
+			$insert_val .=",'". $sourceIP ."'";
+		}
+		if ($trapoid !=null)
+		{
+			$insert_col .=',trap_oid';
+			$insert_val .=",'". $trapoid ."'";
+		}
+		$insert_col .=',status_detail';
+		$insert_val .=",'". $message ."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
 	    
-	    switch ($this->trapsDB->trapDBType)
-	    {
-	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO);
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
-	            }
-	            $this->trap_id=$inserted_id_ret['id'];
-	            break;
-	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
-	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            $sql='SELECT LAST_INSERT_ID();';
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',1,'');
+				}
+				$this->trap_id=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
 	            
-	            $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");
-	            $this->trap_id=$inserted_id;
-	            break;
-	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-	    }
+				$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");
+				$this->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+		$this->logging->log('id found: '. $this->trap_id,INFO );    
 	}
 	
 	/** Write trap data to trap database
-	*/
+	 */
 	public function writeTrapToDB()
 	{
 		
@@ -612,10 +612,10 @@ 
 	}
 
 	/** Get rules from rule database with ip and oid
-	*	@param $ip string ipv4 or ipv6
-	*	@param $oid string oid in numeric
-	*	@return mixed : PDO object or false
-	*/	
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed : PDO object or false
+	 */	
 	protected function getRules($ip,$oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -674,9 +674,9 @@ 
 	}
 
 	/** Add rule match to rule
-	*	@param id int : rule id
-	*   @param set int : value to set
-	*/
+	 *	@param id int : rule id
+	 *   @param set int : value to set
+	 */
 	protected function add_rule_match($id, $set)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -693,53 +693,53 @@ 
 	 * @param integer $state numerical staus 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
-	*/
+	 */
 	public function serviceCheckResult($host,$service,$state,$display)
 	{
-	    if ($this->api_use === false)
-	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+		if ($this->api_use === false)
+		{
+			$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
+				$host.';' .$service .';' . $state . ';'.$display;
+			$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
     		
-    		// 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
-	    {
-	        $api = $this->getAPI();
-	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
-	        if ($retcode == false)
-	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-	            return false;
-	        }
-	        else 
-	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
-	            return true;
-	        }
-	    }
+			// 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
+		{
+			$api = $this->getAPI();
+			$api->setCredentials($this->api_username, $this->api_password);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+			if ($retcode == false)
+			{
+				$this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+				return false;
+			}
+			else 
+			{
+				$this->logging->log( "Sent result : " .$retmessage,INFO );
+				return true;
+			}
+		}
 	}
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
-	    $api->setCredentials($this->api_username, $this->api_password);
-	    return $api->getHostByIP($ip);
+		$api = $this->getAPI();
+		$api->setCredentials($this->api_username, $this->api_password);
+		return $api->getHostByIP($ip);
 	}
 	
 	/** Resolve display. 
-	*	Changes OID(<oid>) to value if found or text "<not in trap>"
-	*	@param $display string
-	*	@return string display
-	*/
+	 *	Changes OID(<oid>) to value if found or text "<not in trap>"
+	 *	@param $display string
+	 *	@return string display
+	 */
 	protected function applyDisplay($display)
 	{
-	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -799,11 +799,11 @@ 
 		
 		if ($rule[$item] == '(')
 		{ // grouping
-		    $item++;
+			$item++;
 			$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
@@ -811,14 +811,14 @@ 
 					$item=$this->eval_getNext($rule,$item,'"');
 				} 
 				else{
-				    if ($rule[$item] == '(')
-				    {
-				        $parenthesis_count++;
-				    }
-				    if ($rule[$item] == ')')
-				    {
-				        $parenthesis_count--;
-				    }
+					if ($rule[$item] == '(')
+					{
+						$parenthesis_count++;
+					}
+					if ($rule[$item] == ')')
+					{
+						$parenthesis_count--;
+					}
 					$item++;
 				}
 			}
@@ -870,24 +870,24 @@ 
 	}
 	
 	/** Evaluation : makes token and evaluate. 
-	*	Public function for expressions testing
-	*	accepts : < > = <= >= !=  (typec = 0)
-	*	operators : & | (typec=1)
-	*	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
-	*   comparison int vs strings will return null (error)
-	*	return : bool or null on error
-	*/
+	 *	Public function for expressions testing
+	 *	accepts : < > = <= >= !=  (typec = 0)
+	 *	operators : & | (typec=1)
+	 *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
+	 *   comparison int vs strings will return null (error)
+	 *	return : bool or null on error
+	 */
 	public function evaluation($rule,&$item)
 	{
-	    //echo "Evaluation of ".substr($rule,$item)."\n";
+		//echo "Evaluation of ".substr($rule,$item)."\n";
 		if ( $rule[$item] == '!') // If '!' found, negate next expression.
 		{
-		    $negate=true;
-		    $item++;
+			$negate=true;
+			$item++;
 		}
 		else
 		{
-		    $negate=false;
+			$negate=false;
 		}
 		// First element : number, string or ()
 		list($type1,$val1) = $this->eval_getElement($rule,$item);
@@ -907,24 +907,24 @@ 
 		// Third element : number, string or ()
 		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
 		{
-		    $item++;
-		    if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-		    $val2= ! $this->evaluation($rule,$item);
-		    $type2=2; // result is a boolean 
+			$item++;
+			if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+			$val2= ! $this->evaluation($rule,$item);
+			$type2=2; // result is a boolean 
 		}
 		else 
 		{
-		    list($type2,$val2) = $this->eval_getElement($rule,$item);
+			list($type2,$val2) = $this->eval_getElement($rule,$item);
 		}
 		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
 		
 		if ($type1!=$type2)  // cannot compare different types
 		{ 
-		    throw new Exception("Cannot compare string & number : ".$rule);
+			throw new Exception("Cannot compare string & number : ".$rule);
 		}
 		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
 		{
-		    throw new Exception("Cannot use boolean operators with string & number : ".$rule);
+			throw new Exception("Cannot use boolean operators with string & number : ".$rule);
 		}
 		
 		switch ($comp){
@@ -982,9 +982,9 @@ 
 	}		
 	
 	/** Evaluation rule (uses eval_* functions recursively)
-	*	@param $rule string rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
-	*	@return bool : true : rule match, false : rule don't match , throw exception on error.
-	*/
+	 *	@param $rule string rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
+	 *	@return bool : true : rule match, false : rule don't match , throw exception on error.
+	 */
 	
 	protected function eval_rule($rule)
 	{
@@ -1029,7 +1029,7 @@ 
 			}
 			if ($found==0)
 			{	// OID not found : throw error
-			    throw new Exception('OID '.$oid.' not found in trap');
+				throw new Exception('OID '.$oid.' not found in trap');
 			}
 		}
 		$item=0;
@@ -1040,7 +1040,7 @@ 
 	}
 	
 	/** Match rules for current trap and do action
-	*/
+	 */
 	public function applyRules()
 	{
 		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
@@ -1077,12 +1077,12 @@ 
 					{
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
-						    $this->trap_action.='Error sending status : check cmd/API';
+							$this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
-						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
@@ -1099,15 +1099,15 @@ 
 					$this->logging->log('action NOK : '.$action,INFO );
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-					    {
-					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
-					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
-    						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-					    }
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
 					}
 					else
 					{
@@ -1130,9 +1130,9 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-			    $this->trap_action.=' ERR : '.$e->getMessage();
-			    $this->trap_data['status']='error';
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trap_action.=' ERR : '.$e->getMessage();
+				$this->trap_data['status']='error';
 			}
 			
 		}
@@ -1147,8 +1147,8 @@ 
 	}
 
 	/** Add Time a action to rule
-	*	@param string $time : time to process to insert in SQL
-	*/
+	 *	@param string $time : time to process to insert in SQL
+	 */
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -1165,9 +1165,9 @@ 
 	/*********** UTILITIES *********************/
 	
 	/** Create database schema 
-	*	@param $schema_file	string File to read schema from
-	*	@param $table_prefix string to replace #PREFIX# in schema file by this
-	*/
+	 *	@param $schema_file	string File to read schema from
+	 *	@param $table_prefix string to replace #PREFIX# in schema file by this
+	 */
 	public function create_schema($schema_file,$table_prefix)
 	{
 		//Read data from snmptrapd from stdin
@@ -1187,30 +1187,30 @@ 
 		{
 			$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
 			if (preg_match('/; *$/', $newline)) 
-            {
-                $sql= $newline;
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
-                {
-                    $cur_table='table '.$cur_table_array[1];
-                }
-                else
-                {
-                    $cur_table='secret SQL stuff :-)';
-                }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
-                $newline='';
-            }
+			{
+				$sql= $newline;
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error create schema : '.$sql,ERROR,'');
+				}
+				if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+				{
+					$cur_table='table '.$cur_table_array[1];
+				}
+				else
+				{
+					$cur_table='secret SQL stuff :-)';
+				}
+				$this->logging->log('Creating : ' . $cur_table,INFO );
+				$newline='';
+			}
 		}
 		
 		$sql= $newline;
 		if ($sql != '')
 		{
-    		if ($db_conn->query($sql) === false) {
-    			$this->logging->log('Error create schema : '.$sql,ERROR,'');
-    		}
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Error create schema : '.$sql,ERROR,'');
+			}
 		}
 		$this->logging->log('Schema created',INFO);		
 	}
@@ -1225,113 +1225,113 @@ 
 	 */
 	public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
 	{
-	    // Get current db number
-	    $db_conn=$this->trapsDB->db_connect_trap();
-	    $sql='SELECT id,value from '.$this->db_prefix.'db_config WHERE name=\'db_version\' ';
-	    $this->logging->log('SQL query : '.$sql,DEBUG );
-	    if (($ret_code=$db_conn->query($sql)) === false) {
-	        $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
-	        return;
-	    }
-	    $version=$ret_code->fetchAll();
-	    $cur_version=$version[0]['value'];
-	    $db_version_id=$version[0]['id'];
+		// Get current db number
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT id,value from '.$this->db_prefix.'db_config WHERE name=\'db_version\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+			return;
+		}
+		$version=$ret_code->fetchAll();
+		$cur_version=$version[0]['value'];
+		$db_version_id=$version[0]['id'];
 	    
-	    if ($this->trapsDB->trapDBType == 'pgsql')
-	    {
-	        $prefix .= 'update_pgsql/schema_';
-	    }
-	    else
-	    {
-	        $prefix .= 'update_sql/schema_';
-	    }
-	    //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
-	    if ($getmsg === true)
-	    {
-	        $message='';
-	        $this->logging->log('getting message for upgrade',DEBUG );
-	        while($cur_version<$target_version)
-	        {
-	            $cur_version++;
-	            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-	            $input_stream=fopen($updateFile, 'r');
-	            if ($input_stream=== false)
-	            {
-	                $this->logging->log("Error reading update file ". $updateFile,2,'');
-	                return;
-	            }
-	            do { $line=fgets($input_stream); }
-	            while ($line !== false && !preg_match('/#MESSAGE/',$line));
-	            if ($line === false)
-	            {
-	                $this->logging->log("No message in file ". $updateFile,2,'');
-	                return;
-	            }
-	            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
-	        }
-	        return $message;
-	    }
-	    while($cur_version<$target_version)
-	    { // tODO : execute pre & post scripts
-	       $cur_version++;
-	       $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-	       $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-	       $input_stream=fopen($updateFile, 'r');
-	       if ($input_stream=== false)
-	       {
-	           $this->logging->log("Error reading update file ". $updateFile,2,'');
-	           return;
-	       }
-	       $newline='';
-	       $db_conn=$this->trapsDB->db_connect_trap();
-	       $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-	       while (($line=fgets($input_stream)) !== false)
-	       {
-	           if (preg_match('/^#/', $line)) continue; // ignore comment lines
-	           $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-	           if (preg_match('/; *$/', $newline))
-	           {
-	               $sql_req=$db_conn->prepare($newline);
-	               if ($sql_req->execute() === false) {
-	                   $this->logging->log('Error create schema : '.$newline,1,'');
-	               }
-	               $cur_table_array=array();
-	               if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
-	               {
-	                   $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-	               }
-	               else
-	               {
-	                   $cur_table='secret SQL stuff :-)';
-	                   //$cur_table=$newline;
-	               }
-	               $this->logging->log('Doing : ' . $cur_table,INFO );
+		if ($this->trapsDB->trapDBType == 'pgsql')
+		{
+			$prefix .= 'update_pgsql/schema_';
+		}
+		else
+		{
+			$prefix .= 'update_sql/schema_';
+		}
+		//echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
+		if ($getmsg === true)
+		{
+			$message='';
+			$this->logging->log('getting message for upgrade',DEBUG );
+			while($cur_version<$target_version)
+			{
+				$cur_version++;
+				$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+				$input_stream=fopen($updateFile, 'r');
+				if ($input_stream=== false)
+				{
+					$this->logging->log("Error reading update file ". $updateFile,2,'');
+					return;
+				}
+				do { $line=fgets($input_stream); }
+				while ($line !== false && !preg_match('/#MESSAGE/',$line));
+				if ($line === false)
+				{
+					$this->logging->log("No message in file ". $updateFile,2,'');
+					return;
+				}
+				$message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+			}
+			return $message;
+		}
+		while($cur_version<$target_version)
+		{ // tODO : execute pre & post scripts
+		   $cur_version++;
+		   $this->logging->log('Updating to version : ' .$cur_version ,INFO );
+		   $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+		   $input_stream=fopen($updateFile, 'r');
+		   if ($input_stream=== false)
+		   {
+			   $this->logging->log("Error reading update file ". $updateFile,2,'');
+			   return;
+		   }
+		   $newline='';
+		   $db_conn=$this->trapsDB->db_connect_trap();
+		   $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		   while (($line=fgets($input_stream)) !== false)
+		   {
+			   if (preg_match('/^#/', $line)) continue; // ignore comment lines
+			   $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+			   if (preg_match('/; *$/', $newline))
+			   {
+				   $sql_req=$db_conn->prepare($newline);
+				   if ($sql_req->execute() === false) {
+					   $this->logging->log('Error create schema : '.$newline,1,'');
+				   }
+				   $cur_table_array=array();
+				   if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+				   {
+					   $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+				   }
+				   else
+				   {
+					   $cur_table='secret SQL stuff :-)';
+					   //$cur_table=$newline;
+				   }
+				   $this->logging->log('Doing : ' . $cur_table,INFO );
 	               
-	               $newline='';
-	           }
-	       }
-	       fclose($input_stream);
+				   $newline='';
+			   }
+		   }
+		   fclose($input_stream);
 	       
-	       //$sql= $newline;
-	       //if ($db_conn->query($sql) === false) {
-	       //    $this->logging->log('Error updating schema : '.$sql,1,'');
-	       //}
+		   //$sql= $newline;
+		   //if ($db_conn->query($sql) === false) {
+		   //    $this->logging->log('Error updating schema : '.$sql,1,'');
+		   //}
 	       
-	       $sql='UPDATE '.$this->db_prefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
-	       $this->logging->log('SQL query : '.$sql,DEBUG );
-	       if ($db_conn->query($sql) === false) {
-	           $this->logging->log('Cannot update db version. Query : ' . $sql,2);
-	           return;
-	       }
+		   $sql='UPDATE '.$this->db_prefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
+		   $this->logging->log('SQL query : '.$sql,DEBUG );
+		   if ($db_conn->query($sql) === false) {
+			   $this->logging->log('Cannot update db version. Query : ' . $sql,2);
+			   return;
+		   }
 	       
-	       $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
-	    }
+		   $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+		}
 	}
 	
 	/** reset service to OK after time defined in rule
-	*	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
-	*	@return : like a plugin : status code (0->3) <message> | <perfdata>
-	**/
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
+	 *	@return : like a plugin : status code (0->3) <message> | <perfdata>
+	 **/
 	public function reset_services()
 	{
 		// Get all services not in 'ok' state
@@ -1401,105 +1401,105 @@ 
 		$description=$db_conn->quote($description);
 		if (isset($this->dbOidIndex[$oid]))
 		{
-		    if ($this->dbOidIndex[$oid]['key'] == -1)
-		    { // newly created.
-		        return 0;
-		    }
+			if ($this->dbOidIndex[$oid]['key'] == -1)
+			{ // newly created.
+				return 0;
+			}
 			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
-			    $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
-			    $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
-			    //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
-			    //$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
-			    //$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
-			    //$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
-			    //$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
-			    )
+				$mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
+				$type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
+				//$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
+				//$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
+				//$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
+				//$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
+				//$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
+				)
 			{ // Do update
-			    $sql='UPDATE '.$this->db_prefix.'mib_cache SET '.
- 			    'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'. 
- 			    ', syntax = :syntax, type_enum = :type_enum, description = :description '.
- 			    ' WHERE id= :id';
-			    $sqlQuery=$db_conn->prepare($sql);
+				$sql='UPDATE '.$this->db_prefix.'mib_cache SET '.
+ 				'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'. 
+ 				', syntax = :syntax, type_enum = :type_enum, description = :description '.
+ 				' WHERE id= :id';
+				$sqlQuery=$db_conn->prepare($sql);
 			    
-			    $sqlParam=array(
-			        ':name' => $name,
-			        ':type' => $type, 
-			        ':mib' => $mib, 
-			        ':tc' =>  ($textConv==null)?'null':$textConv , 
-			        ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-			        ':syntax' => ($syntax==null)?'null':$syntax,
-			        ':type_enum' => ($type_enum==null)?'null':$type_enum, 
-			        ':description' => ($description==null)?'null':$description,
-			        ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
-			    );
+				$sqlParam=array(
+					':name' => $name,
+					':type' => $type, 
+					':mib' => $mib, 
+					':tc' =>  ($textConv==null)?'null':$textConv , 
+					':display_hint' => ($dispHint==null)?'null':$dispHint ,
+					':syntax' => ($syntax==null)?'null':$syntax,
+					':type_enum' => ($type_enum==null)?'null':$type_enum, 
+					':description' => ($description==null)?'null':$description,
+					':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
+				);
 			    
-			    if ($sqlQuery->execute($sqlParam) === false) {
-			        $this->logging->log('Error in query : ' . $sql,ERROR,'');
-			    }
-			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+				if ($sqlQuery->execute($sqlParam) === false) {
+					$this->logging->log('Error in query : ' . $sql,ERROR,'');
+				}
+				$this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
 				return 1;
 			}
 			else
 			{
-			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
-			    return 0;
+				$this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+				return 0;
 			}
 		}
-        // create new OID.
+		// create new OID.
 			
 		// Insert data
 
 		$sql='INSERT INTO '.$this->db_prefix.'mib_cache '.
-		      '(oid, name, type , mib, textual_convention, display_hint '.
-              ', syntax, type_enum , description ) ' . 
-              'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-              ', :syntax, :type_enum, :description )';
+			  '(oid, name, type , mib, textual_convention, display_hint '.
+			  ', syntax, type_enum , description ) ' . 
+			  'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			  ', :syntax, :type_enum, :description )';
         
 		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
 		
 		$sqlQuery=$db_conn->prepare($sql);
 		
 		$sqlParam=array(
-		    ':oid' => $oid,
-		    ':name' => $name,
-		    ':type' => $type,
-		    ':mib' => $mib,
-		    ':tc' =>  ($textConv==null)?'null':$textConv ,
-		    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-		    ':syntax' => ($syntax==null)?'null':$syntax,
-		    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-		    ':description' => ($description==null)?'null':$description
+			':oid' => $oid,
+			':name' => $name,
+			':type' => $type,
+			':mib' => $mib,
+			':tc' =>  ($textConv==null)?'null':$textConv ,
+			':display_hint' => ($dispHint==null)?'null':$dispHint ,
+			':syntax' => ($syntax==null)?'null':$syntax,
+			':type_enum' => ($type_enum==null)?'null':$type_enum,
+			':description' => ($description==null)?'null':$description
 		);
 		
 		if ($sqlQuery->execute($sqlParam) === false) {
-		    $this->logging->log('Error in query : ' . $sql,1,'');
+			$this->logging->log('Error in query : ' . $sql,1,'');
 		}
 		
 		switch ($this->trapsDB->trapDBType)
 		{
-		    case 'pgsql':
-		        // Get last id to insert oid/values in secondary table
-		        if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
-		            $this->logging->log('Error getting id - pgsql - ',1,'');
-		        }
-		        if (! isset($inserted_id_ret['id'])) {
-		            $this->logging->log('Error getting id - pgsql - empty.',1,'');
-		        }
-		        $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
-		        break;
-		    case 'mysql':
-		        // Get last id to insert oid/values in secondary table
-		        $sql='SELECT LAST_INSERT_ID();';
-		        if (($ret_code=$db_conn->query($sql)) === false) {
-		            $this->logging->log('Erreur getting id - mysql - ',1,'');
-		        }
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
+					$this->logging->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id - pgsql - empty.',1,'');
+				}
+				$this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur getting id - mysql - ',1,'');
+				}
 		        
-		        $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");
-		        $this->dbOidIndex[$oid]['id']=$inserted_id;
-		        break;
-		    default:
-		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+				$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");
+				$this->dbOidIndex[$oid]['id']=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
 		}
 
 		// Set as newly created.
@@ -1507,148 +1507,148 @@ 
 		return 2;
 	}
 
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
 	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
 	{
-	    $dbObjects=null; // cache of objects for trap in db
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$dbObjects=null; // cache of objects for trap in db
+		$db_conn=$this->trapsDB->db_connect_trap();
 	    
-	    // Get id of trapmib.
+		// Get id of trapmib.
 
-	    $trapId = $this->dbOidIndex[$trapOID]['id'];
-	    if ($check_existing === true)
-	    {
-	        // Get all objects
-	        $sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-	        $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
-	        if (($ret_code=$db_conn->query($sql)) === false) {
-	            $this->logging->log('No result in query : ' . $sql,1,'');
-	        }
-	        $dbObjectsRaw=$ret_code->fetchAll();
+		$trapId = $this->dbOidIndex[$trapOID]['id'];
+		if ($check_existing === true)
+		{
+			// Get all objects
+			$sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+			$this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+			if (($ret_code=$db_conn->query($sql)) === false) {
+				$this->logging->log('No result in query : ' . $sql,1,'');
+			}
+			$dbObjectsRaw=$ret_code->fetchAll();
 	        
-	        foreach ($dbObjectsRaw as $val)
-	        {
-	            $dbObjects[$val['object_id']]=1;
-	        }
-	    }
-	    foreach ($objects as $object)
-	    {
-	        $match=$snmptrans=array();
-	        $retVal=0;
-	        $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-	        $tmpdesc='';$indesc=false;
+			foreach ($dbObjectsRaw as $val)
+			{
+				$dbObjects[$val['object_id']]=1;
+			}
+		}
+		foreach ($objects as $object)
+		{
+			$match=$snmptrans=array();
+			$retVal=0;
+			$objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
+			$tmpdesc='';$indesc=false;
 	        
-	        $objMib=$trapmib;
-	        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	            ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	        if ($retVal!=0)
-	        {
-	            // Maybe not trap mib, search with IR
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-	            { // Not found -> continue with warning
-	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-	               continue;
-	            }
-	            $objMib=$match[1];
+			$objMib=$trapmib;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				// Maybe not trap mib, search with IR
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+				if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+				{ // Not found -> continue with warning
+				   $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+				   continue;
+				}
+				$objMib=$match[1];
 	            
-	            // Do the snmptranslate again.
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-	            if ($retVal!=0) {
-	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
-	            }
+				// Do the snmptranslate again.
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
+				if ($retVal!=0) {
+					$this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+				}
 	            
-	        }
-	        foreach ($snmptrans as $line)
-	        {
-	            if ($indesc===true)
-	            {
-	                $line=preg_replace('/[\t ]+/',' ',$line);
-	                if (preg_match('/(.*)"$/', $line,$match))
-	                {
-	                    $objDesc = $tmpdesc . $match[1];
-	                    $indesc=false;
-	                }
-	                $tmpdesc.=$line;
-	                continue;
-	            }
-	            if (preg_match('/^\.[0-9\.]+$/', $line))
-	            {
-	                $objOid=$line;
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-	            {
-	                $objSyntax=$match[1];
-                    $objEnum=$match[2];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-	            {
-	                $objSyntax=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-	            {
-	                $objDispHint=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-	            {
-	                $objDesc=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-	            {
-	                $tmpdesc=$match[1];
-	                $indesc=true;
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-	            {
-	                $objTc=$match[1];
-	                continue;
-	            }
-	        }
-	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
-	        //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
-	        // Update 
-	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+			}
+			foreach ($snmptrans as $line)
+			{
+				if ($indesc===true)
+				{
+					$line=preg_replace('/[\t ]+/',' ',$line);
+					if (preg_match('/(.*)"$/', $line,$match))
+					{
+						$objDesc = $tmpdesc . $match[1];
+						$indesc=false;
+					}
+					$tmpdesc.=$line;
+					continue;
+				}
+				if (preg_match('/^\.[0-9\.]+$/', $line))
+				{
+					$objOid=$line;
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					$objEnum=$match[2];
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDispHint=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDesc=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+				{
+					$tmpdesc=$match[1];
+					$indesc=true;
+					continue;
+				}
+				if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+				{
+					$objTc=$match[1];
+					continue;
+				}
+			}
+			$this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+			//echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
+			// Update 
+			$this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
             
-	        if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
-	        {   // if link exists, continue
-	            $dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
-	            continue;
-	        }
-	        if ($check_existing === true) 
-	        {
-	            // TODO : check link trap - objects exists, mark them.
-	        }
-	        // Associate in object table
-	        $sql='INSERT INTO '.$this->db_prefix.'mib_cache_trap_object (trap_id,object_id) '.
-	   	        'values (:trap_id, :object_id)';	        
-	        $sqlQuery=$db_conn->prepare($sql);	        
-	        $sqlParam=array(
-	            ':trap_id' => $trapId,
-	            ':object_id' => $this->dbOidIndex[$objOid]['id'],
-	        );
+			if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true) 
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$sql='INSERT INTO '.$this->db_prefix.'mib_cache_trap_object (trap_id,object_id) '.
+	   			'values (:trap_id, :object_id)';	        
+			$sqlQuery=$db_conn->prepare($sql);	        
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$objOid]['id'],
+			);
 	        
-	        if ($sqlQuery->execute($sqlParam) === false) {
-	            $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
-	        }
-	    }
-	    if ($check_existing === true)
-	    {
-	        // TODO : remove link trap - objects that wasn't marked.
-	    }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
 	    
 	}
 	
@@ -1658,7 +1658,7 @@ 
 	 * @param boolean $check_change : Force check of trap params & objects
 	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
 	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-	*/	
+	 */	
 	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
 	{
 		// Timing 
@@ -1710,7 +1710,7 @@ 
 		
 		for ($curElement=0;$curElement < $numElements;$curElement++)
 		{
-		    $time_1= microtime(true);
+			$time_1= microtime(true);
 			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
 			{ // echo a . every 2 sec
 				echo '.';
@@ -1728,8 +1728,8 @@ 
 			// Get oid or pass if not found
 			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
 			{
-			    $time_parse1 += microtime(true) - $time_1;
-			    $time_parse1N ++;
+				$time_parse1 += microtime(true) - $time_1;
+				$time_parse1N ++;
 				continue;
 			}
 			$oid=$this->objectsAll[$curElement];
@@ -1740,7 +1740,7 @@ 
 			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
 						$this->objectsAll[$curElement],$match))
 			{
-			    $time_check1 += microtime(true) - $time_1;
+				$time_check1 += microtime(true) - $time_1;
 				$time_check1N++;
 				continue;
 			}
@@ -1753,8 +1753,8 @@ 
 				// 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++;
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
 					continue;
 				}		
 				unset($snmptrans);
@@ -1762,8 +1762,8 @@ 
 					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
 				if ($retVal!=0)
 				{
-				    $time_check2 += microtime(true) - $time_1;
-				    $time_check2N++;
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
 					continue;
 				}
 				//echo "\n v1 trap found : $oid \n";
@@ -1772,7 +1772,7 @@ 
 			}
 			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
 			{
-			    $time_check3 += microtime(true) - $time_1;
+				$time_check3 += microtime(true) - $time_1;
 				$time_check3N++;
 				continue;
 			}
@@ -1793,7 +1793,7 @@ 
 			
 			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
 			{
-			    $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+				$this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
 			}
 			$trapMib=$match[1];
 			
@@ -1801,17 +1801,17 @@ 
 			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]);
+				$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
 
-			    while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-			    {
-			        $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-			        $numLine++;
-			    }
-			    if (isset($snmptrans[$numLine])) {
-			        $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-			        $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
-			    }
+				while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+				{
+					$trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+					$numLine++;
+				}
+				if (isset($snmptrans[$numLine])) {
+					$trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
+					$trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+				}
 
 			}
 			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
@@ -1819,23 +1819,23 @@ 
 			
 			if (($update==0) && ($check_change===false))
 			{ // Trapd didn't change & force check disabled
-			    $time_objects += microtime(true) - $time_1;
-			    if ($display_progress) echo "C";
-			    continue;
+				$time_objects += microtime(true) - $time_1;
+				if ($display_progress) echo "C";
+				continue;
 			}
 			
 			$synt=null;
 			foreach ($snmptrans as $line)
 			{	
-    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-    				{
-    					$synt=$match[1];
-    				}
+				if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+					{
+						$synt=$match[1];
+					}
 			}
 			if ($synt == null) 
 			{
 				//echo "No objects for $trapOID\n";
-			    $time_objects += microtime(true) - $time_1;
+				$time_objects += microtime(true) - $time_1;
 				continue;
 			}
 			//echo "$synt \n";
@@ -1854,18 +1854,18 @@ 
 		
 		if ($display_progress)
 		{
-    		echo "\nNumber of processed traps : $time_num_traps \n";
-    		echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-    		echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-    		echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+			echo "\nNumber of processed traps : $time_num_traps \n";
+			echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
+			echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
+			echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
+			echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
 		}
 		
 		// Timing ends
 		$timeTaken=microtime(true) - $timeTaken;
 		if ($display_progress)
 		{
-		    echo "Global time : ".round($timeTaken)." seconds\n";
+			echo "Global time : ".round($timeTaken)." seconds\n";
 		}
 		
 	}

Spacing +417 added lines, -417 removed lines

@@ -32,8 +32,8 @@ 
 	protected $api_password='';
 
 	// Logs 
-	protected $logging;    //< Logging class.
-	protected $logSetup;   //< bool true if log was setup in constructor
+	protected $logging; //< Logging class.
+	protected $logSetup; //< bool true if log was setup in constructor
 	
 	//protected $debug_file="php://stdout";	
 	// Databases
@@ -58,7 +58,7 @@ 
 	private $objectsAll; //< output lines of snmptranslate list
 	private $trapObjectsIndex; //< array of traps objects (as OID)
 	
-	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	function __construct($etc_dir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
 	{
 	    // Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
@@ -66,10 +66,10 @@ 
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
 
 		// Setup logging
-		$this->logging = new Logging();
+		$this->logging=new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+		    $this->logging->setLogging($baseLogLevel, $baseLogMode, $baseLogFile);
 		    $this->logSetup=true;
 		}
 		else 
@@ -77,10 +77,10 @@ 
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
-		$trapConfig=parse_ini_file($this->trap_module_config,true);
+		$trapConfig=parse_ini_file($this->trap_module_config, true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+		    $this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -108,15 +108,15 @@ 
 	 * @param string $message warning message if not found
 	 * @return boolean true if found, or false
 	 */
-	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+	protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=2, $message=null)
 	{
 	    if (!isset($option_array[$option_category][$option_name]))
 	    {
 	        if ($message === null)
 	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+	            $message='No '.$option_name.' in config file: '.$this->trap_module_config;
 	        }
-	        $this->logging->log($message,$log_level,'syslog');
+	        $this->logging->log($message, $log_level, 'syslog');
 	        return false;
 	    }
 	    else
@@ -133,30 +133,30 @@ 
 	*/
 	protected function getMainOptions($trap_config)
 	{
-		$trap_config=parse_ini_file($this->trap_module_config,true);
+		$trap_config=parse_ini_file($this->trap_module_config, true);
 		if ($trap_config == false) 
 		{
-			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog'); 
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog'); 
 		}
 		// Snmptranslate binary path
-		$this->getOptionIfSet($trap_config,'config','snmptranslate', $this->snmptranslate);
+		$this->getOptionIfSet($trap_config, 'config', 'snmptranslate', $this->snmptranslate);
 
 		// mibs path
-		$this->getOptionIfSet($trap_config,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+		$this->getOptionIfSet($trap_config, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
 
 		// icinga2cmd path
-		$this->getOptionIfSet($trap_config,'config','icingacmd', $this->icinga2cmd);
+		$this->getOptionIfSet($trap_config, 'config', 'icingacmd', $this->icinga2cmd);
 		
 		// table prefix
-		$this->getOptionIfSet($trap_config,'config','database_prefix', $this->db_prefix);
+		$this->getOptionIfSet($trap_config, 'config', 'database_prefix', $this->db_prefix);
 
 		// API options
-		if ($this->getOptionIfSet($trap_config,'config','icingaAPI_host', $this->api_hostname))
+		if ($this->getOptionIfSet($trap_config, 'config', 'icingaAPI_host', $this->api_hostname))
 		{
 		    $this->api_use=true;
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trap_config,'config','icingaAPI_password', $this->api_password);
+		    $this->getOptionIfSet($trap_config, 'config', 'icingaAPI_port', $this->api_port);
+		    $this->getOptionIfSet($trap_config, 'config', 'icingaAPI_user', $this->api_username);
+		    $this->getOptionIfSet($trap_config, 'config', 'icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -164,40 +164,40 @@ 
 	protected function setupDatabase($trapConfig)
 	{
 	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
+	    if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trap_module_config, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
 	    
-	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
+	   if (($dbConfig=parse_ini_file($this->icingaweb2_ressources, true)) === false)
 	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
+	    if (!array_key_exists($dbTrapName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName]);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName]);
 	    
 	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
 	    // IDO Database
-	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+	    if (!array_key_exists('IDOdatabase', $trapConfig['config']))
 	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config, ERROR, '');
 	    }
 	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
 
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+	    $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
@@ -212,13 +212,13 @@ 
 		// Database options
 		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);
+    		$this->getDBConfigIfSet('log_level', $this->logging->debugLevel);
+    		$this->getDBConfigIfSet('log_destination', $this->logging->outputMode);
+    		$this->getDBConfigIfSet('log_file', $this->logging->outputFile);
 		}
 	}
 
-	protected function getDBConfigIfSet($element,&$variable)
+	protected function getDBConfigIfSet($element, &$variable)
 	{
 		$value=$this->getDBConfig($element);
 		if ($value != 'null') $variable=$value;
@@ -234,7 +234,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return null;
 		}
 		$value=$ret_code->fetch();
@@ -251,22 +251,22 @@ 
 	*	@param  string $destination file/syslog/display
 	*	@return void
 	**/	
-	public function trapLog( $message, $level, $destination ='') // OBSOLETE
+	public function trapLog($message, $level, $destination='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
 	    $this->logging->log($message, $level, $destination);
 	}
 	
-	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	public function setLogging($debugLvl, $outputType, $outputOption=null)  // OBSOLETE
 	{
-		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+		$this->logging->setLogging($debugLvl, $outputType, $outputOption);
 	}
 	
 	protected function getAPI()
 	{
 	    if ($this->icinga2api == null)
 	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+	        $this->icinga2api=new Icinga2API($this->api_hostname, $this->api_port);
 	    }
 	    return $this->icinga2api;
 	}
@@ -285,7 +285,7 @@ 
 		if ($input_stream === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-			$this->logging->log("Error reading stdin !",ERROR,'');
+			$this->logging->log("Error reading stdin !", ERROR, '');
 			return null; // note : exception thrown by logging
 		}
 
@@ -294,21 +294,21 @@ 
 		if ($this->receivingHost === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-			$this->logging->log("Error reading Host !",ERROR,''); 
+			$this->logging->log("Error reading Host !", ERROR, ''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-			$this->logging->log("Error reading IP !",ERROR,''); 
+			$this->logging->log("Error reading IP !", ERROR, ''); 
 		}
 		$matches=array();
-		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-		if ($ret_code===0 || $ret_code===false) 
+		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/', $IP, $matches);
+		if ($ret_code === 0 || $ret_code === false) 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+			$this->logging->log('Error parsing IP : '.$IP, ERROR, '');
 		} 
 		else 
 		{		
@@ -318,34 +318,34 @@ 
 			$this->trap_data['destination_port']=$matches[4];
 		}
 
-		while (($vars=fgets($input_stream)) !==false)
+		while (($vars=fgets($input_stream)) !== false)
 		{
 			$vars=chop($vars);
-			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-			if ($ret_code===0 || $ret_code===false) 
+			$ret_code=preg_match('/^([^ ]+) (.*)$/', $vars, $matches);
+			if ($ret_code === 0 || $ret_code === false) 
 			{
-				$this->logging->log('No match on trap data : '.$vars,WARN,'');
+				$this->logging->log('No match on trap data : '.$vars, WARN, '');
 			}
 			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'))
+			    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
 				{
-					$object= new stdClass;
-					$object->oid =$matches[1];
-					$object->value = $matches[2];
-					array_push($this->trap_data_ext,$object);
+					$object=new stdClass;
+					$object->oid=$matches[1];
+					$object->value=$matches[2];
+					array_push($this->trap_data_ext, $object);
 				}
 			}
 		}
 
-		if ($this->trap_data['trap_oid']=='unknown') 
+		if ($this->trap_data['trap_oid'] == 'unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-			$this->logging->log('no trap oid found',ERROR,'');
+		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trap_data['source_ip']);
+			$this->logging->log('no trap oid found', ERROR, '');
 		} 
 
 		// Translate oids.
@@ -367,7 +367,7 @@ 
 		}
 		
 
-		$this->trap_data['status']= 'waiting';
+		$this->trap_data['status']='waiting';
 		
 		return $this->trap_data;
 	}
@@ -383,40 +383,40 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Also check if it is an instance of OID
-		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+		$oid_instance=preg_replace('/\.[0-9]+$/', '', $oid);
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Try to get oid name from snmptranslate
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
 		$matches=array();
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code === false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return NULL;
 		} else {
-			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-			return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid, INFO);
+			return array('trap_name_mib'=>$matches[1], 'trap_name'=>$matches[2]);
 		}	
 	}
 	
@@ -427,90 +427,90 @@ 
 	**/
 	public function eraseOldTraps($days=0)
 	{
-		if ($days==0)
+		if ($days == 0)
 		{
 			if (($days=$this->getDBConfig('db_remove_days')) == null)
 			{
-				$this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+				$this->logging->log('No days specified & no db value : no tap erase', WARN, '');
 				return;
 			}
 		}
 		$db_conn=$this->trapsDB->db_connect_trap();
-		$daysago = strtotime("-".$days." day");
-		$sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		$daysago=strtotime("-".$days." day");
+		$sql='delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s", $daysago).'\';';
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+			$this->logging->log('Error erasing traps : '.$sql, ERROR, '');
 		}
-		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql, INFO);
 	}
 
 	/** Write error to received trap database
 	 */
-	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+	public function writeTrapErrorToDB($message, $sourceIP=null, $trapoid=null)
 	{
 	    
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    
 	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+	    $insert_col='date_received,status';
+	    $insert_val="'".date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
+	    if ($sourceIP != null)
 	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
+	        $insert_col.=',source_ip';
+	        $insert_val.=",'".$sourceIP."'";
 	    }
-	    if ($trapoid !=null)
+	    if ($trapoid != null)
 	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
+	        $insert_col.=',trap_oid';
+	        $insert_val.=",'".$trapoid."'";
 	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+	    $insert_col.=',status_detail';
+	    $insert_val.=",'".$message."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+	    $sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 	    
 	    switch ($this->trapsDB->trapDBType)
 	    {
 	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
+	            $sql.=' RETURNING id;';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
+	            if (!isset($inserted_id_ret['id'])) {
+	                $this->logging->log('Error getting id', 1, '');
 	            }
 	            $this->trap_id=$inserted_id_ret['id'];
 	            break;
 	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
+	            $sql.=';';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            $sql='SELECT LAST_INSERT_ID();';
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
 	            
 	            $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:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType, 1, '');
 	    }
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+	    $this->logging->log('id found: '.$this->trap_id, INFO);    
 	}
 	
 	/** Write trap data to trap database
@@ -527,86 +527,86 @@ 
 		$insert_col='';
 		$insert_val='';
 		// add date time
-		$this->trap_data['date_received'] = date("Y-m-d H:i:s");
+		$this->trap_data['date_received']=date("Y-m-d H:i:s");
 
 		$firstcol=1;
 		foreach ($this->trap_data as $col => $val)
 		{
-			if ($firstcol==0) 
+			if ($firstcol == 0) 
 			{
-				$insert_col .=',';
-				$insert_val .=',';
+				$insert_col.=',';
+				$insert_val.=',';
 			}
-			$insert_col .= $col ;
-			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$insert_col.=$col;
+			$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 			$firstcol=0;
 		}
 		
-		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 		switch ($this->trapsDB->trapDBType)
 		{
 			case 'pgsql': 
-				$sql .= ' RETURNING id;';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=' RETURNING id;';
+				$this->logging->log('sql : '.$sql, INFO);
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 														   
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
-				if (! isset($inserted_id_ret['id'])) {
-					$this->logging->log('Error getting id',ERROR,'');
+				if (!isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id', ERROR, '');
 				}
 				$this->trap_id=$inserted_id_ret['id'];
 			break;
 			case 'mysql': 
-				$sql .= ';';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=';';
+				$this->logging->log('sql : '.$sql, INFO);
 				if ($db_conn->query($sql) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				$sql='SELECT LAST_INSERT_ID();';
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
 
 				$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: 
-				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType, ERROR, '');
 		}
-		$this->logging->log('id found: '.$this->trap_id,INFO );
+		$this->logging->log('id found: '.$this->trap_id, INFO);
 		
 		// Fill trap extended data table
 		foreach ($this->trap_data_ext as $value) {			
 			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
 			$firstcol=1;
-			$value->trap_id = $this->trap_id;
+			$value->trap_id=$this->trap_id;
 			$insert_col='';
 			$insert_val='';
 			foreach ($value as $col => $val)
 			{
-				if ($firstcol==0) 
+				if ($firstcol == 0) 
 				{
-					$insert_col .=',';
-					$insert_val .=',';
+					$insert_col.=',';
+					$insert_val.=',';
 				}
-				$insert_col .= $col;
-				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$insert_col.=$col;
+				$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 				$firstcol=0;
 			}
 
-			$sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';			
+			$sql='INSERT INTO '.$this->db_prefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';			
 
 			if (($ret_code=$db_conn->query($sql)) === false) {
-				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+				$this->logging->log('Erreur insertion data : '.$sql, WARN, '');
 			}	
 		}	
 	}
@@ -616,14 +616,14 @@ 
 	*	@param $oid string oid in numeric
 	*	@return mixed : PDO object or false
 	*/	
-	protected function getRules($ip,$oid)
+	protected function getRules($ip, $oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
 		// fetch rules based on IP in rule and OID
 		$sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return false;
 		}
 		$rules_all=$ret_code->fetchAll();
@@ -632,7 +632,7 @@ 
 		$rule_ret_key=0;
 		foreach ($rules_all as $key => $rule)
 		{
-			if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+			if ($rule['ip4'] == $ip || $rule['ip6'] == $ip)
 			{
 				$rules_ret[$rule_ret_key]=$rules_all[$key];
 				//TODO : get host name by API (and check if correct in rule).
@@ -640,7 +640,7 @@ 
 				continue;
 			}
 			// TODO : get hosts IP by API
-			if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+			if (isset($rule['host_group_name']) && $rule['host_group_name'] != null)
 			{ // get ips of group members by oid
 				$db_conn2=$this->trapsDB->db_connect_ido();
 				$sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
@@ -651,15 +651,15 @@ 
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
 				if (($ret_code2=$db_conn2->query($sql)) === false) {
-					$this->logging->log('No result in query : ' . $sql,WARN,'');
+					$this->logging->log('No result in query : '.$sql, WARN, '');
 					continue;
 				}
 				$grouphosts=$ret_code2->fetchAll();
 				//echo "rule grp :\n";print_r($grouphosts);echo "\n";
-				foreach ( $grouphosts as $host)
+				foreach ($grouphosts as $host)
 				{
 					//echo $host['ip4']."\n";
-					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					if ($host['ip4'] == $ip || $host['ip6'] == $ip)
 					{
 						//echo "Rule added \n";
 						$rules_ret[$rule_ret_key]=$rules_all[$key];
@@ -682,7 +682,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -694,31 +694,31 @@ 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
 	*/
-	public function serviceCheckResult($host,$service,$state,$display)
+	public function serviceCheckResult($host, $service, $state, $display)
 	{
 	    if ($this->api_use === false)
 	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+    		$send='['.date('U').'] PROCESS_SERVICE_CHECK_RESULT;'.
+    			$host.';'.$service.';'.$state.';'.$display;
+    		$this->logging->log($send." : to : ".$this->icinga2cmd, INFO);
     		
     		// 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);
+    		exec('echo "'.$send.'" > '.$this->icinga2cmd);
     		return true;
 	    }
 	    else
 	    {
-	        $api = $this->getAPI();
+	        $api=$this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+	        list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display);
 	        if ($retcode == false)
 	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+	            $this->logging->log("Error sending result : ".$retmessage, WARN, '');
 	            return false;
 	        }
 	        else 
 	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
+	            $this->logging->log("Sent result : ".$retmessage, INFO);
 	            return true;
 	        }
 	    }
@@ -726,7 +726,7 @@ 
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
+	    $api=$this->getAPI();
 	    $api->setCredentials($this->api_username, $this->api_password);
 	    return $api->getHostByIP($ip);
 	}
@@ -739,32 +739,32 @@ 
 	protected function applyDisplay($display)
 	{
 	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+	    while (preg_match('/_OID\(([0-9\.]+)\)/', $display, $matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
 				if ($oid == $val->oid)
 				{
-					$val->value=preg_replace('/"/','',$val->value);
+					$val->value=preg_replace('/"/', '', $val->value);
 					$rep=0;
-					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-					if ($rep==0)
+					$display=preg_replace('/_OID\('.$oid.'\)/', $val->value, $display, -1, $rep);
+					if ($rep == 0)
 					{
-						$this->logging->log("Error in display",WARN,'');
+						$this->logging->log("Error in display", WARN, '');
 						return $display;
 					}
 					$found=1;
 					break;
 				}
 			}
-			if ($found==0)
+			if ($found == 0)
 			{
-				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-				if ($rep==0)
+				$display=preg_replace('/_OID\('.$oid.'\)/', '<not in trap>', $display, -1, $rep);
+				if ($rep == 0)
 				{
-					$this->logging->log("Error in display",WARN,'');
+					$this->logging->log("Error in display", WARN, '');
 					return $display;
 				}				
 			}
@@ -774,27 +774,27 @@ 
 
 	
 	/***************** Eval & tokenizer functions ****************/
-	protected function eval_getElement($rule,&$item)
+	protected function eval_getElement($rule, &$item)
 	{
-		while ($rule[$item]==' ') $item++;
-		if (preg_match('/[0-9\.]/',$rule[$item]))
+		while ($rule[$item] == ' ') $item++;
+		if (preg_match('/[0-9\.]/', $rule[$item]))
 		{ // number
 	
-			$item2=$item+1; 
-			while (($item2!=strlen($rule)) && (preg_match('/[0-9\.]/',$rule[$item2]))) { $item2++ ;}
-			$val=substr($rule,$item,$item2-$item);
+			$item2=$item + 1; 
+			while (($item2 != strlen($rule)) && (preg_match('/[0-9\.]/', $rule[$item2]))) { $item2++; }
+			$val=substr($rule, $item, $item2 - $item);
 			$item=$item2;
 			//echo "number ".$val."\n";
-			return array(0,$val);
+			return array(0, $val);
 		}
 		if ($rule[$item] == '"')
 		{ // string
 			$item++;
-			$item2=$this->eval_getNext($rule,$item,'"');
-			$val=substr($rule,$item,$item2-$item-1);
+			$item2=$this->eval_getNext($rule, $item, '"');
+			$val=substr($rule, $item, $item2 - $item - 1);
 			$item=$item2;
 			//echo "string : ".$val."\n";
-			return array(1,$val);
+			return array(1, $val);
 		}
 		
 		if ($rule[$item] == '(')
@@ -803,14 +803,14 @@ 
 			$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] == '"' )
+				if ($rule[$item] == '"')
 				{ // pass through string
 					$item++;
-					$item=$this->eval_getNext($rule,$item,'"');
+					$item=$this->eval_getNext($rule, $item, '"');
 				} 
-				else{
+				else {
 				    if ($rule[$item] == '(')
 				    {
 				        $parenthesis_count++;
@@ -823,49 +823,49 @@ 
 				}
 			}
 			
-			if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-			$val=substr($rule,$start,$item-$start);
+			if ($item == strlen($rule)) {throw new Exception("no closing () in ".$rule." at ".$item); }
+			$val=substr($rule, $start, $item - $start);
 			$item++;
 			$start=0;
 			//echo "group : ".$val."\n";
 			// returns evaluation of group as type 2 (boolean)
-			return array(2,$this->evaluation($val,$start));		
+			return array(2, $this->evaluation($val, $start));		
 		}
-		throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+		throw new Exception("number/string not found in ".$rule." at ".$item.' : '.$rule[$item]);
 		
 	}
 	
-	protected function eval_getNext($rule,$item,$tok)
+	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);
-		return $item+1;
+		while (($rule[$item] != $tok) && ($item < strlen($rule))) { $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)
+	protected function eval_getOper($rule, &$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item] == ' ') $item++;
 		switch ($rule[$item])
 		{
 			case '<':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-				$item++; return array(0,"<");
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, "<="); }
+				$item++; return array(0, "<");
 			case '>':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-				$item++; return array(0,">");
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, ">="); }
+				$item++; return array(0, ">");
 			case '=':
-				$item++; return array(0,"=");	
+				$item++; return array(0, "=");	
 			case '!':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, "!="); }
+				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule." at ".$item);
 			case '~':
-				$item++; return array(0,"~");	
+				$item++; return array(0, "~");	
 			case '|':
-				$item++; return array(1,"|");	
+				$item++; return array(1, "|");	
 			case '&':
-				$item++; return array(1,"&");
+				$item++; return array(1, "&");
 			default	:
-				throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+				throw new Exception("Erreur in expr - operator not found in ".$rule." at ".$item);
 		}
 	}
 	
@@ -877,10 +877,10 @@ 
 	*   comparison int vs strings will return null (error)
 	*	return : bool or null on error
 	*/
-	public function evaluation($rule,&$item)
+	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++;
@@ -890,63 +890,63 @@ 
 		    $negate=false;
 		}
 		// First element : number, string or ()
-		list($type1,$val1) = $this->eval_getElement($rule,$item);
+		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;
 		}  
 		
 		// Second element : operator
-		list($typec,$comp) = $this->eval_getOper($rule,$item);
+		list($typec, $comp)=$this->eval_getOper($rule, $item);
 		//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);
-		    $val2= ! $this->evaluation($rule,$item);
+		    $val2=!$this->evaluation($rule, $item);
 		    $type2=2; // result is a boolean 
 		}
 		else 
 		{
-		    list($type2,$val2) = $this->eval_getElement($rule,$item);
+		    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;
-			case '<=':	$retVal= ($val1 <= $val2); break;
-			case '>':	$retVal= ($val1 > $val2); break;
-			case '>=':	$retVal= ($val1 >= $val2); break;
-			case '=':	$retVal= ($val1 == $val2); break;
-			case '!=':	$retVal= ($val1 != $val2); break;
-			case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-			case '|':	$retVal= ($val1 || $val2); break;
-			case '&':	$retVal= ($val1 && $val2); break;
+		switch ($comp) {
+			case '<':	$retVal=($val1 < $val2); break;
+			case '<=':	$retVal=($val1 <= $val2); break;
+			case '>':	$retVal=($val1 > $val2); break;
+			case '>=':	$retVal=($val1 >= $val2); break;
+			case '=':	$retVal=($val1 == $val2); break;
+			case '!=':	$retVal=($val1 != $val2); break;
+			case '~':	$retVal=(preg_match('/'.preg_replace('/"/', '', $val2).'/', $val1)); break;
+			case '|':	$retVal=($val1 || $val2); break;
+			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])
 		{
-			case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-			case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+			case '|':	$item++; return ($retVal || $this->evaluation($rule, $item));
+			case '&':	$item++; return ($retVal && $this->evaluation($rule, $item));
 			
 			default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
 		}
@@ -958,17 +958,17 @@ 
 		$rule2='';
 		while ($item < strlen($rule))
 		{
-			if ($rule[$item]==' ') { $item++; continue; }
-			if ($rule[$item]=='"')
+			if ($rule[$item] == ' ') { $item++; continue; }
+			if ($rule[$item] == '"')
 			{
 				$rule2.=$rule[$item];
 				$item++;
-				while (($rule[$item]!='"') && ($item < strlen($rule)))
+				while (($rule[$item] != '"') && ($item < strlen($rule)))
 				{
 					$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,12 +988,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)
+		while (preg_match('/_OID\(([0-9\.\*]+)\)/', $rule, $matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -1005,49 +1005,49 @@ 
 			// replace * with \* in oid for preg_replace
 			$oid=preg_replace('/\*/', '\*', $oid);
 			
-			$this->logging->log('OID in rule : '.$oid.' / '.$oidR,DEBUG );
+			$this->logging->log('OID in rule : '.$oid.' / '.$oidR, DEBUG);
 			
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
-				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				if (preg_match("/^$oidR$/", $val->oid) == 1)
 				{
-					if (!preg_match('/^[0-9]*\.?[0-9]+$/',$val->value))
+					if (!preg_match('/^[0-9]*\.?[0-9]+$/', $val->value))
 					{ // If not a number, change " to ' and put " around it
-						$val->value=preg_replace('/"/',"'",$val->value);
+						$val->value=preg_replace('/"/', "'", $val->value);
 						$val->value='"'.$val->value.'"';
 					}
 					$rep=0;
-					$rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-					if ($rep==0)
+					$rule=preg_replace('/_OID\('.$oid.'\)/', $val->value, $rule, -1, $rep);
+					if ($rep == 0)
 					{
-						$this->logging->log("Error in rule_eval",WARN,'');
+						$this->logging->log("Error in rule_eval", WARN, '');
 						return false;
 					}
 					$found=1;
 					break;
 				}
 			}
-			if ($found==0)
+			if ($found == 0)
 			{	// OID not found : throw error
 			    throw new Exception('OID '.$oid.' not found in trap');
 			}
 		}
 		$item=0;
 		$rule=$this->eval_cleanup($rule);
-		$this->logging->log('Rule after clenup: '.$rule,INFO );
+		$this->logging->log('Rule after clenup: '.$rule, INFO);
 		
-		return  $this->evaluation($rule,$item);
+		return  $this->evaluation($rule, $item);
 	}
 	
 	/** Match rules for current trap and do action
 	*/
 	public function applyRules()
 	{
-		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+		$rules=$this->getRules($this->trap_data['source_ip'], $this->trap_data['trap_oid']);
 		
-		if ($rules===false || count($rules)==0)
+		if ($rules === false || count($rules) == 0)
 		{
-			$this->logging->log('No rules found for this trap',INFO );
+			$this->logging->log('No rules found for this trap', INFO);
 			$this->trap_data['status']='unknown';
 			$this->trap_to_db=true;
 			return;
@@ -1062,58 +1062,58 @@ 
 			$service_name=$rule['service_name'];
 			
 			$display=$this->applyDisplay($rule['display']);
-			$this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+			$this->trap_action=($this->trap_action == null) ? '' : $this->trap_action.', ';
 			try
 			{
-				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$this->logging->log('Rule to eval : '.$rule['rule'], INFO);
 				$evalr=$this->eval_rule($rule['rule']);
 				
 				if ($evalr == true)
 				{
 					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
 					$action=$rule['action_match'];
-					$this->logging->log('action OK : '.$action,INFO );
+					$this->logging->log('action OK : '.$action, INFO);
 					if ($action >= 0)
 					{
-						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
+						    $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;
+					$this->trap_to_db=($action == -2) ?false:true;
 				}
 				else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
 					$action=$rule['action_nomatch'];
-					$this->logging->log('action NOK : '.$action,INFO );
+					$this->logging->log('action NOK : '.$action, INFO);
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+					    if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
 					    }
 					    else
 					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+    						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;					
+					$this->trap_to_db=($action == -2) ?false:true;					
 				}
 				// Put name in source_name
 				if (!isset($this->trap_data['source_name']))
@@ -1122,7 +1122,7 @@ 
 				}
 				else
 				{
-					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+					if (!preg_match('/'.$rule['host_name'].'/', $this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
@@ -1130,13 +1130,13 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+			    $this->logging->log('Error in rule eval : '.$e->getMessage(), WARN, '');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
 			    $this->trap_data['status']='error';
 			}
 			
 		}
-		if ($this->trap_data['status']=='error')
+		if ($this->trap_data['status'] == 'error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
 		}
@@ -1152,13 +1152,13 @@ 
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
-		if ($this->trap_action==null) 
+		if ($this->trap_action == null) 
 		{
 			$this->trap_action='No action';
 		}
 		$sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -1168,14 +1168,14 @@ 
 	*	@param $schema_file	string File to read schema from
 	*	@param $table_prefix string to replace #PREFIX# in schema file by this
 	*/
-	public function create_schema($schema_file,$table_prefix)
+	public function create_schema($schema_file, $table_prefix)
 	{
 		//Read data from snmptrapd from stdin
 		$input_stream=fopen($schema_file, 'r');
 
-		if ($input_stream=== false)
+		if ($input_stream === false)
 		{
-			$this->logging->log("Error reading schema !",ERROR,''); 
+			$this->logging->log("Error reading schema !", ERROR, ''); 
 			return;
 		}
 		$newline='';
@@ -1185,14 +1185,14 @@ 
 		
 		while (($line=fgets($input_stream)) !== false)
 		{
-			$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+			$newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
 			if (preg_match('/; *$/', $newline)) 
             {
-                $sql= $newline;
+                $sql=$newline;
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                    $this->logging->log('Error create schema : '.$sql, ERROR, '');
                 }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+                if (preg_match('/^ *CREATE TABLE ([^ ]+)/', $newline, $cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
                 }
@@ -1200,19 +1200,19 @@ 
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
+                $this->logging->log('Creating : '.$cur_table, INFO);
                 $newline='';
             }
 		}
 		
-		$sql= $newline;
+		$sql=$newline;
 		if ($sql != '')
 		{
     		if ($db_conn->query($sql) === false) {
-    			$this->logging->log('Error create schema : '.$sql,ERROR,'');
+    			$this->logging->log('Error create schema : '.$sql, ERROR, '');
     		}
 		}
-		$this->logging->log('Schema created',INFO);		
+		$this->logging->log('Schema created', INFO);		
 	}
 
 	/** 
@@ -1223,14 +1223,14 @@ 
 	 *     @param bool $getmsg : only get messages from version upgrades
 	 *     @return string : if $getmsg=true, return messages.
 	 */
-	public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+	public function update_schema($prefix, $target_version, $table_prefix, $getmsg=false)
 	{
 	    // Get current db number
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    $sql='SELECT id,value from '.$this->db_prefix.'db_config WHERE name=\'db_version\' ';
-	    $this->logging->log('SQL query : '.$sql,DEBUG );
+	    $this->logging->log('SQL query : '.$sql, DEBUG);
 	    if (($ret_code=$db_conn->query($sql)) === false) {
-	        $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+	        $this->logging->log('Cannot get db version. Query : '.$sql, 2, '');
 	        return;
 	    }
 	    $version=$ret_code->fetchAll();
@@ -1239,47 +1239,47 @@ 
 	    
 	    if ($this->trapsDB->trapDBType == 'pgsql')
 	    {
-	        $prefix .= 'update_pgsql/schema_';
+	        $prefix.='update_pgsql/schema_';
 	    }
 	    else
 	    {
-	        $prefix .= 'update_sql/schema_';
+	        $prefix.='update_sql/schema_';
 	    }
 	    //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
 	    if ($getmsg === true)
 	    {
 	        $message='';
-	        $this->logging->log('getting message for upgrade',DEBUG );
-	        while($cur_version<$target_version)
+	        $this->logging->log('getting message for upgrade', DEBUG);
+	        while ($cur_version < $target_version)
 	        {
 	            $cur_version++;
-	            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+	            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
 	            $input_stream=fopen($updateFile, 'r');
-	            if ($input_stream=== false)
+	            if ($input_stream === false)
 	            {
-	                $this->logging->log("Error reading update file ". $updateFile,2,'');
+	                $this->logging->log("Error reading update file ".$updateFile, 2, '');
 	                return;
 	            }
 	            do { $line=fgets($input_stream); }
-	            while ($line !== false && !preg_match('/#MESSAGE/',$line));
+	            while ($line !== false && !preg_match('/#MESSAGE/', $line));
 	            if ($line === false)
 	            {
-	                $this->logging->log("No message in file ". $updateFile,2,'');
+	                $this->logging->log("No message in file ".$updateFile, 2, '');
 	                return;
 	            }
-	            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+	            $message.=($cur_version - 1).'->'.$cur_version.' : '.preg_replace('/#MESSAGE : /', '', $line)."\n";
 	        }
 	        return $message;
 	    }
-	    while($cur_version<$target_version)
+	    while ($cur_version < $target_version)
 	    { // tODO : execute pre & post scripts
 	       $cur_version++;
-	       $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-	       $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+	       $this->logging->log('Updating to version : '.$cur_version, INFO);
+	       $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
 	       $input_stream=fopen($updateFile, 'r');
-	       if ($input_stream=== false)
+	       if ($input_stream === false)
 	       {
-	           $this->logging->log("Error reading update file ". $updateFile,2,'');
+	           $this->logging->log("Error reading update file ".$updateFile, 2, '');
 	           return;
 	       }
 	       $newline='';
@@ -1288,24 +1288,24 @@ 
 	       while (($line=fgets($input_stream)) !== false)
 	       {
 	           if (preg_match('/^#/', $line)) continue; // ignore comment lines
-	           $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+	           $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
 	           if (preg_match('/; *$/', $newline))
 	           {
 	               $sql_req=$db_conn->prepare($newline);
 	               if ($sql_req->execute() === false) {
-	                   $this->logging->log('Error create schema : '.$newline,1,'');
+	                   $this->logging->log('Error create schema : '.$newline, 1, '');
 	               }
 	               $cur_table_array=array();
-	               if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+	               if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/', $newline, $cur_table_array))
 	               {
-	                   $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+	                   $cur_table=$cur_table_array[1].' SQL table '.$cur_table_array[2];
 	               }
 	               else
 	               {
 	                   $cur_table='secret SQL stuff :-)';
 	                   //$cur_table=$newline;
 	               }
-	               $this->logging->log('Doing : ' . $cur_table,INFO );
+	               $this->logging->log('Doing : '.$cur_table, INFO);
 	               
 	               $newline='';
 	           }
@@ -1318,13 +1318,13 @@ 
 	       //}
 	       
 	       $sql='UPDATE '.$this->db_prefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
-	       $this->logging->log('SQL query : '.$sql,DEBUG );
+	       $this->logging->log('SQL query : '.$sql, DEBUG);
 	       if ($db_conn->query($sql) === false) {
-	           $this->logging->log('Cannot update db version. Query : ' . $sql,2);
+	           $this->logging->log('Cannot update db version. Query : '.$sql, 2);
 	           return;
 	       }
 	       
-	       $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+	       $this->logging->log('Schema updated to version : '.$cur_version, INFO);
 	    }
 	}
 	
@@ -1345,7 +1345,7 @@ 
     WHERE s.current_state != 0;";
 		$db_conn=$this->trapsDB->db_connect_ido();
 		if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			$this->logging->log('No result in query : '.$sql_query, ERROR, '');
 		}
 		$services=$services_db->fetchAll();
 		
@@ -1353,7 +1353,7 @@ 
 		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
 		$db_conn2=$this->trapsDB->db_connect_trap();
 		if (($rules_db=$db_conn2->query($sql_query)) === false) {
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,''); 
+			$this->logging->log('No result in query : '.$sql_query, ERROR, ''); 
 		}
 		$rules=$rules_db->fetchAll();
 		
@@ -1368,13 +1368,13 @@ 
 					$service['host_name'] == $rule['host_name'] &&
 					($service['last_check'] + $rule['revert_ok']) < $now)
 				{
-					$this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+					$this->serviceCheckResult($service['host_name'], $service['service_name'], 0, 'Reset service to OK after '.$rule['revert_ok'].' seconds');
 					$numreset++;
 				}
 			}
 		}
 		echo "\n";
-		echo $numreset . " service(s) reset to OK\n";
+		echo $numreset." service(s) reset to OK\n";
 		return 0;
 		
 	}
@@ -1395,7 +1395,7 @@ 
 	 * @param string $description
 	 * @return number : 0=unchanged, 1 = changed, 2=created
 	 */
-	public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
+	public function update_oid($oid, $mib, $name, $type, $textConv, $dispHint, $syntax, $type_enum, $description=NULL)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$description=$db_conn->quote($description);
@@ -1405,7 +1405,7 @@ 
 		    { // newly created.
 		        return 0;
 		    }
-			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
+			if ($name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
 			    $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
 			    $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
 			    //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
@@ -1425,23 +1425,23 @@ 
 			        ':name' => $name,
 			        ':type' => $type, 
 			        ':mib' => $mib, 
-			        ':tc' =>  ($textConv==null)?'null':$textConv , 
-			        ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-			        ':syntax' => ($syntax==null)?'null':$syntax,
-			        ':type_enum' => ($type_enum==null)?'null':$type_enum, 
-			        ':description' => ($description==null)?'null':$description,
+			        ':tc' =>  ($textConv == null) ? 'null' : $textConv, 
+			        ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+			        ':syntax' => ($syntax == null) ? 'null' : $syntax,
+			        ':type_enum' => ($type_enum == null) ? 'null' : $type_enum, 
+			        ':description' => ($description == null) ? 'null' : $description,
 			        ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
 			    );
 			    
 			    if ($sqlQuery->execute($sqlParam) === false) {
-			        $this->logging->log('Error in query : ' . $sql,ERROR,'');
+			        $this->logging->log('Error in query : '.$sql, ERROR, '');
 			    }
-			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+			    $this->logging->log('Trap updated : '.$name.' / OID : '.$oid, DEBUG);
 				return 1;
 			}
 			else
 			{
-			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+			    $this->logging->log('Trap unchanged : '.$name.' / OID : '.$oid, DEBUG);
 			    return 0;
 			}
 		}
@@ -1451,11 +1451,11 @@ 
 
 		$sql='INSERT INTO '.$this->db_prefix.'mib_cache '.
 		      '(oid, name, type , mib, textual_convention, display_hint '.
-              ', syntax, type_enum , description ) ' . 
+              ', syntax, type_enum , description ) '. 
               '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);
 		
@@ -1464,15 +1464,15 @@ 
 		    ':name' => $name,
 		    ':type' => $type,
 		    ':mib' => $mib,
-		    ':tc' =>  ($textConv==null)?'null':$textConv ,
-		    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-		    ':syntax' => ($syntax==null)?'null':$syntax,
-		    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-		    ':description' => ($description==null)?'null':$description
+		    ':tc' =>  ($textConv == null) ? 'null' : $textConv,
+		    ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+		    ':syntax' => ($syntax == null) ? 'null' : $syntax,
+		    ':type_enum' => ($type_enum == null) ? 'null' : $type_enum,
+		    ':description' => ($description == null) ? 'null' : $description
 		);
 		
 		if ($sqlQuery->execute($sqlParam) === false) {
-		    $this->logging->log('Error in query : ' . $sql,1,'');
+		    $this->logging->log('Error in query : '.$sql, 1, '');
 		}
 		
 		switch ($this->trapsDB->trapDBType)
@@ -1480,10 +1480,10 @@ 
 		    case 'pgsql':
 		        // Get last id to insert oid/values in secondary table
 		        if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
-		            $this->logging->log('Error getting id - pgsql - ',1,'');
+		            $this->logging->log('Error getting id - pgsql - ', 1, '');
 		        }
-		        if (! isset($inserted_id_ret['id'])) {
-		            $this->logging->log('Error getting id - pgsql - empty.',1,'');
+		        if (!isset($inserted_id_ret['id'])) {
+		            $this->logging->log('Error getting id - pgsql - empty.', 1, '');
 		        }
 		        $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
 		        break;
@@ -1491,15 +1491,15 @@ 
 		        // Get last id to insert oid/values in secondary table
 		        $sql='SELECT LAST_INSERT_ID();';
 		        if (($ret_code=$db_conn->query($sql)) === false) {
-		            $this->logging->log('Erreur getting id - mysql - ',1,'');
+		            $this->logging->log('Erreur getting id - mysql - ', 1, '');
 		        }
 		        
 		        $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:
-		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType, 1, '');
 		}
 
 		// Set as newly created.
@@ -1514,21 +1514,21 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
 	{
 	    $dbObjects=null; // cache of objects for trap in db
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    
 	    // Get id of trapmib.
 
-	    $trapId = $this->dbOidIndex[$trapOID]['id'];
+	    $trapId=$this->dbOidIndex[$trapOID]['id'];
 	    if ($check_existing === true)
 	    {
 	        // Get all objects
 	        $sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-	        $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+	        $this->logging->log('SQL query get all traps: '.$sql, DEBUG);
 	        if (($ret_code=$db_conn->query($sql)) === false) {
-	            $this->logging->log('No result in query : ' . $sql,1,'');
+	            $this->logging->log('No result in query : '.$sql, 1, '');
 	        }
 	        $dbObjectsRaw=$ret_code->fetchAll();
 	        
@@ -1542,39 +1542,39 @@ 
 	        $match=$snmptrans=array();
 	        $retVal=0;
 	        $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-	        $tmpdesc='';$indesc=false;
+	        $tmpdesc=''; $indesc=false;
 	        
 	        $objMib=$trapmib;
-	        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	            ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	        if ($retVal!=0)
+	        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	            ' -On -Td '.$objMib.'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+	        if ($retVal != 0)
 	        {
 	            // Maybe not trap mib, search with IR
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+	            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	                ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
 	            { // Not found -> continue with warning
-	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
 	               continue;
 	            }
 	            $objMib=$match[1];
 	            
 	            // Do the snmptranslate again.
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-	            if ($retVal!=0) {
-	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+	            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	                ' -On -Td '.$objMib.'::'.$object, $snmptrans, $retVal);
+	            if ($retVal != 0) {
+	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object, 2, '');
 	            }
 	            
 	        }
 	        foreach ($snmptrans as $line)
 	        {
-	            if ($indesc===true)
+	            if ($indesc === true)
 	            {
-	                $line=preg_replace('/[\t ]+/',' ',$line);
-	                if (preg_match('/(.*)"$/', $line,$match))
+	                $line=preg_replace('/[\t ]+/', ' ', $line);
+	                if (preg_match('/(.*)"$/', $line, $match))
 	                {
-	                    $objDesc = $tmpdesc . $match[1];
+	                    $objDesc=$tmpdesc.$match[1];
 	                    $indesc=false;
 	                }
 	                $tmpdesc.=$line;
@@ -1585,43 +1585,43 @@ 
 	                $objOid=$line;
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
 	            {
 	                $objSyntax=$match[1];
                     $objEnum=$match[2];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
 	            {
 	                $objSyntax=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
 	            {
 	                $objDispHint=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
 	            {
 	                $objDesc=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
 	            {
 	                $tmpdesc=$match[1];
 	                $indesc=true;
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
 	            {
 	                $objTc=$match[1];
 	                continue;
 	            }
 	        }
-	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc", DEBUG);
 	        //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
 	        // Update 
-	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum, $objDesc);
             
 	        if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
 	        {   // if link exists, continue
@@ -1642,7 +1642,7 @@ 
 	        );
 	        
 	        if ($sqlQuery->execute($sqlParam) === false) {
-	            $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+	            $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$objOid]['id'], 1, '');
 	        }
 	    }
 	    if ($check_existing === true)
@@ -1659,19 +1659,19 @@ 
 	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
 	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
 	*/	
-	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
 	{
 		// Timing 
-		$timeTaken = microtime(true);
+		$timeTaken=microtime(true);
 		$retVal=0;
 		// Get all mib objects from all mibs
-		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
-		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		$snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
 		unset($this->objectsAll);
-		exec($snmpCommand,$this->objectsAll,$retVal);		
-		if ($retVal!=0)
+		exec($snmpCommand, $this->objectsAll, $retVal);		
+		if ($retVal != 0)
 		{
-			$this->logging->log('error executing snmptranslate',ERROR,'');
+			$this->logging->log('error executing snmptranslate', ERROR, '');
 		}
 		
 		// Get all mibs from databse to have a memory index
@@ -1679,14 +1679,14 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT * from '.$this->db_prefix.'mib_cache;';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$this->dbOidAll=$ret_code->fetchAll();
 		$this->dbOidIndex=array();
 		// Create the index for db;
-		foreach($this->dbOidAll as $key=>$val)
+		foreach ($this->dbOidAll as $key=>$val)
 		{
 			$this->dbOidIndex[$val['oid']]['key']=$key;
 			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -1694,11 +1694,11 @@ 
 		
 		// Count elements to show progress
 		$numElements=count($this->objectsAll);
-		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
 		
-		$step=$basestep=$numElements/10; // output display of % done
+		$step=$basestep=$numElements / 10; // output display of % done
 		$num_step=0;
-		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
 		
 		// Create index for trap objects
 		$this->trapObjectsIndex=array();
@@ -1708,28 +1708,28 @@ 
 		$time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
 		$time_num_traps=0;
 		
-		for ($curElement=0;$curElement < $numElements;$curElement++)
+		for ($curElement=0; $curElement < $numElements; $curElement++)
 		{
-		    $time_1= microtime(true);
-			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
+		    $time_1=microtime(true);
+			if ((microtime(true) - $timeFiveSec) > 2 && $display_progress)
 			{ // echo a . every 2 sec
 				echo '.';
-				$timeFiveSec = microtime(true);
+				$timeFiveSec=microtime(true);
 			}
-			if ($curElement>$step) 
+			if ($curElement > $step) 
 			{ // display progress
 				$num_step++;
 				$step+=$basestep;
 				if ($display_progress)
 				{				
-					echo "\n" . ($num_step*10). '% : ';
+					echo "\n".($num_step * 10).'% : ';
 				}
 			}
 			// Get oid or pass if not found
-			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+			if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
 			{
-			    $time_parse1 += microtime(true) - $time_1;
-			    $time_parse1N ++;
+			    $time_parse1+=microtime(true) - $time_1;
+			    $time_parse1N++;
 				continue;
 			}
 			$oid=$this->objectsAll[$curElement];
@@ -1738,9 +1738,9 @@ 
 			$curElement++;
 			$match=$snmptrans=array();
 			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-						$this->objectsAll[$curElement],$match))
+						$this->objectsAll[$curElement], $match))
 			{
-			    $time_check1 += microtime(true) - $time_1;
+			    $time_check1+=microtime(true) - $time_1;
 				$time_check1N++;
 				continue;
 			}
@@ -1748,21 +1748,21 @@ 
 			$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]))
+				if (preg_match("/^$oid/", $this->objectsAll[$curElement + 1]))
 				{
-				    $time_check2 += microtime(true) - $time_1;
+				    $time_check2+=microtime(true) - $time_1;
 				    $time_check2N++;
 					continue;
 				}		
 				unset($snmptrans);
-				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
-				if ($retVal!=0)
+				exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid.' | grep OBJECTS ', $snmptrans, $retVal);
+				if ($retVal != 0)
 				{
-				    $time_check2 += microtime(true) - $time_1;
+				    $time_check2+=microtime(true) - $time_1;
 				    $time_check2N++;
 					continue;
 				}
@@ -1770,56 +1770,56 @@ 
 				// 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_check3+=microtime(true) - $time_1;
 				$time_check3N++;
 				continue;
 			}
 			
 			$time_num_traps++;
 			
-			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
+			$this->logging->log('Found trap : '.$match[1].' / OID : '.$oid, INFO);
 			if ($display_progress) echo '#'; // echo a # when trap found
 				
 			// get trap objects & source MIB
 			unset($snmptrans);
-			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-					' -Td '.$oid,$snmptrans,$retVal);
-			if ($retVal!=0)
+			exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid, $snmptrans, $retVal);
+			if ($retVal != 0)
 			{
-				$this->logging->log('error executing snmptranslate',ERROR,'');
+				$this->logging->log('error executing snmptranslate', ERROR, '');
 			}
 			
-			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+			if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
 			{
-			    $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+			    $this->logging->log('Error getting mib from trap '.$oid.' : '.$snmptrans[0], 1, '');
 			}
 			$trapMib=$match[1];
 			
-			$numLine=1;$trapDesc='';
-			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			$numLine=1; $trapDesc='';
+			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]);
+			    $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
 
-			    while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+			    while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
 			    {
-			        $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+			        $trapDesc.=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
 			        $numLine++;
 			    }
 			    if (isset($snmptrans[$numLine])) {
-			        $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-			        $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+			        $trapDesc.=preg_replace('/".*/', '', $snmptrans[$numLine]);
+			        $trapDesc=preg_replace('/[\t ]+/', ' ', $trapDesc);
 			    }
 
 			}
-			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
-			$time_update += microtime(true) - $time_1; $time_1= microtime(true);
+			$update=$this->update_oid($oid, $trapMib, $name, $type, NULL, NULL, NULL, NULL, $trapDesc);
+			$time_update+=microtime(true) - $time_1; $time_1=microtime(true);
 			
-			if (($update==0) && ($check_change===false))
+			if (($update == 0) && ($check_change === false))
 			{ // Trapd didn't change & force check disabled
-			    $time_objects += microtime(true) - $time_1;
+			    $time_objects+=microtime(true) - $time_1;
 			    if ($display_progress) echo "C";
 			    continue;
 			}
@@ -1827,7 +1827,7 @@ 
 			$synt=null;
 			foreach ($snmptrans as $line)
 			{	
-    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
     				{
     					$synt=$match[1];
     				}
@@ -1835,30 +1835,30 @@ 
 			if ($synt == null) 
 			{
 				//echo "No objects for $trapOID\n";
-			    $time_objects += microtime(true) - $time_1;
+			    $time_objects+=microtime(true) - $time_1;
 				continue;
 			}
 			//echo "$synt \n";
 			$trapObjects=array();
-			while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
+			while (preg_match('/ *([^ ,]+) *,* */', $synt, $match))
 			{
-				array_push($trapObjects,$match[1]);
-				$synt=preg_replace('/'.$match[0].'/','',$synt);
+				array_push($trapObjects, $match[1]);
+				$synt=preg_replace('/'.$match[0].'/', '', $synt);
 			}
 			
 			$this->trap_objects($oid, $trapMib, $trapObjects, false);
 			
-			$time_objects += microtime(true) - $time_1;
+			$time_objects+=microtime(true) - $time_1;
 			$time_objectsN++;
 		}
 		
 		if ($display_progress)
 		{
     		echo "\nNumber of processed traps : $time_num_traps \n";
-    		echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-    		echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-    		echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+    		echo "\nParsing : ".number_format($time_parse1 + $time_check1, 1)." sec / ".($time_parse1N + $time_check1N)." occurences\n";
+    		echo "Detecting traps : ".number_format($time_check2 + $time_check3, 1)." sec / ".($time_check2N + $time_check3N)." occurences\n";
+    		echo "Trap processing ($time_updateN): ".number_format($time_update, 1)." sec , ";
+    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects, 1)." sec \n";
 		}
 		
 		// Timing ends

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

Indentation +13 added lines, -13 removed lines

@@ -15,12 +15,12 @@ 
 
 try
 {
-    $Trap = new Trap($icingaweb2_etc,4,'syslog');
-    //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	$Trap = new Trap($icingaweb2_etc,4,'syslog');
+	//$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
+	//$Trap->setLogging(4,'syslog'); 
     
-    // TODO : tranfer this to reset_trap cli command
-    $Trap->eraseOldTraps();
+	// TODO : tranfer this to reset_trap cli command
+	$Trap->eraseOldTraps();
 
 	$Trap->read_trap('php://stdin');
 
@@ -33,15 +33,15 @@ 
 }
 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
-    {
+	if ($Trap == null)
+	{  // Exception in trap creation : log in display & syslog
+		$logging = new Logging();
+		$logging->log("Caught exception creating Trap class",2);
+	}
+	else
+	{
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
-    }
+	}
 }
 
 //end

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 use Trapdirector\Logging;
 
 // start
-$time1 = microtime(true);
+$time1=microtime(true);
 
 require_once ('trap_class.php');
 
@@ -15,7 +15,7 @@ 
 
 try
 {
-    $Trap = new Trap($icingaweb2_etc,4,'syslog');
+    $Trap=new Trap($icingaweb2_etc, 4, 'syslog');
     //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
     //$Trap->setLogging(4,'syslog'); 
     
@@ -35,12 +35,12 @@ 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
+        $logging=new Logging();
+        $logging->log("Caught exception creating Trap class", 2);
     }
     else
     {
-	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
+	   $Trap->trapLog("Exception : ".$e->getMessage(), 2, 0);
     }
 }
 

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

Indentation +115 added lines, -115 removed lines

@@ -32,8 +32,8 @@ 
 	protected $trapClass;		//< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -58,12 +58,12 @@ 
 	
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	public function getHandlerListTable() 
@@ -77,11 +77,11 @@ 
 	}	
 	
 	/**	Get Database connexion
-	*	@param $DBname string DB name in resource.ini_ge
-	*	@param $test bool if set to true, returns error code and not database
-	*	@param $test_version bool if set to flase, does not test database version of trapDB
-	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-	*/
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
 	public function getDbByName($DBname,$test=false,$test_version=true)
 	{
 		try 
@@ -166,20 +166,20 @@ 
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
-		    $this->redirectNow('trapdirector/settings?idodberror=1');
-		    return null;
+			if ($test) return array(1,'No database in config.ini');
+			$this->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
 		}
 		catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
-		    $this->redirectNow('trapdirector/settings?idodberror=2');
-		    return null;
+			if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+			$this->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
 		}
 		
 		if ($test == false) 
@@ -190,13 +190,13 @@ 
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
-		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
-		    {
-		        return array(4,"$dbresource does not look like an IDO database");
-		    }
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				return array(4,"$dbresource does not look like an IDO database");
+			}
 		}
 		catch (Exception $e)
 		{
@@ -206,15 +206,15 @@ 
 		return array(0,'');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -223,33 +223,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -269,8 +269,8 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
@@ -288,9 +288,9 @@ 
 	/**************************  Database queries *******************/
 	
 	/** Get host(s) by IP (v4 or v6) or by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -309,9 +309,9 @@ 
 	}
 
 	/** Get host(s) by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -330,9 +330,9 @@ 
 	}	
 	
 	/** Get host groups by  name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -352,9 +352,9 @@ 
 
 	
 	/** Get host IP (v4 and v6) by name in IDO database
-	*	does not catch exceptions
-	*	@return array ( name, display_name, ip4, ip6)
-	*/
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
 	protected function getHostInfoByID($id) 
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -373,9 +373,9 @@ 
 
 	
 	/** Get host by objectid  in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( id, name, display_name, ip, ip6,  )
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -393,10 +393,10 @@ 
 	}	
 	
 	/** Get services from object ( host_object_id) in IDO database
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -416,11 +416,11 @@ 
 	}	
 	
 	/** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
-	* 	gets all hosts in hostgroup and return common services
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 * 	gets all hosts in hostgroup and return common services
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostGroupid($id) 
 	{		
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -459,7 +459,7 @@ 
 		//print_r($common_services);
 		foreach (array_keys($common_services) as $key)
 		{
-		    if ($common_services[$key]['num'] == $num_hosts)
+			if ($common_services[$key]['num'] == $num_hosts)
 			{
 				array_push($result,array($key,$common_services[$key]['name']));
 			}
@@ -469,11 +469,11 @@ 
 	}	
 
 	/** Get services object id by host name / service name in IDO database
-	*	does not catch exceptions
-	*	@param $hostname string host name
-	*	@param $name string service name
-	*	@return array  service id
-	*/
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return array  service id
+	 */
 	protected function getServiceIDByName($hostname,$name) 
 	{
 		$db = $this->getIdoDb()->getConnection();
@@ -496,10 +496,10 @@ 
 	}
 	
 	/** Get object name from object_id  in IDO database
-	*	does not catch exceptions
-	*	@param int $id object_id (default to null, used first if not null)
-	*	@return array name1 (host) name2 (service)
-	*/
+	 *	does not catch exceptions
+	 *	@param int $id object_id (default to null, used first if not null)
+	 *	@return array name1 (host) name2 (service)
+	 */
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -515,9 +515,9 @@ 
 	}		
 
 	/** Add handler rule in traps DB
-	*	@param array $params : array(<db item>=><value>)
-	*	@return int inserted id
-	*/
+	 *	@param array $params : array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
@@ -539,9 +539,9 @@ 
 	}	
 
 	/** Update handler rule in traps DB
-	*	@param array(<db item>=><value>)
-	*	@return array affected rows
-	*/
+	 *	@param array(<db item>=><value>)
+	 *	@return array affected rows
+	 */
 	protected function updateHandlerRule($params,$ruleID)
 	{
 		// TODO Check for rule consistency
@@ -559,8 +559,8 @@ 
 	}	
 	
 	/** Delete rule by id
-	*	@param int $ruleID rule id
-	*/
+	 *	@param int $ruleID rule id
+	 */
 	protected function deleteRule($ruleID)
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
@@ -574,9 +574,9 @@ 
 	}
 
 	/** Delete trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function deleteTrap($ip,$oid)
 	{
 		
@@ -602,9 +602,9 @@ 
    
 
 	/** count trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function countTrap($ip,$oid)
 	{
 		
@@ -630,8 +630,8 @@ 
 	}		
 	
 	/** get configuration value
-	*	@param string $element : configuration name in db
-	*/
+	 *	@param string $element : configuration name in db
+	 */
 	protected function getDBConfigValue($element)
 	{
 	
@@ -662,9 +662,9 @@ 
 	}
 
 	/** add configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 		
 	protected function addDBConfigValue($element,$value)
 	{
@@ -682,9 +682,9 @@ 
 	}
 
 	/** set configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 	protected function setDBConfigValue($element,$value)
 	{
 	
@@ -698,13 +698,13 @@ 
 	}
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +112 added lines, -112 removed lines

@@ -22,14 +22,14 @@ 
 
 class TrapsController extends Controller
 {
-	protected $moduleConfig;  	//< TrapModuleConfig instance
-	protected $trapTableList; 	//< TrapTableList (by date)
-	protected $trapTableHostList; 	//< TrapTableList (by hosts)
-	protected $handlerTableList; 	//< HandlerTableList instance
-	protected $trapDB;			//< Trap database
-	protected $icingaDB;		//< Icinga IDO database;
-	protected $MIBData; 		//< MIBLoader class
-	protected $trapClass;		//< Trap class for bin/trap_class.php
+	protected $moduleConfig; //< TrapModuleConfig instance
+	protected $trapTableList; //< TrapTableList (by date)
+	protected $trapTableHostList; //< TrapTableList (by hosts)
+	protected $handlerTableList; //< HandlerTableList instance
+	protected $trapDB; //< Trap database
+	protected $icingaDB; //< Icinga IDO database;
+	protected $MIBData; //< MIBLoader class
+	protected $trapClass; //< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
 	*	@return TrapModuleConfig
@@ -43,14 +43,14 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
 	
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -60,7 +60,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -70,7 +70,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -82,15 +82,15 @@ 
 	*	@param $test_version bool if set to flase, does not test database version of trapDB
 	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
 	*/
-	public function getDbByName($DBname,$test=false,$test_version=true)
+	public function getDbByName($DBname, $test=false, $test_version=true)
 	{
 		try 
 		{
-			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+			$dbconn=IcingaDbConnection::fromResourceName($DBname);
 		} 
 		catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) return array(2, $DBname);
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -101,37 +101,37 @@ 
 			}
 			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;
 			}
 			try
 			{
-				$query = $db->select()
-					->from($this->getModuleConfig()->getDbConfigTableName(),'value')
+				$query=$db->select()
+					->from($this->getModuleConfig()->getDbConfigTableName(), 'value')
 					->where('name=\'db_version\'');
 				$version=$db->fetchRow($query);
-				if ( ($version == null) || ! property_exists($version,'value') )
+				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) 
 			{
-				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,17 +142,17 @@ 
 	 */
 	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 (!$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);
+		$retDB=$this->getDbByName($dbresource, $test, true);
 		if ($test == true) return $retDB;
 		$this->trapDB=$retDB;
 		return $this->trapDB;
@@ -160,78 +160,78 @@ 
 	
 	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');;
+		$dbresource=$this->Config()->get('config', 'IDOdatabase'); ;
 
-		if ( ! $dbresource )
+		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;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		    $dbconn=IcingaDbConnection::fromResourceName($dbresource);
 		}
 		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;
 		}
 		
 		if ($test == false) 
 		{ 
-			$this->icingaDB = $dbconn; 
+			$this->icingaDB=$dbconn; 
 			return $this->icingaDB;
 		}
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
+		    $query=$dbconn->select()
+		    ->from('icinga_dbversion', array('version'));
 		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
+		    if (($version == null) || !property_exists($version, 'version'))
 		    {
-		        return array(4,"$dbresource does not look like an IDO database");
+		        return array(4, "$dbresource does not look like an IDO database");
 		    }
 		}
 		catch (Exception $e)
 		{
-			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+			return array(3, "Error connecting to $dbresource : ".$e->getMessage());
 		}
 		
-		return array(0,'');
+		return array(0, '');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -242,10 +242,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -257,10 +257,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -294,12 +294,12 @@ 
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -315,12 +315,12 @@ 
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -336,12 +336,12 @@ 
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hostgroups'),
 					'b.hostgroup_object_id=a.object_id',
@@ -357,8 +357,8 @@ 
 	*/
 	protected function getHostInfoByID($id) 
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -378,17 +378,17 @@ 
 	*/
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'a.object_id'))
+					array('name' => 'a.name1', 'id' => 'a.object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
-					array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-				->where('a.object_id = ?',$id);
+					array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?', $id);
 		return $db->fetchRow($query);
 	}	
 	
@@ -400,16 +400,16 @@ 
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
-					array('is_active'=>'a.is_active','name2'=>'a.name2'))
+					array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
 				->where('s.host_object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchAll($query);
@@ -423,8 +423,8 @@ 
 	*/
 	protected function getServicesByHostGroupid($id) 
 	{		
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_hostgroup_members'),
@@ -441,11 +441,11 @@ 
 		foreach ($hosts as $key => $host)
 		{ // For each host, get all services and add in common_services if not found or add counter
 			$host_services=$this->getServicesByHostid($host->host_object_id);
-			foreach($host_services as $service)
+			foreach ($host_services as $service)
 			{
 				if (isset($common_services[$service->name2]['num']))
 				{
-					$common_services[$service->name2]['num'] +=1;
+					$common_services[$service->name2]['num']+=1;
 				}
 				else
 				{
@@ -461,7 +461,7 @@ 
 		{
 		    if ($common_services[$key]['num'] == $num_hosts)
 			{
-				array_push($result,array($key,$common_services[$key]['name']));
+				array_push($result, array($key, $common_services[$key]['name']));
 			}
 		}
 		
@@ -474,9 +474,9 @@ 
 	*	@param $name string service name
 	*	@return array  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		if ($name == null)
 		{
 			return array();
@@ -485,7 +485,7 @@ 
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
@@ -503,12 +503,12 @@ 
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name1' => 'a.name1','name2' => 'a.name2'))
+					array('name1' => 'a.name1', 'name2' => 'a.name2'))
 				->where('a.object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchRow($query);
@@ -521,17 +521,17 @@ 
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['created'] = new Zend_Db_Expr('NOW()');
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['created']=new Zend_Db_Expr('NOW()');
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$query=$db->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$params
 		);
-		if($query==false)
+		if ($query == false)
 		{
 		  return null;
 		}
@@ -542,13 +542,13 @@ 
 	*	@param array(<db item>=><value>)
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$db->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -563,8 +563,8 @@ 
 	*/
 	protected function deleteRule($ruleID)
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
-		$db = $this->getDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -577,10 +577,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function deleteTrap($ip,$oid)
+	protected function deleteTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -588,10 +588,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$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
@@ -605,10 +605,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function countTrap($ip,$oid)
+	protected function countTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -616,10 +616,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$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(),
@@ -635,27 +635,27 @@ 
 	protected function getDBConfigValue($element)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
-			->where('name=?',$element);
+			->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]);
+			$this->addDBConfigValue($element, $default[$element]);
 			return $default[$element];
 		}
 		if ($return_row->value == null) // value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
-			$this->setDBConfigValue($element,$default[$element]);
+			if (!isset($default[$element])) return null; // no default and not value
+			$this->setDBConfigValue($element, $default[$element]);
 			return $default[$element];			
 		}
 		return $return_row->value;		
@@ -666,10 +666,10 @@ 
 	*   @param string $value : value
 	*/
 		
-	protected function addDBConfigValue($element,$value)
+	protected function addDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
@@ -685,10 +685,10 @@ 
 	*	@param string $element : name of config element
 	*   @param string $value : value
 	*/
-	protected function setDBConfigValue($element,$value)
+	protected function setDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$query=$db->update(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>$value),
@@ -703,10 +703,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

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

Indentation +46 added lines, -46 removed lines

@@ -31,10 +31,10 @@ 
 				
 	}
 
-    /**
-     * Get all mibs in db which have at least one trap
-     * @return array
-     */	
+	/**
+	 * Get all mibs in db which have at least one trap
+	 * @return array
+	 */	
 	
 	public function getMIBList()
 	{
@@ -58,9 +58,9 @@ 
 	
 	
 	/** Get trap list from a mib 
-	*	@param $mib string mib name
-	*	@return array : traps
-	*/
+	 *	@param $mib string mib name
+	 *	@return array : traps
+	 */
 	public function getTrapList($mib)
 	{
 		$traps=array();
@@ -68,7 +68,7 @@ 
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
-				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
+					array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
 				->where("mib = '".$mib."' AND type='21'") ;
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
@@ -79,9 +79,9 @@ 
 	}
 	
 	/** Get objects a trap can have
-	*	@param int $trap oid of trap
-	*	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
-	*/
+	 *	@param int $trap oid of trap
+	 *	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
+	 */
 	public function getObjectList($trap)
 	{
 		$objects=array();
@@ -97,15 +97,15 @@ 
 		if ( ($id == null) || ! property_exists($id,'id') ) return null;
 		
 		$query=$dbconn->select()
-		        ->from(
-		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-		                'description' => 'c.description'))
-		        ->join(
-		            array('o' => $this->config->getMIBCacheTableTrapObjName()),
-		            'o.trap_id='.$id->id )
-		        ->where("o.object_id = c.id");
+				->from(
+					array('c' => $this->config->getMIBCacheTableName()),
+					array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+						'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+						'description' => 'c.description'))
+				->join(
+					array('o' => $this->config->getMIBCacheTableTrapObjName()),
+					'o.trap_id='.$id->id )
+				->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
 		if ( count($listObjects)==0 ) return null;
 		
@@ -123,12 +123,12 @@ 
 	}
 
 	/** translate oid in MIB::Name 
-	*	@param string oid
-	*	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
-	*/
+	 *	@param string oid
+	 *	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
+	 */
 	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();
 
@@ -136,7 +136,7 @@ 
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
 					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
-					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
+						'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
 		if ($object != null) 
@@ -152,7 +152,7 @@ 
 		// Try to get oid name from snmptranslate
 		$matches=array();
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code===false) {
 			return null;
@@ -164,8 +164,8 @@ 
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
 		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
 		{
-		    $retArray['type']=$matches[1];
-		    $retArray['type_enum']=$matches[2];
+			$retArray['type']=$matches[1];
+			$retArray['type_enum']=$matches[2];
 		}
 		else
 		{
@@ -229,25 +229,25 @@ 
 	 */
 	public function getTrapDetails($oid=null,$id=null)
 	{	    
-	    // Get trap id in DB
-	    if ($oid===null)
-	    {
-	        $where="c.id = '$id'";
-	    }
-	    else
-	    {
-	        $where="c.oid = '$oid'";
-	    }
-	    $query=$this->db->getConnection()->select()
-           ->from(
-            array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-                'description' => 'c.description'))
-            ->where($where);
-        $trap=$this->db->getConnection()->fetchRow($query);
+		// Get trap id in DB
+		if ($oid===null)
+		{
+			$where="c.id = '$id'";
+		}
+		else
+		{
+			$where="c.oid = '$oid'";
+		}
+		$query=$this->db->getConnection()->select()
+		   ->from(
+			array('c' => $this->config->getMIBCacheTableName()),
+			array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+				'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+				'description' => 'c.description'))
+			->where($where);
+		$trap=$this->db->getConnection()->fetchRow($query);
         
-        return $trap;
+		return $trap;
 	}
 	
 }

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param string $db current database
 	 * @param TrapModuleConfig $config TrapModuleConfig class instance
 	 */
-	public function __construct($snmptranslate,$snmptranslate_dirs,$db,$config)
+	public function __construct($snmptranslate, $snmptranslate_dirs, $db, $config)
 	{
 		$this->snmptranslate=$snmptranslate;
 		$this->snmptranslate_dirs=$snmptranslate_dirs;
@@ -38,19 +38,19 @@ 
 	
 	public function getMIBList()
 	{
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->distinct()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('mib' => 'mib'))
 				->where("type = '21'")
-				->order('mib ASC');				;
+				->order('mib ASC'); ;
 		$names=$dbconn->fetchAll($query);
 		$mib=array();
-		foreach($names as $val)
+		foreach ($names as $val)
 		{
-			array_push($mib,$val->mib);
+			array_push($mib, $val->mib);
 		}
 		return $mib;
 		
@@ -64,12 +64,12 @@ 
 	public function getTrapList($mib)
 	{
 		$traps=array();
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
-				->where("mib = '".$mib."' AND type='21'") ;
+				->where("mib = '".$mib."' AND type='21'");
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
 		{
@@ -87,19 +87,19 @@ 
 		$objects=array();
 		
 		// Get trap id in DB
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('id' => 'id'))
-				->where("oid = '".$trap."'") ;
+				->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(
 		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+		            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
 		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
 		                'description' => 'c.description'))
 		        ->join(
@@ -107,7 +107,7 @@ 
 		            '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,14 +128,14 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
-		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
-		$dbconn = $this->db->getConnection();
+	    if (!preg_match('/^\./', $oid)) $oid='.'.$oid; // Add a leading '.'
+		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null, 'type'=>null);
+		$dbconn=$this->db->getConnection();
 
 		$query=$dbconn->select()
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
-					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
+					array('mib'=>'o.mib', 'name' => 'o.name', 'type'=>'o.syntax',
 					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
@@ -151,18 +151,18 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$matches=array();
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code===false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return null;
 		} 
 		$retArray['mib']=$matches[1];
 		$retArray['name']=$matches[2];
 		
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On ' . $matches[0] .
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On '.$matches[0].
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
-		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
+		if (preg_match('/(.*)\{(.*)\}/', $translate, $matches))
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
@@ -197,9 +197,9 @@ 
 	 * @param string $type filter by type (21=trap)
 	 * @return number number of entries in db.
 	 */
-	public function countObjects($mib=null,$type=null)
+	public function countObjects($mib=null, $type=null)
 	{
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
@@ -207,11 +207,11 @@ 
 		$where=null;
 		if ($mib !== null)
 		{
-			$where ="mib = '$mib' ";
+			$where="mib = '$mib' ";
 		}
 		if ($type !== null)
 		{
-			$where=($where != null)?' AND ':'';
+			$where=($where != null) ? ' AND ' : '';
 			$where.="type='$type'";
 		}
 		if ($where !== null)
@@ -227,10 +227,10 @@ 
 	 * @param integer $id
 	 * @return array trap details
 	 */
-	public function getTrapDetails($oid=null,$id=null)
+	public function getTrapDetails($oid=null, $id=null)
 	{	    
 	    // Get trap id in DB
-	    if ($oid===null)
+	    if ($oid === null)
 	    {
 	        $where="c.id = '$id'";
 	    }
@@ -241,7 +241,7 @@ 
 	    $query=$this->db->getConnection()->select()
            ->from(
             array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
                 'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
                 'description' => 'c.description'))
             ->where($where);

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

Indentation +102 added lines, -102 removed lines

@@ -9,113 +9,113 @@
 class Logging
 {
 
-    //**** Options from config database
-    // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
-    public $outputMode='syslog'; // alert type : file, syslog, display
-    public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
-    protected $outputList=array('file', 'syslog', 'display');
+	//**** Options from config database
+	// Default values
+	public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+	public $outputMode='syslog'; // alert type : file, syslog, display
+	public $outputFile="/tmp/trapdebug.txt";
+	protected $logLevels=array("","Error","Warning","Info","Debug");
+	protected $outputList=array('file', 'syslog', 'display');
     
-    /** Send log. Throws exception on critical error
-     *	@param	string $message Message to log
-     *	@param	int $level 1=critical 2=warning 3=trace 4=debug
-     *	@param  string $destination file/syslog/display
-     *	@return void
-     *  @throws Exception
-     **/
-    public function log( $message, $level, $destination ='')
-    {
-        if ($this->debugLevel >= $level)
-        {
-            $message = '['.  date("Y/m/d H:i:s") . '] ' .
-                '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+	/** Send log. Throws exception on critical error
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 *  @throws Exception
+	 **/
+	public function log( $message, $level, $destination ='')
+	{
+		if ($this->debugLevel >= $level)
+		{
+			$message = '['.  date("Y/m/d H:i:s") . '] ' .
+				'[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
-            switch ($output)
-            {
-                case 'file':
-                    file_put_contents ($this->outputFile, $message , FILE_APPEND);
-                    break;
-                case 'syslog':
-                    switch($level)
-                    {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_DEBUG;break;
-                        default: $prio = LOG_ERR;
-                    }
-                    syslog($prio,$message);
-                    break;
-                case 'display':
-                    echo $message;
-                    break;
-                default : // nothing we can do at this point
-                    throw new Exception($message);
-            }
-        }
-        if ($level == 1)
-        {
-            throw new Exception($message);
-        }
-    }
+			$output = ( $destination != '' ) ? $destination : $this->outputMode;
+			switch ($output)
+			{
+				case 'file':
+					file_put_contents ($this->outputFile, $message , FILE_APPEND);
+					break;
+				case 'syslog':
+					switch($level)
+					{
+						case 1 : $prio = LOG_ERR;break;
+						case 2 : $prio = LOG_WARNING;break;
+						case 3 : $prio = LOG_INFO;break;
+						case 4 : $prio = LOG_DEBUG;break;
+						default: $prio = LOG_ERR;
+					}
+					syslog($prio,$message);
+					break;
+				case 'display':
+					echo $message;
+					break;
+				default : // nothing we can do at this point
+					throw new Exception($message);
+			}
+		}
+		if ($level == 1)
+		{
+			throw new Exception($message);
+		}
+	}
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
-    {
-        $this->setLevel($debugLvl);
-        switch ($outputType)
-        {
-            case 'file':
-                if ($outputFile == null) throw new Exception("File logging without file !");
-                $this->setFile($outputFile);
-                $this->setDestination('file');
-                break;
-            default:
-                $this->setDestination($outputType);
-        }
-    }
+	public function setLogging($debugLvl,$outputType,$outputFile=null)
+	{
+		$this->setLevel($debugLvl);
+		switch ($outputType)
+		{
+			case 'file':
+				if ($outputFile == null) throw new Exception("File logging without file !");
+				$this->setFile($outputFile);
+				$this->setDestination('file');
+				break;
+			default:
+				$this->setDestination($outputType);
+		}
+	}
     
-    /**
-     * Set logging level
-     * @param integer $level
-     * @throws Exception
-     */
-    public function setLevel($level)
-    {
-        if (!is_integer($level) || $level < 0 || $level > 10)
-        {
-            throw new Exception('Invalid log level');
-        }
-        $this->debugLevel=$level;
-    }
+	/**
+	 * Set logging level
+	 * @param integer $level
+	 * @throws Exception
+	 */
+	public function setLevel($level)
+	{
+		if (!is_integer($level) || $level < 0 || $level > 10)
+		{
+			throw new Exception('Invalid log level');
+		}
+		$this->debugLevel=$level;
+	}
 
-    /**
-     * Set logging destination
-     * @param string $destination
-     * @throws Exception
-     */
-    public function setDestination($destination)
-    {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
-        {
-            throw new Exception('Invalid log destination');
-        }
-        $this->outputMode=$destination;
-    }
-    /**
-     * Set file destination
-     * @param string $file
-     * @throws Exception
-     */
-    public function setFile($file)
-    {
-        if (!is_string($file))
-        {
-            throw new Exception('Invalid log file');
-        }
-        $this->outputFile=$file;
-    }
+	/**
+	 * Set logging destination
+	 * @param string $destination
+	 * @throws Exception
+	 */
+	public function setDestination($destination)
+	{
+		if (!is_string($destination) || ! in_array($destination, $this->outputList))
+		{
+			throw new Exception('Invalid log destination');
+		}
+		$this->outputMode=$destination;
+	}
+	/**
+	 * Set file destination
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function setFile($file)
+	{
+		if (!is_string($file))
+		{
+			throw new Exception('Invalid log file');
+		}
+		$this->outputFile=$file;
+	}
     
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -4,17 +4,17 @@ 
 
 use Exception;
 
-define("ERROR", 1);define("WARN", 2);define("INFO", 3);define("DEBUG", 4);
+define("ERROR", 1); define("WARN", 2); define("INFO", 3); define("DEBUG", 4);
 
 class Logging
 {
 
     //**** Options from config database
     // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+    public $debugLevel=2; // 0=No output 1=critical 2=warning 3=trace 4=ALL
     public $outputMode='syslog'; // alert type : file, syslog, display
     public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
+    protected $logLevels=array("", "Error", "Warning", "Info", "Debug");
     protected $outputList=array('file', 'syslog', 'display');
     
     /** Send log. Throws exception on critical error
@@ -24,29 +24,29 @@ 
      *	@return void
      *  @throws Exception
      **/
-    public function log( $message, $level, $destination ='')
+    public function log($message, $level, $destination='')
     {
         if ($this->debugLevel >= $level)
         {
-            $message = '['.  date("Y/m/d H:i:s") . '] ' .
-                '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+            $message='['.date("Y/m/d H:i:s").'] '.
+                '[TrapDirector] ['.$this->logLevels[$level].']: '.$message."\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
+            $output=($destination != '') ? $destination : $this->outputMode;
             switch ($output)
             {
                 case 'file':
-                    file_put_contents ($this->outputFile, $message , FILE_APPEND);
+                    file_put_contents($this->outputFile, $message, FILE_APPEND);
                     break;
                 case 'syslog':
-                    switch($level)
+                    switch ($level)
                     {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_DEBUG;break;
-                        default: $prio = LOG_ERR;
+                        case 1 : $prio=LOG_ERR; break;
+                        case 2 : $prio=LOG_WARNING; break;
+                        case 3 : $prio=LOG_INFO; break;
+                        case 4 : $prio=LOG_DEBUG; break;
+                        default: $prio=LOG_ERR;
                     }
-                    syslog($prio,$message);
+                    syslog($prio, $message);
                     break;
                 case 'display':
                     echo $message;
@@ -62,7 +62,7 @@ 
     }
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
+    public function setLogging($debugLvl, $outputType, $outputFile=null)
     {
         $this->setLevel($debugLvl);
         switch ($outputType)
@@ -98,7 +98,7 @@ 
      */
     public function setDestination($destination)
     {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
+        if (!is_string($destination) || !in_array($destination, $this->outputList))
         {
             throw new Exception('Invalid log destination');
         }

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

Indentation +110 added lines, -110 removed lines

@@ -11,128 +11,128 @@
 class Database
 {
 
-    // Databases
-    protected $trapDB=null; //< trap database
-    protected $idoDB=null; //< ido database
-    public $trapDBType; //< Type of database for traps (mysql, pgsql)
-    public $idoDBType; //< Type of database for ido (mysql, pgsql)
+	// Databases
+	protected $trapDB=null; //< trap database
+	protected $idoDB=null; //< ido database
+	public $trapDBType; //< Type of database for traps (mysql, pgsql)
+	public $idoDBType; //< Type of database for ido (mysql, pgsql)
     
-    protected $trapDSN; //< trap database connection params
-    protected $trapUsername; //< trap database connection params
-    protected $trapPass; //< trap database connection params
+	protected $trapDSN; //< trap database connection params
+	protected $trapUsername; //< trap database connection params
+	protected $trapPass; //< trap database connection params
     
-    protected $idoSet; //< bool true is ido database set
-    protected $idoDSN; //< trap database connection params
-    protected $idoUsername; //< trap database connection params
-    protected $idoPass; //< trap database connection params
+	protected $idoSet; //< bool true is ido database set
+	protected $idoDSN; //< trap database connection params
+	protected $idoUsername; //< trap database connection params
+	protected $idoPass; //< trap database connection params
     
-    // Logging function
+	// Logging function
     
-    protected $logging; //< logging class
+	protected $logging; //< logging class
     
-    /**
-     * @param Logging $logClass : where to log
-     * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
-     */
-    function __construct($logClass,$dbParam)
-    {
-        $this->logging=$logClass;
+	/**
+	 * @param Logging $logClass : where to log
+	 * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
+	 */
+	function __construct($logClass,$dbParam)
+	{
+		$this->logging=$logClass;
         
-        $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername,INFO);
-        $this->db_connect_trap();
+		$this->trapDSN=$this->setupDSN($dbParam);
+		$this->trapUsername = $dbParam['username'];
+		$this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->trapDBType=$dbParam['db'];
+		$this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername,INFO);
+		$this->db_connect_trap();
         
-    }
+	}
     
-    /**
-     * Setup and connect to IDO database
-     * @param array $dbParam : array of named params
-     */
-    public function setupIDO($dbParam)
-    {
-        $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
-        $this->idoDBType=$dbParam['db'];
-        $this->db_connect_ido();
-    }
+	/**
+	 * Setup and connect to IDO database
+	 * @param array $dbParam : array of named params
+	 */
+	public function setupIDO($dbParam)
+	{
+		$this->idoDSN=$this->setupDSN($dbParam);
+		$this->idoUsername = $dbParam['username'];
+		$this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+		$this->idoDBType=$dbParam['db'];
+		$this->db_connect_ido();
+	}
     
-    /**
-     * Connect to IDO database
-     * @return \PDO
-     */
-    public function db_connect_ido()
-    {
-        if ($this->idoDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->idoDB->query('select 1')->fetchColumn();
-                return $this->idoDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
-            }
-        }
-        try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->idoDB;
-    }
+	/**
+	 * Connect to IDO database
+	 * @return \PDO
+	 */
+	public function db_connect_ido()
+	{
+		if ($this->idoDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->idoDB->query('select 1')->fetchColumn();
+				return $this->idoDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database IDO connection lost, reconnecting',WARN);
+			}
+		}
+		try {
+			$this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->idoDB;
+	}
     
-    /**
-     * Connect to Trap database
-     * @return \PDO
-     */
-    public function db_connect_trap()
-    {
+	/**
+	 * Connect to Trap database
+	 * @return \PDO
+	 */
+	public function db_connect_trap()
+	{
         
-        if ($this->trapDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->trapDB->query('select 1')->fetchColumn();
-                return $this->trapDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
-            }           
-        }       
-        try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->trapDB;
-    }
+		if ($this->trapDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->trapDB->query('select 1')->fetchColumn();
+				return $this->trapDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database connection lost, reconnecting',WARN);
+			}           
+		}       
+		try {
+			$this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->trapDB;
+	}
     
-    /**
-     * Setup dsn and check parameters
-     * @param array $configElmt
-     * @return string
-     */
-    protected function setupDSN($configElmt)  
-    {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
-        {
-            $this->logging->log('Missing DB params',ERROR);
-            return ''; 
-        }
+	/**
+	 * Setup dsn and check parameters
+	 * @param array $configElmt
+	 * @return string
+	 */
+	protected function setupDSN($configElmt)  
+	{
+		if (!array_key_exists('db',$configElmt) ||
+			!array_key_exists('host',$configElmt) ||
+			!array_key_exists('dbname',$configElmt) ||
+			!array_key_exists('username',$configElmt))
+		{
+			$this->logging->log('Missing DB params',ERROR);
+			return ''; 
+		}
         
-        //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+		//	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
+		$dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
-        if (array_key_exists('port', $configElmt))
-        {
-            $dsn .= ';port='.$configElmt['port'];
-        }
-        return $dsn;
-    }
+		if (array_key_exists('port', $configElmt))
+		{
+			$dsn .= ';port='.$configElmt['port'];
+		}
+		return $dsn;
+	}
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -34,15 +34,15 @@ 
      * @param Logging $logClass : where to log
      * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
      */
-    function __construct($logClass,$dbParam)
+    function __construct($logClass, $dbParam)
     {
         $this->logging=$logClass;
         
         $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+        $this->trapUsername=$dbParam['username'];
+        $this->trapPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
         $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername,INFO);
+        $this->logging->log('DSN : '.$this->trapDSN.';user '.$this->trapUsername, INFO);
         $this->db_connect_trap();
         
     }
@@ -54,9 +54,9 @@ 
     public function setupIDO($dbParam)
     {
         $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+        $this->idoUsername=$dbParam['username'];
+        $this->idoPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
+        $this->logging->log('DSN : '.$this->idoDSN.';user '.$this->idoUsername, INFO);
         $this->idoDBType=$dbParam['db'];
         $this->db_connect_ido();
     }
@@ -74,13 +74,13 @@ 
                 return $this->idoDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
+                $this->logging->log('Database IDO connection lost, reconnecting', WARN);
             }
         }
         try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+            $this->idoDB=new PDO($this->idoDSN, $this->idoUsername, $this->idoPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed to IDO : '.$e->getMessage(), ERROR, '');
         }
         return $this->idoDB;
     }
@@ -99,13 +99,13 @@ 
                 return $this->trapDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
+                $this->logging->log('Database connection lost, reconnecting', WARN);
             }           
         }       
         try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+            $this->trapDB=new PDO($this->trapDSN, $this->trapUsername, $this->trapPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed : '.$e->getMessage(), ERROR, '');
         }
         return $this->trapDB;
     }
@@ -117,21 +117,21 @@ 
      */
     protected function setupDSN($configElmt)  
     {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
+        if (!array_key_exists('db', $configElmt) ||
+            !array_key_exists('host', $configElmt) ||
+            !array_key_exists('dbname', $configElmt) ||
+            !array_key_exists('username', $configElmt))
         {
-            $this->logging->log('Missing DB params',ERROR);
+            $this->logging->log('Missing DB params', ERROR);
             return ''; 
         }
         
         //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+        $dsn=$configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
         if (array_key_exists('port', $configElmt))
         {
-            $dsn .= ';port='.$configElmt['port'];
+            $dsn.=';port='.$configElmt['port'];
         }
         return $dsn;
     }

application/controllers/ReceivedController.php

Spacing +33 added lines, -33 removed lines

@@ -20,19 +20,19 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('traps');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getTrapListTable()->setConnection($db);
 		
 		// Apply pagination limits
-		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
 		//$postData=$this->getRequest()->getPost();
 		$filter=array();
-		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 		$filter['done']=$this->params->get('done');
 		$this->view->filter=$filter;
-		$this->view->table->updateFilter(Url::fromRequest(),$filter);
+		$this->view->table->updateFilter(Url::fromRequest(), $filter);
 		
 		//$this->view->filterEditor = $this->getTrapListTable()->getFilterEditor($this->getRequest());
 
@@ -46,7 +46,7 @@ 
 		
 		$this->checkReadPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Detailed status'),
 			'url'		=> Url::fromRequest()
@@ -56,11 +56,11 @@ 
 		$this->view->trapid=$trapid;
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
-			$this->getModuleConfig()->urlPath() . '/handler/add',
+			$this->getModuleConfig()->urlPath().'/handler/add',
 			array('fromid' => $trapid));
 		// ***************  Get main data
 		// extract columns and titles;
@@ -72,28 +72,28 @@ 
 		// Do DB query for trap. 
 		try
 		{
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->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);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 			return;
 		}
 
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=strftime('%c', $trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
-			array_push($queryArray[$key],$cval);
+			array_push($queryArray[$key], $cval);
 		}
-		$this->view->rowset = $queryArray;
+		$this->view->rowset=$queryArray;
 
 		// **************   Check for additionnal data
 		
@@ -105,17 +105,17 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->fetchAll($query);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 		// TODO : code this in a better & simpler way
-		if ($trapDetail == null ) 
+		if ($trapDetail == null) 
 		{
 			$this->view->data=false;
 		}
@@ -127,9 +127,9 @@ 
 			foreach ($trapDetail as $key => $val) 
 			{	
 				$trapval[$key]=array();
-				foreach (array_keys($queryArrayData) as $vkey ) 
+				foreach (array_keys($queryArrayData) as $vkey) 
 				{
-					array_push($trapval[$key],$val->$vkey);
+					array_push($trapval[$key], $val->$vkey);
 				}
 			}
 			$this->view->data_val=$trapval;
@@ -145,19 +145,19 @@ 
 	    $this->checkReadPermission();
 	    $this->prepareTabs()->activate('hosts');
 	    
-	    $db = $this->getDb();
+	    $db=$this->getDb();
 	    $this->getTrapHostListTable()->setConnection($db);
 	    
 	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(), $this->getModuleConfig()->itemListDisplay());
 	    
 	    // Set Filter
 	    //$postData=$this->getRequest()->getPost();
 	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+	    $filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 	    $filter['done']=$this->params->get('done');
 	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+	    $this->view->table->updateFilter(Url::fromRequest(), $filter);
 	}
 	
 	public function deleteAction()
@@ -176,15 +176,15 @@ 
 	{
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received')
+			'url'   => $this->getModuleConfig()->urlPath().'/received')
 		    )
 		    ->add('hosts', array(
 		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+		        'url'   => $this->getModuleConfig()->urlPath().'/received/hosts')
 		    )
 		    ->add('delete', array(
 			'label' => $this->translate('Delete'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
+			'url'   => $this->getModuleConfig()->urlPath().'/received/delete')
 		  );
 	} 
 
@@ -211,14 +211,14 @@ 
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;
 		}
-		if ($action =="count")
+		if ($action == "count")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->countTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->countTrap($ip, $oid)));
 			return;
 		}
-		if ($action =="delete")
+		if ($action == "delete")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->deleteTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->deleteTrap($ip, $oid)));
 			return;
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));

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;