patrickpr / trapdirector

library/Trapdirector/TrapsProcess/TrapConfig.php

Indentation +134 added lines, -134 removed lines

@@ -15,156 +15,156 @@
 trait TrapConfig
 {
 
-    /** @return \Trapdirector\Logging   */
-    abstract public function getLogging();
+	/** @return \Trapdirector\Logging   */
+	abstract public function getLogging();
     
-    /**
-     * Get option from array of ini file, send message if empty
-     * @param string $option_array Array of ini file
-     * @param string $option_category category in ini file
-     * @param string $option_name name of option in category
-     * @param mixed $option_var variable to fill if found, left untouched if not found
-     * @param integer $log_level default 2 (warning)
-     * @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)
-    {
-        if (!isset($option_array[$option_category][$option_name]))
-        {
-            if ($message === null)
-            {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
-            }
-            $this->getLogging()->log($message,$log_level);
-            return false;
-        }
-        else
-        {
-            $option_var=$option_array[$option_category][$option_name];
-            return true;
-        }
-    }
+	/**
+	 * Get option from array of ini file, send message if empty
+	 * @param string $option_array Array of ini file
+	 * @param string $option_category category in ini file
+	 * @param string $option_name name of option in category
+	 * @param mixed $option_var variable to fill if found, left untouched if not found
+	 * @param integer $log_level default 2 (warning)
+	 * @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)
+	{
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+			}
+			$this->getLogging()->log($message,$log_level);
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
+	}
 
-    /**
-     * Get options in database
-     */
-    protected function getDatabaseOptions()
-    {
-        // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
-        {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
-        }
-    }
+	/**
+	 * Get options in database
+	 */
+	protected function getDatabaseOptions()
+	{
+		// Database options
+		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		{
+			$this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+		}
+	}
         
-    /** Set $variable to value if $element found in database config table
-     * @param string $element
-     * @param string $variable
-     */
-    protected function getDBConfigIfSet($element,&$variable)
-    {
-        $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
-    }
+	/** Set $variable to value if $element found in database config table
+	 * @param string $element
+	 * @param string $variable
+	 */
+	protected function getDBConfigIfSet($element,&$variable)
+	{
+		$value=$this->getDBConfig($element);
+		if ($value != null) $variable=$value;
+	}
     
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    protected function getDBConfig($element)  // TODO : put this in DB class
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	protected function getDBConfig($element)  // TODO : put this in DB class
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
     
-    /**
-     * Get options from ini file
-     * @param array $trap_config : ini file array
-     */
-    protected function getMainOptions($trapConfig)
-    {
+	/**
+	 * Get options from ini file
+	 * @param array $trap_config : ini file array
+	 */
+	protected function getMainOptions($trapConfig)
+	{
         
-        // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+		// Snmptranslate binary path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
         
-        // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+		// mibs path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
         
-        // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+		// icinga2cmd path
+		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
         
-        // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+		// table prefix
+		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
         
-        // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
-        {
-            $this->apiUse=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
-        }
-    }
+		// API options
+		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+		{
+			$this->apiUse=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
+		}
+	}
     
-    /**
-     * Create and setup database class for trap & ido (if no api) db
-     * @param array $trap_config : ini file array
-     */
-    protected function setupDatabase($trapConfig)
-    {
-        // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+	/**
+	 * Create and setup database class for trap & ido (if no api) db
+	 * @param array $trap_config : ini file array
+	 */
+	protected function setupDatabase($trapConfig)
+	{
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        if (!array_key_exists($dbTrapName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
+		if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
         
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+		if ($this->apiUse === 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->trapModuleConfig,ERROR,'');
-        }
-        $dbIdoName=$trapConfig['config']['IDOdatabase'];
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,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->icingaweb2Ressources,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->icingaweb2Ressources,ERROR,'');
+			return;
+		}
         
-        $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
-    }
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+	}
     
 }
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -28,15 +28,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->trapModuleConfig;
+                $message='No '.$option_name.' in config file: '.$this->trapModuleConfig;
             }
-            $this->getLogging()->log($message,$log_level);
+            $this->getLogging()->log($message, $log_level);
             return false;
         }
         else
@@ -54,9 +54,9 @@ 
         // Database options
         if ($this->logSetup === false) // Only if logging was no setup in constructor
         {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+            $this->getDBConfigIfSet('log_level', $this->getLogging()->debugLevel);
+            $this->getDBConfigIfSet('log_destination', $this->getLogging()->outputMode);
+            $this->getDBConfigIfSet('log_file', $this->getLogging()->outputFile);
         }
     }
         
@@ -64,7 +64,7 @@ 
      * @param string $element
      * @param string $variable
      */
-    protected function getDBConfigIfSet($element,&$variable)
+    protected function getDBConfigIfSet($element, &$variable)
     {
         $value=$this->getDBConfig($element);
         if ($value != null) $variable=$value;
@@ -80,7 +80,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'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();
@@ -99,24 +99,24 @@ 
     {
         
         // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
         
         // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
         
         // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        $this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
         
         // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        $this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->dbPrefix);
         
         // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+        if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->apiHostname))
         {
             $this->apiUse=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->apiPort);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->apiUsername);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->apiPassword);
         }
     }
     
@@ -127,40 +127,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->trapModuleConfig,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trapModuleConfig, 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->icingaweb2Ressources,true)) === false)
+        if (($dbConfig=parse_ini_file($this->icingaweb2Ressources, true)) === false)
         {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
-        if (!array_key_exists($dbTrapName,$dbConfig))
+        if (!array_key_exists($dbTrapName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->dbPrefix);
         
         if ($this->apiUse === 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->trapModuleConfig,ERROR,'');
+            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig, 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->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         

Braces +11 added lines, -5 removed lines

@@ -38,8 +38,7 @@ 
             }
             $this->getLogging()->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -52,9 +51,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->getLogging()->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
             $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
         }
@@ -67,7 +68,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
+        if ($value != null) {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -148,7 +151,10 @@ 
         
         $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
         
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+        if ($this->apiUse === true) {
+        	return;
+        }
+        // In case of API use, no IDO is necessary
         
         // IDO Database
         if (!array_key_exists('IDOdatabase',$trapConfig['config']))

library/Trapdirector/TrapsProcess/Trap.php

Indentation +805 added lines, -805 removed lines

@@ -17,825 +17,825 @@ 
  */
 class Trap
 {
-    use TrapConfig;
+	use TrapConfig;
     
-    // Configuration files and dirs
-    /** @var string Icinga etc path */
-    protected $icingaweb2Etc;
-    /** @var string $trapModuleConfig config.ini of module */
-    protected $trapModuleConfig;
-    /** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
-    protected $icingaweb2Ressources;
-    // Options from config.ini (default values)
-    /** @var string $snmptranslate */
-    protected $snmptranslate='/usr/bin/snmptranslate';
-    /** @var string $snmptranslate_dirs */
-    protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
-    /** @var string $icinga2cmd */
-    protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
-    /** @var string $dbPrefix */
-    protected $dbPrefix='traps_';
+	// Configuration files and dirs
+	/** @var string Icinga etc path */
+	protected $icingaweb2Etc;
+	/** @var string $trapModuleConfig config.ini of module */
+	protected $trapModuleConfig;
+	/** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
+	protected $icingaweb2Ressources;
+	// Options from config.ini (default values)
+	/** @var string $snmptranslate */
+	protected $snmptranslate='/usr/bin/snmptranslate';
+	/** @var string $snmptranslate_dirs */
+	protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
+	/** @var string $icinga2cmd */
+	protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
+	/** @var string $dbPrefix */
+	protected $dbPrefix='traps_';
     
-    // API
-    /** @var boolean $apiUse */
-    protected $apiUse=false;
-    /** @var Icinga2API $icinga2api */
-    protected $icinga2api=null;
-    /** @var string $apiHostname */
-    protected $apiHostname='';
-    /** @var integer $apiPort */
-    protected $apiPort=0;
-    /** @var string $apiUsername */
-    protected $apiUsername='';
-    /** @var string $apiPassword */
-    protected $apiPassword='';
+	// API
+	/** @var boolean $apiUse */
+	protected $apiUse=false;
+	/** @var Icinga2API $icinga2api */
+	protected $icinga2api=null;
+	/** @var string $apiHostname */
+	protected $apiHostname='';
+	/** @var integer $apiPort */
+	protected $apiPort=0;
+	/** @var string $apiUsername */
+	protected $apiUsername='';
+	/** @var string $apiPassword */
+	protected $apiPassword='';
     
-    // Logs
-    /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
-    /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
+	// Logs
+	/** @var Logging Logging class. */
+	public $logging;    //< Logging class.
+	/** @var bool true if log was setup in constructor */
+	protected $logSetup;   //< bool true if log was setup in constructor
     
-    // Databases
-    /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
+	// Databases
+	/** @var Database $trapsDB  Database class*/
+	public $trapsDB = null;
     
-    // Trap received data
-    protected $receivingHost;
-    /** @var array	Main trap data (oid, source...) */
-    public $trapData=array();
-    /** @var array $trapDataExt Additional trap data objects (oid/value).*/
-    public $trapDataExt=array(); 
-    /** @var int $trapId trap_id after sql insert*/
-    public $trapId=null;
-    /** @var string $trapAction trap action for final write*/
-    public $trapAction=null;
-    /** @var boolean $trapToDb log trap to DB */
-    protected $trapToDb=true;
+	// Trap received data
+	protected $receivingHost;
+	/** @var array	Main trap data (oid, source...) */
+	public $trapData=array();
+	/** @var array $trapDataExt Additional trap data objects (oid/value).*/
+	public $trapDataExt=array(); 
+	/** @var int $trapId trap_id after sql insert*/
+	public $trapId=null;
+	/** @var string $trapAction trap action for final write*/
+	public $trapAction=null;
+	/** @var boolean $trapToDb log trap to DB */
+	protected $trapToDb=true;
     
-    /** @var Mib mib class */
-    public $mibClass = null;
+	/** @var Mib mib class */
+	public $mibClass = null;
     
-    /** @var Rule rule class */
-    public $ruleClass = null;
+	/** @var Rule rule class */
+	public $ruleClass = null;
     
-    /** @var Plugins plugins manager **/
-    public $pluginClass = null;
+	/** @var Plugins plugins manager **/
+	public $pluginClass = null;
     
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
-    {
-        // Paths of ini files
-        $this->icingaweb2Etc=$etcDir;
-        $this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
-        $this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
-        
-        //************* Setup logging
-        $this->logging = new Logging();
-        if ($baseLogLevel != null)
-        {
-            $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-            $this->logSetup=true;
-        }
-        else
-        {
-            $this->logSetup=false;
-        }
-        $this->logging->log('Loggin started', INFO);
-        
-        //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
-        {
-            throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
-        }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
-        if ($trapConfig == false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
-            throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
-        }
-        $this->getMainOptions($trapConfig); // Get main options from ini file
-        
-        //*************** Setup database class & get options
-        $this->setupDatabase($trapConfig);
-        
-        $this->getDatabaseOptions(); // Get options in database
-        
-        //*************** Setup API
-        if ($this->apiUse === true) $this->getAPI(); // Setup API
-        
-        //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
-        
-        //*************** Setup Rule
-        $this->ruleClass = new Rule($this); //< Create Rule class
-        
-        $this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
-            'source_ip'	=> 'unknown',
-            'source_port'	=> 'unknown',
-            'destination_ip'	=> 'unknown',
-            'destination_port'	=> 'unknown',
-            'trap_oid'	=> 'unknown'
-        );
-        
-        //*************** Setup Plugins
-        //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+	function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	{
+		// Paths of ini files
+		$this->icingaweb2Etc=$etcDir;
+		$this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
+		$this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
+        
+		//************* Setup logging
+		$this->logging = new Logging();
+		if ($baseLogLevel != null)
+		{
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
+		}
+		else
+		{
+			$this->logSetup=false;
+		}
+		$this->logging->log('Loggin started', INFO);
+        
+		//*************** Get options from ini files
+		if (! is_file($this->trapModuleConfig))
+		{
+			throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
+		}
+		$trapConfig=parse_ini_file($this->trapModuleConfig,true);
+		if ($trapConfig == false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+			throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
+		}
+		$this->getMainOptions($trapConfig); // Get main options from ini file
+        
+		//*************** Setup database class & get options
+		$this->setupDatabase($trapConfig);
+        
+		$this->getDatabaseOptions(); // Get options in database
+        
+		//*************** Setup API
+		if ($this->apiUse === true) $this->getAPI(); // Setup API
+        
+		//*************** Setup MIB
+		$this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        
+		//*************** Setup Rule
+		$this->ruleClass = new Rule($this); //< Create Rule class
+        
+		$this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
+			'source_ip'	=> 'unknown',
+			'source_port'	=> 'unknown',
+			'destination_ip'	=> 'unknown',
+			'destination_port'	=> 'unknown',
+			'trap_oid'	=> 'unknown'
+		);
+        
+		//*************** Setup Plugins
+		//Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
+		$this->pluginClass = new Plugins($this);
             
             
-    }
+	}
 
-    /** @return \Trapdirector\Logging   */
-    public function getLogging()
-    {
-        return $this->logging;
-    }
+	/** @return \Trapdirector\Logging   */
+	public function getLogging()
+	{
+		return $this->logging;
+	}
     
-    /** @return \Trapdirector\Database */
-    public function getTrapsDB()
-    {
-        return $this->trapsDB;
-    }
+	/** @return \Trapdirector\Database */
+	public function getTrapsDB()
+	{
+		return $this->trapsDB;
+	}
     
-    /** 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
-     **/
-    public function trapLog( $message, $level, $destination ='') // OBSOLETE
-    {
-        // TODO : replace ref with $this->logging->log
-        $this->logging->log($message, $level, $destination);
-    }
+	/** 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
+	 **/
+	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
-    {
-        $this->logging->setLogging($debugLvl, $outputType,$outputOption);
-    }
+	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	{
+		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+	}
     
-    /**
-     * Returns or create new IcingaAPI object
-     * @return \Icinga\Module\Trapdirector\Icinga2API
-     */
-    protected function getAPI()
-    {
-        if ($this->icinga2api == null)
-        {
-            $this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
-        }
-        return $this->icinga2api;
-    }
+	/**
+	 * Returns or create new IcingaAPI object
+	 * @return \Icinga\Module\Trapdirector\Icinga2API
+	 */
+	protected function getAPI()
+	{
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+		}
+		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
-     */
-    public function read_trap($stream='php://stdin')
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($stream, 'r');
-        
-        if ($input_stream === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-            $this->logging->log("Error reading stdin !",ERROR,'');
-            return null; // note : exception thrown by logging
-        }
-        
-        // line 1 : host
-        $this->receivingHost=chop(fgets($input_stream));
-        if ($this->receivingHost === false)
-        {
-            $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->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->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
-        {
-            $this->trapData['source_ip']=$matches[1];
-            $this->trapData['destination_ip']=$matches[3];
-            $this->trapData['source_port']=$matches[2];
-            $this->trapData['destination_port']=$matches[4];
-        }
-        
-        while (($vars=fgets($input_stream)) !==false)
-        {
-            $vars=chop($vars);
-            $ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-            if ($ret_code===0 || $ret_code===false)
-            {
-                $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'))
-                {
-                    $this->trapData['trap_oid']=$matches[2];
-                }
-                else
-                {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trapDataExt,$object);
-                }
-            }
-        }
-        
-        if ($this->trapData['trap_oid']=='unknown')
-        {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
-        }
-        
-        // Translate oids.
-        
-        $retArray=$this->translateOID($this->trapData['trap_oid']);
-        if ($retArray != null)
-        {
-            $this->trapData['trap_name']=$retArray['trap_name'];
-            $this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
-        }
-        foreach ($this->trapDataExt as $key => $val)
-        {
-            $retArray=$this->translateOID($val->oid);
-            if ($retArray != null)
-            {
-                $this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
-                $this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
-            }
-        }
-        
-        
-        $this->trapData['status']= 'waiting';
-        
-        return $this->trapData;
-    }
+	/**
+	 * read data from stream
+	 *	@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
+		$input_stream=fopen($stream, 'r');
+        
+		if ($input_stream === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->logging->log("Error reading stdin !",ERROR,'');
+			return null; // note : exception thrown by logging
+		}
+        
+		// line 1 : host
+		$this->receivingHost=chop(fgets($input_stream));
+		if ($this->receivingHost === false)
+		{
+			$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->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->logging->log('Error parsing IP : '.$IP,ERROR,'');
+		}
+		else
+		{
+			$this->trapData['source_ip']=$matches[1];
+			$this->trapData['destination_ip']=$matches[3];
+			$this->trapData['source_port']=$matches[2];
+			$this->trapData['destination_port']=$matches[4];
+		}
+        
+		while (($vars=fgets($input_stream)) !==false)
+		{
+			$vars=chop($vars);
+			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
+			if ($ret_code===0 || $ret_code===false)
+			{
+				$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'))
+				{
+					$this->trapData['trap_oid']=$matches[2];
+				}
+				else
+				{
+					$object= new stdClass;
+					$object->oid =$matches[1];
+					$object->value = $matches[2];
+					array_push($this->trapDataExt,$object);
+				}
+			}
+		}
+        
+		if ($this->trapData['trap_oid']=='unknown')
+		{
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
+			$this->logging->log('no trap oid found',ERROR,'');
+		}
+        
+		// Translate oids.
+        
+		$retArray=$this->translateOID($this->trapData['trap_oid']);
+		if ($retArray != null)
+		{
+			$this->trapData['trap_name']=$retArray['trap_name'];
+			$this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
+		}
+		foreach ($this->trapDataExt as $key => $val)
+		{
+			$retArray=$this->translateOID($val->oid);
+			if ($retArray != null)
+			{
+				$this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
+				$this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
+			}
+		}
+        
+        
+		$this->trapData['status']= 'waiting';
+        
+		return $this->trapData;
+	}
     
-    /**
-     * Translate oid into 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
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $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']);
-        }
-        
-        // Also check if it is an instance of OID
-        $oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
-        
-        $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $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']);
-        }
-        
-        // Try to get oid name from snmptranslate
-        $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) {
-            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]);
-        }
-    }
+	/**
+	 * Translate oid into 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
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$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']);
+		}
+        
+		// Also check if it is an instance of OID
+		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+        
+		$sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$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']);
+		}
+        
+		// Try to get oid name from snmptranslate
+		$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) {
+			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]);
+		}
+	}
     
-    /**
-     * Erase old trap records
-     *	@param integer $days : erase traps when more than $days old
-     *	@return integer : number of lines deleted
-     **/
-    public function eraseOldTraps($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,'');
-                return;
-            }
-        }
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $daysago = strtotime("-".$days." day");
-        $sql= 'delete from '.$this->dbPrefix.'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('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
-    }
+	/**
+	 * Erase old trap records
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
+	public function eraseOldTraps($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,'');
+				return;
+			}
+		}
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$daysago = strtotime("-".$days." day");
+		$sql= 'delete from '.$this->dbPrefix.'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('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+	}
     
-    /** Write error to received trap database
-     */
-    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'";
-        
-        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->dbPrefix.'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) {
+	/** Write error to received trap database
+	 */
+	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'";
+        
+		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->dbPrefix.'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) {
                     
-                    $this->logging->log('Erreur recuperation id',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',1,'');
-                }
-                $this->trapId=$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->trapId=$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->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-        }
-        
-        $this->logging->log('id found: '. $this->trapId,INFO );
-    }
+				$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->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
+        
+		$this->logging->log('id found: '. $this->trapId,INFO );
+	}
     
-    /** Write trap data to trap database
-     */
-    public function writeTrapToDB()
-    {
-        
-        // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
-        
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $insert_col='';
-        $insert_val='';
-        // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
-        
-        $firstcol=1;
-        foreach ($this->trapData as $col => $val)
-        {
-            if ($firstcol==0)
-            {
-                $insert_col .=',';
-                $insert_val .=',';
-            }
-            $insert_col .= $col ;
-            $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-            $firstcol=0;
-        }
-        
-        $sql= 'INSERT INTO '.$this->dbPrefix.'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,ERROR,'');
-                }
-                $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) {
+	/** Write trap data to trap database
+	 */
+	public function writeTrapToDB()
+	{
+        
+		// If action is ignore -> don't send t DB
+		if ($this->trapToDb === false) return;
+        
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$insert_col='';
+		$insert_val='';
+		// add date time
+		$this->trapData['date_received'] = date("Y-m-d H:i:s");
+        
+		$firstcol=1;
+		foreach ($this->trapData as $col => $val)
+		{
+			if ($firstcol==0)
+			{
+				$insert_col .=',';
+				$insert_val .=',';
+			}
+			$insert_col .= $col ;
+			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$firstcol=0;
+		}
+        
+		$sql= 'INSERT INTO '.$this->dbPrefix.'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,ERROR,'');
+				}
+				$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,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',ERROR,'');
-                }
-                $this->trapId=$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,ERROR,'');
-                }
-                $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,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',ERROR,'');
+				}
+				$this->trapId=$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,ERROR,'');
+				}
+				$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,'');
+				}
                 
-                $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->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
-        }
-        $this->logging->log('id found: '.$this->trapId,INFO );
-        
-        // Fill trap extended data table
-        foreach ($this->trapDataExt as $value) {
-            // TODO : detect if trap value is encoded and decode it to UTF-8 for database
-            $firstcol=1;
-            $value->trap_id = $this->trapId;
-            $insert_col='';
-            $insert_val='';
-            foreach ($value as $col => $val)
-            {
-                if ($firstcol==0)
-                {
-                    $insert_col .=',';
-                    $insert_val .=',';
-                }
-                $insert_col .= $col;
-                $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-                $firstcol=0;
-            }
+				$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->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+		}
+		$this->logging->log('id found: '.$this->trapId,INFO );
+        
+		// Fill trap extended data table
+		foreach ($this->trapDataExt as $value) {
+			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
+			$firstcol=1;
+			$value->trap_id = $this->trapId;
+			$insert_col='';
+			$insert_val='';
+			foreach ($value as $col => $val)
+			{
+				if ($firstcol==0)
+				{
+					$insert_col .=',';
+					$insert_val .=',';
+				}
+				$insert_col .= $col;
+				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$firstcol=0;
+			}
             
-            $sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+			$sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
             
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
-            }
-        }
-    }
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+			}
+		}
+	}
     
-    /** Get rules from rule database with ip and oid
-     *	@param $ip string ipv4 or ipv6
-     *	@param $oid string oid in numeric
-     *	@return mixed|boolean : PDO object or false
-     */
-    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->dbPrefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return false;
-        }
-        $rules_all=$ret_code->fetchAll();
-        //echo "rule all :\n";print_r($rules_all);echo "\n";
-        $rules_ret=array();
-        $rule_ret_key=0;
-        foreach ($rules_all as $key => $rule)
-        {
-            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).
-                $rule_ret_key++;
-                continue;
-            }
-            // TODO : get hosts IP by API
-            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
+	/** Get rules from rule database with ip and oid
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed|boolean : PDO object or false
+	 */
+	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->dbPrefix.'rules WHERE trap_oid=\''.$oid.'\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return false;
+		}
+		$rules_all=$ret_code->fetchAll();
+		//echo "rule all :\n";print_r($rules_all);echo "\n";
+		$rules_ret=array();
+		$rule_ret_key=0;
+		foreach ($rules_all as $key => $rule)
+		{
+			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).
+				$rule_ret_key++;
+				continue;
+			}
+			// TODO : get hosts IP by API
+			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
 						FROM icinga_objects as o
 						LEFT JOIN icinga_hostgroups as h ON o.object_id=h.hostgroup_object_id
 						LEFT JOIN icinga_hostgroup_members as m ON h.hostgroup_id=m.hostgroup_id
 						LEFT JOIN icinga_hosts as a ON a.host_object_id = m.host_object_id
 						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,'');
-                    continue;
-                }
-                $grouphosts=$ret_code2->fetchAll();
-                //echo "rule grp :\n";print_r($grouphosts);echo "\n";
-                foreach ( $grouphosts as $host)
-                {
-                    //echo $host['ip4']."\n";
-                    if ($host['ip4']==$ip || $host['ip6']==$ip)
-                    {
-                        //echo "Rule added \n";
-                        $rules_ret[$rule_ret_key]=$rules_all[$key];
-                        $rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
-                        $rule_ret_key++;
-                    }
-                }
-            }
-        }
-        //echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
-        return $rules_ret;
-    }
+				if (($ret_code2=$db_conn2->query($sql)) === false) {
+					$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)
+				{
+					//echo $host['ip4']."\n";
+					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					{
+						//echo "Rule added \n";
+						$rules_ret[$rule_ret_key]=$rules_all[$key];
+						$rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
+						$rule_ret_key++;
+					}
+				}
+			}
+		}
+		//echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
+		return $rules_ret;
+	}
     
-    /** Add rule match to rule
-     *	@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();
-        $sql="UPDATE ".$this->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
+	/** Add rule match to rule
+	 *	@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();
+		$sql="UPDATE ".$this->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
     
-    /** Send SERVICE_CHECK_RESULT with icinga2cmd or API
-     *
-     * @param string $host
-     * @param string $service
-     * @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->apiUse === false)
-        {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+	/** Send SERVICE_CHECK_RESULT with icinga2cmd or API
+	 *
+	 * @param string $host
+	 * @param string $service
+	 * @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->apiUse === 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
-        {
-            // Get perfdata if found
-            $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
-            {
-                $display=$matches[1];
-                $perfdata=$matches[2];
-            }
-            else
-            {
-                $perfdata='';
-            }
+				// 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
+		{
+			// Get perfdata if found
+			$matches=array();
+			if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+			{
+				$display=$matches[1];
+				$perfdata=$matches[2];
+			}
+			else
+			{
+				$perfdata='';
+			}
             
-            $api = $this->getAPI();
-            $api->setCredentials($this->apiUsername, $this->apiPassword);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
-            if ($retcode == false)
-            {
-                $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-                return false;
-            }
-            else
-            {
-                $this->logging->log( "Sent result : " .$retmessage,INFO );
-                return true;
-            }
-        }
-    }
+			$api = $this->getAPI();
+			$api->setCredentials($this->apiUsername, $this->apiPassword);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+			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->apiUsername, $this->apiPassword);
-        return $api->getHostByIP($ip);
-    }
+	public function getHostByIP($ip)
+	{
+		$api = $this->getAPI();
+		$api->setCredentials($this->apiUsername, $this->apiPassword);
+		return $api->getHostByIP($ip);
+	}
     
-    /** Resolve 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)
-        {
-            $oid=$matches[1];
-            $found=0;
-            // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+	/** Resolve 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)
+		{
+			$oid=$matches[1];
+			$found=0;
+			// Test and transform regexp
+			$oidR = $this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
-            {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
-                {
-                    $val->value=preg_replace('/"/','',$val->value);
-                    $rep=0;
-                    $display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-                    if ($rep==0)
-                    {
-                        $this->logging->log("Error in display",WARN,'');
-                        return $display;
-                    }
-                    $found=1;
-                    break;
-                }
-            }
-            if ($found==0)
-            {
-                $display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-                if ($rep==0)
-                {
-                    $this->logging->log("Error in display",WARN,'');
-                    return $display;
-                }
-            }
-        }
-        return $display;
-    }
+			foreach($this->trapDataExt as $val)
+			{
+				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				{
+					$val->value=preg_replace('/"/','',$val->value);
+					$rep=0;
+					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
+					if ($rep==0)
+					{
+						$this->logging->log("Error in display",WARN,'');
+						return $display;
+					}
+					$found=1;
+					break;
+				}
+			}
+			if ($found==0)
+			{
+				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
+				if ($rep==0)
+				{
+					$this->logging->log("Error in display",WARN,'');
+					return $display;
+				}
+			}
+		}
+		return $display;
+	}
     
-    /** Match rules for current trap and do action
-     */
-    public function applyRules()
-    {
-        $rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
-        
-        if ($rules===false || count($rules)==0)
-        {
-            $this->logging->log('No rules found for this trap',INFO );
-            $this->trapData['status']='unknown';
-            $this->trapToDb=true;
-            return;
-        }
-        //print_r($rules);
-        // Evaluate all rules in sequence
-        $this->trapAction=null;
-        foreach ($rules as $rule)
-        {
+	/** Match rules for current trap and do action
+	 */
+	public function applyRules()
+	{
+		$rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        
+		if ($rules===false || count($rules)==0)
+		{
+			$this->logging->log('No rules found for this trap',INFO );
+			$this->trapData['status']='unknown';
+			$this->trapToDb=true;
+			return;
+		}
+		//print_r($rules);
+		// Evaluate all rules in sequence
+		$this->trapAction=null;
+		foreach ($rules as $rule)
+		{
             
-            $host_name=$rule['host_name'];
-            $service_name=$rule['service_name'];
+			$host_name=$rule['host_name'];
+			$service_name=$rule['service_name'];
             
-            $display=$this->applyDisplay($rule['display']);
-            $this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
-            try
-            {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
-                //->eval_rule($rule['rule']);
+			$display=$this->applyDisplay($rule['display']);
+			$this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+			try
+			{
+				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+				//->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 );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
-                        {
-                            $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($action==-2)?false:true;
-                }
-                else
-                {
-                    //$this->logging->log('rules KOO : '.print_r($rule),INFO );
+				if ($evalr == true)
+				{
+					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
+					$action=$rule['action_match'];
+					$this->logging->log('action OK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						{
+							$this->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($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 );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-                        {
-                            $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($action==-2)?false:true;
-                }
-                // Put name in source_name
-                if (!isset($this->trapData['source_name']))
-                {
-                    $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
-                {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
-                    { // only add if not present
-                        $this->trapData['source_name'].=','.$rule['host_name'];
-                    }
-                }
-            }
-            catch (Exception $e)
-            {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-                $this->trapAction.=' ERR : '.$e->getMessage();
-                $this->trapData['status']='error';
-            }
+					$action=$rule['action_nomatch'];
+					$this->logging->log('action NOK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($action==-2)?false:true;
+				}
+				// Put name in source_name
+				if (!isset($this->trapData['source_name']))
+				{
+					$this->trapData['source_name']=$rule['host_name'];
+				}
+				else
+				{
+					if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+					{ // only add if not present
+						$this->trapData['source_name'].=','.$rule['host_name'];
+					}
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trapAction.=' ERR : '.$e->getMessage();
+				$this->trapData['status']='error';
+			}
             
-        }
-        if ($this->trapData['status']=='error')
-        {
-            $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
-        {
-            $this->trapData['status']='done';
-        }
-    }
+		}
+		if ($this->trapData['status']=='error')
+		{
+			$this->trapToDb=true; // Always put errors in DB for the use can see
+		}
+		else
+		{
+			$this->trapData['status']='done';
+		}
+	}
     
-    /** Add Time a action to rule
-     *	@param string $time : time to process to insert in SQL
-     */
-    public function add_rule_final($time)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trapAction==null)
-        {
-            $this->trapAction='No action';
-        }
-        $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
+	/** Add Time a action to rule
+	 *	@param string $time : time to process to insert in SQL
+	 */
+	public function add_rule_final($time)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		if ($this->trapAction==null)
+		{
+			$this->trapAction='No action';
+		}
+		$sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
     
-    /*********** UTILITIES *********************/
+	/*********** UTILITIES *********************/
     
-    /** 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
-     **/
-    public function reset_services()
-    {
-        // Get all services not in 'ok' state
-        $sql_query="SELECT s.service_object_id,
+	/** 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
+	 **/
+	public function reset_services()
+	{
+		// Get all services not in 'ok' state
+		$sql_query="SELECT s.service_object_id,
 	 UNIX_TIMESTAMP(s.last_check) AS last_check,
 	s.current_state as state,
 	v.name1 as host_name,
@@ -843,43 +843,43 @@ 
 	FROM icinga_servicestatus AS s
     LEFT JOIN icinga_objects as v ON s.service_object_id=v.object_id
     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,'');
-            return 0;
-        }
-        $services=$services_db->fetchAll();
-        
-        // Get all rules
-        $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."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,'');
-            return 0;
-        }
-        $rules=$rules_db->fetchAll();
-        
-        $now=date('U');
-        
-        $numreset=0;
-        foreach ($rules as $rule)
-        {
-            foreach ($services as $service)
-            {
-                if ($service['service_name'] == $rule['service_name'] &&
-                    $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');
-                    $numreset++;
-                }
-            }
-        }
-        echo "\n";
-        echo $numreset . " service(s) reset to OK\n";
-        return 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,'');
+			return 0;
+		}
+		$services=$services_db->fetchAll();
+        
+		// Get all rules
+		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."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,'');
+			return 0;
+		}
+		$rules=$rules_db->fetchAll();
+        
+		$now=date('U');
+        
+		$numreset=0;
+		foreach ($rules as $rule)
+		{
+			foreach ($services as $service)
+			{
+				if ($service['service_name'] == $rule['service_name'] &&
+					$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');
+					$numreset++;
+				}
+			}
+		}
+		echo "\n";
+		echo $numreset . " service(s) reset to OK\n";
+		return 0;
+        
+	}
     
     
 }
\ No newline at end of file

Spacing +170 added lines, -170 removed lines

@@ -52,13 +52,13 @@ 
     
     // Logs
     /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
+    public $logging; //< Logging class.
     /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
+    protected $logSetup; //< bool true if log was setup in constructor
     
     // Databases
     /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
+    public $trapsDB=null;
     
     // Trap received data
     protected $receivingHost;
@@ -74,15 +74,15 @@ 
     protected $trapToDb=true;
     
     /** @var Mib mib class */
-    public $mibClass = null;
+    public $mibClass=null;
     
     /** @var Rule rule class */
-    public $ruleClass = null;
+    public $ruleClass=null;
     
     /** @var Plugins plugins manager **/
-    public $pluginClass = null;
+    public $pluginClass=null;
     
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+    function __construct($etcDir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
     {
         // Paths of ini files
         $this->icingaweb2Etc=$etcDir;
@@ -90,10 +90,10 @@ 
         $this->icingaweb2Ressources=$this->icingaweb2Etc."/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
@@ -103,14 +103,14 @@ 
         $this->logging->log('Loggin started', INFO);
         
         //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
+        if (!is_file($this->trapModuleConfig))
         {
             throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
         }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
+        $trapConfig=parse_ini_file($this->trapModuleConfig, true);
         if ($trapConfig == false)
         {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig, ERROR, 'syslog');
             throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
         }
         $this->getMainOptions($trapConfig); // Get main options from ini file
@@ -124,10 +124,10 @@ 
         if ($this->apiUse === true) $this->getAPI(); // Setup API
         
         //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        $this->mibClass=new Mib($this->logging, $this->trapsDB, $this->snmptranslate, $this->snmptranslate_dirs); // Create Mib class
         
         //*************** Setup Rule
-        $this->ruleClass = new Rule($this); //< Create Rule class
+        $this->ruleClass=new Rule($this); //< Create Rule class
         
         $this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
             'source_ip'	=> 'unknown',
@@ -139,7 +139,7 @@ 
         
         //*************** Setup Plugins
         //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+        $this->pluginClass=new Plugins($this);
             
             
     }
@@ -162,15 +162,15 @@ 
      *	@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);
     }
     
     /**
@@ -181,7 +181,7 @@ 
     {
         if ($this->icinga2api == null)
         {
-            $this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+            $this->icinga2api=new Icinga2API($this->apiHostname, $this->apiPort);
         }
         return $this->icinga2api;
     }
@@ -200,7 +200,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
         }
         
@@ -209,21 +209,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
         {
@@ -233,34 +233,34 @@ 
             $this->trapData['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->trapData['trap_oid']=$matches[2];
                 }
                 else
                 {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trapDataExt,$object);
+                    $object=new stdClass;
+                    $object->oid=$matches[1];
+                    $object->value=$matches[2];
+                    array_push($this->trapDataExt, $object);
                 }
             }
         }
         
-        if ($this->trapData['trap_oid']=='unknown')
+        if ($this->trapData['trap_oid'] == 'unknown')
         {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
+            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trapData['source_ip']);
+            $this->logging->log('no trap oid found', ERROR, '');
         }
         
         // Translate oids.
@@ -282,7 +282,7 @@ 
         }
         
         
-        $this->trapData['status']= 'waiting';
+        $this->trapData['status']='waiting';
         
         return $this->trapData;
     }
@@ -298,40 +298,40 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT mib,name from '.$this->dbPrefix.'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->dbPrefix.'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]);
         }
     }
     
@@ -342,90 +342,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->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+        $daysago=strtotime("-".$days." day");
+        $sql='delete from '.$this->dbPrefix.'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->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'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->trapId=$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->trapId=$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->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
     }
     
     /** Write trap data to trap database
@@ -442,86 +442,86 @@ 
         $insert_col='';
         $insert_val='';
         // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
+        $this->trapData['date_received']=date("Y-m-d H:i:s");
         
         $firstcol=1;
         foreach ($this->trapData 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->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'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->trapId=$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->trapId=$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->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
         
         // Fill trap extended data table
         foreach ($this->trapDataExt as $value) {
             // TODO : detect if trap value is encoded and decode it to UTF-8 for database
             $firstcol=1;
-            $value->trap_id = $this->trapId;
+            $value->trap_id=$this->trapId;
             $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->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+            $sql='INSERT INTO '.$this->dbPrefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';
             
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+                $this->logging->log('Erreur insertion data : '.$sql, WARN, '');
             }
         }
     }
@@ -531,14 +531,14 @@ 
      *	@param $oid string oid in numeric
      *	@return mixed|boolean : 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->dbPrefix.'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();
@@ -547,7 +547,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).
@@ -555,7 +555,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
@@ -566,15 +566,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];
@@ -597,7 +597,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql="UPDATE ".$this->dbPrefix."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, '');
         }
     }
     
@@ -609,23 +609,23 @@ 
      * @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->apiUse === 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
         {
             // Get perfdata if found
             $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+            if (preg_match('/(.*)\|(.*)/', $display, $matches) == 1)
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
@@ -635,17 +635,17 @@ 
                 $perfdata='';
             }
             
-            $api = $this->getAPI();
+            $api=$this->getAPI();
             $api->setCredentials($this->apiUsername, $this->apiPassword);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+            list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display, $perfdata);
             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;
             }
         }
@@ -653,7 +653,7 @@ 
     
     public function getHostByIP($ip)
     {
-        $api = $this->getAPI();
+        $api=$this->getAPI();
         $api->setCredentials($this->apiUsername, $this->apiPassword);
         return $api->getHostByIP($ip);
     }
@@ -666,35 +666,35 @@ 
     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;
             // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+            $oidR=$this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
+            foreach ($this->trapDataExt as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    $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;
                 }
             }
@@ -706,11 +706,11 @@ 
      */
     public function applyRules()
     {
-        $rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        $rules=$this->getRules($this->trapData['source_ip'], $this->trapData['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->trapData['status']='unknown';
             $this->trapToDb=true;
             return;
@@ -725,59 +725,59 @@ 
             $service_name=$rule['service_name'];
             
             $display=$this->applyDisplay($rule['display']);
-            $this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+            $this->trapAction=($this->trapAction == null) ? '' : $this->trapAction.', ';
             try
             {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+                $this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt);
                 //->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->trapAction.='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->trapAction.='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->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($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->trapAction.='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->trapAction.='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->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($action == -2) ?false:true;
                 }
                 // Put name in source_name
                 if (!isset($this->trapData['source_name']))
@@ -786,7 +786,7 @@ 
                 }
                 else
                 {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+                    if (!preg_match('/'.$rule['host_name'].'/', $this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
@@ -794,13 +794,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->trapAction.=' ERR : '.$e->getMessage();
                 $this->trapData['status']='error';
             }
             
         }
-        if ($this->trapData['status']=='error')
+        if ($this->trapData['status'] == 'error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
         }
@@ -816,13 +816,13 @@ 
     public function add_rule_final($time)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trapAction==null)
+        if ($this->trapAction == null)
         {
             $this->trapAction='No action';
         }
         $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -845,7 +845,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, '');
             return 0;
         }
         $services=$services_db->fetchAll();
@@ -854,7 +854,7 @@ 
         $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."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, '');
             return 0;
         }
         $rules=$rules_db->fetchAll();
@@ -870,13 +870,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;
         
     }

Braces +28 added lines, -34 removed lines

@@ -95,8 +95,7 @@ 
         {
             $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
             $this->logSetup=true;
-        }
-        else
+        } else
         {
             $this->logSetup=false;
         }
@@ -121,7 +120,10 @@ 
         $this->getDatabaseOptions(); // Get options in database
         
         //*************** Setup API
-        if ($this->apiUse === true) $this->getAPI(); // Setup API
+        if ($this->apiUse === true) {
+        	$this->getAPI();
+        }
+        // Setup API
         
         //*************** Setup MIB
         $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
@@ -224,8 +226,7 @@ 
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
             $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
+        } else
         {
             $this->trapData['source_ip']=$matches[1];
             $this->trapData['destination_ip']=$matches[3];
@@ -240,14 +241,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->trapData['trap_oid']=$matches[2];
-                }
-                else
+                } else
                 {
                     $object= new stdClass;
                     $object->oid =$matches[1];
@@ -418,7 +417,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->trapId=$inserted_id;
                 break;
             default:
@@ -434,7 +435,9 @@ 
     {
         
         // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
+        if ($this->trapToDb === false) {
+        	return;
+        }
         
         
         $db_conn=$this->trapsDB->db_connect_trap();
@@ -491,7 +494,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->trapId=$inserted_id;
                 break;
             default:
@@ -620,8 +625,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
         {
             // Get perfdata if found
             $matches=array();
@@ -629,8 +633,7 @@ 
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
-            }
-            else
+            } else
             {
                 $perfdata='';
             }
@@ -642,8 +645,7 @@ 
             {
                 $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
                 return false;
-            }
-            else
+            } else
             {
                 $this->logging->log( "Sent result : " .$retmessage,INFO );
                 return true;
@@ -742,20 +744,17 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
                     $this->trapToDb=($action==-2)?false:true;
-                }
-                else
+                } else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
@@ -766,14 +765,12 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
@@ -783,16 +780,14 @@ 
                 if (!isset($this->trapData['source_name']))
                 {
                     $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
+                } else
                 {
                     if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
                 $this->trapAction.=' ERR : '.$e->getMessage();
@@ -803,8 +798,7 @@ 
         if ($this->trapData['status']=='error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
+        } else
         {
             $this->trapData['status']='done';
         }

bin/trap_in.php

Indentation +14 added lines, -14 removed lines

@@ -17,13 +17,13 @@ 
 try
 {
        
-    $trap = new Trap($icingaweb2Etc);
-    //$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
-    //$Trap = new Trap($icingaweb2Etc,4,'syslog'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	$trap = new Trap($icingaweb2Etc);
+	//$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
+	//$Trap = new Trap($icingaweb2Etc,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');
 
@@ -36,15 +36,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->logging->log("Exception : ". $e->getMessage(),2,0);
-    }
+	}
 }
 
 //end

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 use Trapdirector\Trap;
 
 // start
-$time1 = microtime(true);
+$time1=microtime(true);
 
 require_once ('trap_class.php');
 
@@ -17,7 +17,7 @@ 
 try
 {
        
-    $trap = new Trap($icingaweb2Etc);
+    $trap=new Trap($icingaweb2Etc);
     //$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
     //$Trap = new Trap($icingaweb2Etc,4,'syslog'); // For debug
     //$Trap->setLogging(4,'syslog'); 
@@ -38,12 +38,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->logging->log("Exception : ". $e->getMessage(),2,0);
+	   $trap->logging->log("Exception : ".$e->getMessage(), 2, 0);
     }
 }
 

Braces +2 added lines, -4 removed lines

@@ -33,15 +33,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->logging->log("Exception : ". $e->getMessage(),2,0);
     }

application/clicommands/MibCommand.php

Indentation +76 added lines, -76 removed lines

@@ -22,77 +22,77 @@ 
 class MibCommand extends Command
 {
 	/**
-	*	Update mib database
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib update
-	*	
-	*	OPTIONS
-	*	
-	*	--pid <file> : run in background with pid in <file>
-	*
-	*	--verb    : Set output log to verbose
-	*
-	*   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
-	*/
+	 *	Update mib database
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib update
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--pid <file> : run in background with pid in <file>
+	 *
+	 *	--verb    : Set output log to verbose
+	 *
+	 *   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
+	 */
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
-	    $pid=1;
-	    if ($background != null)
-	    {
-	        $file=@fopen($background,'w');
-	        if ($file == false)
-	        {
-	            echo 'Error : cannot open pid file '.$background;
-	            return 1;
-	        }
-	        $pid = pcntl_fork();
-	        if ($pid == -1) {
-	            echo 'Error : Cannot fork process';
-	            return 1;
-	        }
-	    }
-	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
+		$background = $this->params->get('pid', null);
+		$logLevel= $this->params->has('verb') ? 4 : 2;
+		if ($this->params->has('force-check')) { echo "Not implemented"; return;}
+		$forceCheck=$this->params->has('force-check')?True:False;
+		$pid=1;
+		if ($background != null)
+		{
+			$file=@fopen($background,'w');
+			if ($file == false)
+			{
+				echo 'Error : cannot open pid file '.$background;
+				return 1;
+			}
+			$pid = pcntl_fork();
+			if ($pid == -1) {
+				echo 'Error : Cannot fork process';
+				return 1;
+			}
+		}
+		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
 		require_once($module->getBaseDir() .'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$trap = new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+			$trap->setLogging($logLevel,'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
-		    if ($pid != 0)
-		    {
-		        // father process
-		        fwrite($file,$pid);
-		        fclose($file);
-		        echo "OK : process $pid in bckground";
-		        return 0;
-		    }
-		    else
-		    {  // son process : close all file descriptors and go to a new session
-		        fclose($file);		        
+			if ($pid != 0)
+			{
+				// father process
+				fwrite($file,$pid);
+				fclose($file);
+				echo "OK : process $pid in bckground";
+				return 0;
+			}
+			else
+			{  // son process : close all file descriptors and go to a new session
+				fclose($file);		        
 // 		        $sid = posix_setsid();
-                fclose(STDIN);
-                fclose(STDOUT);
-                fclose(STDERR);
-                try
-                {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
-                {
-                    $trap->logging->log('Error in updating : ' . $e->getMessage(),2);
-                }
-                unlink($background);
-                return 0;
-		    }
+				fclose(STDIN);
+				fclose(STDOUT);
+				fclose(STDERR);
+				try
+				{
+					$trap->mibClass->update_mib_database(false,$forceCheck);
+				}
+				catch (Exception $e)
+				{
+					$trap->logging->log('Error in updating : ' . $e->getMessage(),2);
+				}
+				unlink($background);
+				return 0;
+			}
 		    
 		}
 		
@@ -110,28 +110,28 @@ 
 		}
 		if ($pid != 1)
 		{
-		    unlink($background);
+			unlink($background);
 		}
 	}
 	/**
-	*	purge all mib database NOT IMPLEMENTED
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib purge --confirm
-	*	
-	*	OPTIONS
-	*	
-	*	--confirm : needed to execute purge
-	*/
+	 *	purge all mib database NOT IMPLEMENTED
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib purge --confirm
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--confirm : needed to execute purge
+	 */
 	public function purgeAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');
 		
 		if (!$this->params->has('confirm'))
 		{
-		    echo "This needs confirmation with '--confirm'\n";
-		    return;
+			echo "This needs confirmation with '--confirm'\n";
+			return;
 		}
 		
 		$Config = new TrapModuleConfig($db_prefix);
@@ -144,9 +144,9 @@ 
 			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
 			$query = $db->delete(
-			    $Config->getMIBCacheTableName(),
-			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+				$Config->getMIBCacheTableName(),
+				'id>0');
+			echo 'Deleted '. $query . " traps and objects\n";
 		}
 		catch (Exception $e)
 		{

Spacing +19 added lines, -19 removed lines

@@ -38,39 +38,39 @@ 
 	*/
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
+	    $background=$this->params->get('pid', null);
+	    $logLevel=$this->params->has('verb') ? 4 : 2;
+	    if ($this->params->has('force-check')) { echo "Not implemented"; return; }
+	    $forceCheck=$this->params->has('force-check') ?True:False;
 	    $pid=1;
 	    if ($background != null)
 	    {
-	        $file=@fopen($background,'w');
+	        $file=@fopen($background, 'w');
 	        if ($file == false)
 	        {
 	            echo 'Error : cannot open pid file '.$background;
 	            return 1;
 	        }
-	        $pid = pcntl_fork();
+	        $pid=pcntl_fork();
 	        if ($pid == -1) {
 	            echo 'Error : Cannot fork process';
 	            return 1;
 	        }
 	    }
 	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-		$trap = new Trap($icingaweb2_etc);
+		$trap=new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+		    $trap->setLogging($logLevel, 'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
 		        // father process
-		        fwrite($file,$pid);
+		        fwrite($file, $pid);
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
@@ -84,11 +84,11 @@ 
                 fclose(STDERR);
                 try
                 {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
+                    $trap->mibClass->update_mib_database(false, $forceCheck);
                 }
                 catch (Exception $e)
                 {
-                    $trap->logging->log('Error in updating : ' . $e->getMessage(),2);
+                    $trap->logging->log('Error in updating : '.$e->getMessage(), 2);
                 }
                 unlink($background);
                 return 0;
@@ -100,13 +100,13 @@ 
 		{
 			echo "Update main mib database : \n";
 			echo "# (trap found) C (trap already processed) . (every 2 seconds) : \n";
-			$trap->mibClass->update_mib_database(true,$forceCheck);
+			$trap->mibClass->update_mib_database(true, $forceCheck);
 			echo "Done\n";
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}
 		if ($pid != 1)
 		{
@@ -134,23 +134,23 @@ 
 		    return;
 		}
 		
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$db=IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
-			$query = $db->delete(
+			$query=$db->delete(
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+            echo 'Deleted '.$query." traps and objects\n";
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in DB : ' . $e->getMessage();
+			echo 'Error in DB : '.$e->getMessage();
 		}	   
 	}  	 	
 

Braces +5 added lines, -10 removed lines

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

application/controllers/SettingsController.php

Braces +17 added lines, -17 removed lines

@@ -52,8 +52,7 @@ 
               $this->Config()->saveIni();
               $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
               //$emptyConfig=1;
-          }
-          catch (Exception $e)
+          } catch (Exception $e)
           {
               $this->view->configErrorDetected=$e->getMessage();
           }
@@ -141,8 +140,7 @@ 
               $this->view->apimessage='API config : ' . $e->getMessage();
               $this->view->apimessageError=true;
           }
-      }
-      else
+      } else
       {
           $this->view->apimessage='API parameters not configured';
           $this->view->apimessageError=true;
@@ -208,7 +206,9 @@ 
           $input="154865134987aaaa";
           exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (! isset($output[0])) {
+          	$output[0]="NO OUT";
+          }
           
           if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
           {
@@ -310,8 +310,7 @@ 
 	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
 	    printf('Schema already exists');
 	    
-	} 
-	catch (DBException $e) 
+	} catch (DBException $e) 
 	{
 
 		printf('Creating schema : <br>');
@@ -367,8 +366,7 @@ 
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
           echo 'Schema already exists and is up to date<br>';
           return;
-      }
-      catch (DBException $e)
+      } catch (DBException $e)
       {
           $dberror=$e->getArray(); 
       }
@@ -452,16 +450,18 @@ 
           }
           // Assume there is only one line... TODO : see if there is a better way to do this
           $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-          if (!preg_match('/-n/',$line))
-              return array(1,'snmptrapd has no -n option : '.$line);
-          if (!preg_match('/-O[^ ]*n/',$line))
-              return array(1,'snmptrapd has no -On option : '.$line);
-          if (!preg_match('/-O[^ ]*e/',$line))
-              return array(1,'snmptrapd has no -Oe option : '.$line);
+          if (!preg_match('/-n/',$line)) {
+                        return array(1,'snmptrapd has no -n option : '.$line);
+          }
+          if (!preg_match('/-O[^ ]*n/',$line)) {
+                        return array(1,'snmptrapd has no -On option : '.$line);
+          }
+          if (!preg_match('/-O[^ ]*e/',$line)) {
+                        return array(1,'snmptrapd has no -Oe option : '.$line);
+          }
 
           return array(0,'snmptrapd listening to UDP/162, options : '.$line);
-      }
-      else
+      } else
       {
           return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
       }

Indentation +225 added lines, -225 removed lines

@@ -25,16 +25,16 @@ 
    */
   private function get_param()
   {
-      $dberrorMsg=$this->params->get('dberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
-      $dberrorMsg=$this->params->get('idodberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
+	  $dberrorMsg=$this->params->get('dberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
+	  $dberrorMsg=$this->params->get('idodberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
   }
   
   /**
@@ -43,22 +43,22 @@ 
    */
   private function check_empty_config()
   {
-      $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
-      if ($this->Config()->isEmpty() == true)
-      {
-          $this->Config()->setSection('config'); // Set base config section.
-          try
-          {
-              $this->Config()->saveIni();
-              $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
-              //$emptyConfig=1;
-          }
-          catch (Exception $e)
-          {
-              $this->view->configErrorDetected=$e->getMessage();
-          }
+	  $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	  if ($this->Config()->isEmpty() == true)
+	  {
+		  $this->Config()->setSection('config'); // Set base config section.
+		  try
+		  {
+			  $this->Config()->saveIni();
+			  $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
+			  //$emptyConfig=1;
+		  }
+		  catch (Exception $e)
+		  {
+			  $this->view->configErrorDetected=$e->getMessage();
+		  }
           
-      }
+	  }
   }
   
   /**
@@ -71,56 +71,56 @@ 
    */
   private function check_db()
   {
-      $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
-              Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
-              Url::fromPath('trapdirector/settings/updateschema')),
-      );
+	  $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
+		  0	=>	array('Database configuration OK','',''),
+		  1	=>	array('Database set in config.ini','No database in config.ini',''),
+		  2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+			  Url::fromPath('config/resource')),
+		  3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  4	=>	array('Schema is set','Schema is not set for ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  5	=>	array('Schema is up to date','Schema is outdated :',
+			  Url::fromPath('trapdirector/settings/updateschema')),
+	  );
       
-      try {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->db_error=$dberror[0];
-      switch ($dberror[0])
-      {
-          case 2:
-          case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
-              break;
-          case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
-              break;
-          case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
-              break;
-          case 0:
-          case 1:
-              break;
-          default:
-              new ProgrammingError('Out of bond result from database test');
-      }
-      $this->view->message=$db_message;
+	  $this->view->db_error=$dberror[0];
+	  switch ($dberror[0])
+	  {
+		  case 2:
+		  case 4:
+			  $db_message[$dberror[0]][1] .= $dberror[1];
+			  break;
+		  case 3:
+			  $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+			  break;
+		  case 5:
+			  $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+			  break;
+		  case 0:
+		  case 1:
+			  break;
+		  default:
+			  new ProgrammingError('Out of bond result from database test');
+	  }
+	  $this->view->message=$db_message;
       
-      try {
-          $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+	  $this->view->ido_db_error=$dberror[0];
+	  $this->view->ido_message='IDO Database : ' . $dberror[1];
   }
   
   /**
@@ -130,23 +130,23 @@ 
    */
   private function check_api()
   {
-      if ($this->Config()->get('config', 'icingaAPI_host') != '')
-      {
-          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
-          $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
-          try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
-              //$this->view->apimessageError=false;
-          } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
-              $this->view->apimessageError=true;
-          }
-      }
-      else
-      {
-          $this->view->apimessage='API parameters not configured';
-          $this->view->apimessageError=true;
-      }
+	  if ($this->Config()->get('config', 'icingaAPI_host') != '')
+	  {
+		  $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+		  $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
+		  try {
+			  list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+			  //$this->view->apimessageError=false;
+		  } catch (RuntimeException $e) {
+			  $this->view->apimessage='API config : ' . $e->getMessage();
+			  $this->view->apimessageError=true;
+		  }
+	  }
+	  else
+	  {
+		  $this->view->apimessage='API parameters not configured';
+		  $this->view->apimessageError=true;
+	  }
   }
 
   /**
@@ -157,21 +157,21 @@ 
    */
   private function check_icingaweb_path()
   {
-      $this->view->icingaEtcWarn=0;
-      $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-      if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
-      {
-          $output=array();
+	  $this->view->icingaEtcWarn=0;
+	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+	  if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
+	  {
+		  $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+		  exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
-          {
-              $this->view->icingaEtcWarn=1;
-              $this->view->icingaweb2_etc=$icingaweb2_etc;
-          }
-      }
+		  if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		  {
+			  $this->view->icingaEtcWarn=1;
+			  $this->view->icingaweb2_etc=$icingaweb2_etc;
+		  }
+	  }
       
   }
   
@@ -182,15 +182,15 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
-      foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
-      {
-          if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
-          {
-              $resources[$name] = $name;
-          }
-      }
-      return $resources;
+	  $resources = array();
+	  foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
+	  {
+		  if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
+		  {
+			  $resources[$name] = $name;
+		  }
+	  }
+	  return $resources;
   }
   
   /**
@@ -199,23 +199,23 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+	  $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
-      {
-          $output=array();
-          $retCode=255;
-          $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+	  foreach ($phpBinary as $phpBin )
+	  {
+		  $output=array();
+		  $retCode=255;
+		  $input="154865134987aaaa";
+		  exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+		  if (! isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
-          {
-              return $phpBin;
-          }          
-      }
-      return NULL;
+		  if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+		  {
+			  return $phpBin;
+		  }          
+	  }
+	  return NULL;
   }
   
   /**
@@ -234,7 +234,7 @@ 
   public function indexAction()
   {
       
-    // CHeck permissions : display tests in any case, but no configuration.
+	// CHeck permissions : display tests in any case, but no configuration.
 	$this->view->configPermission=$this->checkModuleConfigPermission(1);
 	// But check read permission
 	$this->checkReadPermission();
@@ -242,16 +242,16 @@ 
 	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
-    $this->get_param();
+	$this->get_param();
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	$this->check_empty_config();
 
 	// Test Database
-    $this->check_db();
+	$this->check_db();
 	
 	//********* Test API
-    $this->check_api();
+	$this->check_api();
 	
 	//*********** Test snmptrapd alive and options
 	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
@@ -265,7 +265,7 @@ 
 	$phpBinary = $this->get_php_binary();
 	if ($phpBinary == null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+		$phpBinary = ' PHP BINARY NOT FOUND ';
 	    
 	}
 	
@@ -273,11 +273,11 @@ 
 	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . $phpBinary
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -307,8 +307,8 @@ 
 	
 	try 
 	{
-	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-	    printf('Schema already exists');
+		$this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		printf('Schema already exists');
 	    
 	} 
 	catch (DBException $e) 
@@ -319,19 +319,19 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
-        $dbType=$dbResource->get('db');
-        switch ($dbType) {
-          case 'mysql':
-              $dbFileExt='sql';
-              break;
-          case 'pgsql':
-              $dbFileExt='pgsql';
-              break;
-          default:
-              printf("Database configuration error : Unsuported DB");
-              return;
-        } 
+		$dbResource = ResourceFactory::getResourceConfig($dbName);
+		$dbType=$dbResource->get('db');
+		switch ($dbType) {
+		  case 'mysql':
+			  $dbFileExt='sql';
+			  break;
+		  case 'pgsql':
+			  $dbFileExt='pgsql';
+			  break;
+		  default:
+			  printf("Database configuration error : Unsuported DB");
+			  return;
+		} 
 
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -355,32 +355,32 @@ 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
-    		'active'	=> true,
-    		'label'		=> $this->translate('Update Schema'),
-    		'url'		=> Url::fromRequest()
-    	));
+	  $this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Update Schema'),
+			'url'		=> Url::fromRequest()
+		));
 	  // check if needed
 	  $dberror=array();
-      try
-      {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          echo 'Schema already exists and is up to date<br>';
-          return;
-      }
-      catch (DBException $e)
-      {
-          $dberror=$e->getArray(); 
-      }
+	  try
+	  {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
+	  }
+	  catch (DBException $e)
+	  {
+		  $dberror=$e->getArray(); 
+	  }
 	  
 	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
-	      echo 'Database does not exists or is not setup correctly<br>';
-	      return;
+		  echo 'Database does not exists or is not setup correctly<br>';
+		  return;
 	  }
-      // setup
+	  // setup
 	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
@@ -393,20 +393,20 @@ 
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
-	      // Check for messages and display if any
-              echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
-	      if ($message != '')
-	      {
-	          echo 'Note :<br><pre>';
-	          echo $message;
-	          echo '</pre>';
-	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
-	          echo '<br>';
-	          return;
-	      }
+		  // Check for messages and display if any
+			  echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
+		  $Trap->setLogging(2,'syslog');
+		  $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+		  if ($message != '')
+		  {
+			  echo 'Note :<br><pre>';
+			  echo $message;
+			  echo '</pre>';
+			  echo '<br>';
+			  echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+			  echo '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -420,50 +420,50 @@ 
 
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
-      {
-          // RHEL based systems
-          $sspath = '/usr/sbin/ss';
-      }
-      if(!is_executable("$sspath"))
-      {
-          return array(1,"Can not execute $sspath");
-      }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?');
-      }
-      $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
-      {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
-      }
-      if($selinux_state !== 'Enforcing')
-      {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
-          if (count($psOutput) == 0)
-          {
-              return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
-          }
-          // Assume there is only one line... TODO : see if there is a better way to do this
-          $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-          if (!preg_match('/-n/',$line))
-              return array(1,'snmptrapd has no -n option : '.$line);
-          if (!preg_match('/-O[^ ]*n/',$line))
-              return array(1,'snmptrapd has no -On option : '.$line);
-          if (!preg_match('/-O[^ ]*e/',$line))
-              return array(1,'snmptrapd has no -Oe option : '.$line);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  $sspath = exec('which ss 2>/dev/null');
+	  if(empty($sspath))
+	  {
+		  // RHEL based systems
+		  $sspath = '/usr/sbin/ss';
+	  }
+	  if(!is_executable("$sspath"))
+	  {
+		  return array(1,"Can not execute $sspath");
+	  }
+	  exec("$sspath -lun | grep ':162 '",$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,'Port UDP/162 is not open : is snmptrapd running?');
+	  }
+	  $psOutput=array();
+	  $selinux_state = '';
+	  if(is_executable('/usr/sbin/getenforce'))
+	  {
+		  $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+	  }
+	  if($selinux_state !== 'Enforcing')
+	  {
+		  exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+		  if (count($psOutput) == 0)
+		  {
+			  return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+		  }
+		  // Assume there is only one line... TODO : see if there is a better way to do this
+		  $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
+		  if (!preg_match('/-n/',$line))
+			  return array(1,'snmptrapd has no -n option : '.$line);
+		  if (!preg_match('/-O[^ ]*n/',$line))
+			  return array(1,'snmptrapd has no -On option : '.$line);
+		  if (!preg_match('/-O[^ ]*e/',$line))
+			  return array(1,'snmptrapd has no -Oe option : '.$line);
 
-          return array(0,'snmptrapd listening to UDP/162, options : '.$line);
-      }
-      else
-      {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
-      }
+		  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  }
+	  else
+	  {
+		  return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+	  }
   }
 }

Spacing +82 added lines, -82 removed lines

@@ -72,23 +72,23 @@ 
   private function check_db()
   {
       $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+          0	=>	array('Database configuration OK', '', ''),
+          1	=>	array('Database set in config.ini', 'No database in config.ini', ''),
+          2	=>	array('Database exists in Icingaweb2 config', 'Database does not exist in Icingaweb2 : ',
               Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+          3	=>	array('Database credentials OK', 'Database does not exist/invalid credentials/no schema : ',
               Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
+          4	=>	array('Schema is set', 'Schema is not set for ',
               Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
+          5	=>	array('Schema is up to date', 'Schema is outdated :',
               Url::fromPath('trapdirector/settings/updateschema')),
       );
       
       try {
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->db_error=$dberror[0];
@@ -96,13 +96,13 @@ 
       {
           case 2:
           case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
+              $db_message[$dberror[0]][1].=$dberror[1];
               break;
           case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+              $db_message[$dberror[0]][1].=$dberror[1].', Message : '.$dberror[2];
               break;
           case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+              $db_message[$dberror[0]][1].=' version '.$dberror[1].', version needed : '.$dberror[2];
               break;
           case 0:
           case 1:
@@ -114,13 +114,13 @@ 
       
       try {
           $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+      $this->view->ido_message='IDO Database : '.$dberror[1];
   }
   
   /**
@@ -132,13 +132,13 @@ 
   {
       if ($this->Config()->get('config', 'icingaAPI_host') != '')
       {
-          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'), $this->Config()->get('config', 'icingaAPI_port'));
           $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
           try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+              list($this->view->apimessageError, $this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
               //$this->view->apimessageError=false;
           } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
+              $this->view->apimessage='API config : '.$e->getMessage();
               $this->view->apimessageError=true;
           }
       }
@@ -163,10 +163,10 @@ 
       {
           $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+          exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2Etc=" ', $output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+          if (!isset($output[0]) || !preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
           {
               $this->view->icingaEtcWarn=1;
               $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -182,12 +182,12 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
+      $resources=array();
       foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
       {
           if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
           {
-              $resources[$name] = $name;
+              $resources[$name]=$name;
           }
       }
       return $resources;
@@ -199,18 +199,18 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+      $phpBinary=array(PHP_BINARY, PHP_BINDIR."/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
+      foreach ($phpBinary as $phpBin)
       {
           $output=array();
           $retCode=255;
           $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+          exec("$phpBin -r \"echo '$input';\"", $output, $retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (!isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+          if ($retCode == 0 && preg_match("/$input/", $output[0]) == 1)
           {
               return $phpBin;
           }          
@@ -239,7 +239,7 @@ 
 	// But check read permission
 	$this->checkReadPermission();
 	
-	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+	$this->view->tabs=$this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
     $this->get_param();
@@ -254,39 +254,39 @@ 
     $this->check_api();
 	
 	//*********** Test snmptrapd alive and options
-	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
+	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage)=$this->checkSnmpTrapd();
 
 	// List DB in $ressources
-	$resources = $this->get_db_list(array('mysql', 'pgsql')); 
+	$resources=$this->get_db_list(array('mysql', 'pgsql')); 
 
 	// Check standard Icingaweb2 path
 	$this->check_icingaweb_path();
 
-	$phpBinary = $this->get_php_binary();
+	$phpBinary=$this->get_php_binary();
 	if ($phpBinary == null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+	    $phpBinary=' PHP BINARY NOT FOUND ';
 	    
 	}
 	
 	// Setup path for mini documentation
-	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=$phpBinary.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.$phpBinary
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -298,7 +298,7 @@ 
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -319,7 +319,7 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
+        $dbResource=ResourceFactory::getResourceConfig($dbName);
         $dbType=$dbResource->get('db');
         switch ($dbType) {
           case 'mysql':
@@ -334,28 +334,28 @@ 
         } 
 
 		printf('<pre>');
-		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;
-		$Trap = new Trap($icingaweb2_etc);
-		$Trap->setLogging($debug_level,'display');
+		$Trap=new Trap($icingaweb2_etc);
+		$Trap->setLogging($debug_level, 'display');
 		
 		$prefix=$this->Config()->get('config', 'database_prefix');
 		// schema file : <path>/SQL/schema_v<verion>.<dbtype>
-		$schema=$this->Module()->getBaseDir() . 
-		'/SQL/schema_v'. $this->getModuleConfig()->getDbCurVersion() . '.' . $dbFileExt;
+		$schema=$this->Module()->getBaseDir(). 
+		'/SQL/schema_v'.$this->getModuleConfig()->getDbCurVersion().'.'.$dbFileExt;
 		
-		$Trap->trapsDB->create_schema($schema,$prefix);
+		$Trap->trapsDB->create_schema($schema, $prefix);
 		echo '</pre>';
 	}
-	echo '<br><br>Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a>';
+	echo '<br><br>Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a>';
   }
 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
+      $this->getTabs()->add('get', array(
     		'active'	=> true,
     		'label'		=> $this->translate('Update Schema'),
     		'url'		=> Url::fromRequest()
@@ -373,7 +373,7 @@ 
           $dberror=$e->getArray(); 
       }
 	  
-	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
+	  echo 'Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
@@ -381,40 +381,40 @@ 
 	      return;
 	  }
       // setup
-	  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;
-	  $Trap = new Trap($icingaweb2_etc);
+	  $Trap=new Trap($icingaweb2_etc);
 	  
 	  
 	  $prefix=$this->Config()->get('config', 'database_prefix');
-	  $updateSchema=$this->Module()->getBaseDir() . '/SQL/';
+	  $updateSchema=$this->Module()->getBaseDir().'/SQL/';
 	  
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
 	      // Check for messages and display if any
               echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix, true);
 	      if ($message != '')
 	      {
 	          echo 'Note :<br><pre>';
 	          echo $message;
 	          echo '</pre>';
 	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="'.Url::fromPath('trapdirector/settings/updateschema').'?msgok=1">Click here to update</a>';
 	          echo '<br>';
 	          return;
 	      }
 	  }
 	  
-	  $Trap->setLogging($debug_level,'display');
+	  $Trap->setLogging($debug_level, 'display');
 	  
-	  echo 'Updating schema to '. $target_version . ': <br>';
+	  echo 'Updating schema to '.$target_version.': <br>';
 	  echo '<pre>';
 	  	  
-	  $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -422,48 +422,48 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
+      $sspath=exec('which ss 2>/dev/null');
+      if (empty($sspath))
       {
           // RHEL based systems
-          $sspath = '/usr/sbin/ss';
+          $sspath='/usr/sbin/ss';
       }
-      if(!is_executable("$sspath"))
+      if (!is_executable("$sspath"))
       {
-          return array(1,"Can not execute $sspath");
+          return array(1, "Can not execute $sspath");
       }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
+      exec("$sspath -lun | grep ':162 '", $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?');
+          return array(1, 'Port UDP/162 is not open : is snmptrapd running?');
       }
       $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
+      $selinux_state='';
+      if (is_executable('/usr/sbin/getenforce'))
       {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+          $selinux_state=exec('/usr/sbin/getenforce 2>/dev/null');
       }
-      if($selinux_state !== 'Enforcing')
+      if ($selinux_state !== 'Enforcing')
       {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+          exec('ps --no-headers -o command -C snmptrapd', $psOutput);
           if (count($psOutput) == 0)
           {
-              return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+              return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
           }
           // Assume there is only one line... TODO : see if there is a better way to do this
-          $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-          if (!preg_match('/-n/',$line))
-              return array(1,'snmptrapd has no -n option : '.$line);
-          if (!preg_match('/-O[^ ]*n/',$line))
-              return array(1,'snmptrapd has no -On option : '.$line);
-          if (!preg_match('/-O[^ ]*e/',$line))
-              return array(1,'snmptrapd has no -Oe option : '.$line);
+          $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+          if (!preg_match('/-n/', $line))
+              return array(1, 'snmptrapd has no -n option : '.$line);
+          if (!preg_match('/-O[^ ]*n/', $line))
+              return array(1, 'snmptrapd has no -On option : '.$line);
+          if (!preg_match('/-O[^ ]*e/', $line))
+              return array(1, 'snmptrapd has no -Oe option : '.$line);
 
-          return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+          return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
       }
       else
       {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+          return array(0, 'A daemon (hidden by SELinux) is listening on UDP/162');
       }
   }
 }