patrickpr / trapdirector

library/Trapdirector/Icinga2Api.php

Indentation +246 added lines, -246 removed lines

@@ -10,281 +10,281 @@
 class Icinga2API extends IcingaApiBase
 {
     
-    /**
-     * Creates Icinga2API object
-     * 
-     * @param string $host host name or IP
-     * @param number $port API port
-     */
-    public function __construct($host, $port = 5665)
-    {
-        parent::__construct($host,$port);
-    }
-    /**
+	/**
+	 * Creates Icinga2API object
+	 * 
+	 * @param string $host host name or IP
+	 * @param number $port API port
+	 */
+	public function __construct($host, $port = 5665)
+	{
+		parent::__construct($host,$port);
+	}
+	/**
 
 /************ Host query ************/  
 
-    /**
-     * return array of host by filter
-     * @param string $hostfilter
-     * @throws Exception
-     * @return array objects : array('__name','name','display_name','id' (=__name), 'address', 'ip4' (=address), 'address6', 'ip6' (=address6)
-     */
-    public function getHostByFilter(string $hostfilter)
-    {
-        $hosts = $this->standardQuery(
-            'host',
-            $hostfilter,
-            //'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
-            array('__name','name','display_name','address','address6')
-            );
-        foreach ( array_keys($hosts) as $key )
-        {
-            $hosts[$key]->id = $hosts[$key]->__name;
-            $hosts[$key]->ip4 = $hosts[$key]->address;
-            $hosts[$key]->ip6 = $hosts[$key]->address6;
-        }
-        return $hosts;
-    }
+	/**
+	 * return array of host by filter
+	 * @param string $hostfilter
+	 * @throws Exception
+	 * @return array objects : array('__name','name','display_name','id' (=__name), 'address', 'ip4' (=address), 'address6', 'ip6' (=address6)
+	 */
+	public function getHostByFilter(string $hostfilter)
+	{
+		$hosts = $this->standardQuery(
+			'host',
+			$hostfilter,
+			//'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
+			array('__name','name','display_name','address','address6')
+			);
+		foreach ( array_keys($hosts) as $key )
+		{
+			$hosts[$key]->id = $hosts[$key]->__name;
+			$hosts[$key]->ip4 = $hosts[$key]->address;
+			$hosts[$key]->ip6 = $hosts[$key]->address6;
+		}
+		return $hosts;
+	}
     
-    /**
-     * return array of host by IP (4 or 6)
-     * @param string $ip
-     * @throws Exception
-     * @return array objects : array('__name','name','display_name')
-     */
-    public function getHostByIP(string $ip) 
-    {
-        return $this->getHostByFilter('match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6)');
-    }
+	/**
+	 * return array of host by IP (4 or 6)
+	 * @param string $ip
+	 * @throws Exception
+	 * @return array objects : array('__name','name','display_name')
+	 */
+	public function getHostByIP(string $ip) 
+	{
+		return $this->getHostByFilter('match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6)');
+	}
 
     
-    /**
-     * Get host(s) by name in API
-     * @param string $name
-     * @return array|NULL[] : see getHostByIP
-     */
-    public function getHostByName(string $name)
-    {
-        return $this->getHostByFilter('match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name)');
-    }
+	/**
+	 * Get host(s) by name in API
+	 * @param string $name
+	 * @return array|NULL[] : see getHostByIP
+	 */
+	public function getHostByName(string $name)
+	{
+		return $this->getHostByFilter('match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name)');
+	}
 
-    /**
-     * Get host(s) by name in API
-     * @param string $name
-     * @return array|NULL[] : see getHostByIP
-     */
-    public function getHostByNameOrIP(string $name)
-    {
-        return $this->getHostByFilter( 
-            'match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name) || match("*' . $name . '*",host.address) || match("*' . $name . '*",host.address6)');
-    }
+	/**
+	 * Get host(s) by name in API
+	 * @param string $name
+	 * @return array|NULL[] : see getHostByIP
+	 */
+	public function getHostByNameOrIP(string $name)
+	{
+		return $this->getHostByFilter( 
+			'match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name) || match("*' . $name . '*",host.address) || match("*' . $name . '*",host.address6)');
+	}
     
-    public function getHostInfoByID(string $name)
-    {
-        $host = $this->getHostByFilter(
-            'host.__name=="'. $name .'"');
-        if (isset($host[0]))
-            return $host[0];
-        else
-            return NULL;
-    }
+	public function getHostInfoByID(string $name)
+	{
+		$host = $this->getHostByFilter(
+			'host.__name=="'. $name .'"');
+		if (isset($host[0]))
+			return $host[0];
+		else
+			return NULL;
+	}
  
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostsIPByHostGroup($hostGroup)
-    {        
-        return $this->standardQuery(
-            'host', 
-            '"' . $hostGroup . '" in host.groups',
-            array('address','address6','name')
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostsIPByHostGroup($hostGroup)
+	{        
+		return $this->standardQuery(
+			'host', 
+			'"' . $hostGroup . '" in host.groups',
+			array('address','address6','name')
                 
-        );
-    }
+		);
+	}
 
 
-    /** Get services from host in API
-     *	
-     *  @throws Exception
-     *	@param $id string host name
-     *  @param bool $active
-     *  @param bool $passive_svc
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
-    {
-        $filter = 'match("' . $id . '!*", service.__name)';
-        if ($active === TRUE)
-        {
-            $filter .= ' && service.active==true';
-        }
-        if ($passive_svc === TRUE)
-        {
-            $filter .= ' && service.enable_passive_checks==true';
-        }
-        $services =  $this->standardQuery(
-            'service',
-            $filter,
-            array('__name','name','display_name','active')
-            );
+	/** Get services from host in API
+	 *	
+	 *  @throws Exception
+	 *	@param $id string host name
+	 *  @param bool $active
+	 *  @param bool $passive_svc
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
+	{
+		$filter = 'match("' . $id . '!*", service.__name)';
+		if ($active === TRUE)
+		{
+			$filter .= ' && service.active==true';
+		}
+		if ($passive_svc === TRUE)
+		{
+			$filter .= ' && service.enable_passive_checks==true';
+		}
+		$services =  $this->standardQuery(
+			'service',
+			$filter,
+			array('__name','name','display_name','active')
+			);
         
-        foreach ( array_keys($services) as $key )
-        {
-            $services[$key]->id = $services[$key]->__name;
-        }
+		foreach ( array_keys($services) as $key )
+		{
+			$services[$key]->id = $services[$key]->__name;
+		}
         
-        return $services;
+		return $services;
         
-    }
+	}
 
 /************  Host group query ************/    
-    /**
-     * return array of host by IP (4 or 6) or name
-     * @param string $group Host group name
-     * @throws Exception
-     * @return array objects : array('name','display_name')
-     */
-    public function getHostsByGroup(string $group)
-    {
-         return $this->standardQuery(
-            'host',
-            '"' . $group . '" in host.groups',
-            array('name','display_name')
-            );
-    }
+	/**
+	 * return array of host by IP (4 or 6) or name
+	 * @param string $group Host group name
+	 * @throws Exception
+	 * @return array objects : array('name','display_name')
+	 */
+	public function getHostsByGroup(string $group)
+	{
+		 return $this->standardQuery(
+			'host',
+			'"' . $group . '" in host.groups',
+			array('name','display_name')
+			);
+	}
     
-    public function getServicesByHostGroupid(string $group)
-    {
-        $hostList = $this->getHostsByGroup($group);
-        //return $hostList;
-        $hostNum = count($hostList);
-        $serviceList=array();
-        foreach ($hostList as $curHost)
-        {
-            $services = $this->getServicesByHostid($curHost->name);
-            foreach ($services as $service)
-            {
-                //return $service;
-                if (! isset($serviceList[$service->name]))
-                {
-                    $serviceList[$service->name]=
-                        array('num'=> 1 ,'__name' => $service->__name,'display_name' => $service->display_name);
-                }
-                else
-                {
-                    $serviceList[$service->name]['num']++;
-                }
-            }
-        }
-        $commonServices=array();
-        foreach ($serviceList as $key => $values)
-        {
-            if ($values['num'] >= $hostNum)
-            {
-                array_push($commonServices,array($key,$values['display_name']));
-            }
-        }
-        return $commonServices;
-    }
+	public function getServicesByHostGroupid(string $group)
+	{
+		$hostList = $this->getHostsByGroup($group);
+		//return $hostList;
+		$hostNum = count($hostList);
+		$serviceList=array();
+		foreach ($hostList as $curHost)
+		{
+			$services = $this->getServicesByHostid($curHost->name);
+			foreach ($services as $service)
+			{
+				//return $service;
+				if (! isset($serviceList[$service->name]))
+				{
+					$serviceList[$service->name]=
+						array('num'=> 1 ,'__name' => $service->__name,'display_name' => $service->display_name);
+				}
+				else
+				{
+					$serviceList[$service->name]['num']++;
+				}
+			}
+		}
+		$commonServices=array();
+		foreach ($serviceList as $key => $values)
+		{
+			if ($values['num'] >= $hostNum)
+			{
+				array_push($commonServices,array($key,$values['display_name']));
+			}
+		}
+		return $commonServices;
+	}
  
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostGroupByName($name)
-    {
-        $hosts = $this->standardQuery(
-            'hostgroup',
-            'match("*' . $name . '*",hostgroup.name)',
-            array('__name','name','display_name')
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostGroupByName($name)
+	{
+		$hosts = $this->standardQuery(
+			'hostgroup',
+			'match("*' . $name . '*",hostgroup.name)',
+			array('__name','name','display_name')
             
-            );
-        foreach ( array_keys($hosts) as $key )
-        {
-            $hosts[$key]->id = $hosts[$key]->__name;
-        }
-        return $hosts;
-    }
+			);
+		foreach ( array_keys($hosts) as $key )
+		{
+			$hosts[$key]->id = $hosts[$key]->__name;
+		}
+		return $hosts;
+	}
     
-    /**
-     * Get hostgroup by id (__name)
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : __name, name, display_name
-     */
-    public function getHostGroupById($name)
-    {
-        $hosts = $this->standardQuery(
-            'hostgroup',
-            'hostgroup.__name=="'. $name .'"',
-            array('__name','name','display_name')
+	/**
+	 * Get hostgroup by id (__name)
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : __name, name, display_name
+	 */
+	public function getHostGroupById($name)
+	{
+		$hosts = $this->standardQuery(
+			'hostgroup',
+			'hostgroup.__name=="'. $name .'"',
+			array('__name','name','display_name')
             
-            );
-        $hosts[0]->id = $hosts[0]->__name;
-        return $hosts[0];
-    }
+			);
+		$hosts[0]->id = $hosts[0]->__name;
+		return $hosts[0];
+	}
     
 /****************   Service queries ************/
-    /** Get services object id by host name / service name
-     *	does not catch exceptions
-     *	@param $hostname string host name
-     *	@param $name string service name
-     *  @param bool $active : if true, return only active service
-     *  @param bool $passive_svc : if true, return only service accepting passive checks
-     *	@return array  service id
-     */
-    public function getServiceIDByName($hostname,$name,bool $active = TRUE, bool $passive_svc = TRUE)
-    {
-        $filter = 'service.__name=="' . $hostname . '!'. $name .'"';
-        if ($active === TRUE)
-        {
-            $filter .= ' && service.active==true';
-        }
-        if ($passive_svc === TRUE)
-        {
-            $filter .= ' && service.enable_passive_checks==true';
-        }
-        $services =  $this->standardQuery(
-            'service',
-            $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
-            );
+	/** Get services object id by host name / service name
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *  @param bool $active : if true, return only active service
+	 *  @param bool $passive_svc : if true, return only service accepting passive checks
+	 *	@return array  service id
+	 */
+	public function getServiceIDByName($hostname,$name,bool $active = TRUE, bool $passive_svc = TRUE)
+	{
+		$filter = 'service.__name=="' . $hostname . '!'. $name .'"';
+		if ($active === TRUE)
+		{
+			$filter .= ' && service.active==true';
+		}
+		if ($passive_svc === TRUE)
+		{
+			$filter .= ' && service.enable_passive_checks==true';
+		}
+		$services =  $this->standardQuery(
+			'service',
+			$filter,
+			array('__name','name','display_name','active','enable_passive_checks')
+			);
         
-        foreach ( array_keys($services) as $key )
-        {
-            $services[$key]->id = $services[$key]->__name;
-        }
+		foreach ( array_keys($services) as $key )
+		{
+			$services[$key]->id = $services[$key]->__name;
+		}
         
-        return $services;
-    }
+		return $services;
+	}
  
-    /** Get services object by id (host!name)
-     *	does not catch exceptions
-     *	@param $name string service __name (host!name)
-     *	@return array  service id
-     */
-    public function getServiceById($name)
-    {
-        $filter = 'service.__name=="' .  $name .'"';
-        $services =  $this->standardQuery(
-            'service',
-            $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
-            );
+	/** Get services object by id (host!name)
+	 *	does not catch exceptions
+	 *	@param $name string service __name (host!name)
+	 *	@return array  service id
+	 */
+	public function getServiceById($name)
+	{
+		$filter = 'service.__name=="' .  $name .'"';
+		$services =  $this->standardQuery(
+			'service',
+			$filter,
+			array('__name','name','display_name','active','enable_passive_checks')
+			);
         
-        foreach ( array_keys($services) as $key )
-        {
-            $services[$key]->id = $services[$key]->__name;
-        }
+		foreach ( array_keys($services) as $key )
+		{
+			$services[$key]->id = $services[$key]->__name;
+		}
         
-        return $services;
-    }
+		return $services;
+	}
     
     
 }

library/Trapdirector/TrapsController.php

Indentation +105 added lines, -105 removed lines

@@ -49,8 +49,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -82,12 +82,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;
 	}
 	
 	/**
@@ -108,12 +108,12 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 
 	/**
@@ -122,36 +122,36 @@ 
 	 */
 	public function getIdoConn()
 	{
-	    if ($this->icingaAPI === NULL)
-	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
-    	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
-    	    if ($ret === TRUE) // On error, switch to ido DB
-    	    {
-    	        $this->apiMode = FALSE;
-    	        return $this->getUIDatabase();
-    	    }
-    	    $this->apiMode = TRUE;
+		if ($this->icingaAPI === NULL)
+		{
+			$host = $this->Config()->get('config', 'icingaAPI_host');
+			$port = $this->Config()->get('config', 'icingaAPI_port');
+			$user = $this->Config()->get('config', 'icingaAPI_user');
+			$pass = $this->Config()->get('config', 'icingaAPI_password');
+			$this->icingaAPI = new Icinga2API($host,$port);
+			$this->icingaAPI->setCredentials($user, $pass);
+			list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
+			if ($ret === TRUE) // On error, switch to ido DB
+			{
+				$this->apiMode = FALSE;
+				return $this->getUIDatabase();
+			}
+			$this->apiMode = TRUE;
     	    
-	    }
-	    return $this->icingaAPI;
+		}
+		return $this->icingaAPI;
 	    
 	}
 	
-    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 ?)
@@ -160,33 +160,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 **********************/
@@ -206,18 +206,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -227,13 +227,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** 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))
 			{
@@ -246,72 +246,72 @@ 
 
 	/************************ UI elements **************************/
 	
-    /**
-     * get max rows to display before paging.
-     * @return number
-     */
+	/**
+	 * get max rows to display before paging.
+	 * @return number
+	 */
 	public function itemListDisplay()
 	{
-	    return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
+		return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
 	}
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+		return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
 	}
 	
-    /**
-     * get Handlers categories list (index => textvalue).
-     * @return array
-     */	
+	/**
+	 * get Handlers categories list (index => textvalue).
+	 * @return array
+	 */	
 	public function getHandlersCategory()
 	{
-	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
-	    $retArray=array();
-	    foreach ($catListArray as $category)
-	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
-	    }
-	    return $retArray; 
+		//<index>:<name>!<index>:<name>
+		$catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
+		$catListArray=explode('!',$catList);
+		$retArray=array();
+		foreach ($catListArray as $category)
+		{
+			$catArray=explode(':',$category);
+			$retArray[$catArray[0]] = $catArray[1];
+		}
+		return $retArray; 
 	}
 
 	public function setHandlerCategory(array $catArray)
 	{
-	    $catString='';
-	    foreach ($catArray as $index => $value)
-	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
-	    }
-	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
+		$catString='';
+		foreach ($catArray as $index => $value)
+		{
+			if ($catString != '' ) $catString .= '!';
+			$catString .= $index . ':' . $value;
+		}
+		$this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$i=1;
+		while (isset($catArray[$i]) && $i < 100) $i++;
+		if ($i == 100) throw new ProgrammingError('Category array error');
+		$catArray[$i] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    unset($catArray[$catIndex]);
-	    $this->setHandlerCategory($catArray);
-	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
+		$catArray = $this->getHandlersCategory();
+		unset($catArray[$catIndex]);
+		$this->setHandlerCategory($catArray);
+		$this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
 	}
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$catArray[$catIndex] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 }

library/Trapdirector/IcingaApi/IcingaApiBase.php

Indentation +313 added lines, -313 removed lines

@@ -8,347 +8,347 @@
 
 class IcingaApiBase
 {
-    protected $version = 'v1';      //< icinga2 api version
+	protected $version = 'v1';      //< icinga2 api version
     
-    protected $host;                //< icinga2 host name or IP
-    protected $port;                //< icinga2 api port
+	protected $host;                //< icinga2 host name or IP
+	protected $port;                //< icinga2 api port
     
-    protected $user;                //< user name
-    protected $pass;                //< user password
-    protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
-    protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
+	protected $user;                //< user name
+	protected $pass;                //< user password
+	protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
+	protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
 
-    protected $queryURL=array(
-        'host'  => 'objects/hosts',
-        'hostgroup' => 'objects/hostgroups',
-        'service' => 'objects/services'
-    );
+	protected $queryURL=array(
+		'host'  => 'objects/hosts',
+		'hostgroup' => 'objects/hostgroups',
+		'service' => 'objects/services'
+	);
     
-    protected $curl;
-    // http://php.net/manual/de/function.json-last-error.php#119985
-    protected $errorReference = [
-        JSON_ERROR_NONE => 'No error has occurred.',
-        JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
-        JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
-        JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded.',
-        JSON_ERROR_SYNTAX => 'Syntax error.',
-        JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
-        JSON_ERROR_RECURSION => 'One or more recursive references in the value to be encoded.',
-        JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
-        JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
-    ];
-    const JSON_UNKNOWN_ERROR = 'Unknown error.';
+	protected $curl;
+	// http://php.net/manual/de/function.json-last-error.php#119985
+	protected $errorReference = [
+		JSON_ERROR_NONE => 'No error has occurred.',
+		JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
+		JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
+		JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded.',
+		JSON_ERROR_SYNTAX => 'Syntax error.',
+		JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
+		JSON_ERROR_RECURSION => 'One or more recursive references in the value to be encoded.',
+		JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
+		JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
+	];
+	const JSON_UNKNOWN_ERROR = 'Unknown error.';
     
-    /**
-     * Creates Icinga2API object
-     * 
-     * @param string $host host name or IP
-     * @param number $port API port
-     */
-    public function __construct($host, $port = 5665)
-    {
-        $this->host=$host;
-        $this->port=$port;
-    }
-    /**
-     * Set user & pass
-     * @param string $user
-     * @param string $pass
-     */
-    public function setCredentials($user,$pass)
-    {
-        $this->user=$user;
-        $this->pass=$pass;
-        $this->authmethod='pass';
-    }
+	/**
+	 * Creates Icinga2API object
+	 * 
+	 * @param string $host host name or IP
+	 * @param number $port API port
+	 */
+	public function __construct($host, $port = 5665)
+	{
+		$this->host=$host;
+		$this->port=$port;
+	}
+	/**
+	 * Set user & pass
+	 * @param string $user
+	 * @param string $pass
+	 */
+	public function setCredentials($user,$pass)
+	{
+		$this->user=$user;
+		$this->pass=$pass;
+		$this->authmethod='pass';
+	}
     
-    /**
-     * Set user & certificate (NOT IMPLEMENTED @throws RuntimeException)
-     * @param string $user
-     * @param string $usercert
-     */
-    public function setCredentialskey($user,$usercert)
-    {
-        $this->user=$user;
-        $this->usercert=$usercert;
-        $this->authmethod='cert';
-        throw new RuntimeException('Certificate auth not implemented');
-    }
+	/**
+	 * Set user & certificate (NOT IMPLEMENTED @throws RuntimeException)
+	 * @param string $user
+	 * @param string $usercert
+	 */
+	public function setCredentialskey($user,$usercert)
+	{
+		$this->user=$user;
+		$this->usercert=$usercert;
+		$this->authmethod='cert';
+		throw new RuntimeException('Certificate auth not implemented');
+	}
 
-    /**
-     * Test API connection
-     * @param array $permissions : check permissions if not null or empty
-     * @return array (bool,string) : bool = false is all OK, else true with message
-     * */
-    public function test(array $permissions)
-    {
-       try
-        {
-            $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
-        {
-            return array(true, 'Error with API : '.$e->getMessage());
-        }
-        //var_dump($result);
-        $permOk=1;
-        $permMissing='';
-        if ($permissions === NULL || count($permissions) == 0) // If no permission check return OK after connexion
-        {
-            return array(false,'OK');
-        }
-        if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
-        {
+	/**
+	 * Test API connection
+	 * @param array $permissions : check permissions if not null or empty
+	 * @return array (bool,string) : bool = false is all OK, else true with message
+	 * */
+	public function test(array $permissions)
+	{
+	   try
+		{
+			$result=$this->request('GET', "", NULL, NULL);
+		} 
+		catch (Exception $e)
+		{
+			return array(true, 'Error with API : '.$e->getMessage());
+		}
+		//var_dump($result);
+		$permOk=1;
+		$permMissing='';
+		if ($permissions === NULL || count($permissions) == 0) // If no permission check return OK after connexion
+		{
+			return array(false,'OK');
+		}
+		if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
+		{
             
-            foreach ( $permissions as $mustPermission)
-            {
-                $curPermOK=0;
-                foreach ( $result->results[0]->permissions as $curPermission)
-                {
-                    $curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
-                    if (preg_match('#'.$curPermission.'#',$mustPermission))
-                    {
-                        $curPermOK=1;
-                        break;
-                    }
-                }
-                if ($curPermOK == 0)
-                {
-                    $permOk=0;
-                    $permMissing=$mustPermission;
-                    break;
-                }
-            }
-            if ($permOk == 0)
-            {
-                return array(true,'API connection OK, but missing permission : '.$permMissing);
-            }
-            return array(false,'API connection OK');
+			foreach ( $permissions as $mustPermission)
+			{
+				$curPermOK=0;
+				foreach ( $result->results[0]->permissions as $curPermission)
+				{
+					$curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
+					if (preg_match('#'.$curPermission.'#',$mustPermission))
+					{
+						$curPermOK=1;
+						break;
+					}
+				}
+				if ($curPermOK == 0)
+				{
+					$permOk=0;
+					$permMissing=$mustPermission;
+					break;
+				}
+			}
+			if ($permOk == 0)
+			{
+				return array(true,'API connection OK, but missing permission : '.$permMissing);
+			}
+			return array(false,'API connection OK');
             
-        }
-        return array(true,'API connection OK, but cannot get permissions');
-    }
+		}
+		return array(true,'API connection OK, but cannot get permissions');
+	}
     
     
-    protected function url($url) {
-        return sprintf('https://%s:%d/%s/%s', $this->host, $this->port, $this->version, $url);
-    }
+	protected function url($url) {
+		return sprintf('https://%s:%d/%s/%s', $this->host, $this->port, $this->version, $url);
+	}
     
-    /**
-     * Create or return curl ressource
-     * @throws Exception
-     * @return resource
-     */
-    protected function curl() {
-        if ($this->curl === null) {
-            $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
-            if ($this->curl === false) {
-                throw new Exception('CURL INIT ERROR');
-            }
-        }
-        return $this->curl;
-    }
+	/**
+	 * Create or return curl ressource
+	 * @throws Exception
+	 * @return resource
+	 */
+	protected function curl() {
+		if ($this->curl === null) {
+			$this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
+			if ($this->curl === false) {
+				throw new Exception('CURL INIT ERROR');
+			}
+		}
+		return $this->curl;
+	}
 
-    /**
-     * Send a passive service check
-     * @param string $host : host name 
-     * @param string $service : service name
-     * @param int $state : state of service
-     * @param string $display : service passive check output
-     * @param string $perfdata : performance data as string
-     * @return array (status = true (oK) or false (nok), string message)
-     */
-    public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
-    {
-        //Send a POST request to the URL endpoint /v1/actions/process-check-result
-        //actions/process-check-result?service=example.localdomain!passive-ping6
-        $url='actions/process-check-result';
-        $body=array(
-            "filter"        => 'service.name=="'.$service.'" && service.host_name=="'.$host.'"',
-            'type'          => 'Service',
-            "exit_status"   => $state,
-            "plugin_output" => $display,
-            "performance_data" => $perfdata
-        );
-        try 
-        {
-            $result=$this->request('POST', $url, null, $body);
-        } catch (Exception $e) 
-        {
-            return array(false, $e->getMessage());
-        }
-        if (property_exists($result,'error') )
-        {
-            if (property_exists($result,'status'))
-            {
-                $message=$result->status;
-            }
-            else 
-            {
-                $message="Unkown status";
-            }
-            return array(false , 'Ret code ' .$result->error.' : '.$message);
-        }
-        if (property_exists($result, 'results'))
-        {
-            if (isset($result->results[0]))
-            {
-                return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
-            }
-            else
-            {
-                return array(false,'Service not found');
-            }
+	/**
+	 * Send a passive service check
+	 * @param string $host : host name 
+	 * @param string $service : service name
+	 * @param int $state : state of service
+	 * @param string $display : service passive check output
+	 * @param string $perfdata : performance data as string
+	 * @return array (status = true (oK) or false (nok), string message)
+	 */
+	public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
+	{
+		//Send a POST request to the URL endpoint /v1/actions/process-check-result
+		//actions/process-check-result?service=example.localdomain!passive-ping6
+		$url='actions/process-check-result';
+		$body=array(
+			"filter"        => 'service.name=="'.$service.'" && service.host_name=="'.$host.'"',
+			'type'          => 'Service',
+			"exit_status"   => $state,
+			"plugin_output" => $display,
+			"performance_data" => $perfdata
+		);
+		try 
+		{
+			$result=$this->request('POST', $url, null, $body);
+		} catch (Exception $e) 
+		{
+			return array(false, $e->getMessage());
+		}
+		if (property_exists($result,'error') )
+		{
+			if (property_exists($result,'status'))
+			{
+				$message=$result->status;
+			}
+			else 
+			{
+				$message="Unkown status";
+			}
+			return array(false , 'Ret code ' .$result->error.' : '.$message);
+		}
+		if (property_exists($result, 'results'))
+		{
+			if (isset($result->results[0]))
+			{
+				return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
+			}
+			else
+			{
+				return array(false,'Service not found');
+			}
             
-        }
-        return array(false,'Unkown result, open issue with this : '.print_r($result,true));
-    }
+		}
+		return array(false,'Unkown result, open issue with this : '.print_r($result,true));
+	}
   
-    /**
-     * Check 'result' exists and check for errors/status
-     * @param \stdClass $result
-     * @throws Exception 
-     */
-    public function checkResultStatus(\stdClass $result) 
-    {
-        if (property_exists($result,'error') )
-        {
-            if (property_exists($result,'status'))
-            {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
-            {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
-            }
-        }
-        if ( ! property_exists($result, 'results'))
-        {
-            throw new Exception('Unkown result');
-        }
-    }
+	/**
+	 * Check 'result' exists and check for errors/status
+	 * @param \stdClass $result
+	 * @throws Exception 
+	 */
+	public function checkResultStatus(\stdClass $result) 
+	{
+		if (property_exists($result,'error') )
+		{
+			if (property_exists($result,'status'))
+			{
+				throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+			}
+			else
+			{
+				throw new Exception('Ret code ' .$result->error.' : Unkown status');
+			}
+		}
+		if ( ! property_exists($result, 'results'))
+		{
+			throw new Exception('Unkown result');
+		}
+	}
     
-    /**
-     * Send request to API
-     * @param string $method get/post/...
-     * @param string $url (after /v1/ )
-     * @param array $headers
-     * @param array $body 
-     * @throws Exception
-     * @return array
-     */
-    public function request($method, $url, $headers, $body) {
-        $auth = sprintf('%s:%s', $this->user, $this->pass);
-        $curlHeaders = array("Accept: application/json");
-        if ($body !== null) {
-            $body = json_encode($body);
-            array_push($curlHeaders, 'Content-Type: application/json');
-            //array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
-        }
-        //var_dump($body);
-        //var_dump($this->url($url));
-        if ($headers !== null) {
-            $curlFinalHeaders = array_merge($curlHeaders, $headers);
-        } else 
-        {
-            $curlFinalHeaders=$curlHeaders;
-        }
-        $curl = $this->curl();
-        $opts = array(
-            CURLOPT_URL		=> $this->url($url),
-            CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
-            CURLOPT_USERPWD		=> $auth,
-            CURLOPT_CUSTOMREQUEST	=> strtoupper($method),
-            CURLOPT_RETURNTRANSFER 	=> true,
-            CURLOPT_CONNECTTIMEOUT 	=> 10,
-            CURLOPT_SSL_VERIFYHOST 	=> false,
-            CURLOPT_SSL_VERIFYPEER 	=> false,
-        );
-        if ($body !== null) {
-            $opts[CURLOPT_POSTFIELDS] = $body;
-        }
-        curl_setopt_array($curl, $opts);
-        $res = curl_exec($curl);
-        if ($res === false) {
-            throw new Exception('CURL ERROR: ' . curl_error($curl));
-        }
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        if ($statusCode === 401) {
-            throw new Exception('Unable to authenticate, please check your API credentials');
-        }
-        return $this->fromJsonResult($res);
-    }
+	/**
+	 * Send request to API
+	 * @param string $method get/post/...
+	 * @param string $url (after /v1/ )
+	 * @param array $headers
+	 * @param array $body 
+	 * @throws Exception
+	 * @return array
+	 */
+	public function request($method, $url, $headers, $body) {
+		$auth = sprintf('%s:%s', $this->user, $this->pass);
+		$curlHeaders = array("Accept: application/json");
+		if ($body !== null) {
+			$body = json_encode($body);
+			array_push($curlHeaders, 'Content-Type: application/json');
+			//array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
+		}
+		//var_dump($body);
+		//var_dump($this->url($url));
+		if ($headers !== null) {
+			$curlFinalHeaders = array_merge($curlHeaders, $headers);
+		} else 
+		{
+			$curlFinalHeaders=$curlHeaders;
+		}
+		$curl = $this->curl();
+		$opts = array(
+			CURLOPT_URL		=> $this->url($url),
+			CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
+			CURLOPT_USERPWD		=> $auth,
+			CURLOPT_CUSTOMREQUEST	=> strtoupper($method),
+			CURLOPT_RETURNTRANSFER 	=> true,
+			CURLOPT_CONNECTTIMEOUT 	=> 10,
+			CURLOPT_SSL_VERIFYHOST 	=> false,
+			CURLOPT_SSL_VERIFYPEER 	=> false,
+		);
+		if ($body !== null) {
+			$opts[CURLOPT_POSTFIELDS] = $body;
+		}
+		curl_setopt_array($curl, $opts);
+		$res = curl_exec($curl);
+		if ($res === false) {
+			throw new Exception('CURL ERROR: ' . curl_error($curl));
+		}
+		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		if ($statusCode === 401) {
+			throw new Exception('Unable to authenticate, please check your API credentials');
+		}
+		return $this->fromJsonResult($res);
+	}
     
-    /**
-     * 
-     * @param string $json json encoded 
-     * @throws Exception
-     * @return array json decoded
-     */
-    protected function fromJsonResult($json) {
-        $result = @json_decode($json);
-        //var_dump($json);
-        if ($result === null) {
-            throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));
-        }
-        return $result;
-    }
+	/**
+	 * 
+	 * @param string $json json encoded 
+	 * @throws Exception
+	 * @return array json decoded
+	 */
+	protected function fromJsonResult($json) {
+		$result = @json_decode($json);
+		//var_dump($json);
+		if ($result === null) {
+			throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));
+		}
+		return $result;
+	}
     
-    /**
-     * Return text error no json error
-     * @param string $errorCode
-     * @return string
-     */
-    protected function getLastJsonErrorMessage($errorCode) {
-        if (!array_key_exists($errorCode, $this->errorReference)) {
-            return self::JSON_UNKNOWN_ERROR;
-        }
-        return $this->errorReference[$errorCode];
-    }
+	/**
+	 * Return text error no json error
+	 * @param string $errorCode
+	 * @return string
+	 */
+	protected function getLastJsonErrorMessage($errorCode) {
+		if (!array_key_exists($errorCode, $this->errorReference)) {
+			return self::JSON_UNKNOWN_ERROR;
+		}
+		return $this->errorReference[$errorCode];
+	}
 
-    public function standardQuery(string $urlType , string $filter, array $attributes)
-    {
-        /*
+	public function standardQuery(string $urlType , string $filter, array $attributes)
+	{
+		/*
          *  curl -k -s -u  trapdirector:trapdirector -H 'X-HTTP-Method-Override: GET' -X POST 'https://localhost:5665/v1/objects/hosts' 
          *  -d '{"filter":"\"test_trap\" in host.groups","attrs": ["address" ,"address6"],"pretty": true}'
          
          {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        if (! isset($this->queryURL[$urlType] ))
-        {
-            throw new Exception("Unkown object type");
-        }
-        $url=$this->queryURL[$urlType];
-        $body=array();
-        if ($filter !== NULL)
-        {
-            $body['filter'] = $filter;
-        }
-        if (count($attributes) != 0)
-        {
-            $body['attrs'] = $attributes;
-        }
+		if (! isset($this->queryURL[$urlType] ))
+		{
+			throw new Exception("Unkown object type");
+		}
+		$url=$this->queryURL[$urlType];
+		$body=array();
+		if ($filter !== NULL)
+		{
+			$body['filter'] = $filter;
+		}
+		if (count($attributes) != 0)
+		{
+			$body['attrs'] = $attributes;
+		}
 
-        try
-        {
-            $result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
-        } catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
-        }
+		try
+		{
+			$result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
+		} catch (Exception $e)
+		{
+			throw new Exception($e->getMessage());
+		}
         
-        $this->checkResultStatus($result);
+		$this->checkResultStatus($result);
         
-        $numHost=0;
-        $hostArray=array();
-        while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
-        {
-            $hostArray[$numHost] = $result->results[$numHost]->attrs;
-            $numHost++;
-        }
-        return $hostArray;
-    }
+		$numHost=0;
+		$hostArray=array();
+		while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+		{
+			$hostArray[$numHost] = $result->results[$numHost]->attrs;
+			$numHost++;
+		}
+		return $hostArray;
+	}
     
 }
 

application/controllers/HandlerController.php

Indentation +295 added lines, -296 removed lines

@@ -12,13 +12,12 @@ 
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -28,13 +27,13 @@ 
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		$handlerTable = new HandlerTable(
-		      $this->moduleConfig->getTrapRuleName(),
-		      $this->moduleConfig->getHandlerListTitles(),
-		      $this->moduleConfig->getHandlerListDisplayColumns(),
-		      $this->moduleConfig->getHandlerColumns(),
-		      $dbConn->getConnection(),
-		      $this->view,
-		      $this->moduleConfig->urlPath());
+			  $this->moduleConfig->getTrapRuleName(),
+			  $this->moduleConfig->getHandlerListTitles(),
+			  $this->moduleConfig->getHandlerListDisplayColumns(),
+			  $this->moduleConfig->getHandlerColumns(),
+			  $dbConn->getConnection(),
+			  $this->view,
+			  $this->moduleConfig->urlPath());
 		
 		$handlerTable->setMaxPerPage($this->itemListDisplay());
 		
@@ -56,7 +55,7 @@ 
 		
 		// TODO : Obsolete remove after new table validation.
 		
-	    /**
+		/**
 		$this->getHandlerListTable()->setConnection($dbConn);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
 		// Apply pagination limits 
@@ -73,22 +72,22 @@ 
 	 */
 	public function testruleAction()
 	{
-	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
-	        'active'	=> true,
-	        'label'		=> $this->translate('Test Rule'),
-	        'url'		=> Url::fromRequest()
-	    ));
+		$this->checkReadPermission();
+		$this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Test Rule'),
+			'url'		=> Url::fromRequest()
+		));
 	    
 
-	    if ($this->params->get('rule') !== null) 
-	    {
-	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
-	    {
-	        $this->view->rule='';
-	    }
+		if ($this->params->get('rule') !== null) 
+		{
+			$this->view->rule= $this->params->get('rule');
+		}
+		else
+		{
+			$this->view->rule='';
+		}
 	}
 	
 	/**
@@ -96,31 +95,31 @@ 
 	 */
 	private function add_setup_vars()
 	{
-	    // variables to send to view
-	    $this->view->hostlist=array(); // host list to input datalist
-	    $this->view->hostname=''; // Host name in input text
-	    $this->view->serviceGet=false; // Set to true to get list of service if only one host set
-	    $this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
-	    $this->view->mainoid=''; // Trap OID
-	    $this->view->mib=''; // Trap mib
-	    $this->view->name=''; // Trap name
-	    $this->view->trapListForMIB=array(); // Trap list if mib exists for trap
-	    $this->view->objectList=array(); // objects sent with trap
-	    $this->view->display=''; // Initial display
-	    $this->view->rule=''; // rule display
-	    $this->view->revertOK=''; // revert OK in seconds
-	    $this->view->hostid=-1; // normally set by javascript serviceGet()
-	    $this->view->ruleid=-1; // Rule id in DB for update & delete
-	    $this->view->setToUpdate=false; // set form as update form
-	    $this->view->setRuleMatch=-1; // set action on rule match (default nothing)
-	    $this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
+		// variables to send to view
+		$this->view->hostlist=array(); // host list to input datalist
+		$this->view->hostname=''; // Host name in input text
+		$this->view->serviceGet=false; // Set to true to get list of service if only one host set
+		$this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
+		$this->view->mainoid=''; // Trap OID
+		$this->view->mib=''; // Trap mib
+		$this->view->name=''; // Trap name
+		$this->view->trapListForMIB=array(); // Trap list if mib exists for trap
+		$this->view->objectList=array(); // objects sent with trap
+		$this->view->display=''; // Initial display
+		$this->view->rule=''; // rule display
+		$this->view->revertOK=''; // revert OK in seconds
+		$this->view->hostid=-1; // normally set by javascript serviceGet()
+		$this->view->ruleid=-1; // Rule id in DB for update & delete
+		$this->view->setToUpdate=false; // set form as update form
+		$this->view->setRuleMatch=-1; // set action on rule match (default nothing)
+		$this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
 	    
-	    $this->view->selectGroup=false; // Select by group if true
-	    $this->view->hostgroupid=-1; // host group id
-	    $this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
+		$this->view->selectGroup=false; // Select by group if true
+		$this->view->hostgroupid=-1; // host group id
+		$this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
 	    
-	    $this->view->modifier=null;
-	    $this->view->modified=null;
+		$this->view->modifier=null;
+		$this->view->modified=null;
 	}
 	
 	/**
@@ -129,102 +128,102 @@ 
 	 */
 	private function add_from_existing($trapid)
 	{
-	    /********** Setup from existing trap ***************/
-	    // Get the full trap info
-	    $trapDetail=$this->getTrapDetail($trapid);
+		/********** Setup from existing trap ***************/
+		// Get the full trap info
+		$trapDetail=$this->getTrapDetail($trapid);
 	    
-	    $hostfilter=$trapDetail->source_ip;
+		$hostfilter=$trapDetail->source_ip;
 	    
-	    // Get host
-	    try
-	    {
-	        $hosts=$this->getIdoConn()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getIdoConn()->getHostByIP($hostfilter);
+		}
+		catch (Exception $e)
+		{
+			$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+		}
 	    
 	    
-	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
-	        $this->view->hostname=$hosts[0]->name;
-	        //$hostid=$hosts[0]->id;
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
+		// if one unique host found -> put id text input
+		if (count($hosts)==1) {
+			$this->view->hostname=$hosts[0]->name;
+			//$hostid=$hosts[0]->id;
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
 	        
-	    }
-	    else
-	    {
-	        foreach($hosts as $key=>$val)
-	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
-	        }
-	    }
+		}
+		else
+		{
+			foreach($hosts as $key=>$val)
+			{
+				array_push($this->view->hostlist,$hosts[$key]->name);
+			}
+		}
 	    
-	    // set up trap oid and objects received by the trap
+		// set up trap oid and objects received by the trap
 	    
-	    $this->view->mainoid=$trapDetail->trap_oid;
-	    if ($trapDetail->trap_name_mib != null)
-	    {
-	        $this->view->mib=$trapDetail->trap_name_mib;
-	        $this->view->name=$trapDetail->trap_name;
-	        $this->view->trapListForMIB=$this->getMIB()
-	        ->getTrapList($trapDetail->trap_name_mib);
-	    }
+		$this->view->mainoid=$trapDetail->trap_oid;
+		if ($trapDetail->trap_name_mib != null)
+		{
+			$this->view->mib=$trapDetail->trap_name_mib;
+			$this->view->name=$trapDetail->trap_name;
+			$this->view->trapListForMIB=$this->getMIB()
+			->getTrapList($trapDetail->trap_name_mib);
+		}
 	    
-	    // Get all objects that can be in trap from MIB
-	    $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
-	    // Get all objects in current Trap
-	    $currentTrapObjects=$this->getTrapobjects($trapid);
-	    $oid_index=1;
-	    foreach ($currentTrapObjects as $key => $val)
-	    {
-	        $currentObjectType='Unknown';
-	        $currentObjectTypeEnum='Unknown';
-	        if (isset($allObjects[$val->oid]['type']))
-	        {
-	            $currentObjectType=$allObjects[$val->oid]['type'];
-	            $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
-	        }
-	        $currentObject=array(
-	            $oid_index,
-	            $val->oid,
-	            $val->oid_name_mib,
-	            $val->oid_name,
-	            $val->value,
-	            $currentObjectType,
-	            $currentObjectTypeEnum
-	        );
-	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
-	        // set currrent object to null in allObjects
-	        if (isset($allObjects[$val->oid]))
-	        {
-	            $allObjects[$val->oid]=null;
-	        }
-	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
-	    {
-	        foreach ($allObjects as $key => $val)
-	        {
-	            if ($val==null) { continue; }
-	            array_push($this->view->objectList, array(
-	                $oid_index,
-	                $key,
-	                $allObjects[$key]['mib'],
-	                $allObjects[$key]['name'],
-	                '',
-	                $allObjects[$key]['type'],
-	                $allObjects[$key]['type_enum']
-	            ));
-	            $oid_index++;
-	        }
-	    }
+		// Get all objects that can be in trap from MIB
+		$allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
+		// Get all objects in current Trap
+		$currentTrapObjects=$this->getTrapobjects($trapid);
+		$oid_index=1;
+		foreach ($currentTrapObjects as $key => $val)
+		{
+			$currentObjectType='Unknown';
+			$currentObjectTypeEnum='Unknown';
+			if (isset($allObjects[$val->oid]['type']))
+			{
+				$currentObjectType=$allObjects[$val->oid]['type'];
+				$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
+			}
+			$currentObject=array(
+				$oid_index,
+				$val->oid,
+				$val->oid_name_mib,
+				$val->oid_name,
+				$val->value,
+				$currentObjectType,
+				$currentObjectTypeEnum
+			);
+			$oid_index++;
+			array_push($this->view->objectList,$currentObject);
+			// set currrent object to null in allObjects
+			if (isset($allObjects[$val->oid]))
+			{
+				$allObjects[$val->oid]=null;
+			}
+		}
+		if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+		{
+			foreach ($allObjects as $key => $val)
+			{
+				if ($val==null) { continue; }
+				array_push($this->view->objectList, array(
+					$oid_index,
+					$key,
+					$allObjects[$key]['mib'],
+					$allObjects[$key]['name'],
+					'',
+					$allObjects[$key]['type'],
+					$allObjects[$key]['type_enum']
+				));
+				$oid_index++;
+			}
+		}
 	    
-	    // Add a simple display
-	    $this->view->display='Trap '.$trapDetail->trap_name.' received';
-	    $this->view->create_basic_rule=true;
+		// Add a simple display
+		$this->view->display='Trap '.$trapDetail->trap_name.' received';
+		$this->view->create_basic_rule=true;
 	}
 
 	/**
@@ -233,29 +232,29 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getIdoConn()->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getIdoConn()->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
-	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
-	        $this->view->serviceGet=false;
-	    }
-	    else
-	    {
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
-	        // get service id for form to set :
-	        $serviceID=$this->getIdoConn()->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
-	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
-	        {
-	            $this->view->serviceSet=$serviceID[0]->id;
-	        }
-	    }
+		if (count($host_get)==0)
+		{
+			$this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+			$this->view->serviceGet=false;
+		}
+		else
+		{
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
+			// get service id for form to set :
+			$serviceID=$this->getIdoConn()->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
+			if (count($serviceID) ==0)
+			{
+				$this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+			else
+			{
+				$this->view->serviceSet=$serviceID[0]->id;
+			}
+		}
 	}
 
 	/**
@@ -264,33 +263,33 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getIdoConn()->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
-	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
-	        $this->view->serviceGroupGet=false;
-	    }
-	    else
-	    {
-	        $grpServices=$this->getIdoConn()->getServicesByHostGroupid($group_get[0]->id);
-	        $foundGrpService=0;
-	        foreach ($grpServices as $grpService)
-	        {
-	            if ($grpService[0] == $ruleDetail->service_name)
-	            {
-	                $foundGrpService=1;
-	                $this->view->serviceSet=$ruleDetail->service_name;
-	            }
-	        }
+		// Check if groupe exists
+		$group_get=$this->getIdoConn()->getHostGroupByName($this->view->hostgroupname);
+		if (count($group_get)==0)
+		{
+			$this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+			$this->view->serviceGroupGet=false;
+		}
+		else
+		{
+			$grpServices=$this->getIdoConn()->getServicesByHostGroupid($group_get[0]->id);
+			$foundGrpService=0;
+			foreach ($grpServices as $grpService)
+			{
+				if ($grpService[0] == $ruleDetail->service_name)
+				{
+					$foundGrpService=1;
+					$this->view->serviceSet=$ruleDetail->service_name;
+				}
+			}
 	        
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
-	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	    }
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGroupGet=true;
+			if ($foundGrpService==0)
+			{
+				$this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+		}
 	}
 	
 	/**
@@ -302,52 +301,52 @@ 
 	 */
 	private function add_create_trap_object_list(&$display, &$rule)
 	{
-	    $curObjectList=array();
-	    $index=1;
-	    // check in display & rule for : OID(<oid>)
-	    $matches=array();
-	    while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) ||
-	        preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
-	    {
-	        $curOid=$matches[1];
+		$curObjectList=array();
+		$index=1;
+		// check in display & rule for : OID(<oid>)
+		$matches=array();
+		while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) ||
+			preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
+		{
+			$curOid=$matches[1];
 	        
-	        if ( (preg_match('/\*/',$curOid) == 0 ) 
-	            && ($object=$this->getMIB()->translateOID($curOid)) != null)
-	        {
-	            array_push($curObjectList, array(
-	                $index,
-	                $curOid,
-	                $object['mib'],
-	                $object['name'],
-	                '',
-	                $object['type'],
-	                $object['type_enum']
-	            ));
-	        }
-	        else
-	        {
-	            array_push($curObjectList, array(
-	                $index,
-	                $curOid,
-	                'not found',
-	                'not found',
-	                '',
-	                'not found',
-	                'not found'
-	            ));
-	        }
-	        $curOid = preg_replace('/\*/','\*',$curOid);
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
-	        $index++;
-	    }
-	    return $curObjectList;
+			if ( (preg_match('/\*/',$curOid) == 0 ) 
+				&& ($object=$this->getMIB()->translateOID($curOid)) != null)
+			{
+				array_push($curObjectList, array(
+					$index,
+					$curOid,
+					$object['mib'],
+					$object['name'],
+					'',
+					$object['type'],
+					$object['type_enum']
+				));
+			}
+			else
+			{
+				array_push($curObjectList, array(
+					$index,
+					$curOid,
+					'not found',
+					'not found',
+					'',
+					'not found',
+					'not found'
+				));
+			}
+			$curOid = preg_replace('/\*/','\*',$curOid);
+			$display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
+			$rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+			$index++;
+		}
+		return $curObjectList;
 	}
 	
 	/** Add a handler  
-	*	Get params fromid : setup from existing trap (id of trap table)
-	*	Get param ruleid : edit from existing handler (id of rule table)
-	*/
+	 *	Get params fromid : setup from existing trap (id of trap table)
+	 *	Get param ruleid : edit from existing handler (id of rule table)
+	 */
 	public function addAction()
 	{
 		$this->checkConfigPermission();
@@ -370,8 +369,8 @@ 
 		//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
 		
 		if (($trapid = $this->params->get('fromid')) !== null) {
-		    /********** Setup from existing trap ***************/
-            $this->add_from_existing($trapid);
+			/********** Setup from existing trap ***************/
+			$this->add_from_existing($trapid);
 			return;
 		}
 		
@@ -399,14 +398,14 @@ 
 			$this->view->warning_message='';
 			if ($this->view->hostname != null)
 			{
-			    $this->view->selectGroup=false;
-			    // Check if hostname still exists
-			    $this->add_check_host_exists($ruleDetail);
+				$this->view->selectGroup=false;
+				// Check if hostname still exists
+				$this->add_check_host_exists($ruleDetail);
 			}
 			else
 			{
-			    $this->view->selectGroup=true;
-			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
+				$this->view->selectGroup=true;
+				$this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
 			}
 			
 			$this->view->mainoid=$ruleDetail->trap_oid;
@@ -434,9 +433,9 @@ 
 	}
 	
 	/** Validate form and output message to user  
-	*	@param in postdata 
-	* 	@return string status : OK / <Message>
-	**/
+	 *	@param in postdata 
+	 * 	@return string status : OK / <Message>
+	 **/
 	protected function handlerformAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -451,8 +450,8 @@ 
 			'host_group_name'=>	array('post' => null,            'val' => null,  'db'=>true),
 			'serviceid'		=>	array('post' => 'serviceid',                     'db'=>false),
 			'service_name'	=>	array('post' => 'serviceName',                    'db'=>true),
-		    'comment'       =>  array('post' => 'comment',       'val' => '',    'db'=>true),
-		    'rule_type'     =>  array('post' => 'category',       'val' => 0,    'db'=>true),
+			'comment'       =>  array('post' => 'comment',       'val' => '',    'db'=>true),
+			'rule_type'     =>  array('post' => 'category',       'val' => 0,    'db'=>true),
 			'trap_oid'		=>	array('post' => 'oid',                            'db'=>true),
 			'revert_ok'		=>	array('post' => 'revertOK',      'val' => 0,      'db'=>true),
 			'display'		=>	array('post' => 'display',        'val' => '',     'db'=>true),
@@ -461,7 +460,7 @@ 
 			'action_nomatch'=>	array('post' => 'ruleNoMatch',    'val' => -1,    'db'=>true),					
 			'ip4'			=>	array('post' => null,             'val' => null,  'db'=>true),
 			'ip6'			=>	array('post' => null,             'val' => null,  'db'=>true),
-		    'action_form'	=>	array('post' => 'action_form',    'val' => null, 'db'=>false)
+			'action_form'	=>	array('post' => 'action_form',    'val' => null, 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
@@ -469,7 +468,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
+				$this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
 			}
 			catch (Exception $e)
 			{
@@ -479,7 +478,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -506,8 +505,8 @@ 
 			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
 			if (! $isHostGroup ) 
 			{  // checks if selection by host 
-			    $hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
-			    if ($hostAddr === NULL) throw new \Exception("No object found");
+				$hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
+				if ($hostAddr === NULL) throw new \Exception("No object found");
 				$params['ip4']['val']=$hostAddr->ip4;
 				$params['ip6']['val']=$hostAddr->ip6;
 				$checkHostName=$hostAddr->name;
@@ -518,49 +517,49 @@ 
 				}
 				if ($this->apiMode == TRUE)
 				{
-				    $serviceName=$this->getIdoConn()->getServiceById($params['serviceid']['val']);
-				    if (count($serviceName) == 0 )
-				    {
-				        $this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
-				        return;
-				    }
+					$serviceName=$this->getIdoConn()->getServiceById($params['serviceid']['val']);
+					if (count($serviceName) == 0 )
+					{
+						$this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
+						return;
+					}
 				}
 				else
 				{
-    				if (!is_numeric($params['serviceid']['val']))
-    				{
-    				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
-    				    return;
-    				}
+					if (!is_numeric($params['serviceid']['val']))
+					{
+						$this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+						return;
+					}
     				
-    				$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
-    				if ($params['service_name']['val'] != $serviceName->name2)
-    				{
-    					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
-    					return;
-    				}
+					$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
+					if ($params['service_name']['val'] != $serviceName->name2)
+					{
+						$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
+						return;
+					}
 				}
 			}
 			else
 			{
-			    if ($this->apiMode == TRUE)
-			    {
-			        $object=$this->getIdoConn()->getHostGroupById($params['hostid']['val']);
-			        if (count($object) == 0 || $params['host_name']['val'] != $object->__name)
-			        {
-			            $this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
-			            return;
-			        }
-			    }
-			    else 
-			    {
-    			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
-    				if ($params['host_name']['val'] != $object->name1)
-    				{
-    					$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
-    					return;					
-    				}
-			    }
+				if ($this->apiMode == TRUE)
+				{
+					$object=$this->getIdoConn()->getHostGroupById($params['hostid']['val']);
+					if (count($object) == 0 || $params['host_name']['val'] != $object->__name)
+					{
+						$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
+						return;
+					}
+				}
+				else 
+				{
+					$object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
+					if ($params['host_name']['val'] != $object->name1)
+					{
+						$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
+						return;					
+					}
+				}
 				// Put param in correct column (group_name)
 				$params['host_group_name']['val'] = $params['host_name']['val'];
 				$params['host_name']['val']=null;
@@ -577,17 +576,17 @@ 
 			
 			if ($params['db_rule']['val'] == -1 || $params['action_form']['val'] == 'clone') 
 			{  // If no rule number or action is clone, add the handler
-			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
+				$ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
 			}
 			else
 			{
-			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
 		catch (Exception $e)
 		{
-		    $this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
+			$this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK', 'id' => $ruleID));
@@ -595,9 +594,9 @@ 
 	}
 
 	/** Get trap detail by trapid. 
-	*	@param integer $trapid : id of trap in received table
-	*	@return array (objects)
-	*/
+	 *	@param integer $trapid : id of trap in received table
+	 *	@return array (objects)
+	 */
 	protected function getTrapDetail($trapid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -613,14 +612,14 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
 			if ( $trapDetail == null ) 
 			{
-			    $trapDetail = 'NULL';
-			    throw new Exception('No traps was found with id = '.$trapid);
+				$trapDetail = 'NULL';
+				throw new Exception('No traps was found with id = '.$trapid);
 			}
 		}
 		catch (Exception $e)
@@ -634,9 +633,9 @@ 
 	}
 
 	/** Get trap objects
-	*	@param integer $trapid : trap id
-	* 	@return array : full column in db of trap id
-	*/
+	 *	@param integer $trapid : trap id
+	 * 	@return array : full column in db of trap id
+	 */
 	protected function getTrapobjects($trapid)
 	{	
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -652,7 +651,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -668,10 +667,10 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object|array : column objects in db 
-	*
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object|array : column objects in db 
+	 *
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -682,7 +681,7 @@ 
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -699,7 +698,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

application/controllers/HelperController.php

Indentation +151 added lines, -151 removed lines

@@ -12,8 +12,8 @@ 
 {
 	
 	/** Get host list with filter (IP or name) : host=<filter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -22,15 +22,15 @@ 
 		
 		$retHosts=array('status'=>'OK','hosts' => array());
 		$this->getIdoConn(); // set apiMode to correct val
-        if ($this->apiMode === TRUE)
-        {
-          $hosts=$this->getIdoConn()->getHostByNameOrIP($hostFilter);
-          $retHosts['test']=count($hosts);
-        }
-        else 
-        {
+		if ($this->apiMode === TRUE)
+		{
+		  $hosts=$this->getIdoConn()->getHostByNameOrIP($hostFilter);
+		  $retHosts['test']=count($hosts);
+		}
+		else 
+		{
 		  $hosts=$this->getIdoConn()->getHostByIP($hostFilter);
-        }
+		}
 		foreach ($hosts as $val)
 		{
 			array_push($retHosts['hosts'],$val->name);
@@ -40,8 +40,8 @@ 
 	}
 	
 	/** Get hostgroup list with filter (name) : hostgroup=<hostFilter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostgroupsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -60,11 +60,11 @@ 
 	}
 	
 	/** Get service list by host name ( host=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		hostid = host object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		hostid = host object id or -1 if not found.
+	 */
 	public function getservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -106,11 +106,11 @@ 
 	}
 	
 	/** Get service list by host group ( name=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		groupid = group object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		groupid = group object id or -1 if not found.
+	 */
 	public function gethostgroupservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -140,10 +140,10 @@ 
 	}
 
 	/** Get traps from mib  : entry : mib=<mib>
-	*	returns in JSON : 
-	*		status=>OK/No mib/Error getting mibs
-	*		traps=>array of array( oid -> name)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No mib/Error getting mibs
+	 *		traps=>array of array( oid -> name)
+	 */
 	public function gettrapsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -163,10 +163,10 @@ 
 	}	
 
 	/** Get trap objects from mib  : entry : trap=<oid>
-	*	returns in JSON : 
-	*		status=>OK/no trap/not found
-	*		objects=>array of array( oid -> name, oid->mib)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/no trap/not found
+	 *		objects=>array of array( oid -> name, oid->mib)
+	 */
 	public function gettrapobjectsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -186,8 +186,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -202,10 +202,10 @@ 
 	}
 	
 	/** Get MIB::Name from OID : entry : oid
-	*		status=>OK/No oid/not found
-	*		mib=>string
-	*		name=>string
-	*/	
+	 *		status=>OK/No oid/not found
+	 *		mib=>string
+	 *		name=>string
+	 */	
 	public function translateoidAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -226,7 +226,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -234,10 +234,10 @@ 
 	}
 	
 	/** Save or execute database purge of <n> days
-	*	days=>int 
-	*	action=>save/execute
-	*	return : status=>OK/Message error
-	*/
+	 *	days=>int 
+	 *	action=>save/execute
+	 *	return : status=>OK/Message error
+	 */
 	public function dbmaintenanceAction()
 	{
 		
@@ -252,7 +252,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+				$this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
 			}
 			catch (Exception $e)
 			{
@@ -290,33 +290,33 @@ 
 	 */
 	public function snmpconfigAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
+		$snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
 	    
-	    $snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
+		$snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
 	    	    
-	    try
-	    {
-	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
-	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
-	        return;
-	    }
-	    $this->_helper->json(array('status'=>'OK'));
-	    return;
+		try
+		{
+			$this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
+			$this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			return;
+		}
+		$this->_helper->json(array('status'=>'OK'));
+		return;
 	    
 	}
 	
 	/** Save log output to db
-	*	destination=>log destination 
-	*	file=>file name
-	*	level => int 
-	*	return : status=>OK/Message error
-	*/
+	 *	destination=>log destination 
+	 *	file=>file name
+	 *	level => int 
+	 *	return : status=>OK/Message error
+	 */
 	public function logdestinationAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -335,8 +335,8 @@ 
 			$fileHandler=@fopen($file,'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
-			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
-			    return;
+				$this->_helper->json(array('status'=>'File not writable :  '.$file));
+				return;
 			}
 		}
 		else
@@ -356,9 +356,9 @@ 
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+			$this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
+			$this->getUIDatabase()->setDBConfigValue('log_file',$file);
+			$this->getUIDatabase()->setDBConfigValue('log_level',$level);
 		}
 		catch (Exception $e)
 		{
@@ -378,33 +378,33 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+		$rule = $this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+		$action = $this->checkPostVar($postData, 'action', 'evaluate');
 
-	    if ($action == 'evaluate')
-	    {
-	        try
-	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
-	            // Cleanup spaces before eval
-	            $rule=$trap->ruleClass->eval_cleanup($rule);
-	            // Eval
-	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
-	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
-	            return;
-	        }
-	        $return=($rule==true)?'true':'false';
-	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
-	    }
+		if ($action == 'evaluate')
+		{
+			try
+			{
+				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+				$trap = new Trap($icingaweb2_etc);
+				// Cleanup spaces before eval
+				$rule=$trap->ruleClass->eval_cleanup($rule);
+				// Eval
+				$item=0;
+				$rule=$trap->ruleClass->evaluation($rule,$item);
+			}
+			catch (Exception $e)
+			{
+				$this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+				return;
+			}
+			$return=($rule==true)?'true':'false';
+			$this->_helper->json(array('status'=>'OK', 'message' => $return));
+		}
 	    
 	}	
 
@@ -415,35 +415,35 @@ 
 	 */
 	public function pluginAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+		$pluginName = $this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+		$action = $this->checkPostVar($postData, 'action', 'enable|disable');
 	    
-        try
-        {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
-            // Enable plugin.
-            $action=($action == 'enable') ? true : false;
-            $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2_etc);
+			// Enable plugin.
+			$action=($action == 'enable') ? true : false;
+			$retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
-        {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-            return;
-        }
-        if ($retVal === true)
-        {
-            $this->_helper->json(array('status'=>'OK'));
-        }
-        else
-        {
-            $this->_helper->json(array('status'=>'Error, see logs'));
-        }
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
+		if ($retVal === true)
+		{
+			$this->_helper->json(array('status'=>'OK'));
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'Error, see logs'));
+		}
 	}
 	
 	/** Function evaluation
@@ -453,49 +453,49 @@ 
 	 */
 	public function functionAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+		$functionString = $this->checkPostVar($postData, 'function', '.*');
 	    
-	    $this->checkPostVar($postData, 'action', 'evaluate');
+		$this->checkPostVar($postData, 'action', 'evaluate');
 	    
-	    // Only one action possible for now, no tests on action.
-	    try
-	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
-	        // load all plugins in case tested function is not enabled.
-	        $trap->pluginClass->registerAllPlugins(false);
-	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
-	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-	        return;
-	    }
+		// Only one action possible for now, no tests on action.
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2Etc);
+			// load all plugins in case tested function is not enabled.
+			$trap->pluginClass->registerAllPlugins(false);
+			// Clean all spaces
+			$functionString = $trap->ruleClass->eval_cleanup($functionString);
+			// Eval functions
+			$result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+		$result = ($result === true)?'True':'False';
+		$this->_helper->json(array('status'=>'OK','message' => $result));
 	}
 
-    /**************   Utilities **********************/
+	/**************   Utilities **********************/
 
 	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
 	{
-	    if (!isset ($postData[$postVar]))
-	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
-	        return '';
-	    }
-	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
-	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
-	        return '';
-	    }
-	    return $postData[$postVar];
+		if (!isset ($postData[$postVar]))
+		{
+			$this->_helper->json(array('status'=>'No ' . $postVar));
+			return '';
+		}
+		if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
+		{
+			$this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+			return '';
+		}
+		return $postData[$postVar];
 	}
 }