patrickpr / trapdirector

bin/trap_in.php

Indentation +14 added lines, -14 removed lines

@@ -15,13 +15,13 @@ 
 
 try
 {
-    $Trap = new Trap($icingaweb2_etc);
-    //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    //$Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	$Trap = new Trap($icingaweb2_etc);
+	//$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
+	//$Trap = new Trap($icingaweb2_etc,4,'syslog'); // 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');
 
@@ -34,15 +34,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

bin/trap_class.php

Indentation +597 added lines, -597 removed lines

@@ -54,7 +54,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";
@@ -63,18 +63,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
@@ -104,26 +104,26 @@ 
 	 */
 	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
 	 * @param array $trap_config : ini file array
-	*/
+	 */
 	protected function getMainOptions($trapConfig)
 	{
 
@@ -142,10 +142,10 @@ 
 		// API options
 		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
 		{
-		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+			$this->api_use=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -155,45 +155,45 @@ 
 	 */
 	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]);
 	}
 	
 	/**
@@ -204,9 +204,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);
 		}
 	}
 
@@ -217,10 +217,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();
@@ -238,15 +238,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
@@ -256,19 +256,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
@@ -276,7 +276,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
 		}
@@ -285,21 +285,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 
@@ -320,7 +320,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];				
 				}
@@ -336,7 +336,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,'');
 		} 
 
@@ -366,9 +366,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
@@ -401,7 +401,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) {
@@ -414,9 +414,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)
@@ -441,72 +441,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()
 	{
 		
@@ -604,10 +604,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();
@@ -666,9 +666,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();
@@ -685,53 +685,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;
@@ -791,11 +791,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
@@ -803,14 +803,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++;
 				}
 			}
@@ -862,24 +862,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);
@@ -899,24 +899,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){
@@ -974,9 +974,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)
 	{
@@ -1021,7 +1021,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;
@@ -1032,7 +1032,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']);
@@ -1069,12 +1069,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
@@ -1091,15 +1091,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
 					{
@@ -1122,9 +1122,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';
 			}
 			
 		}
@@ -1139,8 +1139,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();
@@ -1157,9 +1157,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
@@ -1179,30 +1179,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);		
 	}
@@ -1217,113 +1217,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 integer : not in use
-	**/
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
+	 *	@return integer : not in use
+	 **/
 	public function reset_services()
 	{
 		// Get all services not in 'ok' state
@@ -1395,105 +1395,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.
@@ -1501,148 +1501,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.
+		}
 	    
 	}
 	
@@ -1652,7 +1652,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 
@@ -1704,7 +1704,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 '.';
@@ -1722,8 +1722,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];
@@ -1734,7 +1734,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;
 			}
@@ -1747,8 +1747,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);
@@ -1756,8 +1756,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";
@@ -1766,7 +1766,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;
 			}
@@ -1787,7 +1787,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];
 			
@@ -1795,17 +1795,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);
@@ -1813,23 +1813,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";
@@ -1848,18 +1848,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";
 		}
 		
 	}

library/Trapdirector/TrapsController.php

Indentation +116 added lines, -116 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,10 +539,10 @@ 
 	}	
 
 	/** Update handler rule in traps DB
-	*	@param array $params : (<db item>=><value>)
-	*   @param integer $ruleID : rule id in db
-	*	@return array affected rows
-	*/
+	 *	@param array $params : (<db item>=><value>)
+	 *   @param integer $ruleID : rule id in db
+	 *	@return array affected rows
+	 */
 	protected function updateHandlerRule($params,$ruleID)
 	{
 		// TODO Check for rule consistency
@@ -560,8 +560,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');  }
@@ -575,9 +575,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)
 	{
 		
@@ -603,9 +603,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)
 	{
 		
@@ -631,8 +631,8 @@ 
 	}		
 	
 	/** get configuration value
-	*	@param string $element : configuration name in db
-	*/
+	 *	@param string $element : configuration name in db
+	 */
 	protected function getDBConfigValue($element)
 	{
 	
@@ -663,9 +663,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)
 	{
@@ -683,9 +683,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)
 	{
 	
@@ -699,13 +699,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))
 			{