patrickpr / trapdirector

library/Trapdirector/TrapsController.php

Indentation +113 added lines, -113 removed lines

@@ -32,8 +32,8 @@ 
 	protected $trapClass;		//< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -58,12 +58,12 @@ 
 	
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	public function getHandlerListTable() 
@@ -77,11 +77,11 @@ 
 	}	
 	
 	/**	Get Database connexion
-	*	@param $DBname string DB name in resource.ini_ge
-	*	@param $test bool if set to true, returns error code and not database
-	*	@param $test_version bool if set to flase, does not test database version of trapDB
-	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-	*/
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
 	public function getDbByName($DBname,$test=false,$test_version=true)
 	{
 		try 
@@ -161,20 +161,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) 
@@ -185,13 +185,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)
 		{
@@ -201,15 +201,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 ?)
@@ -218,33 +218,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 **********************/
@@ -264,8 +264,8 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
@@ -283,9 +283,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
@@ -304,9 +304,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
@@ -325,9 +325,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
@@ -347,9 +347,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');  }
@@ -368,9 +368,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');  }
@@ -388,10 +388,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
@@ -411,11 +411,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');  }
@@ -454,7 +454,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']));
 			}
@@ -464,11 +464,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 int  service id
-	*/
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return int  service id
+	 */
 	protected function getServiceIDByName($hostname,$name) 
 	{
 		$db = $this->getIdoDb()->getConnection();
@@ -491,10 +491,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
@@ -510,9 +510,9 @@ 
 	}		
 
 	/** Add handler rule in traps DB
-	*	@param array(<db item>=><value>)
-	*	@return int inserted id
-	*/
+	 *	@param array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
@@ -534,9 +534,9 @@ 
 	}	
 
 	/** Update handler rule in traps DB
-	*	@param array(<db item>=><value>)
-	*	@return array affected rows
-	*/
+	 *	@param array(<db item>=><value>)
+	 *	@return array affected rows
+	 */
 	protected function updateHandlerRule($params,$ruleID)
 	{
 		// TODO Check for rule consistency
@@ -554,8 +554,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');  }
@@ -569,9 +569,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)
 	{
 		
@@ -597,9 +597,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)
 	{
 		
@@ -625,8 +625,8 @@ 
 	}		
 	
 	/** get configuration value
-	*	@param configuration name in db
-	*/
+	 *	@param configuration name in db
+	 */
 	protected function getDBConfigValue($element)
 	{
 	
@@ -657,8 +657,8 @@ 
 	}
 
 	/** add configuration value
-	*	@param name value
-	*/
+	 *	@param name value
+	 */
 	protected function addDBConfigValue($element,$value)
 	{
 	
@@ -675,8 +675,8 @@ 
 	}
 
 	/** set configuration value
-	*	@param name value
-	*/
+	 *	@param name value
+	 */
 	protected function setDBConfigValue($element,$value)
 	{
 	
@@ -690,13 +690,13 @@ 
 	}
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +112 added lines, -112 removed lines

@@ -22,14 +22,14 @@ 
 
 class TrapsController extends Controller
 {
-	protected $moduleConfig;  	//< TrapModuleConfig instance
-	protected $trapTableList; 	//< TrapTableList (by date)
-	protected $trapTableHostList; 	//< TrapTableList (by hosts)
-	protected $handlerTableList; 	//< HandlerTableList instance
-	protected $trapDB;			//< Trap database
-	protected $icingaDB;		//< Icinga IDO database;
-	protected $MIBData; 		//< MIBLoader class
-	protected $trapClass;		//< Trap class for bin/trap_class.php
+	protected $moduleConfig; //< TrapModuleConfig instance
+	protected $trapTableList; //< TrapTableList (by date)
+	protected $trapTableHostList; //< TrapTableList (by hosts)
+	protected $handlerTableList; //< HandlerTableList instance
+	protected $trapDB; //< Trap database
+	protected $icingaDB; //< Icinga IDO database;
+	protected $MIBData; //< MIBLoader class
+	protected $trapClass; //< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
 	*	@return TrapModuleConfig
@@ -43,14 +43,14 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
 	
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -60,7 +60,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -70,7 +70,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -82,15 +82,15 @@ 
 	*	@param $test_version bool if set to flase, does not test database version of trapDB
 	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
 	*/
-	public function getDbByName($DBname,$test=false,$test_version=true)
+	public function getDbByName($DBname, $test=false, $test_version=true)
 	{
 		try 
 		{
-			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+			$dbconn=IcingaDbConnection::fromResourceName($DBname);
 		} 
 		catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) return array(2, $DBname);
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -101,53 +101,53 @@ 
 			}
 			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;
 	}
 
 	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;
@@ -155,78 +155,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');
         }		
 	}
 	
@@ -237,10 +237,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;
         }
@@ -252,10 +252,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;
@@ -289,12 +289,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',
@@ -310,12 +310,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',
@@ -331,12 +331,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',
@@ -352,8 +352,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'),
@@ -373,17 +373,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);
 	}	
 	
@@ -395,16 +395,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);
@@ -418,8 +418,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'),
@@ -436,11 +436,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
 				{
@@ -456,7 +456,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']));
 			}
 		}
 		
@@ -469,9 +469,9 @@ 
 	*	@param $name string service name
 	*	@return int  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		if ($name == null)
 		{
 			return 0;
@@ -480,7 +480,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',
@@ -498,12 +498,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);
@@ -516,17 +516,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;
 		}
@@ -537,13 +537,13 @@ 
 	*	@param array(<db item>=><value>)
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$db->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -558,8 +558,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(),
@@ -572,10 +572,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)
 		{
@@ -583,10 +583,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
@@ -600,10 +600,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)
 		{
@@ -611,10 +611,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(),
@@ -630,27 +630,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;		
@@ -659,10 +659,10 @@ 
 	/** add configuration value
 	*	@param name 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(),
@@ -677,10 +677,10 @@ 
 	/** set configuration value
 	*	@param name 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),
@@ -695,10 +695,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

Braces +62 added lines, -30 removed lines

@@ -87,10 +87,11 @@ 
 		try 
 		{
 			$dbconn = IcingaDbConnection::fromResourceName($DBname);
-		} 
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) {
+				return array(2,$DBname);
+			}
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -98,10 +99,11 @@ 
 			try 
 			{
 				$db=$dbconn->getConnection();
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
@@ -113,55 +115,72 @@ 
 				$version=$db->fetchRow($query);
 				if ( ($version == null) || ! property_exists($version,'value') )
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) {
+						return array(4,$DBname);
+					}
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) {
+						return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					}
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) {
+			return array(0,'');
+		}
 		return $dbconn;
 	}
 
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test = false) {
+			return $this->trapDB;
+		}
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
 		if ( ! $dbresource )
 		{	
-			if ($test) return array(1,'');
+			if ($test) {
+				return array(1,'');
+			}
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
 		$retDB=$this->getDbByName($dbresource,$test,true);
-		if ($test == true) return $retDB;
+		if ($test == true) {
+			return $retDB;
+		}
 		$this->trapDB=$retDB;
 		return $this->trapDB;
 	}
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test = false) {
+			return $this->icingaDB;
+		}
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
 		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) {
+		    	return array(1,'No database in config.ini');
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
@@ -169,10 +188,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;
 		}
@@ -192,8 +212,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());
 		}
@@ -441,8 +460,7 @@ 
 				if (isset($common_services[$service->name2]['num']))
 				{
 					$common_services[$service->name2]['num'] +=1;
-				}
-				else
+				} else
 				{
 					$common_services[$service->name2]['num']=1;
 					$common_services[$service->name2]['name']=$service->name;
@@ -586,7 +604,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if($condition === null) {
+			return null;
+		}
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -614,7 +634,9 @@ 
 			$condition=($condition==null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition ==null) return 0;
+		if($condition ==null) {
+			return 0;
+		}
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -638,18 +660,28 @@ 
 				array('value'=>'value'))
 			->where('name=?',$element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row==null) {
+			// value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			
 			$this->addDBConfigValue($element,$default[$element]);
 			return $default[$element];
 		}
-		if ($return_row->value == null) // value id empty
+		if ($return_row->value == null) {
+			// value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			$this->setDBConfigValue($element,$default[$element]);
 			return $default[$element];			
 		}