patrickpr / trapdirector

library/Trapdirector/Tables/HandlerTableList.php

Indentation +59 added lines, -59 removed lines

@@ -31,9 +31,9 @@ 
 	
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	protected function getTitles() {
 		return $this->moduleConfig->getHandlerListTitles();
@@ -45,10 +45,10 @@ 
 		$this->doTranslate=true;
 	}
 	// ******************  Render table in html  
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	public function render()
 	{
@@ -153,30 +153,30 @@ 
 
 	}
 
-    public function count()
-    {
-        //$db = $this->connection()->getConnection();
-        $query = clone($this->getBaseQuery());
-        $query->reset('order')->columns(array('COUNT(*)'));
-        $this->applyFiltersToQuery($query);
+	public function count()
+	{
+		//$db = $this->connection()->getConnection();
+		$query = clone($this->getBaseQuery());
+		$query->reset('order')->columns(array('COUNT(*)'));
+		$this->applyFiltersToQuery($query);
 
 		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapRuleName(),
-            array('COUNT(*)')
-        );
+			$this->moduleConfig->getTrapRuleName(),
+			array('COUNT(*)')
+		);
 		
-        return $db->fetchOne($query);
-    }
+		return $db->fetchOne($query);
+	}
 	
-    public function getPaginator()
-    {
-        $paginator = new Paginator();
-        $paginator->setQuery($this);
+	public function getPaginator()
+	{
+		$paginator = new Paginator();
+		$paginator->setQuery($this);
 
-        return $paginator;
-    }
+		return $paginator;
+	}
 	
 	// ****************** DB connection and query
 	
@@ -186,63 +186,63 @@ 
 		
 		$query = $this->getBaseQuery();
 		
-       if ($this->hasLimit() || $this->hasOffset()) {
-            $query->limit($this->getLimit(), $this->getOffset());
-        }		
+	   if ($this->hasLimit() || $this->hasOffset()) {
+			$query->limit($this->getLimit(), $this->getOffset());
+		}		
 		
 		return $db->fetchAll($query);
 	}
 	 
-    public function getBaseQuery()
-    {
+	public function getBaseQuery()
+	{
 		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapRuleName(),
-            $this->moduleConfig->getHandlerListDisplayColumns()
-        )->order('host_name DESC,trap_oid DESC');
+			$this->moduleConfig->getTrapRuleName(),
+			$this->moduleConfig->getHandlerListDisplayColumns()
+		)->order('host_name DESC,trap_oid DESC');
 
-        return $query;
-    }	 
+		return $query;
+	}	 
 	
 	// ****************** Filters
 
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	public function getColumns()
 	{
 		return $this->moduleConfig->getHandlerListDisplayColumns();
 	}
 
-    public function setFilter($filter)
-    {
-        $this->filter = $filter;
-        return $this;
-    }
+	public function setFilter($filter)
+	{
+		$this->filter = $filter;
+		return $this;
+	}
 	
 	public function getFilterEditor(Request $request)
-    {
-        $filterEditor = Widget::create('filterEditor')
-            ->setColumns(array_keys($this->getColumns()))
-            ->setSearchColumns(array_keys($this->getSearchColumns()))
-            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
-            ->ignoreParams('page')
-            ->handleRequest($request);
+	{
+		$filterEditor = Widget::create('filterEditor')
+			->setColumns(array_keys($this->getColumns()))
+			->setSearchColumns(array_keys($this->getSearchColumns()))
+			->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
+			->ignoreParams('page')
+			->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
-        $this->setFilter($filter);
+		$filter = $filterEditor->getFilter();
+		$this->setFilter($filter);
 
-        return $filterEditor;
-    }
+		return $filterEditor;
+	}
 	
-    protected function applyFiltersToQuery($query)
-    {
+	protected function applyFiltersToQuery($query)
+	{
 		// TODO : implement
 		
-        /*$filter = null;
+		/*$filter = null;
         $enforced = $this->enforcedFilters;
         if ($this->filter && ! $this->filter->isEmpty()) {
             $filter = $this->filter;
@@ -257,7 +257,7 @@ 
         }
 		*/
 		
-        return $query;
-    }	
+		return $query;
+	}	
 
 }

Spacing +34 added lines, -34 removed lines

@@ -32,8 +32,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		return $this->moduleConfig->getHandlerListTitles();
@@ -53,34 +53,34 @@ 
 	public function render()
 	{
 		$data=$this->getTable();
-		$view = $this->getView();
-		$this->columnCount = count($this->getTitles());
+		$view=$this->getView();
+		$this->columnCount=count($this->getTitles());
 		$this->lastDay=null;
 		// Table start
-		$htm  = '<table class="simple common-table table-row-selectable">';
+		$htm='<table class="simple common-table table-row-selectable">';
 		
 		// Titles
-		$htm .= "<thead>\n  <tr>\n";
-		$titles = $this->getTitles();
+		$htm.="<thead>\n  <tr>\n";
+		$titles=$this->getTitles();
 		foreach ($titles as $title) 
 		{
-			$htm .= '    <th>' . $view->escape($view->translate($title)) . "</th>\n";
+			$htm.='    <th>'.$view->escape($view->translate($title))."</th>\n";
 		}
-		$htm .= "  </tr>\n</thead>\n";
+		$htm.="  </tr>\n</thead>\n";
 		
 		// Rows
-		$htm .= "<tbody>\n";
+		$htm.="<tbody>\n";
 		
 		foreach ($data as $row) 
 		{
-			$firstCol = true;
+			$firstCol=true;
 			// Put date header
 			//$htm .= $this->renderDayIfNew($row->timestamp);
 			
 			
 			// Render row
-			$htm .= '<tr '.' >';
-			foreach ( $titles as $rowkey => $title) 
+			$htm.='<tr '.' >';
+			foreach ($titles as $rowkey => $title) 
 			{
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
@@ -93,7 +93,7 @@ 
 						break;
 						case 'trap_oid': // try to traslate oids.
 						
-							if ($this->doTranslate===true)
+							if ($this->doTranslate === true)
 							{
 								$oidName=$this->MIB->translateOID($row->$rowkey);
 								if (isset($oidName['name']))
@@ -102,52 +102,52 @@ 
 								}
 								else
 								{
-									$val = $row->$rowkey;
+									$val=$row->$rowkey;
 								}								
 							}
 							else
 							{
-								$val = $row->$rowkey;
+								$val=$row->$rowkey;
 							}
 						break;
 						case 'host_name': // switch to hostgroup if name is null
 							if ($row->$rowkey == null)
 							{
-								$val = $row->host_group_name;
+								$val=$row->host_group_name;
 							}
 							else
 							{
-								$val = $row->$rowkey;
+								$val=$row->$rowkey;
 							}
 						break;
 						default:
-							$val = $row->$rowkey;
+							$val=$row->$rowkey;
 					}
-					if ($rowkey == 'trap_oid' && $this->doTranslate===true)
+					if ($rowkey == 'trap_oid' && $this->doTranslate === true)
 					{					
 							
 					}
 				} else {
-					$val = '-';
+					$val='-';
 				}
 				if ($firstCol === true) { // Put link in first column for trap detail.
-					$htm .= '<td>' 
+					$htm.='<td>' 
 							. $view->qlink(
 									$view->escape($val),  
 									Url::fromPath(
-										$this->moduleConfig->urlPath() . '/handler/add', 
+										$this->moduleConfig->urlPath().'/handler/add', 
 										array('ruleid' => $row->id)
 									)
 							)
 							. '</td>';
 				} else {
-					$htm .= '<td>' . $view->escape($val) . '</td>';
+					$htm.='<td>'.$view->escape($val).'</td>';
 				}
 				$firstCol=false;
 			}
-			$htm .= "<tr>\n";
+			$htm.="<tr>\n";
 		}
-		$htm .= "</tbody></table>\n";
+		$htm.="</tbody></table>\n";
 		//$htm .= "Filter : " . $this->filter."<br>\n";
 		return $htm;
 
@@ -156,13 +156,13 @@ 
     public function count()
     {
         //$db = $this->connection()->getConnection();
-        $query = clone($this->getBaseQuery());
+        $query=clone($this->getBaseQuery());
         $query->reset('order')->columns(array('COUNT(*)'));
         $this->applyFiltersToQuery($query);
 
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapRuleName(),
             array('COUNT(*)')
         );
@@ -172,7 +172,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -184,7 +184,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -197,7 +197,7 @@ 
     {
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapRuleName(),
             $this->moduleConfig->getHandlerListDisplayColumns()
         )->order('host_name DESC,trap_oid DESC');
@@ -219,20 +219,20 @@ 
 
     public function setFilter($filter)
     {
-        $this->filter = $filter;
+        $this->filter=$filter;
         return $this;
     }
 	
 	public function getFilterEditor(Request $request)
     {
-        $filterEditor = Widget::create('filterEditor')
+        $filterEditor=Widget::create('filterEditor')
             ->setColumns(array_keys($this->getColumns()))
             ->setSearchColumns(array_keys($this->getSearchColumns()))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
+        $filter=$filterEditor->getFilter();
         $this->setFilter($filter);
 
         return $filterEditor;

library/Trapdirector/Icinga2Api.php

Indentation +330 added lines, -330 removed lines

@@ -8,361 +8,361 @@
 
 class Icinga2API 
 {
-    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 $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');
+	}
 
-    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 (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
-        {
+	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 (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) {
-                throw new Exception('CURL INIT ERROR: ' . curl_error($this->curl));
-            }
-        }
-        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) {
+				throw new Exception('CURL INIT ERROR: ' . curl_error($this->curl));
+			}
+		}
+		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
-     * @return array (status = true (oK) or false (nok), string message)
-     */
-    public function serviceCheckResult($host,$service,$state,$display)
-    {
-        //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
-        );
-        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
+	 * @return array (status = true (oK) or false (nok), string message)
+	 */
+	public function serviceCheckResult($host,$service,$state,$display)
+	{
+		//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
+		);
+		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));
+	}
  
-    /**
-     * 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($ip) 
-    {
-        /*
+	/**
+	 * 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($ip) 
+	{
+		/*
          *  curl -k -s -u  trapdirector:trapdirector -H 'X-HTTP-Method-Override: GET' -X POST 'https://localhost:5665/v1/objects/hosts' 
          *  -d '{"filter":"host.group==\"test_trap\"","attrs": ["address" ,"address6"]}'
             
             {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        $url='objects/hosts';
-        $body=array(
-            "filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
-            "attrs"         => array('__name','name','display_name')
-        );
-        try
-        {
-            $result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
-        } catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
-        }
+		$url='objects/hosts';
+		$body=array(
+			"filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
+			"attrs"         => array('__name','name','display_name')
+		);
+		try
+		{
+			$result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
+		} catch (Exception $e)
+		{
+			throw new Exception($e->getMessage());
+		}
         
-        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'))
-        {
-            $numHost=0;
-            $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
-            {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $numHost++;
-            }
-            return $hostArray;            
-        }
-        throw new Exception('Unkown 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'))
+		{
+			$numHost=0;
+			$hostArray=array();
+			while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+			{
+				$hostArray[$numHost] = $result->results[$numHost]->attrs;
+				$numHost++;
+			}
+			return $hostArray;            
+		}
+		throw new Exception('Unkown result');
+	}
 
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostsIPByHostGroup($hostGroup)
-    {        
-        $url='objects/hosts';
-        $body=array(
-            "filter"        => '\"'.$hostGroup.'\" in host.groups',
-            "attrs"         => array('address','address','name')
-        );
-        try
-        {
-            $result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
-        } catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
-        }
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostsIPByHostGroup($hostGroup)
+	{        
+		$url='objects/hosts';
+		$body=array(
+			"filter"        => '\"'.$hostGroup.'\" in host.groups',
+			"attrs"         => array('address','address','name')
+		);
+		try
+		{
+			$result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
+		} catch (Exception $e)
+		{
+			throw new Exception($e->getMessage());
+		}
         
-        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'))
-        {
-            $numHost=0;
-            $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
-            {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $hostArray[$numHost]->name = $result->results[$numHost]->name;
-                $numHost++;
-            }
-            return $hostArray;
-        }
-        throw new Exception('Unkown 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'))
+		{
+			$numHost=0;
+			$hostArray=array();
+			while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+			{
+				$hostArray[$numHost] = $result->results[$numHost]->attrs;
+				$hostArray[$numHost]->name = $result->results[$numHost]->name;
+				$numHost++;
+			}
+			return $hostArray;
+		}
+		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];
+	}
 }
 

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
        try
         {
             $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return array(true, 'Error with API : '.$e->getMessage());
         }
@@ -165,8 +164,7 @@ 
             if (property_exists($result,'status'))
             {
                 $message=$result->status;
-            }
-            else 
+            } else 
             {
                 $message="Unkown status";
             }
@@ -177,8 +175,7 @@ 
             if (isset($result->results[0]))
             {
                 return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
-            }
-            else
+            } else
             {
                 return array(false,'Service not found');
             }
@@ -220,8 +217,7 @@ 
             if (property_exists($result,'status'))
             {
                 throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
+            } else
             {
                 throw new Exception('Ret code ' .$result->error.' : Unkown status');
             }
@@ -266,8 +262,7 @@ 
             if (property_exists($result,'status'))
             {
                 throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
+            } else
             {
                 throw new Exception('Ret code ' .$result->error.' : Unkown status');
             }

bin/trap_class.php

Indentation +210 added lines, -210 removed lines

@@ -58,7 +58,7 @@ 
 	
 	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
 	{
-	    // Paths of ini files
+		// Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
 		$this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";		
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
@@ -67,18 +67,18 @@ 
 		$this->logging = new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-		    $this->logSetup=true;
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
 		}
 		else
-		    $this->logSetup=false;
+			$this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
 		$trapConfig=parse_ini_file($this->trap_module_config,true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -112,26 +112,26 @@ 
 	 */
 	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
 	{
-	    if (!isset($option_array[$option_category][$option_name]))
-	    {
-	        if ($message === null)
-	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
-	        }
-	        $this->logging->log($message,$log_level,'syslog');
-	        return false;
-	    }
-	    else
-	    {
-	        $option_var=$option_array[$option_category][$option_name];
-	        return true;
-	    }
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+			}
+			$this->logging->log($message,$log_level,'syslog');
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
 	}
 	
 	/** 
 	 * Get options from ini file
 	 * @param array $trap_config : ini file array
-	*/
+	 */
 	protected function getMainOptions($trapConfig)
 	{
 
@@ -150,10 +150,10 @@ 
 		// API options
 		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
 		{
-		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+			$this->api_use=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -163,45 +163,45 @@ 
 	 */
 	protected function setupDatabase($trapConfig)
 	{
-	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
 	    
 	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
-	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+		if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
-	    // IDO Database
-	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
-	    }
-	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
-
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];		
+
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
 	}
 	
 	/**
@@ -212,9 +212,9 @@ 
 		// Database options
 		if ($this->logSetup === false) // Only if logging was no setup in constructor
 		{
-    		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-    		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-    		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+			$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
 		}
 	}
 
@@ -225,10 +225,10 @@ 
 	}
 	
 	/** 
-	*   Get data from db_config
-	*	@param $element string name of param
-	*	@return mixed : value (or null)
-	*/	
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */	
 	protected function getDBConfig($element)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -246,15 +246,15 @@ 
 	}
 	
 	/** OBSOLETE Send log. Throws exception on critical error
-	*	@param	string $message Message to log
-	*	@param	int $level 1=critical 2=warning 3=trace 4=debug
-	*	@param  string $destination file/syslog/display
-	*	@return void
-	**/	
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 **/	
 	public function trapLog( $message, $level, $destination ='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
-	    $this->logging->log($message, $level, $destination);
+		$this->logging->log($message, $level, $destination);
 	}
 	
 	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
@@ -264,19 +264,19 @@ 
 	
 	protected function getAPI()
 	{
-	    if ($this->icinga2api == null)
-	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
-	    }
-	    return $this->icinga2api;
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+		}
+		return $this->icinga2api;
 	}
 	
 	
 	/** 
 	 * read data from stream
-	*	@param $stream string input stream, defaults to "php://stdin"
-	*	@return mixed array trap data or exception with error
-	*/
+	 *	@param $stream string input stream, defaults to "php://stdin"
+	 *	@return mixed array trap data or exception with error
+	 */
 	public function read_trap($stream='php://stdin')
 	{
 		//Read data from snmptrapd from stdin
@@ -284,7 +284,7 @@ 
 
 		if ($input_stream === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
 			$this->logging->log("Error reading stdin !",ERROR,'');
 			return null; // note : exception thrown by logging
 		}
@@ -293,21 +293,21 @@ 
 		$this->receivingHost=chop(fgets($input_stream));
 		if ($this->receivingHost === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
 			$this->logging->log("Error reading Host !",ERROR,''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
 			$this->logging->log("Error reading IP !",ERROR,''); 
 		}
 		$matches=array();
 		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
 		if ($ret_code===0 || $ret_code===false) 
 		{
-		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
+			$this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
 		} 
 		else 
@@ -328,7 +328,7 @@ 
 			}
 			else 
 			{
-			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+				if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
 				}
@@ -344,7 +344,7 @@ 
 
 		if ($this->trap_data['trap_oid']=='unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
 			$this->logging->log('no trap oid found',ERROR,'');
 		} 
 
@@ -374,9 +374,9 @@ 
 
 	/** 
 	 * Translate oid into array(MIB,Name)
-	* @param $oid string oid to translate
-	* @return mixed : null if not found or array(MIB,Name)
-	*/
+	 * @param $oid string oid to translate
+	 * @return mixed : null if not found or array(MIB,Name)
+	 */
 	public function translateOID($oid)
 	{
 		// try from database
@@ -409,7 +409,7 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$matches=array();
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code === false) {
@@ -422,9 +422,9 @@ 
 	
 	/** 
 	 * Erase old trap records 
-	*	@param integer $days : erase traps when more than $days old
-	*	@return integer : number of lines deleted
-	**/
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
 	public function eraseOldTraps($days=0)
 	{
 		if ($days==0)
@@ -449,72 +449,72 @@ 
 	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
 	{
 	    
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
 	    
-	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+		// add date time
+		$insert_col ='date_received,status';
+		$insert_val = "'" . date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
-	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
-	    }
-	    if ($trapoid !=null)
-	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
-	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+		if ($sourceIP !=null)
+		{
+			$insert_col .=',source_ip';
+			$insert_val .=",'". $sourceIP ."'";
+		}
+		if ($trapoid !=null)
+		{
+			$insert_col .=',trap_oid';
+			$insert_val .=",'". $trapoid ."'";
+		}
+		$insert_col .=',status_detail';
+		$insert_val .=",'". $message ."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
 	    
-	    switch ($this->trapsDB->trapDBType)
-	    {
-	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO);
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
-	            }
-	            $this->trap_id=$inserted_id_ret['id'];
-	            break;
-	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
-	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            $sql='SELECT LAST_INSERT_ID();';
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',1,'');
+				}
+				$this->trap_id=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
 	            
-	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-	            $this->trap_id=$inserted_id;
-	            break;
-	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-	    }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+		$this->logging->log('id found: '. $this->trap_id,INFO );    
 	}
 	
 	/** Write trap data to trap database
-	*/
+	 */
 	public function writeTrapToDB()
 	{
 		
@@ -612,10 +612,10 @@ 
 	}
 
 	/** Get rules from rule database with ip and oid
-	*	@param $ip string ipv4 or ipv6
-	*	@param $oid string oid in numeric
-	*	@return mixed|boolean : PDO object or false
-	*/	
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed|boolean : PDO object or false
+	 */	
 	protected function getRules($ip,$oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -674,9 +674,9 @@ 
 	}
 
 	/** Add rule match to rule
-	*	@param id int : rule id
-	*   @param set int : value to set
-	*/
+	 *	@param id int : rule id
+	 *   @param set int : value to set
+	 */
 	protected function add_rule_match($id, $set)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -693,53 +693,53 @@ 
 	 * @param integer $state numerical staus 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
-	*/
+	 */
 	public function serviceCheckResult($host,$service,$state,$display)
 	{
-	    if ($this->api_use === false)
-	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+		if ($this->api_use === false)
+		{
+			$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
+				$host.';' .$service .';' . $state . ';'.$display;
+			$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
     		
-    		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-    		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
-    		return true;
-	    }
-	    else
-	    {
-	        $api = $this->getAPI();
-	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
-	        if ($retcode == false)
-	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-	            return false;
-	        }
-	        else 
-	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
-	            return true;
-	        }
-	    }
+			// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
+			exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+			return true;
+		}
+		else
+		{
+			$api = $this->getAPI();
+			$api->setCredentials($this->api_username, $this->api_password);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+			if ($retcode == false)
+			{
+				$this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+				return false;
+			}
+			else 
+			{
+				$this->logging->log( "Sent result : " .$retmessage,INFO );
+				return true;
+			}
+		}
 	}
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
-	    $api->setCredentials($this->api_username, $this->api_password);
-	    return $api->getHostByIP($ip);
+		$api = $this->getAPI();
+		$api->setCredentials($this->api_username, $this->api_password);
+		return $api->getHostByIP($ip);
 	}
 	
 	/** Resolve display. 
-	*	Changes OID(<oid>) to value if found or text "<not in trap>"
-	*	@param $display string
-	*	@return string display
-	*/
+	 *	Changes OID(<oid>) to value if found or text "<not in trap>"
+	 *	@param $display string
+	 *	@return string display
+	 */
 	protected function applyDisplay($display)
 	{
-	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -773,7 +773,7 @@ 
 	}
 	
 	/** Match rules for current trap and do action
-	*/
+	 */
 	public function applyRules()
 	{
 		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
@@ -811,12 +811,12 @@ 
 					{
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
-						    $this->trap_action.='Error sending status : check cmd/API';
+							$this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
-						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
@@ -833,15 +833,15 @@ 
 					$this->logging->log('action NOK : '.$action,INFO );
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-					    {
-					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
-					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
-    						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-					    }
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
 					}
 					else
 					{
@@ -864,9 +864,9 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-			    $this->trap_action.=' ERR : '.$e->getMessage();
-			    $this->trap_data['status']='error';
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trap_action.=' ERR : '.$e->getMessage();
+				$this->trap_data['status']='error';
 			}
 			
 		}
@@ -881,8 +881,8 @@ 
 	}
 
 	/** Add Time a action to rule
-	*	@param string $time : time to process to insert in SQL
-	*/
+	 *	@param string $time : time to process to insert in SQL
+	 */
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -899,9 +899,9 @@ 
 	/*********** UTILITIES *********************/
 	
 	/** reset service to OK after time defined in rule
-	*	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
-	*	@return integer : not in use
-	**/
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
+	 *	@return integer : not in use
+	 **/
 	public function reset_services()
 	{
 		// Get all services not in 'ok' state

Spacing +190 added lines, -190 removed lines

@@ -36,8 +36,8 @@ 
 	protected $api_password='';
 
 	// Logs 
-	protected $logging;    //< Logging class.
-	protected $logSetup;   //< bool true if log was setup in constructor
+	protected $logging; //< Logging class.
+	protected $logSetup; //< bool true if log was setup in constructor
 	
 	// Databases
 	public $trapsDB; //< Database class
@@ -56,7 +56,7 @@ 
 	// Rule evaluation 
 	public $ruleClass; // Rule class
 	
-	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	function __construct($etc_dir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
 	{
 	    // Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
@@ -64,10 +64,10 @@ 
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
 
 		// Setup logging
-		$this->logging = new Logging();
+		$this->logging=new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+		    $this->logging->setLogging($baseLogLevel, $baseLogMode, $baseLogFile);
 		    $this->logSetup=true;
 		}
 		else
@@ -75,10 +75,10 @@ 
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
-		$trapConfig=parse_ini_file($this->trap_module_config,true);
+		$trapConfig=parse_ini_file($this->trap_module_config, true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+		    $this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -86,9 +86,9 @@ 
 		$this->getDatabaseOptions(); // Get options in database
 		if ($this->api_use === true) $this->getAPI(); // Setup API
 		
-		$this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+		$this->mibClass=new Mib($this->logging, $this->trapsDB, $this->snmptranslate, $this->snmptranslate_dirs); // Create Mib class
 		
-		$this->ruleClass = new Rule($this->logging); //< Create Rule class
+		$this->ruleClass=new Rule($this->logging); //< Create Rule class
 		
 		$this->trap_data=array(
 			'source_ip'	=> 'unknown',
@@ -110,15 +110,15 @@ 
 	 * @param string $message warning message if not found
 	 * @return boolean true if found, or false
 	 */
-	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+	protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=2, $message=null)
 	{
 	    if (!isset($option_array[$option_category][$option_name]))
 	    {
 	        if ($message === null)
 	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+	            $message='No '.$option_name.' in config file: '.$this->trap_module_config;
 	        }
-	        $this->logging->log($message,$log_level,'syslog');
+	        $this->logging->log($message, $log_level, 'syslog');
 	        return false;
 	    }
 	    else
@@ -136,24 +136,24 @@ 
 	{
 
 		// Snmptranslate binary path
-		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+		$this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
 
 		// mibs path
-		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+		$this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
 
 		// icinga2cmd path
-		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+		$this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
 		
 		// table prefix
-		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->db_prefix);
+		$this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->db_prefix);
 
 		// API options
-		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
+		if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->api_hostname))
 		{
 		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->api_port);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->api_username);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -164,40 +164,40 @@ 
 	protected function setupDatabase($trapConfig)
 	{
 	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
+	    if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trap_module_config, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
 	    
-	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
+	   if (($dbConfig=parse_ini_file($this->icingaweb2_ressources, true)) === false)
 	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
+	    if (!array_key_exists($dbTrapName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+	    $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->db_prefix);
 	    
 	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
 	    // IDO Database
-	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+	    if (!array_key_exists('IDOdatabase', $trapConfig['config']))
 	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config, ERROR, '');
 	    }
 	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
 
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+	    $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
@@ -212,13 +212,13 @@ 
 		// Database options
 		if ($this->logSetup === false) // Only if logging was no setup in constructor
 		{
-    		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-    		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-    		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+    		$this->getDBConfigIfSet('log_level', $this->logging->debugLevel);
+    		$this->getDBConfigIfSet('log_destination', $this->logging->outputMode);
+    		$this->getDBConfigIfSet('log_file', $this->logging->outputFile);
 		}
 	}
 
-	protected function getDBConfigIfSet($element,&$variable)
+	protected function getDBConfigIfSet($element, &$variable)
 	{
 		$value=$this->getDBConfig($element);
 		if ($value != 'null') $variable=$value;
@@ -234,7 +234,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return null;
 		}
 		$value=$ret_code->fetch();
@@ -251,22 +251,22 @@ 
 	*	@param  string $destination file/syslog/display
 	*	@return void
 	**/	
-	public function trapLog( $message, $level, $destination ='') // OBSOLETE
+	public function trapLog($message, $level, $destination='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
 	    $this->logging->log($message, $level, $destination);
 	}
 	
-	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	public function setLogging($debugLvl, $outputType, $outputOption=null)  // OBSOLETE
 	{
-		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+		$this->logging->setLogging($debugLvl, $outputType, $outputOption);
 	}
 	
 	protected function getAPI()
 	{
 	    if ($this->icinga2api == null)
 	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+	        $this->icinga2api=new Icinga2API($this->api_hostname, $this->api_port);
 	    }
 	    return $this->icinga2api;
 	}
@@ -285,7 +285,7 @@ 
 		if ($input_stream === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-			$this->logging->log("Error reading stdin !",ERROR,'');
+			$this->logging->log("Error reading stdin !", ERROR, '');
 			return null; // note : exception thrown by logging
 		}
 
@@ -294,21 +294,21 @@ 
 		if ($this->receivingHost === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-			$this->logging->log("Error reading Host !",ERROR,''); 
+			$this->logging->log("Error reading Host !", ERROR, ''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-			$this->logging->log("Error reading IP !",ERROR,''); 
+			$this->logging->log("Error reading IP !", ERROR, ''); 
 		}
 		$matches=array();
-		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-		if ($ret_code===0 || $ret_code===false) 
+		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/', $IP, $matches);
+		if ($ret_code === 0 || $ret_code === false) 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+			$this->logging->log('Error parsing IP : '.$IP, ERROR, '');
 		} 
 		else 
 		{		
@@ -318,34 +318,34 @@ 
 			$this->trap_data['destination_port']=$matches[4];
 		}
 
-		while (($vars=fgets($input_stream)) !==false)
+		while (($vars=fgets($input_stream)) !== false)
 		{
 			$vars=chop($vars);
-			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-			if ($ret_code===0 || $ret_code===false) 
+			$ret_code=preg_match('/^([^ ]+) (.*)$/', $vars, $matches);
+			if ($ret_code === 0 || $ret_code === false) 
 			{
-				$this->logging->log('No match on trap data : '.$vars,WARN,'');
+				$this->logging->log('No match on trap data : '.$vars, WARN, '');
 			}
 			else 
 			{
-			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+			    if (($matches[1] == '.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1] == '.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
 				}
 				else
 				{
-					$object= new stdClass;
-					$object->oid =$matches[1];
-					$object->value = $matches[2];
-					array_push($this->trap_data_ext,$object);
+					$object=new stdClass;
+					$object->oid=$matches[1];
+					$object->value=$matches[2];
+					array_push($this->trap_data_ext, $object);
 				}
 			}
 		}
 
-		if ($this->trap_data['trap_oid']=='unknown') 
+		if ($this->trap_data['trap_oid'] == 'unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-			$this->logging->log('no trap oid found',ERROR,'');
+		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trap_data['source_ip']);
+			$this->logging->log('no trap oid found', ERROR, '');
 		} 
 
 		// Translate oids.
@@ -367,7 +367,7 @@ 
 		}
 		
 
-		$this->trap_data['status']= 'waiting';
+		$this->trap_data['status']='waiting';
 		
 		return $this->trap_data;
 	}
@@ -383,40 +383,40 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Also check if it is an instance of OID
-		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+		$oid_instance=preg_replace('/\.[0-9]+$/', '', $oid);
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Try to get oid name from snmptranslate
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
 		$matches=array();
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code === false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return NULL;
 		} else {
-			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-			return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid, INFO);
+			return array('trap_name_mib'=>$matches[1], 'trap_name'=>$matches[2]);
 		}	
 	}
 	
@@ -427,90 +427,90 @@ 
 	**/
 	public function eraseOldTraps($days=0)
 	{
-		if ($days==0)
+		if ($days == 0)
 		{
 			if (($days=$this->getDBConfig('db_remove_days')) == null)
 			{
-				$this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+				$this->logging->log('No days specified & no db value : no tap erase', WARN, '');
 				return;
 			}
 		}
 		$db_conn=$this->trapsDB->db_connect_trap();
-		$daysago = strtotime("-".$days." day");
-		$sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		$daysago=strtotime("-".$days." day");
+		$sql='delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s", $daysago).'\';';
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+			$this->logging->log('Error erasing traps : '.$sql, ERROR, '');
 		}
-		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql, INFO);
 	}
 
 	/** Write error to received trap database
 	 */
-	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+	public function writeTrapErrorToDB($message, $sourceIP=null, $trapoid=null)
 	{
 	    
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    
 	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+	    $insert_col='date_received,status';
+	    $insert_val="'".date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
+	    if ($sourceIP != null)
 	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
+	        $insert_col.=',source_ip';
+	        $insert_val.=",'".$sourceIP."'";
 	    }
-	    if ($trapoid !=null)
+	    if ($trapoid != null)
 	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
+	        $insert_col.=',trap_oid';
+	        $insert_val.=",'".$trapoid."'";
 	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+	    $insert_col.=',status_detail';
+	    $insert_val.=",'".$message."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+	    $sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 	    
 	    switch ($this->trapsDB->trapDBType)
 	    {
 	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
+	            $sql.=' RETURNING id;';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
+	            if (!isset($inserted_id_ret['id'])) {
+	                $this->logging->log('Error getting id', 1, '');
 	            }
 	            $this->trap_id=$inserted_id_ret['id'];
 	            break;
 	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
+	            $sql.=';';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            $sql='SELECT LAST_INSERT_ID();';
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
 	            
 	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
 	            $this->trap_id=$inserted_id;
 	            break;
 	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType, 1, '');
 	    }
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+	    $this->logging->log('id found: '.$this->trap_id, INFO);    
 	}
 	
 	/** Write trap data to trap database
@@ -527,86 +527,86 @@ 
 		$insert_col='';
 		$insert_val='';
 		// add date time
-		$this->trap_data['date_received'] = date("Y-m-d H:i:s");
+		$this->trap_data['date_received']=date("Y-m-d H:i:s");
 
 		$firstcol=1;
 		foreach ($this->trap_data as $col => $val)
 		{
-			if ($firstcol==0) 
+			if ($firstcol == 0) 
 			{
-				$insert_col .=',';
-				$insert_val .=',';
+				$insert_col.=',';
+				$insert_val.=',';
 			}
-			$insert_col .= $col ;
-			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$insert_col.=$col;
+			$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 			$firstcol=0;
 		}
 		
-		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 		switch ($this->trapsDB->trapDBType)
 		{
 			case 'pgsql': 
-				$sql .= ' RETURNING id;';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=' RETURNING id;';
+				$this->logging->log('sql : '.$sql, INFO);
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 														   
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
-				if (! isset($inserted_id_ret['id'])) {
-					$this->logging->log('Error getting id',ERROR,'');
+				if (!isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id', ERROR, '');
 				}
 				$this->trap_id=$inserted_id_ret['id'];
 			break;
 			case 'mysql': 
-				$sql .= ';';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=';';
+				$this->logging->log('sql : '.$sql, INFO);
 				if ($db_conn->query($sql) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				$sql='SELECT LAST_INSERT_ID();';
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
 
 				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
 				$this->trap_id=$inserted_id;
 			break;
 			default: 
-				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType, ERROR, '');
 		}
-		$this->logging->log('id found: '.$this->trap_id,INFO );
+		$this->logging->log('id found: '.$this->trap_id, INFO);
 		
 		// Fill trap extended data table
 		foreach ($this->trap_data_ext as $value) {			
 			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
 			$firstcol=1;
-			$value->trap_id = $this->trap_id;
+			$value->trap_id=$this->trap_id;
 			$insert_col='';
 			$insert_val='';
 			foreach ($value as $col => $val)
 			{
-				if ($firstcol==0) 
+				if ($firstcol == 0) 
 				{
-					$insert_col .=',';
-					$insert_val .=',';
+					$insert_col.=',';
+					$insert_val.=',';
 				}
-				$insert_col .= $col;
-				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$insert_col.=$col;
+				$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 				$firstcol=0;
 			}
 
-			$sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';			
+			$sql='INSERT INTO '.$this->db_prefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';			
 
 			if ($db_conn->query($sql) === false) {
-				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+				$this->logging->log('Erreur insertion data : '.$sql, WARN, '');
 			}	
 		}	
 	}
@@ -616,14 +616,14 @@ 
 	*	@param $oid string oid in numeric
 	*	@return mixed|boolean : PDO object or false
 	*/	
-	protected function getRules($ip,$oid)
+	protected function getRules($ip, $oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
 		// fetch rules based on IP in rule and OID
 		$sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return false;
 		}
 		$rules_all=$ret_code->fetchAll();
@@ -632,7 +632,7 @@ 
 		$rule_ret_key=0;
 		foreach ($rules_all as $key => $rule)
 		{
-			if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+			if ($rule['ip4'] == $ip || $rule['ip6'] == $ip)
 			{
 				$rules_ret[$rule_ret_key]=$rules_all[$key];
 				//TODO : get host name by API (and check if correct in rule).
@@ -640,7 +640,7 @@ 
 				continue;
 			}
 			// TODO : get hosts IP by API
-			if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+			if (isset($rule['host_group_name']) && $rule['host_group_name'] != null)
 			{ // get ips of group members by oid
 				$db_conn2=$this->trapsDB->db_connect_ido();
 				$sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
@@ -651,15 +651,15 @@ 
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
 				if (($ret_code2=$db_conn2->query($sql)) === false) {
-					$this->logging->log('No result in query : ' . $sql,WARN,'');
+					$this->logging->log('No result in query : '.$sql, WARN, '');
 					continue;
 				}
 				$grouphosts=$ret_code2->fetchAll();
 				//echo "rule grp :\n";print_r($grouphosts);echo "\n";
-				foreach ( $grouphosts as $host)
+				foreach ($grouphosts as $host)
 				{
 					//echo $host['ip4']."\n";
-					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					if ($host['ip4'] == $ip || $host['ip6'] == $ip)
 					{
 						//echo "Rule added \n";
 						$rules_ret[$rule_ret_key]=$rules_all[$key];
@@ -682,7 +682,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -694,31 +694,31 @@ 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
 	*/
-	public function serviceCheckResult($host,$service,$state,$display)
+	public function serviceCheckResult($host, $service, $state, $display)
 	{
 	    if ($this->api_use === false)
 	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+    		$send='['.date('U').'] PROCESS_SERVICE_CHECK_RESULT;'.
+    			$host.';'.$service.';'.$state.';'.$display;
+    		$this->logging->log($send." : to : ".$this->icinga2cmd, INFO);
     		
     		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-    		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+    		exec('echo "'.$send.'" > '.$this->icinga2cmd);
     		return true;
 	    }
 	    else
 	    {
-	        $api = $this->getAPI();
+	        $api=$this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+	        list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display);
 	        if ($retcode == false)
 	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+	            $this->logging->log("Error sending result : ".$retmessage, WARN, '');
 	            return false;
 	        }
 	        else 
 	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
+	            $this->logging->log("Sent result : ".$retmessage, INFO);
 	            return true;
 	        }
 	    }
@@ -726,7 +726,7 @@ 
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
+	    $api=$this->getAPI();
 	    $api->setCredentials($this->api_username, $this->api_password);
 	    return $api->getHostByIP($ip);
 	}
@@ -739,32 +739,32 @@ 
 	protected function applyDisplay($display)
 	{
 	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+	    while (preg_match('/_OID\(([0-9\.]+)\)/', $display, $matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
 				if ($oid == $val->oid)
 				{
-					$val->value=preg_replace('/"/','',$val->value);
+					$val->value=preg_replace('/"/', '', $val->value);
 					$rep=0;
-					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-					if ($rep==0)
+					$display=preg_replace('/_OID\('.$oid.'\)/', $val->value, $display, -1, $rep);
+					if ($rep == 0)
 					{
-						$this->logging->log("Error in display",WARN,'');
+						$this->logging->log("Error in display", WARN, '');
 						return $display;
 					}
 					$found=1;
 					break;
 				}
 			}
-			if ($found==0)
+			if ($found == 0)
 			{
-				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-				if ($rep==0)
+				$display=preg_replace('/_OID\('.$oid.'\)/', '<not in trap>', $display, -1, $rep);
+				if ($rep == 0)
 				{
-					$this->logging->log("Error in display",WARN,'');
+					$this->logging->log("Error in display", WARN, '');
 					return $display;
 				}				
 			}
@@ -776,11 +776,11 @@ 
 	*/
 	public function applyRules()
 	{
-		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+		$rules=$this->getRules($this->trap_data['source_ip'], $this->trap_data['trap_oid']);
 		
-		if ($rules===false || count($rules)==0)
+		if ($rules === false || count($rules) == 0)
 		{
-			$this->logging->log('No rules found for this trap',INFO );
+			$this->logging->log('No rules found for this trap', INFO);
 			$this->trap_data['status']='unknown';
 			$this->trap_to_db=true;
 			return;
@@ -795,59 +795,59 @@ 
 			$service_name=$rule['service_name'];
 			
 			$display=$this->applyDisplay($rule['display']);
-			$this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+			$this->trap_action=($this->trap_action == null) ? '' : $this->trap_action.', ';
 			try
 			{
-				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext) ;
+				$this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext);
 				//->eval_rule($rule['rule']);
 				
 				if ($evalr == true)
 				{
 					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
 					$action=$rule['action_match'];
-					$this->logging->log('action OK : '.$action,INFO );
+					$this->logging->log('action OK : '.$action, INFO);
 					if ($action >= 0)
 					{
-						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
+						    $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;
+					$this->trap_to_db=($action == -2) ?false:true;
 				}
 				else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
 					$action=$rule['action_nomatch'];
-					$this->logging->log('action NOK : '.$action,INFO );
+					$this->logging->log('action NOK : '.$action, INFO);
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+					    if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
 					    }
 					    else
 					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+    						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;					
+					$this->trap_to_db=($action == -2) ?false:true;					
 				}
 				// Put name in source_name
 				if (!isset($this->trap_data['source_name']))
@@ -856,7 +856,7 @@ 
 				}
 				else
 				{
-					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+					if (!preg_match('/'.$rule['host_name'].'/', $this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
@@ -864,13 +864,13 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+			    $this->logging->log('Error in rule eval : '.$e->getMessage(), WARN, '');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
 			    $this->trap_data['status']='error';
 			}
 			
 		}
-		if ($this->trap_data['status']=='error')
+		if ($this->trap_data['status'] == 'error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
 		}
@@ -886,13 +886,13 @@ 
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
-		if ($this->trap_action==null) 
+		if ($this->trap_action == null) 
 		{
 			$this->trap_action='No action';
 		}
 		$sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -915,7 +915,7 @@ 
     WHERE s.current_state != 0;";
 		$db_conn=$this->trapsDB->db_connect_ido();
 		if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			$this->logging->log('No result in query : '.$sql_query, ERROR, '');
 			return 0;
 		}
 		$services=$services_db->fetchAll();
@@ -924,7 +924,7 @@ 
 		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
 		$db_conn2=$this->trapsDB->db_connect_trap();
 		if (($rules_db=$db_conn2->query($sql_query)) === false) {
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			$this->logging->log('No result in query : '.$sql_query, ERROR, '');
 			return 0;
 		}
 		$rules=$rules_db->fetchAll();
@@ -940,13 +940,13 @@ 
 					$service['host_name'] == $rule['host_name'] &&
 					($service['last_check'] + $rule['revert_ok']) < $now)
 				{
-					$this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+					$this->serviceCheckResult($service['host_name'], $service['service_name'], 0, 'Reset service to OK after '.$rule['revert_ok'].' seconds');
 					$numreset++;
 				}
 			}
 		}
 		echo "\n";
-		echo $numreset . " service(s) reset to OK\n";
+		echo $numreset." service(s) reset to OK\n";
 		return 0;
 		
 	}

application/controllers/HandlerController.php

Indentation +235 added lines, -236 removed lines

@@ -11,13 +11,12 @@ 
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -39,23 +38,23 @@ 
 	 */
 	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()
+		));
 	    
-	    //$db = $this->getDb();
+		//$db = $this->getDb();
 
-	    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='';
+		}
 	}
 	
 	/**
@@ -63,31 +62,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;
 	}
 	
 	/**
@@ -96,102 +95,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->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->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;
 	}
 
 	/**
@@ -200,29 +199,29 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->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->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->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;
+			}
+		}
 	}
 
 	/**
@@ -231,33 +230,33 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->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->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->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->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';
+			}
+		}
 	}
 	
 	/**
@@ -269,48 +268,48 @@ 
 	 */
 	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];
-	        if (($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'
-	            ));
-	        }
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
-	        $index++;
-	    }
-	    return $curObjectList;
+		$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 (($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'
+				));
+			}
+			$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();
@@ -329,8 +328,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;
 		}
 		
@@ -355,14 +354,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;
@@ -390,9 +389,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();
@@ -433,7 +432,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -517,9 +516,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');  }
@@ -551,9 +550,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');  }
@@ -584,9 +583,9 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return array : column objects in db
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return array : column objects in db
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -613,7 +612,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +77 added lines, -77 removed lines

@@ -23,14 +23,14 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('status');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getHandlerListTable()->setConnection($db);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
 		// Apply pagination limits 
-		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
-		$this->view->filterEditor = $this->getHandlerListTable()->getFilterEditor($this->getRequest());		
+		$this->view->filterEditor=$this->getHandlerListTable()->getFilterEditor($this->getRequest());		
 	
 		//$this->displayExitError('Handler/indexAction','Not implemented');
 	}
@@ -40,7 +40,7 @@ 
 	public function testruleAction()
 	{
 	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
+	    $this->getTabs()->add('get', array(
 	        'active'	=> true,
 	        'label'		=> $this->translate('Test Rule'),
 	        'url'		=> Url::fromRequest()
@@ -50,7 +50,7 @@ 
 
 	    if ($this->params->get('rule') !== null) 
 	    {
-	        $this->view->rule= $this->params->get('rule');
+	        $this->view->rule=$this->params->get('rule');
 	    }
 	    else
 	    {
@@ -109,12 +109,12 @@ 
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+	        $this->displayExitError('Add handler : get host by IP/Name ', $e->getMessage());
 	    }
 	    
 	    
 	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
+	    if (count($hosts) == 1) {
 	        $this->view->hostname=$hosts[0]->name;
 	        //$hostid=$hosts[0]->id;
 	        // Tell JS to get services when page is loaded
@@ -123,9 +123,9 @@ 
 	    }
 	    else
 	    {
-	        foreach($hosts as $key=>$val)
+	        foreach ($hosts as $key=>$val)
 	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
+	            array_push($this->view->hostlist, $hosts[$key]->name);
 	        }
 	    }
 	    
@@ -164,18 +164,18 @@ 
 	            $currentObjectTypeEnum
 	        );
 	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
+	        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
+	    if ($allObjects != null) // in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val == null) { continue; }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -203,9 +203,9 @@ 
 	    // Check if hostname still exists
 	    $host_get=$this->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
+	    if (count($host_get) == 0)
 	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='Host '.$this->view->hostname.' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
 	    }
 	    else
@@ -213,10 +213,10 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        // get service id for form to set :
-	        $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
+	        $serviceID=$this->getServiceIDByName($this->view->hostname, $ruleDetail->service_name);
+	        if (count($serviceID) == 0)
 	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	        else
 	        {
@@ -233,9 +233,9 @@ 
 	{
 	    // Check if groupe exists
 	    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
+	    if (count($group_get) == 0)
 	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname.' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
 	    }
 	    else
@@ -253,9 +253,9 @@ 
 	        
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
+	        if ($foundGrpService == 0)
 	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message.=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	    }
 	}
@@ -273,8 +273,8 @@ 
 	    $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))
+	    while (preg_match('/_OID\(([\.0-9]+)\)/', $display, $matches) ||
+	        preg_match('/_OID\(([\.0-9]+)\)/', $rule, $matches))
 	    {
 	        $curOid=$matches[1];
 	        if (($object=$this->getMIB()->translateOID($curOid)) != null)
@@ -300,8 +300,8 @@ 
 	                'not found'
 	            ));
 	        }
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+	        $display=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $display);
+	        $rule=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $rule);
 	        $index++;
 	    }
 	    return $curObjectList;
@@ -315,7 +315,7 @@ 
 	{
 		$this->checkConfigPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Add handler'),
 			'url'		=> Url::fromRequest()
@@ -328,7 +328,7 @@ 
 		
 		//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
 		
-		if (($trapid = $this->params->get('fromid')) !== null) {
+		if (($trapid=$this->params->get('fromid')) !== null) {
 		    /********** Setup from existing trap ***************/
             $this->add_from_existing($trapid);
 			return;
@@ -348,7 +348,7 @@ 
 			$this->view->setRuleMatch=$ruleDetail->action_match;
 			$this->view->setRuleNoMatch=$ruleDetail->action_nomatch;
 			$this->view->hostgroupname=$ruleDetail->host_group_name;
-			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z",$ruleDetail->modified);
+			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z", $ruleDetail->modified);
 			$this->view->modifier=$ruleDetail->modifier;
 			
 			// Warning message if host/service don't exists anymore
@@ -400,26 +400,26 @@ 
 	
 		$params=array(
 			// id (also db) => 	array('post' => post id, 'val' => default val, 'db' => send to table)
-			'hostgroup'		=>	array('post' => 'hostgroup','db'=>false),
-			'db_rule'		=>	array('post' => 'db_rule','db'=>false),
-			'hostid'		=>	array('post' => 'hostid','db'=>false),
-			'host_name'		=>	array('post' => 'hostname','val' => null,'db'=>true),
-			'host_group_name'=>	array('post' => null,'val' => null,'db'=>true),
-			'serviceid'		=>	array('post' => 'serviceid','db'=>false),
-			'service_name'	=>	array('post' => 'serviceName','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),
-			'rule'			=>	array('post' => 'rule','val' => '','db'=>true),			
-			'action_match'	=>	array('post' => 'ruleMatch','val' => -1,'db'=>true),
-			'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','db'=>false)
+			'hostgroup'		=>	array('post' => 'hostgroup', 'db'=>false),
+			'db_rule'		=>	array('post' => 'db_rule', 'db'=>false),
+			'hostid'		=>	array('post' => 'hostid', 'db'=>false),
+			'host_name'		=>	array('post' => 'hostname', 'val' => null, 'db'=>true),
+			'host_group_name'=>	array('post' => null, 'val' => null, 'db'=>true),
+			'serviceid'		=>	array('post' => 'serviceid', 'db'=>false),
+			'service_name'	=>	array('post' => 'serviceName', '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),
+			'rule'			=>	array('post' => 'rule', 'val' => '', 'db'=>true),			
+			'action_match'	=>	array('post' => 'ruleMatch', 'val' => -1, 'db'=>true),
+			'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', 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
-			&& $postData[$params['action_form']['post']] == 'delete' )
+			&& $postData[$params['action_form']['post']] == 'delete')
 		{
 			try
 			{
@@ -439,16 +439,16 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
-			if (! isset($postData[$params[$key]['post']]))
+			if ($params[$key]['post'] == null) continue; // data not sent in post vars
+			if (!isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
-				$this->_helper->json(array('status'=>'No ' . $key));
+				$this->_helper->json(array('status'=>'No '.$key));
 			}
 			else
 			{
 				$data=$postData[$params[$key]['post']];
-				if ($data!=null && $data !="")
+				if ($data != null && $data != "")
 				{
 					$params[$key]['val']=$postData[$params[$key]['post']];
 				}
@@ -457,8 +457,8 @@ 
 
 		try 
 		{
-			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
-			if (! $isHostGroup ) 
+			$isHostGroup=($params['hostgroup']['val'] == 1) ?true:false;
+			if (!$isHostGroup) 
 			{  // checks if selection by host 
 				$hostAddr=$this->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
@@ -485,25 +485,25 @@ 
 					return;					
 				}
 				// Put param in correct column (group_name)
-				$params['host_group_name']['val'] = $params['host_name']['val'];
+				$params['host_group_name']['val']=$params['host_name']['val'];
 				$params['host_name']['val']=null;
 			}
 			$dbparams=array();
 			foreach ($params as $key=>$val)
 			{
-				if ($val['db']==true )
+				if ($val['db'] == true)
 				{
-					$dbparams[$key] = $val['val'];
+					$dbparams[$key]=$val['val'];
 				}
 			}
 			// echo '<br>';	print_r($dbparams);echo '<br>';
-			if ($params['db_rule']['val'] == -1 ) 
+			if ($params['db_rule']['val'] == -1) 
 			{
 				$ruleID=$this->addHandlerRule($dbparams);
 			}
 			else
 			{
-				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->updateHandlerRule($dbparams, $params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
@@ -522,10 +522,10 @@ 
 	*/
 	protected function getTrapDetail($trapid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -534,15 +534,15 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
+			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail, true), $e->getMessage());
 			return;
 		}
 
@@ -556,10 +556,10 @@ 
 	*/
 	protected function getTrapobjects($trapid)
 	{	
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -568,15 +568,15 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
+			$this->displayExitError('Add handler : get trap data detail : ', $e->getMessage());
 			return array();
 		}
 
@@ -589,22 +589,22 @@ 
 	*/
 	protected function getRuleDetail($ruleid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $ruleid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
-				->where('id=?',$ruleid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapRuleName(), $queryArray)
+				->where('id=?', $ruleid);
 			$ruleDetail=$db->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
+			if ($ruleDetail == null) throw new Exception('No rule was found with id = '.$ruleid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
+			$this->displayExitError('Update handler : get rule detail', $e->getMessage());
 			return array();
 		}
 
@@ -618,7 +618,7 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/handler')
+			'url'   => $this->getModuleConfig()->urlPath().'/handler')
 		);
 	} 
 	

Braces +35 added lines, -39 removed lines

@@ -51,8 +51,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -106,8 +105,7 @@ 
 	    try
 	    {
 	        $hosts=$this->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 	    }
@@ -120,8 +118,7 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        
-	    }
-	    else
+	    } else
 	    {
 	        foreach($hosts as $key=>$val)
 	        {
@@ -171,11 +168,14 @@ 
 	            $allObjects[$val->oid]=null;
 	        }
 	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+	    if ($allObjects!=null) {
+	    	// in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val==null) { continue;
+	    }
+	    }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -207,8 +207,7 @@ 
 	    {
 	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
@@ -217,8 +216,7 @@ 
 	        if (count($serviceID) ==0)
 	        {
 	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
+	        } else
 	        {
 	            $this->view->serviceSet=$serviceID[0]->id;
 	        }
@@ -237,8 +235,7 @@ 
 	    {
 	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
 	        $foundGrpService=0;
@@ -288,8 +285,7 @@ 
 	                $object['type'],
 	                $object['type_enum']
 	            ));
-	        }
-	        else
+	        } else
 	        {
 	            array_push($curObjectList, array(
 	                $index,
@@ -358,8 +354,7 @@ 
 			    $this->view->selectGroup=false;
 			    // Check if hostname still exists
 			    $this->add_check_host_exists($ruleDetail);
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
@@ -367,9 +362,11 @@ 
 			
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
-			if ($oidName != null)  // oid is found in mibs
+			if ($oidName != null) {
+				// oid is found in mibs
 			{
-				$this->view->mib=$oidName['mib']; 
+				$this->view->mib=$oidName['mib'];
+			}
 				$this->view->name=$oidName['name'];
 				$this->view->trapListForMIB=$this->getMIB()
 					->getTrapList($oidName['mib']);				
@@ -424,8 +421,7 @@ 
 			try
 			{
 				$this->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -439,13 +435,15 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
+			if ($params[$key]['post']==null) {
+				continue;
+			}
+			// data not sent in post vars
 			if (! isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
 				$this->_helper->json(array('status'=>'No ' . $key));
-			}
-			else
+			} else
 			{
 				$data=$postData[$params[$key]['post']];
 				if ($data!=null && $data !="")
@@ -475,8 +473,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 				$object=$this->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -500,14 +497,12 @@ 
 			if ($params['db_rule']['val'] == -1 ) 
 			{
 				$ruleID=$this->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>$e->getMessage()));
 			return;
@@ -538,9 +533,10 @@ 
 				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null ) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
 			return;
@@ -573,8 +569,7 @@ 
 				->where('trap_id=?',$trapid);
 			$trapDetail=$db->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
 			return array();
@@ -600,9 +595,10 @@ 
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$db->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
-		}
-		catch (Exception $e)
+			if ( $ruleDetail == null ) {
+				throw new Exception('No rule was found with id = '.$ruleid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
 			return array();