patrickpr / trapdirector

library/Trapdirector/Plugins/NetworkRule.php

Indentation +83 added lines, -83 removed lines

@@ -21,104 +21,104 @@
  */
 class NetworkRule extends PluginTemplate
 {        
-    /** @var string $description Description of plugin */
-    public $description='Network functions to use into rules
+	/** @var string $description Description of plugin */
+	public $description='Network functions to use into rules
 test test test';
     
-    /** @var array[] $functions Functions of this plugin for rule eval. 
-     * If no functions are declared, set to empty array
-     * $functions[<name>]['function'] : Name of the function to be called in this class
-     * $functions[<name>]['params'] : Description of input parameters of function.
-     * $functions[<name>]['description'] : Description. Can be multiline.
-    */
-    public $functions=array(
-        'inNetwork' => array( // The name of the function in rules
-            'function'      =>  'isInNetwork', // Name of the function 
-            'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
-            'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
+	/** @var array[] $functions Functions of this plugin for rule eval. 
+	 * If no functions are declared, set to empty array
+	 * $functions[<name>]['function'] : Name of the function to be called in this class
+	 * $functions[<name>]['params'] : Description of input parameters of function.
+	 * $functions[<name>]['description'] : Description. Can be multiline.
+	 */
+	public $functions=array(
+		'inNetwork' => array( // The name of the function in rules
+			'function'      =>  'isInNetwork', // Name of the function 
+			'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
+			'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
 Does not work with IPV6' // Description (can be multiline).
-        ),
-        'test' => array( // The name of the function in rules
-            'function'      =>  'testParam', // Name of the function
-            'params'        =>  '<boolean to return as string>', // parameters description
-            'description'   =>  'Returns value passed as argument' // Description (can be multiline).
-        )
-    );
+		),
+		'test' => array( // The name of the function in rules
+			'function'      =>  'testParam', // Name of the function
+			'params'        =>  '<boolean to return as string>', // parameters description
+			'description'   =>  'Returns value passed as argument' // Description (can be multiline).
+		)
+	);
     
-    /** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
-    public $catchAllTraps=false;
+	/** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
+	public $catchAllTraps=false;
     
-    /** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
-    public $processTraps=false;
+	/** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
+	public $processTraps=false;
     
-    /**
-     * Constructor. Can throw exceptions on error, but no logging at this point.
-     * @throws \Exception
-     * @return \Trapdirector\Plugins\NetworkRule
-     */
-    function __construct()
-    {
-        $this->name=basename(__FILE__,'.php');
-        return $this;
-    }
+	/**
+	 * Constructor. Can throw exceptions on error, but no logging at this point.
+	 * @throws \Exception
+	 * @return \Trapdirector\Plugins\NetworkRule
+	 */
+	function __construct()
+	{
+		$this->name=basename(__FILE__,'.php');
+		return $this;
+	}
     
-    /**
-     * Function called by trapdirector if found in rules
-     * Parameters check has to be done in function.
-     * @param array $params Function parameters
-     * @throws Exception
-     * @return bool Evaluation 
-     */
-    public function isInNetwork(array $params) : bool
-    {
-        // Check param numbers and thrown exception if not correct.
-        if (count($params)!=3)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($params));
-        }
+	/**
+	 * Function called by trapdirector if found in rules
+	 * Parameters check has to be done in function.
+	 * @param array $params Function parameters
+	 * @throws Exception
+	 * @return bool Evaluation 
+	 */
+	public function isInNetwork(array $params) : bool
+	{
+		// Check param numbers and thrown exception if not correct.
+		if (count($params)!=3)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($params));
+		}
         
-        $ip = $params[0];
-        $net = $params[1];
-        $masq = $params[2];
+		$ip = $params[0];
+		$net = $params[1];
+		$masq = $params[2];
         
         
-        $this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
+		$this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
         
-        $ip2 = ip2long($ip);
-        $net2 = ip2long($net);
+		$ip2 = ip2long($ip);
+		$net2 = ip2long($net);
         
-        if ($ip2 === false )
-        {
-            $this->log('Invalid IP : #' . $ip.'#',WARN);
-            throw new Exception('Invalid IP');
-        }
-        if ($net2 === false)
-        {
-            $this->log('Invalid network',WARN);
-            throw new Exception('Invalid net');
-        }
-        if ($masq<1 || $masq > 32)
-        {
-            $this->log('Invalid masq',WARN);
-            throw new Exception('Invalid net masq');
-        }
-        // $range is in IP/CIDR format eg 127.0.0.1/24
+		if ($ip2 === false )
+		{
+			$this->log('Invalid IP : #' . $ip.'#',WARN);
+			throw new Exception('Invalid IP');
+		}
+		if ($net2 === false)
+		{
+			$this->log('Invalid network',WARN);
+			throw new Exception('Invalid net');
+		}
+		if ($masq<1 || $masq > 32)
+		{
+			$this->log('Invalid masq',WARN);
+			throw new Exception('Invalid net masq');
+		}
+		// $range is in IP/CIDR format eg 127.0.0.1/24
 
-        $masq = pow( 2, ( 32 - $masq ) ) - 1;
-        $masq = ~ $masq;
-        return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
+		$masq = pow( 2, ( 32 - $masq ) ) - 1;
+		$masq = ~ $masq;
+		return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
         
-    }
+	}
     
-    public function testParam(array $param)
-    {
-        if (count($param)!=1)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($param));
-        }
-        if ($param[0] == 'true') return true;
-        return false;
-    }
+	public function testParam(array $param)
+	{
+		if (count($param)!=1)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($param));
+		}
+		if ($param[0] == 'true') return true;
+		return false;
+	}
 }
 
 

library/Trapdirector/Config/TrapModuleConfig.php

Spacing +31 added lines, -31 removed lines

@@ -14,26 +14,26 @@ 
 		'log_level' => 2, // log level
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	/** Minimum DB version
 	 * @return number
 	 */
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	/** Current DB version
 	 * @return number
 	 */
-	static public function getDbCurVersion() { return 2;}
+	static public function getDbCurVersion() { return 2; }
 
 	/************ Module configuration **********************/
 	// Module base path
 	static public function urlPath() { return 'trapdirector'; }
-	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service" , "actions/process-check-result"); } //< api user permissions required
+	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service", "actions/process-check-result"); } //< api user permissions required
 	
 	/*********** Log configuration *************************/
 	protected $logLevels=array(0=>'No output', 1=>'critical', 2=>'warning', 3=>'trace', 4=>'ALL');
-	public function getlogLevels() { return $this->logLevels;}
-	protected $logDestinations=array('syslog'=>'syslog','file'=>'file','display'=>'display');
-	public function getLogDestinations() { return $this->logDestinations;}
+	public function getlogLevels() { return $this->logLevels; }
+	protected $logDestinations=array('syslog'=>'syslog', 'file'=>'file', 'display'=>'display');
+	public function getLogDestinations() { return $this->logDestinations; }
 	
 	function __construct($prefix)
 	{
@@ -44,29 +44,29 @@ 
 	// DB table name of trap received list : prefix 't'
 	public function getTrapTableName() 
 	{ 
-		return array('t' => $this->table_prefix . 'received'); 
+		return array('t' => $this->table_prefix.'received'); 
 	}
 	// DB table name of trap data  list : prefix 'd'
 	public function getTrapDataTableName() 
 	{ 
-		return array('d' => $this->table_prefix . 'received_data'); 
+		return array('d' => $this->table_prefix.'received_data'); 
 	}	
 
 	// DB table name of rules : prefix 'r'
 	public function getTrapRuleName() 
 	{ 
-		return array('r' => $this->table_prefix . 'rules'); 
+		return array('r' => $this->table_prefix.'rules'); 
 	}		
 	
 	// DB table name of db config : prefix 'c'
 	public function getDbConfigTableName() 
 	{ 
-		return array('c' => $this->table_prefix . 'db_config');
+		return array('c' => $this->table_prefix.'db_config');
 	}
 	
 	// Mib cache tables
-	public function getMIBCacheTableName() { return $this->table_prefix . 'mib_cache'; }
-	public function getMIBCacheTableTrapObjName() { return $this->table_prefix . 'mib_cache_trap_object'; }
+	public function getMIBCacheTableName() { return $this->table_prefix.'mib_cache'; }
+	public function getMIBCacheTableTrapObjName() { return $this->table_prefix.'mib_cache_trap_object'; }
 	
 	
 	/****************** Database queries *******************/
@@ -147,7 +147,7 @@ 
 	public function getHandlerListDisplayColumns()
 	{
 		return array(
-			'host_name'		=> 'r.host_name',//'UNIX_TIMESTAMP(t.date_received)',
+			'host_name'		=> 'r.host_name', //'UNIX_TIMESTAMP(t.date_received)',
 			'host_group_name'=> 'r.host_group_name',
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
@@ -200,32 +200,32 @@ 
 	public function trapDetailQuery()
 	{
 		return array(
-			'timestamp'			=> array('Date','UNIX_TIMESTAMP(t.date_received)'),
-			'source_ip'			=> array('Source IP','t.source_ip'),
-			'source_name'		=> array('Source name','t.source_name'),
-			'source_port'		=> array('Source port','t.source_port'),
-			'destination_ip'	=> array('Destination IP','t.destination_ip'),
-			'destination_port'	=> array('Destination port','t.destination_port'),			
-			'trap_oid'			=> array('Numeric OID','t.trap_oid'),
-			'trap_name'			=> array('Trap name','t.trap_name'),
-			'trap_name_mib'		=> array('Trap MIB','t.trap_name_mib'),
-			'status'			=> array('Processing status','t.status'),
-			'status_detail'		=> array('Status details','t.status_detail'),
-			'process_time'		=> array('Trap processing time','t.process_time'),			
+			'timestamp'			=> array('Date', 'UNIX_TIMESTAMP(t.date_received)'),
+			'source_ip'			=> array('Source IP', 't.source_ip'),
+			'source_name'		=> array('Source name', 't.source_name'),
+			'source_port'		=> array('Source port', 't.source_port'),
+			'destination_ip'	=> array('Destination IP', 't.destination_ip'),
+			'destination_port'	=> array('Destination port', 't.destination_port'),			
+			'trap_oid'			=> array('Numeric OID', 't.trap_oid'),
+			'trap_name'			=> array('Trap name', 't.trap_name'),
+			'trap_name_mib'		=> array('Trap MIB', 't.trap_name_mib'),
+			'status'			=> array('Processing status', 't.status'),
+			'status_detail'		=> array('Status details', 't.status_detail'),
+			'process_time'		=> array('Trap processing time', 't.process_time'),			
 		);
 	}
 	// Trap detail : additional data (<key> => <title> <sql select>)
 	public function trapDataDetailQuery()
 	{
 		return array(
-			'oid'				=> array('Numeric OID','d.oid'),
-			'oid_name'			=> array('Text OID','d.oid_name'),
-			'oid_name_mib'		=> array('MIB','d.oid_name_mib'),
-			'value'				=> array('Value','d.value'),
+			'oid'				=> array('Numeric OID', 'd.oid'),
+			'oid_name'			=> array('Text OID', 'd.oid_name'),
+			'oid_name_mib'		=> array('MIB', 'd.oid_name_mib'),
+			'value'				=> array('Value', 'd.value'),
 		);
 	}
 	// foreign key of trap data table
-	public function trapDataFK() { return 'trap_id';}
+	public function trapDataFK() { return 'trap_id'; }
 	
 	// Max items in a list
 	public function itemListDisplay() { return 25; }

library/Trapdirector/TrapsController.php

Indentation +116 added lines, -116 removed lines

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

Spacing +104 added lines, -104 removed lines

@@ -54,7 +54,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -65,7 +65,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -75,7 +75,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -85,7 +85,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -97,15 +97,15 @@ 
 	*	@param $test_version bool if set to flase, does not test database version of trapDB
 	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
 	*/
-	public function getDbByName($DBname,$test=false,$test_version=true)
+	public function getDbByName($DBname, $test=false, $test_version=true)
 	{
 		try 
 		{
-			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+			$dbconn=IcingaDbConnection::fromResourceName($DBname);
 		} 
 		catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) return array(2, $DBname);
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -116,37 +116,37 @@ 
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
 			try
 			{
-				$query = $db->select()
-					->from($this->getModuleConfig()->getDbConfigTableName(),'value')
+				$query=$db->select()
+					->from($this->getModuleConfig()->getDbConfigTableName(), 'value')
 					->where('name=\'db_version\'');
 				$version=$db->fetchRow($query);
-				if ( ($version == null) || ! property_exists($version,'value') )
+				if (($version == null) || !property_exists($version, 'value'))
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) return array(4, $DBname);
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) return array(5, $version->value, $this->getModuleConfig()->getDbMinVersion());
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) return array(0, '');
 		return $dbconn;
 	}
 
@@ -157,17 +157,17 @@ 
 	 */
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test=false) return $this->trapDB;
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{	
-			if ($test) return array(1,'');
+			if ($test) return array(1, '');
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
-		$retDB=$this->getDbByName($dbresource,$test,true);
+		$retDB=$this->getDbByName($dbresource, $test, true);
 		if ($test === true) return $retDB;
 		$this->trapDB=$retDB;
 		return $this->trapDB;
@@ -175,78 +175,78 @@ 
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test=false) return $this->icingaDB;
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
+		$dbresource=$this->Config()->get('config', 'IDOdatabase'); ;
 
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) return array(1, 'No database in config.ini');
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		    $dbconn=IcingaDbConnection::fromResourceName($dbresource);
 		}
 		catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) return array(2, "Database $dbresource does not exists in IcingaWeb2");
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
 		
 		if ($test == false) 
 		{ 
-			$this->icingaDB = $dbconn; 
+			$this->icingaDB=$dbconn; 
 			return $this->icingaDB;
 		}
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
+		    $query=$dbconn->select()
+		    ->from('icinga_dbversion', array('version'));
 		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
+		    if (($version == null) || !property_exists($version, 'version'))
 		    {
-		        return array(4,"$dbresource does not look like an IDO database");
+		        return array(4, "$dbresource does not look like an IDO database");
 		    }
 		}
 		catch (Exception $e)
 		{
-			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+			return array(3, "Error connecting to $dbresource : ".$e->getMessage());
 		}
 		
-		return array(0,'');
+		return array(0, '');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -257,10 +257,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -272,10 +272,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -309,12 +309,12 @@ 
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -330,12 +330,12 @@ 
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -351,12 +351,12 @@ 
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hostgroups'),
 					'b.hostgroup_object_id=a.object_id',
@@ -372,8 +372,8 @@ 
 	*/
 	protected function getHostInfoByID($id) 
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -393,17 +393,17 @@ 
 	*/
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'a.object_id'))
+					array('name' => 'a.name1', 'id' => 'a.object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
-					array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-				->where('a.object_id = ?',$id);
+					array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?', $id);
 		return $db->fetchRow($query);
 	}	
 	
@@ -415,16 +415,16 @@ 
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
-					array('is_active'=>'a.is_active','name2'=>'a.name2'))
+					array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
 				->where('s.host_object_id='.$id.' AND a.is_active = 1');
 		return $db->fetchAll($query);
 	}	
@@ -437,8 +437,8 @@ 
 	*/
 	protected function getServicesByHostGroupid($id) 
 	{		
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_hostgroup_members'),
@@ -454,11 +454,11 @@ 
 		foreach ($hosts as $key => $host)
 		{ // For each host, get all services and add in common_services if not found or add counter
 			$host_services=$this->getServicesByHostid($host->host_object_id);
-			foreach($host_services as $service)
+			foreach ($host_services as $service)
 			{
 				if (isset($common_services[$service->name2]['num']))
 				{
-					$common_services[$service->name2]['num'] +=1;
+					$common_services[$service->name2]['num']+=1;
 				}
 				else
 				{
@@ -474,7 +474,7 @@ 
 		{
 		    if ($common_services[$key]['num'] == $num_hosts)
 			{
-				array_push($result,array($key,$common_services[$key]['name']));
+				array_push($result, array($key, $common_services[$key]['name']));
 			}
 		}
 		
@@ -487,9 +487,9 @@ 
 	*	@param $name string service name
 	*	@return array  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		if ($name == null)
 		{
 			return array();
@@ -498,7 +498,7 @@ 
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
@@ -516,12 +516,12 @@ 
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name1' => 'a.name1','name2' => 'a.name2'))
+					array('name1' => 'a.name1', 'name2' => 'a.name2'))
 				->where('a.object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchRow($query);
@@ -534,17 +534,17 @@ 
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['created'] = new Zend_Db_Expr('NOW()');
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['created']=new Zend_Db_Expr('NOW()');
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$query=$db->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$params
 		);
-		if($query==false)
+		if ($query == false)
 		{
 		  return null;
 		}
@@ -556,13 +556,13 @@ 
 	*   @param integer $ruleID : rule id in db
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$db->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -577,8 +577,8 @@ 
 	*/
 	protected function deleteRule($ruleID)
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
-		$db = $this->getDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -591,10 +591,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function deleteTrap($ip,$oid)
+	protected function deleteTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -602,10 +602,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if ($condition === null) return null;
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -619,10 +619,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function countTrap($ip,$oid)
+	protected function countTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -630,10 +630,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return 0;
+		if ($condition === null) return 0;
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -649,27 +649,27 @@ 
 	protected function getDBConfigValue($element)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
-			->where('name=?',$element);
+			->where('name=?', $element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row == null)  // value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+			if (!isset($default[$element])) return null; // no default and not value
 			
-			$this->addDBConfigValue($element,$default[$element]);
+			$this->addDBConfigValue($element, $default[$element]);
 			return $default[$element];
 		}
 		if ($return_row->value == null) // value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
-			$this->setDBConfigValue($element,$default[$element]);
+			if (!isset($default[$element])) return null; // no default and not value
+			$this->setDBConfigValue($element, $default[$element]);
 			return $default[$element];			
 		}
 		return $return_row->value;		
@@ -680,10 +680,10 @@ 
 	*   @param string $value : value
 	*/
 		
-	protected function addDBConfigValue($element,$value)
+	protected function addDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
@@ -699,10 +699,10 @@ 
 	*	@param string $element : name of config element
 	*   @param string $value : value
 	*/
-	protected function setDBConfigValue($element,$value)
+	protected function setDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$query=$db->update(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>$value),
@@ -717,10 +717,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

library/Trapdirector/TrapsActions/UIDatabase.php

Indentation +156 added lines, -156 removed lines

@@ -15,180 +15,180 @@
 class UIDatabase
 {
     
-    /** @var TrapsController $trapController TrapController 'parent' class */
-    private  $trapController;
+	/** @var TrapsController $trapController TrapController 'parent' class */
+	private  $trapController;
     
-    /** @var Zend_Db_Adapter_Abstract $trapDB Trap Database*/
-    private $trapDB;
+	/** @var Zend_Db_Adapter_Abstract $trapDB Trap Database*/
+	private $trapDB;
  
-    /** @var Zend_Db_Adapter_Abstract $trapDB Icinga IDO database*/
-    private $idoDB;
+	/** @var Zend_Db_Adapter_Abstract $trapDB Icinga IDO database*/
+	private $idoDB;
     
-    /**
-     * 
-     * @param TrapsController $trapCtrl
-     */
-    function __construct(TrapsController $trapCtrl)
-    {
-        $this->trapController=$trapCtrl;
-    }
+	/**
+	 * 
+	 * @param TrapsController $trapCtrl
+	 */
+	function __construct(TrapsController $trapCtrl)
+	{
+		$this->trapController=$trapCtrl;
+	}
     
-    /**
-     * Test if database version >= min database version
-     * 
-     * @param \Zend_Db_Adapter_Abstract $dbConn
-     * @param int $min Minimum version
-     * @param bool $test Test mode
-     * @param string $DBname Name of DB
-     * @return NULL|array 
-     */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
-    {
-        try
-        {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
-            ->where('name=\'db_version\'');
-            $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
-            {
-                if ($test) return array(4,$DBname);
-                $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-                return null;
-            }
-            if ($version->value < $min)
-            {
-                if ($test) return array(5,$version->value,$min);
-                $this->trapController->redirectNow('trapdirector/settings?dberror=5');
-                return null;
-            }
-        }
-        catch (Exception $e)
-        {
-            if ($test) return array(3,$DBname,$e->getMessage());
-            $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-        }
-        return null;
-    }
+	/**
+	 * Test if database version >= min database version
+	 * 
+	 * @param \Zend_Db_Adapter_Abstract $dbConn
+	 * @param int $min Minimum version
+	 * @param bool $test Test mode
+	 * @param string $DBname Name of DB
+	 * @return NULL|array 
+	 */
+	protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+	{
+		try
+		{
+			$query = $dbAdapter->select()
+			->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+			->where('name=\'db_version\'');
+			$version=$dbAdapter->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'value') )
+			{
+				if ($test) return array(4,$DBname);
+				$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+				return null;
+			}
+			if ($version->value < $min)
+			{
+				if ($test) return array(5,$version->value,$min);
+				$this->trapController->redirectNow('trapdirector/settings?dberror=5');
+				return null;
+			}
+		}
+		catch (Exception $e)
+		{
+			if ($test) return array(3,$DBname,$e->getMessage());
+			$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+		}
+		return null;
+	}
     
-    /**	Get Database connexion
-     *	@param $DBname string DB name in resource.ini_ge
-     *	@param $test bool if set to true, returns error code and not database
-     *	@param $test_version bool if set to flase, does not test database version of trapDB
-     *	@return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    protected function getDbByName($DBname,$test=false,$test_version=true)
-    {
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
-        {
-            if ($test) return array(2,$DBname);
-            $this->trapController->redirectNow('trapdirector/settings?dberror=2');
-            return null;
-        }
+	/**	Get Database connexion
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *	@return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	protected function getDbByName($DBname,$test=false,$test_version=true)
+	{
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+		}
+		catch (Exception $e)
+		{
+			if ($test) return array(2,$DBname);
+			$this->trapController->redirectNow('trapdirector/settings?dberror=2');
+			return null;
+		}
 
-        try
-        {
-            $dbAdapter=$dbconn->getDbAdapter();
+		try
+		{
+			$dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
-        {
-            if ($test) return array(3,$DBname,$e->getMessage());
-            $this->trapController->redirectNow('trapdirector/settings?dberror=3');
-            return null;
-        }
+		}
+		catch (Exception $e)
+		{
+			if ($test) return array(3,$DBname,$e->getMessage());
+			$this->trapController->redirectNow('trapdirector/settings?dberror=3');
+			return null;
+		}
         
-        if ($test_version == true) {
-            $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
-            if ($testRet != null) 
-            {
-                return $testRet;
-            }
-        }
-        if ($test) return array(0,'');
-        return $dbAdapter;
-    }
+		if ($test_version == true) {
+			$testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
+			if ($testRet != null) 
+			{
+				return $testRet;
+			}
+		}
+		if ($test) return array(0,'');
+		return $dbAdapter;
+	}
 
-    /**
-     * Get Trap database
-     * @param boolean $test
-     * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function getDb($test=false)
-    {
-        if ($this->trapDB != null && $test = false) return $this->trapDB;
+	/**
+	 * Get Trap database
+	 * @param boolean $test
+	 * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function getDb($test=false)
+	{
+		if ($this->trapDB != null && $test = false) return $this->trapDB;
         
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-            if ($test) return array(1,'');
-            $this->redirectNow('trapdirector/settings?dberror=1');
-            return null;
-        }
-        $retDB=$this->getDbByName($dbresource,$test,true);
+		if ( ! $dbresource )
+		{
+			if ($test) return array(1,'');
+			$this->redirectNow('trapdirector/settings?dberror=1');
+			return null;
+		}
+		$retDB=$this->getDbByName($dbresource,$test,true);
         
-        if ($test === true) return $retDB;
+		if ($test === true) return $retDB;
         
-        $this->trapDB=$retDB;
-        return $this->trapDB;
-    }
+		$this->trapDB=$retDB;
+		return $this->trapDB;
+	}
     
-    /**
-     * Get IDO Database 
-     * @param boolean $test
-     * @return Zend_Db_Adapter_Abstract|array]|NULL if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function getIdoDb($test=false)
-    {
-        if ($this->idoDB != null && $test = false) return $this->idoDB;
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database 
+	 * @param boolean $test
+	 * @return Zend_Db_Adapter_Abstract|array]|NULL if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function getIdoDb($test=false)
+	{
+		if ($this->idoDB != null && $test = false) return $this->idoDB;
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            if ($test) return array(1,'No database in config.ini');
-            $this->redirectNow('trapdirector/settings?idodberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			if ($test) return array(1,'No database in config.ini');
+			$this->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
-            $this->redirectNow('trapdirector/settings?idodberror=2');
-            return null;
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+			$this->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
+		}
         
-        if ($test == false)
-        {
-            $this->idoDB = $dbconn->getDbAdapter();
-            return $this->idoDB;
-        }
+		if ($test == false)
+		{
+			$this->idoDB = $dbconn->getDbAdapter();
+			return $this->idoDB;
+		}
         
-        try
-        {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
-            $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
-            {
-                return array(4,"$dbresource does not look like an IDO database");
-            }
-        }
-        catch (Exception $e)
-        {
-            return array(3,"Error connecting to $dbresource : " . $e->getMessage());
-        }
+		try
+		{
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				return array(4,"$dbresource does not look like an IDO database");
+			}
+		}
+		catch (Exception $e)
+		{
+			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+		}
         
-        return array(0,'');
-    }
+		return array(0,'');
+	}
     
 }
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -42,30 +42,30 @@ 
      * @param string $DBname Name of DB
      * @return NULL|array 
      */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+    protected function testDbVersion($dbAdapter, int $min, bool $test, string $DBname)
     {
         try
         {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+            $query=$dbAdapter->select()
+            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(), 'value')
             ->where('name=\'db_version\'');
             $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
+            if (($version == null) || !property_exists($version, 'value'))
             {
-                if ($test) return array(4,$DBname);
+                if ($test) return array(4, $DBname);
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
                 return null;
             }
             if ($version->value < $min)
             {
-                if ($test) return array(5,$version->value,$min);
+                if ($test) return array(5, $version->value, $min);
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return null;
             }
         }
         catch (Exception $e)
         {
-            if ($test) return array(3,$DBname,$e->getMessage());
+            if ($test) return array(3, $DBname, $e->getMessage());
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
         }
         return null;
@@ -77,15 +77,15 @@ 
      *	@param $test_version bool if set to flase, does not test database version of trapDB
      *	@return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
      */
-    protected function getDbByName($DBname,$test=false,$test_version=true)
+    protected function getDbByName($DBname, $test=false, $test_version=true)
     {
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
+            $dbconn=IcingaDbConnection::fromResourceName($DBname);
         }
         catch (Exception $e)
         {
-            if ($test) return array(2,$DBname);
+            if ($test) return array(2, $DBname);
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
         }
@@ -97,7 +97,7 @@ 
         }
         catch (Exception $e)
         {
-            if ($test) return array(3,$DBname,$e->getMessage());
+            if ($test) return array(3, $DBname, $e->getMessage());
             $this->trapController->redirectNow('trapdirector/settings?dberror=3');
             return null;
         }
@@ -109,7 +109,7 @@ 
                 return $testRet;
             }
         }
-        if ($test) return array(0,'');
+        if ($test) return array(0, '');
         return $dbAdapter;
     }
 
@@ -120,17 +120,17 @@ 
      */
     public function getDb($test=false)
     {
-        if ($this->trapDB != null && $test = false) return $this->trapDB;
+        if ($this->trapDB != null && $test=false) return $this->trapDB;
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-            if ($test) return array(1,'');
+            if ($test) return array(1, '');
             $this->redirectNow('trapdirector/settings?dberror=1');
             return null;
         }
-        $retDB=$this->getDbByName($dbresource,$test,true);
+        $retDB=$this->getDbByName($dbresource, $test, true);
         
         if ($test === true) return $retDB;
         
@@ -145,50 +145,50 @@ 
      */
     public function getIdoDb($test=false)
     {
-        if ($this->idoDB != null && $test = false) return $this->idoDB;
+        if ($this->idoDB != null && $test=false) return $this->idoDB;
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->Config()->get('config', 'IDOdatabase');;
+        $dbresource=$this->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-            if ($test) return array(1,'No database in config.ini');
+            if ($test) return array(1, 'No database in config.ini');
             $this->redirectNow('trapdirector/settings?idodberror=1');
             return null;
         }
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
-            if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+            if ($test) return array(2, "Database $dbresource does not exists in IcingaWeb2");
             $this->redirectNow('trapdirector/settings?idodberror=2');
             return null;
         }
         
         if ($test == false)
         {
-            $this->idoDB = $dbconn->getDbAdapter();
+            $this->idoDB=$dbconn->getDbAdapter();
             return $this->idoDB;
         }
         
         try
         {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
+            $query=$dbconn->select()
+            ->from('icinga_dbversion', array('version'));
             $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
+            if (($version == null) || !property_exists($version, 'version'))
             {
-                return array(4,"$dbresource does not look like an IDO database");
+                return array(4, "$dbresource does not look like an IDO database");
             }
         }
         catch (Exception $e)
         {
-            return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+            return array(3, "Error connecting to $dbresource : ".$e->getMessage());
         }
         
-        return array(0,'');
+        return array(0, '');
     }
     
 }
\ No newline at end of file

Braces +41 added lines, -22 removed lines

@@ -52,20 +52,25 @@ 
             $version=$dbAdapter->fetchRow($query);
             if ( ($version == null) || ! property_exists($version,'value') )
             {
-                if ($test) return array(4,$DBname);
+                if ($test) {
+                	return array(4,$DBname);
+                }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
                 return null;
             }
             if ($version->value < $min)
             {
-                if ($test) return array(5,$version->value,$min);
+                if ($test) {
+                	return array(5,$version->value,$min);
+                }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return null;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if ($test) return array(3,$DBname,$e->getMessage());
+            if ($test) {
+            	return array(3,$DBname,$e->getMessage());
+            }
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
         }
         return null;
@@ -82,10 +87,11 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if ($test) return array(2,$DBname);
+            if ($test) {
+            	return array(2,$DBname);
+            }
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
         }
@@ -94,10 +100,11 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if ($test) return array(3,$DBname,$e->getMessage());
+            if ($test) {
+            	return array(3,$DBname,$e->getMessage());
+            }
             $this->trapController->redirectNow('trapdirector/settings?dberror=3');
             return null;
         }
@@ -109,7 +116,9 @@ 
                 return $testRet;
             }
         }
-        if ($test) return array(0,'');
+        if ($test) {
+        	return array(0,'');
+        }
         return $dbAdapter;
     }
 
@@ -120,19 +129,25 @@ 
      */
     public function getDb($test=false)
     {
-        if ($this->trapDB != null && $test = false) return $this->trapDB;
+        if ($this->trapDB != null && $test = false) {
+        	return $this->trapDB;
+        }
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
         if ( ! $dbresource )
         {
-            if ($test) return array(1,'');
+            if ($test) {
+            	return array(1,'');
+            }
             $this->redirectNow('trapdirector/settings?dberror=1');
             return null;
         }
         $retDB=$this->getDbByName($dbresource,$test,true);
         
-        if ($test === true) return $retDB;
+        if ($test === true) {
+        	return $retDB;
+        }
         
         $this->trapDB=$retDB;
         return $this->trapDB;
@@ -145,13 +160,17 @@ 
      */
     public function getIdoDb($test=false)
     {
-        if ($this->idoDB != null && $test = false) return $this->idoDB;
+        if ($this->idoDB != null && $test = false) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->Config()->get('config', 'IDOdatabase');;
         
         if ( ! $dbresource )
         {
-            if ($test) return array(1,'No database in config.ini');
+            if ($test) {
+            	return array(1,'No database in config.ini');
+            }
             $this->redirectNow('trapdirector/settings?idodberror=1');
             return null;
         }
@@ -159,10 +178,11 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+            if ($test) {
+            	return array(2,"Database $dbresource does not exists in IcingaWeb2");
+            }
             $this->redirectNow('trapdirector/settings?idodberror=2');
             return null;
         }
@@ -182,8 +202,7 @@ 
             {
                 return array(4,"$dbresource does not look like an IDO database");
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return array(3,"Error connecting to $dbresource : " . $e->getMessage());
         }