patrickpr / trapdirector

library/Trapdirector/Tables/TrapTableList.php

Indentation +57 added lines, -57 removed lines

@@ -20,9 +20,9 @@ 
 	
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -30,10 +30,10 @@ 
 	}
 		
 	// ******************  Render table in html  
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	public function render()
 	{
@@ -97,26 +97,26 @@ 
 
 	}
 
-    public function count()
-    {
-        $db=$this->db();
+	public function count()
+	{
+		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapTableName(),
-            array('COUNT(*)')
-        );
+			$this->moduleConfig->getTrapTableName(),
+			array('COUNT(*)')
+		);
 		$this->applyFiltersToQuery($query);
 		
-        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
 	
@@ -126,24 +126,24 @@ 
 		
 		$query = $this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
-       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->getTrapTableName(),
-            $this->moduleConfig->getTrapListDisplayColumns()
-        )->order('timestamp DESC');
+			$this->moduleConfig->getTrapTableName(),
+			$this->moduleConfig->getTrapListDisplayColumns()
+		)->order('timestamp DESC');
 
-        return $query;
-    }	 
+		return $query;
+	}	 
 	
 	// ****************** Filters
 
@@ -173,39 +173,39 @@ 
 		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
 	}
 	
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	public function getColumns()
 	{
 		return $this->moduleConfig->getTrapListDisplayColumns();
 	}
 
-    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);
-
-        $filter = $filterEditor->getFilter();
-        $this->setFilter($filter);
-
-        return $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();
+		$this->setFilter($filter);
+
+		return $filterEditor;
+	}
 	
-    protected function applyFiltersToQuery($query)
-    {
+	protected function applyFiltersToQuery($query)
+	{
 		
 		$sql='';
 		if ($this->filter_query != '')
@@ -226,8 +226,8 @@ 
 			$sql.="(status != 'done')";
 		}
 		if ($sql != '') $query->where($sql);		
-        return $query;
-    }	
+		return $query;
+	}	
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -21,8 +21,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -38,60 +38,60 @@ 
 	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);
+			$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)) 
 				{
-					$val = ($rowkey=='timestamp') ?  strftime('%T',$row->$rowkey) : $row->$rowkey;
+					$val=($rowkey == 'timestamp') ?  strftime('%T', $row->$rowkey) : $row->$rowkey;
 				} 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() . '/received/trapdetail', 
+										$this->moduleConfig->urlPath().'/received/trapdetail', 
 										array('id' => $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;
 
@@ -101,7 +101,7 @@ 
     {
         $db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             array('COUNT(*)')
         );
@@ -112,7 +112,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -124,7 +124,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -137,7 +137,7 @@ 
     {
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             $this->moduleConfig->getTrapListDisplayColumns()
         )->order('timestamp DESC');
@@ -150,7 +150,7 @@ 
 	protected $filter_Handler;
 	protected $filter_query='';
 	protected $filter_done='';
-	protected $filter_query_list=array('q','done');
+	protected $filter_query_list=array('q', 'done');
 	public function renderFilterHTML()
 	{
 		$htm=' <form id="filter" name="mainFilter" 
@@ -160,17 +160,17 @@ 
 		$htm.='<input type="text" name="q" title="Search is simple! Try to combine multiple words" 
 		placeholder="Search..." class="search" value="'.$this->filter_query.'">';
 		$htm.='<input type="checkbox" id="checkbox_done" name="done" value="1" class="autosubmit" ';
-		if	($this->filter_done == 1) { $htm.=' checked ';}
+		if ($this->filter_done == 1) { $htm.=' checked '; }
 		$htm.='> <label for="checkbox_done">Hide processed traps</label>';
 		$htm.='</form>';
 		return $htm;
 	}
 	
-	public function updateFilter($handler,$filter)
+	public function updateFilter($handler, $filter)
 	{
 		$this->filter_Handler=$handler->remove($this->filter_query_list)->__toString();
-		$this->filter_query=(isset($filter['q']))?$this->filter_query=$filter['q']:'';
-		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
+		$this->filter_query=(isset($filter['q'])) ? $this->filter_query=$filter['q'] : '';
+		$this->filter_done=(isset($filter['done'])) ? $this->filter_done=$filter['done'] : 0;
 	}
 	
     protected function getSearchColumns()
@@ -185,20 +185,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;
@@ -212,9 +212,9 @@ 
 		{
 			$sql.='(';
 			$first=1;
-			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
+			foreach ($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first == 0) $sql.=' OR ';
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}

Braces +9 added lines, -3 removed lines

@@ -214,7 +214,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}
@@ -222,10 +224,14 @@ 
 		}
 		if ($this->filter_done == 1)
 		{
-			if ($sql != '') $sql.=' AND ';
+			if ($sql != '') {
+				$sql.=' AND ';
+			}
 			$sql.="(status != 'done')";
 		}
-		if ($sql != '') $query->where($sql);		
+		if ($sql != '') {
+			$query->where($sql);
+		}
         return $query;
     }	
 

library/Trapdirector/Icinga2Api.php

Indentation +329 added lines, -329 removed lines

@@ -8,360 +8,360 @@
 
 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];
+	}
 }
 

Spacing +54 added lines, -54 removed lines

@@ -8,19 +8,19 @@ 
 
 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 = [
+    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.',
@@ -31,7 +31,7 @@ 
         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.';
+    const JSON_UNKNOWN_ERROR='Unknown error.';
     
     /**
      * Creates Icinga2API object
@@ -39,7 +39,7 @@ 
      * @param string $host host name or IP
      * @param number $port API port
      */
-    public function __construct($host, $port = 5665)
+    public function __construct($host, $port=5665)
     {
         $this->host=$host;
         $this->port=$port;
@@ -49,7 +49,7 @@ 
      * @param string $user
      * @param string $pass
      */
-    public function setCredentials($user,$pass)
+    public function setCredentials($user, $pass)
     {
         $this->user=$user;
         $this->pass=$pass;
@@ -61,7 +61,7 @@ 
      * @param string $user
      * @param string $usercert
      */
-    public function setCredentialskey($user,$usercert)
+    public function setCredentialskey($user, $usercert)
     {
         $this->user=$user;
         $this->usercert=$usercert;
@@ -84,13 +84,13 @@ 
         if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
         {
             
-            foreach ( $permissions as $mustPermission)
+            foreach ($permissions as $mustPermission)
             {
                 $curPermOK=0;
-                foreach ( $result->results[0]->permissions as $curPermission)
+                foreach ($result->results[0]->permissions as $curPermission)
                 {
-                    $curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
-                    if (preg_match('#'.$curPermission.'#',$mustPermission))
+                    $curPermission=preg_replace('/\*/', '.*', $curPermission); // put * as .* to created a regexp
+                    if (preg_match('#'.$curPermission.'#', $mustPermission))
                     {
                         $curPermOK=1;
                         break;
@@ -105,12 +105,12 @@ 
             }
             if ($permOk == 0)
             {
-                return array(true,'API connection OK, but missing permission : '.$permMissing);
+                return array(true, 'API connection OK, but missing permission : '.$permMissing);
             }
-            return array(false,'API connection OK');
+            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');
     }
     
     
@@ -125,9 +125,9 @@ 
      */
     protected function curl() {
         if ($this->curl === null) {
-            $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
+            $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));
+                throw new Exception('CURL INIT ERROR: '.curl_error($this->curl));
             }
         }
         return $this->curl;
@@ -141,7 +141,7 @@ 
      * @param string $display : service passive check output
      * @return array (status = true (oK) or false (nok), string message)
      */
-    public function serviceCheckResult($host,$service,$state,$display)
+    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
@@ -159,9 +159,9 @@ 
         {
             return array(false, $e->getMessage());
         }
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
                 $message=$result->status;
             }
@@ -169,21 +169,21 @@ 
             {
                 $message="Unkown status";
             }
-            return array(false , 'Ret code ' .$result->error.' : '.$message);
+            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);
+                return array(true, 'code '.$result->results[0]->code.' : '.$result->results[0]->status);
             }
             else
             {
-                return array(false,'Service not found');
+                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));
     }
  
     /**
@@ -204,7 +204,7 @@ 
         $url='objects/hosts';
         $body=array(
             "filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
-            "attrs"         => array('__name','name','display_name')
+            "attrs"         => array('__name', 'name', 'display_name')
         );
         try
         {
@@ -214,24 +214,24 @@ 
             throw new Exception($e->getMessage());
         }
         
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+                throw new Exception('Ret code '.$result->error.' : '.$result->status);
             }
             else
             {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
+                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'))
+            while (isset($result->results[$numHost]) && property_exists($result->results[$numHost], 'attrs'))
             {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
+                $hostArray[$numHost]=$result->results[$numHost]->attrs;
                 $numHost++;
             }
             return $hostArray;            
@@ -250,7 +250,7 @@ 
         $url='objects/hosts';
         $body=array(
             "filter"        => '\"'.$hostGroup.'\" in host.groups',
-            "attrs"         => array('address','address','name')
+            "attrs"         => array('address', 'address', 'name')
         );
         try
         {
@@ -260,25 +260,25 @@ 
             throw new Exception($e->getMessage());
         }
         
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+                throw new Exception('Ret code '.$result->error.' : '.$result->status);
             }
             else
             {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
+                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'))
+            while (isset($result->results[$numHost]) && property_exists($result->results[$numHost], 'attrs'))
             {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $hostArray[$numHost]->name = $result->results[$numHost]->name;
+                $hostArray[$numHost]=$result->results[$numHost]->attrs;
+                $hostArray[$numHost]->name=$result->results[$numHost]->name;
                 $numHost++;
             }
             return $hostArray;
@@ -296,23 +296,23 @@ 
      * @return array
      */
     public function request($method, $url, $headers, $body) {
-        $auth = sprintf('%s:%s', $this->user, $this->pass);
-        $curlHeaders = array("Accept: application/json");
+        $auth=sprintf('%s:%s', $this->user, $this->pass);
+        $curlHeaders=array("Accept: application/json");
         if ($body !== null) {
-            $body = json_encode($body);
+            $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);
+            $curlFinalHeaders=array_merge($curlHeaders, $headers);
         } else 
         {
             $curlFinalHeaders=$curlHeaders;
         }
-        $curl = $this->curl();
-        $opts = array(
+        $curl=$this->curl();
+        $opts=array(
             CURLOPT_URL		=> $this->url($url),
             CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
             CURLOPT_USERPWD		=> $auth,
@@ -323,14 +323,14 @@ 
             CURLOPT_SSL_VERIFYPEER 	=> false,
         );
         if ($body !== null) {
-            $opts[CURLOPT_POSTFIELDS] = $body;
+            $opts[CURLOPT_POSTFIELDS]=$body;
         }
         curl_setopt_array($curl, $opts);
-        $res = curl_exec($curl);
+        $res=curl_exec($curl);
         if ($res === false) {
-            throw new Exception('CURL ERROR: ' . curl_error($curl));
+            throw new Exception('CURL ERROR: '.curl_error($curl));
         }
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $statusCode=curl_getinfo($curl, CURLINFO_HTTP_CODE);
         if ($statusCode === 401) {
             throw new Exception('Unable to authenticate, please check your API credentials');
         }
@@ -344,7 +344,7 @@ 
      * @return array json decoded
      */
     protected function fromJsonResult($json) {
-        $result = @json_decode($json);
+        $result=@json_decode($json);
         //var_dump($json);
         if ($result === null) {
             throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));

Braces +4 added lines, -8 removed lines

@@ -164,8 +164,7 @@ 
             if (property_exists($result,'status'))
             {
                 $message=$result->status;
-            }
-            else 
+            } else 
             {
                 $message="Unkown status";
             }
@@ -176,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');
             }
@@ -219,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');
             }
@@ -265,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');
             }

library/Trapdirector/Config/TrapModuleConfig.php

Indentation +16 added lines, -16 removed lines

@@ -4,9 +4,9 @@ 
 
 class TrapModuleConfig
 {
-    /********** Database configuration ***********************/
+	/********** Database configuration ***********************/
 	// Database prefix for tables 
-    protected $table_prefix; //< Database prefix for tables 	
+	protected $table_prefix; //< Database prefix for tables 	
 	protected $DBConfigDefaults=array(
 		'db_remove_days' => 60, // number of days before removing traps
 		'log_destination' => 'syslog', // Log destination for trap handler
@@ -113,27 +113,27 @@ 
 	// Note : must have 'source_ip' and 'last_sent'
 	public function getTrapHostListDisplayColumns()
 	{
-	    return array(
-	        'source_name'  =>  't.source_name',
-	        'source_ip'    =>  't.source_ip',
-	        'trap_oid'     =>  't.trap_oid',
-	        'count'        =>  'count(*)',
-	        'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
-	    );
+		return array(
+			'source_name'  =>  't.source_name',
+			'source_ip'    =>  't.source_ip',
+			'trap_oid'     =>  't.trap_oid',
+			'count'        =>  'count(*)',
+			'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
+		);
 	}
 
 	public function getTrapHostListSearchColumns()
 	{
-	    return array(); // No search needed on this table
+		return array(); // No search needed on this table
 	}
 	// Titles display in Trap List table
 	public function getTrapHostListTitles()
 	{
-	    return array(
-	        'trap_oid'		=> 'Trap OID',
-	        'count'		    => 'Number of traps received',
-	        'last_sent'     => 'Last trap received'
-	    );
+		return array(
+			'trap_oid'		=> 'Trap OID',
+			'count'		    => 'Number of traps received',
+			'last_sent'     => 'Last trap received'
+		);
 	}
 	
 	
@@ -188,7 +188,7 @@ 
 			'revert_ok'		=> 'r.revert_ok',
 			'display'		=> 'r.display',
 			'modified'		=> 'UNIX_TIMESTAMP(r.modified)',
-            'modifier'		=> 'r.modifier'
+			'modifier'		=> 'r.modifier'
 		);
 	}	
 		

Spacing +31 added lines, -31 removed lines

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

tests/expr_test.php

Spacing +10 added lines, -10 removed lines

@@ -3,18 +3,18 @@ 
 
 require_once 'bin/trap_class.php';
 
-$options = getopt("r:d:");
+$options=getopt("r:d:");
 
-$icingaweb2Etc=(array_key_exists('d',$options))?$options['d']:"/etc/icingaweb2";
+$icingaweb2Etc=(array_key_exists('d', $options)) ? $options['d'] : "/etc/icingaweb2";
 
-$debugLevel=4;// 0=No output 1=critical 2=warning 3=trace 4=ALL
+$debugLevel=4; // 0=No output 1=critical 2=warning 3=trace 4=ALL
 
-$trap = new trap($icingaweb2Etc);
-$trap->setLogging($debugLevel,'display');
+$trap=new trap($icingaweb2Etc);
+$trap->setLogging($debugLevel, 'display');
 
-$input=array_key_exists('r',$options);
+$input=array_key_exists('r', $options);
 
-if (! $input) {
+if (!$input) {
   $inputStream=fopen('php://stdin', 'r');
   $rule=chop(fgets($inputStream));
 } else
@@ -25,11 +25,11 @@ 
   $rule=$trap->eval_cleanup($rule);
   //echo 'After cleanup : #'.$rule."#\n";
   $item=0;
-  $val = $trap->evaluation($rule,$item);
-  if ($val==true) { printf( "true"); } else { printf( "false");}
+  $val=$trap->evaluation($rule, $item);
+  if ($val == true) { printf("true"); } else { printf("false"); }
   printf("\n");
 }
-catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
+catch (Exception $e) { printf("%s\n", $e->getMessage()); exit(1); }
 
 exit(0);
 ?>

Braces +3 added lines, -3 removed lines

@@ -17,8 +17,9 @@ 
 if (! $input) {
   $inputStream=fopen('php://stdin', 'r');
   $rule=chop(fgets($inputStream));
-} else
+} else {
   $rule=$options['r'];
+}
 
 try
 {
@@ -28,8 +29,7 @@ 
   $val = $trap->evaluation($rule,$item);
   if ($val==true) { printf( "true"); } else { printf( "false");}
   printf("\n");
-}
-catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
+} catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
 
 exit(0);
 ?>

application/controllers/HandlerController.php

Indentation +88 added lines, -89 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,29 +38,29 @@ 
 	 */
 	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='';
+		}
 	}
 	
 	/** 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();
@@ -162,7 +161,7 @@ 
 					$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
 				}
 				$currentObject=array(
-				    $oid_index,
+					$oid_index,
 					$val->oid,
 					$val->oid_name_mib,
 					$val->oid_name,
@@ -184,7 +183,7 @@ 
 				{
 					if ($val==null) { continue; }
 					array_push($this->view->objectList, array(
-					    $oid_index,
+						$oid_index,
 						$key,
 						$allObjects[$key]['mib'],
 						$allObjects[$key]['name'],
@@ -223,61 +222,61 @@ 
 			$this->view->warning_message='';
 			if ($this->view->hostname != null)
 			{
-			    $this->view->selectGroup=false;
-			    // Check if hostname still exists
-			    $host_get=$this->getHostByName($this->view->hostname);
+				$this->view->selectGroup=false;
+				// 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;
+					}
+				}
 			}
 			else
 			{
-			    $this->view->selectGroup=true;
-			    // 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;
-			            }
-			        }
+				$this->view->selectGroup=true;
+				// 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';
+					}
+				}				
 			}
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
@@ -302,7 +301,7 @@ 
 				if (($object=$this->getMIB()->translateOID($curOid)) != null)
 				{
 					array_push($curObjectList, array(
-					    $index,
+						$index,
 						$curOid,
 						$object['mib'],
 						$object['name'],
@@ -314,7 +313,7 @@ 
 				else
 				{
 					array_push($curObjectList, array(
-					    $index,
+						$index,
 						$curOid,
 						'not found',
 						'not found',
@@ -335,9 +334,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();
@@ -378,7 +377,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -462,9 +461,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');  }
@@ -496,9 +495,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');  }
@@ -529,9 +528,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');  }
@@ -558,7 +557,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +76 added lines, -76 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
 	    {
@@ -66,7 +66,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()
@@ -116,12 +116,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
@@ -130,9 +130,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);
 				}
 			}
 			
@@ -171,18 +171,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,
@@ -216,7 +216,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
@@ -227,9 +227,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
@@ -237,10 +237,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
     				{
@@ -253,9 +253,9 @@ 
 			    $this->view->selectGroup=true;
 			    // 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
@@ -273,9 +273,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';
 			        }
 			    }				
 			}
@@ -295,8 +295,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)
@@ -322,8 +322,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++;
 			}
 			// set display
@@ -345,26 +345,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
 			{
@@ -384,16 +384,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']];
 				}
@@ -402,8 +402,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;
@@ -430,25 +430,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'];
 			}
 		}
@@ -467,10 +467,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;
@@ -479,15 +479,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;
 		}
 
@@ -501,10 +501,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;
@@ -513,15 +513,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();
 		}
 
@@ -534,22 +534,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();
 		}
 
@@ -563,7 +563,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='';
 	    }
@@ -113,8 +112,7 @@ 
 			try
 			{
 				$hosts=$this->getHostByIP($hostfilter);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 			}
@@ -127,8 +125,7 @@ 
 				// Tell JS to get services when page is loaded
 				$this->view->serviceGet=true;
 				
-			}
-			else
+			} else
 			{
 				foreach($hosts as $key=>$val)
 				{
@@ -178,11 +175,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,
@@ -231,8 +231,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;
@@ -241,14 +240,12 @@ 
     				if (count($serviceID) ==0)
     				{
     				    $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-    				} 
-    				else
+    				} else
     				{
     				    $this->view->serviceSet=$serviceID[0]->id;
     				}
 			    }
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    // Check if groupe exists
@@ -257,8 +254,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;
@@ -281,9 +277,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']);				
@@ -310,8 +308,7 @@ 
 						$object['type'],
 						$object['type_enum']
 					));
-				}
-				else
+				} else
 				{
 					array_push($curObjectList, array(
 					    $index,
@@ -369,8 +366,7 @@ 
 			try
 			{
 				$this->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -384,13 +380,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 !="")
@@ -420,8 +418,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)
@@ -445,14 +442,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;
@@ -483,9 +478,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;
@@ -518,8 +514,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();
@@ -545,9 +540,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();

application/controllers/HelperController.php

Indentation +84 added lines, -84 removed lines

@@ -12,8 +12,8 @@ 
 {
 	
 	/** Get host list with filter (IP or name) : host=<filter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -40,8 +40,8 @@ 
 
 	
 	/** Get hostgroup list with filter (name) : hostgroup=<hostFilter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostgroupsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -68,11 +68,11 @@ 
 
 	
 	/** Get service list by host name ( host=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		hostid = host object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		hostid = host object id or -1 if not found.
+	 */
 	public function getservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -112,11 +112,11 @@ 
 	}
 	
 	/** Get service list by host group ( name=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		groupid = group object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		groupid = group object id or -1 if not found.
+	 */
 	public function gethostgroupservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -153,10 +153,10 @@ 
 	}
 
 	/** Get traps from mib  : entry : mib=<mib>
-	*	returns in JSON : 
-	*		status=>OK/No mib/Error getting mibs
-	*		traps=>array of array( oid -> name)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No mib/Error getting mibs
+	 *		traps=>array of array( oid -> name)
+	 */
 	public function gettrapsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -182,10 +182,10 @@ 
 	}	
 
 	/** Get trap objects from mib  : entry : trap=<oid>
-	*	returns in JSON : 
-	*		status=>OK/no trap/not found
-	*		objects=>array of array( oid -> name, oid->mib)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/no trap/not found
+	 *		objects=>array of array( oid -> name, oid->mib)
+	 */
 	public function gettrapobjectsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -211,8 +211,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -227,10 +227,10 @@ 
 	}
 	
 	/** Get MIB::Name from OID : entry : oid
-	*		status=>OK/No oid/not found
-	*		mib=>string
-	*		name=>string
-	*/	
+	 *		status=>OK/No oid/not found
+	 *		mib=>string
+	 *		name=>string
+	 */	
 	public function translateoidAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -258,7 +258,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -267,10 +267,10 @@ 
 
 	
 	/** Save or execute database purge of <n> days
-	*	days=>int 
-	*	action=>save/execute
-	*	return : status=>OK/Message error
-	*/
+	 *	days=>int 
+	 *	action=>save/execute
+	 *	return : status=>OK/Message error
+	 */
 	public function dbmaintenanceAction()
 	{
 		
@@ -339,11 +339,11 @@ 
 	}	
 
 	/** Save log output to db
-	*	destination=>log destination 
-	*	file=>file name
-	*	level => int 
-	*	return : status=>OK/Message error
-	*/
+	 *	destination=>log destination 
+	 *	file=>file name
+	 *	level => int 
+	 *	return : status=>OK/Message error
+	 */
 	public function logdestinationAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -367,8 +367,8 @@ 
 			$fileHandler=@fopen($file,'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
-			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
-			    return;
+				$this->_helper->json(array('status'=>'File not writable :  '.$file));
+				return;
 			}
 		}
 		else
@@ -418,50 +418,50 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['rule']))
-	    {
-	        $rule=$postData['rule'];
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No Rule'));
-	    }
-	    if (isset($postData['action']))
-	    {
-	        $action=$postData['action'];
-	        if ($action != 'evaluate')
-	        {
-	            $this->_helper->json(array('status'=>'unknown action '.$action));
-	            return;
-	        }
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No action'));
-	        return;
-	    }
-	    if ($action == 'evaluate')
-	    {
-	        try
-	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $Trap = new Trap($icingaweb2_etc);
-	            // Cleanup spaces before eval
-	            $rule=$Trap->eval_cleanup($rule);
-	            // Eval
-	            $item=0;
-	            $rule=$Trap->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
-	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
-	            return;
-	        }
-	        $return=($rule==true)?'true':'false';
-	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
-	    }
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['rule']))
+		{
+			$rule=$postData['rule'];
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No Rule'));
+		}
+		if (isset($postData['action']))
+		{
+			$action=$postData['action'];
+			if ($action != 'evaluate')
+			{
+				$this->_helper->json(array('status'=>'unknown action '.$action));
+				return;
+			}
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No action'));
+			return;
+		}
+		if ($action == 'evaluate')
+		{
+			try
+			{
+				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+				$Trap = new Trap($icingaweb2_etc);
+				// Cleanup spaces before eval
+				$rule=$Trap->eval_cleanup($rule);
+				// Eval
+				$item=0;
+				$rule=$Trap->evaluation($rule,$item);
+			}
+			catch (Exception $e)
+			{
+				$this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+				return;
+			}
+			$return=($rule==true)?'true':'false';
+			$this->_helper->json(array('status'=>'OK', 'message' => $return));
+		}
 	    
 	}	
 	

Spacing +35 added lines, -35 removed lines

@@ -27,12 +27,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostByIP($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -55,12 +55,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -82,31 +82,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -126,28 +126,28 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -172,7 +172,7 @@ 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -201,7 +201,7 @@ 
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -278,7 +278,7 @@ 
 		if (isset($postData['days']))
 		{
 			$days=$postData['days'];
-			if (!preg_match('/^[0-9]+$/',$days))
+			if (!preg_match('/^[0-9]+$/', $days))
 			{
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
@@ -292,7 +292,7 @@ 
 		if (isset($postData['action']))
 		{
 			$action=$postData['action'];
-			if ($action != 'save' && $action !='execute')
+			if ($action != 'save' && $action != 'execute')
 			{
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
@@ -307,11 +307,11 @@ 
 		{
 			try
 			{
-				$this->setDBConfigValue('db_remove_days',$days);
+				$this->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -321,16 +321,16 @@ 
 		{
 			try
 			{
-				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 				$debug_level=4;
-				$Trap = new Trap($icingaweb2_etc);
-				$Trap->setLogging($debug_level,'syslog');
+				$Trap=new Trap($icingaweb2_etc);
+				$Trap->setLogging($debug_level, 'syslog');
 				$Trap->eraseOldTraps($days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage()));
 				return;
 			}			
 			$this->_helper->json(array('status'=>'OK'));
@@ -364,7 +364,7 @@ 
 		if (isset($postData['file']))
 		{ 
 			$file=$postData['file'];
-			$fileHandler=@fopen($file,'w');
+			$fileHandler=@fopen($file, 'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
@@ -396,13 +396,13 @@ 
 		
 		try
 		{
-			$this->setDBConfigValue('log_destination',$destination);
-			$this->setDBConfigValue('log_file',$file);
-			$this->setDBConfigValue('log_level',$level);
+			$this->setDBConfigValue('log_destination', $destination);
+			$this->setDBConfigValue('log_file', $file);
+			$this->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -445,21 +445,21 @@ 
 	    {
 	        try
 	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $Trap = new Trap($icingaweb2_etc);
+	            $Trap=new Trap($icingaweb2_etc);
 	            // Cleanup spaces before eval
 	            $rule=$Trap->eval_cleanup($rule);
 	            // Eval
 	            $item=0;
-	            $rule=$Trap->evaluation($rule,$item);
+	            $rule=$Trap->evaluation($rule, $item);
 	        }
 	        catch (Exception $e)
 	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage()));
 	            return;
 	        }
-	        $return=($rule==true)?'true':'false';
+	        $return=($rule == true) ? 'true' : 'false';
 	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
 	    }
 	    

Braces +25 added lines, -50 removed lines

@@ -20,8 +20,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'KO'));
 			return;
@@ -48,8 +47,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Error : no filter'));
 			return;
@@ -79,8 +77,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -91,8 +88,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -123,8 +119,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -135,8 +130,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -163,8 +157,7 @@ 
 		if (isset($postData['mib']))
 		{
 			$mib=$postData['mib'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No mib'));
 			return;
@@ -173,8 +166,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -192,8 +184,7 @@ 
 		if (isset($postData['trap']))
 		{
 			$trap=$postData['trap'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No trap'));
 			return;
@@ -202,8 +193,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -218,8 +208,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -237,8 +226,7 @@ 
 		if (isset($postData['oid']))
 		{
 			$oid=$postData['oid'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No oid'));
 			return;
@@ -249,8 +237,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -283,8 +270,7 @@ 
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No days'));
 			return;
@@ -297,8 +283,7 @@ 
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No action'));
 			return;
@@ -308,8 +293,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -327,8 +311,7 @@ 
 				$Trap = new Trap($icingaweb2_etc);
 				$Trap->setLogging($debug_level,'syslog');
 				$Trap->eraseOldTraps($days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
 				return;
@@ -356,8 +339,7 @@ 
 				$this->_helper->json(array('status'=>'invalid destination : '.$destination));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No destination'));
 		}
@@ -370,14 +352,12 @@ 
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			    return;
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 				return;
@@ -387,8 +367,7 @@ 
 		if (isset($postData['level']))
 		{ 
 			$level=$postData['level'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No level'));
 			return;
@@ -399,8 +378,7 @@ 
 			$this->setDBConfigValue('log_destination',$destination);
 			$this->setDBConfigValue('log_file',$file);
 			$this->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -422,8 +400,7 @@ 
 	    if (isset($postData['rule']))
 	    {
 	        $rule=$postData['rule'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No Rule'));
 	    }
@@ -435,8 +412,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -453,8 +429,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$Trap->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;

application/controllers/StatusController.php

Indentation +28 added lines, -28 removed lines

@@ -65,10 +65,10 @@ 
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -87,22 +87,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -110,7 +110,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -259,20 +259,20 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -22,18 +22,18 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-			$db = $this->getDb()->getConnection();
-			$query = $db->select()->from(
+			$db=$this->getDb()->getConnection();
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,7 +59,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -85,7 +85,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -94,34 +94,34 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
 				$name=$_FILES['mibfile']['name'];
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
-				$destination = array_shift($DirConf) .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
+				$destination=array_shift($DirConf).'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				if (move_uploaded_file($_FILES['mibfile']['tmp_name'], $destination) === false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
 				}
@@ -134,13 +134,13 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
@@ -158,46 +158,46 @@ 
 		// mib database
 		
 		$this->view->mibDbCount=$this->getMIB()->countObjects();
-		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21);
+		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21);
 		
 		// mib dirs
 		$DirConf=$this->Config()->get('config', 'snmptranslate_dirs');
-		$dirArray=explode(':',$DirConf);
+		$dirArray=explode(':', $DirConf);
 
 		// Get base directories from net-snmp-config
 		$output=$matches=array();
 		$retVal=0;
-		$sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal);
-		if ($retVal==0)
+		$sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal);
+		if ($retVal == 0)
 		{
-			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
+			$dirArray=array_merge($dirArray, explode(':', $sysDirs));
 		}
 		else
 		{
-			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
-			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
+			$translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
+			if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches))
 			{
-				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
+				$dirArray=array_merge($dirArray, explode(':', $matches[1]));
 			}
 			else
 			{
-				array_push($dirArray,'Install net-snmp-config to see system directories');
+				array_push($dirArray, 'Install net-snmp-config to see system directories');
 			}
 		}
 		
 		$this->view->dirArray=$dirArray;
 		
 		$output=null;
-		foreach (explode(':',$DirConf) as $mibdir)
+		foreach (explode(':', $DirConf) as $mibdir)
 		{
-			exec('ls '.$mibdir.' | grep -v traplist.txt',$output);
+			exec('ls '.$mibdir.' | grep -v traplist.txt', $output);
 		}
 		//$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++];
 		//$this->view->fileList=explode(' ',$listFiles);
 		$this->view->fileList=$output;
 		
 		// Zend form 
-		$this->view->form= new UploadForm();
+		$this->view->form=new UploadForm();
 		//$this->view->form= new Form('upload-form');
 		
 		
@@ -221,18 +221,18 @@ 
 		$this->view->templateForm_output='';
 		if (isset($postData['template_name']) && isset($postData['template_revert_time']))
 		{
-			$template_create = 'icingacli director service create --json \'{ "check_command": "dummy", ';
-			$template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
-			$template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
+			$template_create='icingacli director service create --json \'{ "check_command": "dummy", ';
+			$template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
+			$template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
 			$output=array();
 			$ret_code=0;
-			exec($template_create,$output,$ret_code);
+			exec($template_create, $output, $ret_code);
 			if ($ret_code != 0)
 			{
-				$this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create);
+				$this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create);
 			}
-			exec('icingacli director config deploy',$output,$ret_code);
-			$this->view->templateForm_output='Template '.$postData['template_name']. ' created';
+			exec('icingacli director config deploy', $output, $ret_code);
+			$this->view->templateForm_output='Template '.$postData['template_name'].' created';
 		}
 		
 		// template creation form
@@ -245,13 +245,13 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 		);
 	} 
 }
@@ -259,7 +259,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -268,11 +268,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $file=new File('mib-file');
         $file->setLabel('Mib upload');
              //->setAttrib('multiple', null);
         $this->addElement($file);
-		$button = new Submit("upload",array('ignore'=>false));
-		$this->addElement($button);//->setIgnore(false);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }

Braces +8 added lines, -16 removed lines

@@ -41,8 +41,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +55,7 @@ 
 			$this->view->currentLogFile=$this->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}		
@@ -107,8 +105,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -124,8 +121,7 @@ 
 				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
-				}
-				else
+				} else
 				{
 					$this->view->uploadStatus="File $name uploaded";
 				}
@@ -144,13 +140,11 @@ 
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='can execute but no resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='cannot execute';
 		}
@@ -171,15 +165,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}

application/controllers/SettingsController.php

Braces +18 added lines, -16 removed lines

@@ -28,11 +28,13 @@ 
 	$this->checkReadPermission();
 	// Get message : sent on configuration problems detected by controllers
 	$dberrorMsg=$this->params->get('dberror');
-	if ($dberrorMsg != '')
-	    $this->view->errorDetected=$dberrorMsg;
+	if ($dberrorMsg != '') {
+		    $this->view->errorDetected=$dberrorMsg;
+	}
     $dberrorMsg=$this->params->get('idodberror');
-    if ($dberrorMsg != '')
-        $this->view->errorDetected=$dberrorMsg;
+    if ($dberrorMsg != '') {
+            $this->view->errorDetected=$dberrorMsg;
+    }
     
     $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
     
@@ -46,8 +48,7 @@ 
             $this->Config()->saveIni();
             $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
 			//$emptyConfig=1;
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->view->configErrorDetected=$e->getMessage();
         }
@@ -106,8 +107,7 @@ 
     	    $this->view->apimessage='API config : ' . $e->getMessage();
     	    $this->view->apimessageError=true;
     	} 
-	}
-	else
+	} else
 	{
 	    $this->view->apimessage='API parameters not configured';
 	    $this->view->apimessageError=true;
@@ -184,8 +184,7 @@ 
 	if ($dberror[0] == 0)
 	{
 		printf('Schema already exists');
-	}
-	else
+	} else
 	{
 		printf('Creating schema : <br>');
 
@@ -308,12 +307,15 @@ 
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
       $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      if (!preg_match('/-n/',$line)) {
+                return array(1,'snmptrapd has no -n option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*n/',$line)) {
+                return array(1,'snmptrapd has no -On option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*e/',$line)) {
+                return array(1,'snmptrapd has no -Oe option : '.$line);
+      }
       
       return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }

Indentation +100 added lines, -100 removed lines

@@ -22,37 +22,37 @@ 
   public function indexAction()
   {
       
-    // CHeck permissions : display tests in any case, but no configuration.
+	// CHeck permissions : display tests in any case, but no configuration.
 	$this->view->configPermission=$this->checkModuleConfigPermission(1);
 	// But check read permission
 	$this->checkReadPermission();
 	// Get message : sent on configuration problems detected by controllers
 	$dberrorMsg=$this->params->get('dberror');
 	if ($dberrorMsg != '')
-	    $this->view->errorDetected=$dberrorMsg;
-    $dberrorMsg=$this->params->get('idodberror');
-    if ($dberrorMsg != '')
-        $this->view->errorDetected=$dberrorMsg;
+		$this->view->errorDetected=$dberrorMsg;
+	$dberrorMsg=$this->params->get('idodberror');
+	if ($dberrorMsg != '')
+		$this->view->errorDetected=$dberrorMsg;
     
-    $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	$this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	//$emptyConfig=0;
-    if ($this->Config()->isEmpty() == true)
-    {
-        $this->Config()->setSection('config'); // Set base config section.
-        try 
-        { 
-            $this->Config()->saveIni();
-            $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
+	if ($this->Config()->isEmpty() == true)
+	{
+		$this->Config()->setSection('config'); // Set base config section.
+		try 
+		{ 
+			$this->Config()->saveIni();
+			$this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
 			//$emptyConfig=1;
-        }
-        catch (Exception $e)
-        {
-            $this->view->configErrorDetected=$e->getMessage();
-        }
+		}
+		catch (Exception $e)
+		{
+			$this->view->configErrorDetected=$e->getMessage();
+		}
         
-    }
+	}
 	// Test Database
 	$db_message=array( // index => ( message OK, message NOK, optional link if NOK ) 
 		0	=>	array('Database configuration OK','',''),
@@ -97,20 +97,20 @@ 
 	//********* Test API
 	if ($this->Config()->get('config', 'icingaAPI_host') != '')
 	{
-	    $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
-    	$apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
-    	try {
-    	    list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
-    	    //$this->view->apimessageError=false;
-    	} catch (RuntimeException $e) {
-    	    $this->view->apimessage='API config : ' . $e->getMessage();
-    	    $this->view->apimessageError=true;
-    	} 
+		$apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+		$apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
+		try {
+			list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+			//$this->view->apimessageError=false;
+		} catch (RuntimeException $e) {
+			$this->view->apimessage='API config : ' . $e->getMessage();
+			$this->view->apimessageError=true;
+		} 
 	}
 	else
 	{
-	    $this->view->apimessage='API parameters not configured';
-	    $this->view->apimessageError=true;
+		$this->view->apimessage='API parameters not configured';
+		$this->view->apimessageError=true;
 	}
 	
 	//*********** Test snmptrapd alive and options
@@ -125,33 +125,33 @@ 
 		}
 	}
 
-    $this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
 
 	// Check standard Icingaweb2 path
 	$this->view->icingaEtcWarn=0;
 	$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
 	{
-	    $output=array();
+		$output=array();
 	    
-	    exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2_etc=" ',$output);
+		exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2_etc=" ',$output);
 	    
-	    if (! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
-	    {
-    	    $this->view->icingaEtcWarn=1;
-	        $this->view->icingaweb2_etc=$icingaweb2_etc;
-	    }
+		if (! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		{
+			$this->view->icingaEtcWarn=1;
+			$this->view->icingaweb2_etc=$icingaweb2_etc;
+		}
 	}
 
 	// Setup path for mini documentation
 	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . PHP_BINARY
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -196,19 +196,19 @@ 
 		  $dbResource = ResourceFactory::getResourceConfig($dbName);
 		  $dbType=$dbResource->get('db');
 		  switch ($dbType) {
-		      case 'mysql':
-		          $dbFileExt='sql';
-		          break;
-		      case 'pgsql':
-		          $dbFileExt='pgsql';
-		          break;
-		      default:
-		          throw new ConfigurationError('Unsuported database : '.$dbType);
+			  case 'mysql':
+				  $dbFileExt='sql';
+				  break;
+			  case 'pgsql':
+				  $dbFileExt='pgsql';
+				  break;
+			  default:
+				  throw new ConfigurationError('Unsuported database : '.$dbType);
 		  }
 		} catch (ConfigurationError $e )
 		{
-		    printf("Database configuration error : %s",$e->getMessage());
-		    return;
+			printf("Database configuration error : %s",$e->getMessage());
+			return;
 		}
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -232,11 +232,11 @@ 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-    	$this->getTabs()->add('get',array(
-    		'active'	=> true,
-    		'label'		=> $this->translate('Update Schema'),
-    		'url'		=> Url::fromRequest()
-    	));
+		$this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Update Schema'),
+			'url'		=> Url::fromRequest()
+		));
 	  // check if needed
 	  
 	  $dberror=$this->getDb(true); // Get DB in test mode
@@ -245,15 +245,15 @@ 
 	  
 	  if ($dberror[0] == 0)
 	  {
-	      echo 'Schema already exists and is up to date<br>';
-	      return;
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
 	  }
 	  if ($dberror[0] != 5)
 	  {
-	      echo 'Database does not exists or is not setup correctly<br>';
-	      return;
+		  echo 'Database does not exists or is not setup correctly<br>';
+		  return;
 	  }
-      // setup
+	  // setup
 	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
@@ -266,20 +266,20 @@ 
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
-	      // Check for messages and display if any
-              echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
-	      if ($message != '')
-	      {
-	          echo 'Note :<br><pre>';
-	          echo $message;
-	          echo '</pre>';
-	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
-	          echo '<br>';
-	          return;
-	      }
+		  // Check for messages and display if any
+			  echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
+		  $Trap->setLogging(2,'syslog');
+		  $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+		  if ($message != '')
+		  {
+			  echo 'Note :<br><pre>';
+			  echo $message;
+			  echo '</pre>';
+			  echo '<br>';
+			  echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+			  echo '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -293,28 +293,28 @@ 
 
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
-      }
-      $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
-      }
-      // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+	  }
+	  $psOutput=array();
+	  exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+	  }
+	  // Assume there is only one line... TODO : see if there is a better way to do this
+	  $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
+	  if (!preg_match('/-n/',$line))
+		  return array(1,'snmptrapd has no -n option : '.$line);
+	  if (!preg_match('/-O[^ ]*n/',$line))
+		  return array(1,'snmptrapd has no -On option : '.$line);
+	  if (!preg_match('/-O[^ ]*e/',$line))
+		  return array(1,'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

Spacing +63 added lines, -63 removed lines

@@ -55,15 +55,15 @@ 
     }
 	// Test Database
 	$db_message=array( // index => ( message OK, message NOK, optional link if NOK ) 
-		0	=>	array('Database configuration OK','',''),
-		1	=>	array('Database set in config.ini','No database in config.ini',''),
-		2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+		0	=>	array('Database configuration OK', '', ''),
+		1	=>	array('Database set in config.ini', 'No database in config.ini', ''),
+		2	=>	array('Database exists in Icingaweb2 config', 'Database does not exist in Icingaweb2 : ',
 					Url::fromPath('config/resource')),
-		3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+		3	=>	array('Database credentials OK', 'Database does not exist/invalid credentials/no schema : ',
 					Url::fromPath('trapdirector/settings/createschema')),
-		4	=>	array('Schema is set','Schema is not set for ',
+		4	=>	array('Schema is set', 'Schema is not set for ',
 					Url::fromPath('trapdirector/settings/createschema')),					
-		5	=>	array('Schema is up to date','Schema is outdated :',
+		5	=>	array('Schema is up to date', 'Schema is outdated :',
 					Url::fromPath('trapdirector/settings/updateschema')),
 	);
 		
@@ -74,13 +74,13 @@ 
 	{
 		case 2:
 		case 4:
-			$db_message[$dberror[0]][1] .= $dberror[1];
+			$db_message[$dberror[0]][1].=$dberror[1];
 			break;
 		case 3:
-			$db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+			$db_message[$dberror[0]][1].=$dberror[1].', Message : '.$dberror[2];
 			break;
 		case 5:
-			$db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+			$db_message[$dberror[0]][1].=' version '.$dberror[1].', version needed : '.$dberror[2];
 			break;
 		case 0:
 		case 1:
@@ -92,18 +92,18 @@ 
 	
 	$dberror=$this->getIdoDb(true); // Get IDO DB in test mode
 	$this->view->ido_db_error=$dberror[0];
-	$this->view->ido_message='IDO Database : ' . $dberror[1];
+	$this->view->ido_message='IDO Database : '.$dberror[1];
 	
 	//********* Test API
 	if ($this->Config()->get('config', 'icingaAPI_host') != '')
 	{
-	    $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+	    $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'), $this->Config()->get('config', 'icingaAPI_port'));
     	$apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
     	try {
-    	    list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+    	    list($this->view->apimessageError, $this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
     	    //$this->view->apimessageError=false;
     	} catch (RuntimeException $e) {
-    	    $this->view->apimessage='API config : ' . $e->getMessage();
+    	    $this->view->apimessage='API config : '.$e->getMessage();
     	    $this->view->apimessageError=true;
     	} 
 	}
@@ -114,18 +114,18 @@ 
 	}
 	
 	//*********** Test snmptrapd alive and options
-	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
+	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage)=$this->checkSnmpTrapd();
 
 	// List DB in $ressources
-	$resources = array();
-	$allowed = array('mysql', 'pgsql');
+	$resources=array();
+	$allowed=array('mysql', 'pgsql');
 	foreach (ResourceFactory::getResourceConfigs() as $name => $resource) {
 		if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) {
-			$resources[$name] = $name;
+			$resources[$name]=$name;
 		}
 	}
 
-    $this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+    $this->view->tabs=$this->Module()->getConfigTabs()->activate('config');
 
 	// Check standard Icingaweb2 path
 	$this->view->icingaEtcWarn=0;
@@ -134,9 +134,9 @@ 
 	{
 	    $output=array();
 	    
-	    exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2_etc=" ',$output);
+	    exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2_etc=" ', $output);
 	    
-	    if (! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+	    if (!preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
 	    {
     	    $this->view->icingaEtcWarn=1;
 	        $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -144,23 +144,23 @@ 
 	}
 
 	// Setup path for mini documentation
-	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=PHP_BINARY.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.PHP_BINARY
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -172,7 +172,7 @@ 
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -193,7 +193,7 @@ 
 		$dbName=$this->Config()->get('config', 'database');
 
 		try {
-		  $dbResource = ResourceFactory::getResourceConfig($dbName);
+		  $dbResource=ResourceFactory::getResourceConfig($dbName);
 		  $dbType=$dbResource->get('db');
 		  switch ($dbType) {
 		      case 'mysql':
@@ -205,34 +205,34 @@ 
 		      default:
 		          throw new ConfigurationError('Unsuported database : '.$dbType);
 		  }
-		} catch (ConfigurationError $e )
+		} catch (ConfigurationError $e)
 		{
-		    printf("Database configuration error : %s",$e->getMessage());
+		    printf("Database configuration error : %s", $e->getMessage());
 		    return;
 		}
 		printf('<pre>');
-		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
+		require_once $this->Module()->getBaseDir().'/bin/trap_class.php';
 		
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=4;
-		$Trap = new Trap($icingaweb2_etc);
-		$Trap->setLogging($debug_level,'display');
+		$Trap=new Trap($icingaweb2_etc);
+		$Trap->setLogging($debug_level, 'display');
 		
 		$prefix=$this->Config()->get('config', 'database_prefix');
 		// schema file : <path>/SQL/schema_v<verion>.<dbtype>
-		$schema=$this->Module()->getBaseDir() . 
-		'/SQL/schema_v'. $this->getModuleConfig()->getDbCurVersion() . '.' . $dbFileExt;
+		$schema=$this->Module()->getBaseDir(). 
+		'/SQL/schema_v'.$this->getModuleConfig()->getDbCurVersion().'.'.$dbFileExt;
 		
-		$Trap->trapsDB->create_schema($schema,$prefix);
+		$Trap->trapsDB->create_schema($schema, $prefix);
 		echo '</pre>';
 	}
-	echo '<br><br>Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a>';
+	echo '<br><br>Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a>';
   }
 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-    	$this->getTabs()->add('get',array(
+    	$this->getTabs()->add('get', array(
     		'active'	=> true,
     		'label'		=> $this->translate('Update Schema'),
     		'url'		=> Url::fromRequest()
@@ -241,7 +241,7 @@ 
 	  
 	  $dberror=$this->getDb(true); // Get DB in test mode
 	  
-	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
+	  echo 'Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] == 0)
 	  {
@@ -254,40 +254,40 @@ 
 	      return;
 	  }
       // setup
-	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	  require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
-	  $Trap = new Trap($icingaweb2_etc);
+	  $Trap=new Trap($icingaweb2_etc);
 	  
 	  
 	  $prefix=$this->Config()->get('config', 'database_prefix');
-	  $updateSchema=$this->Module()->getBaseDir() . '/SQL/';
+	  $updateSchema=$this->Module()->getBaseDir().'/SQL/';
 	  
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
 	      // Check for messages and display if any
               echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix, true);
 	      if ($message != '')
 	      {
 	          echo 'Note :<br><pre>';
 	          echo $message;
 	          echo '</pre>';
 	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="'.Url::fromPath('trapdirector/settings/updateschema').'?msgok=1">Click here to update</a>';
 	          echo '<br>';
 	          return;
 	      }
 	  }
 	  
-	  $Trap->setLogging($debug_level,'display');
+	  $Trap->setLogging($debug_level, 'display');
 	  
-	  echo 'Updating schema to '. $target_version . ': <br>';
+	  echo 'Updating schema to '.$target_version.': <br>';
 	  echo '<pre>';
 	  	  
-	  $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -295,26 +295,26 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+      exec('netstat -an |grep -E "udp.*:162"', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+          return array(1, 'Port UDP/162 is not open : snmptrapd must not be started');
       }
       $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+      exec('ps fax |grep snmptrapd |grep -v grep', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+          return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+      if (!preg_match('/-n/', $line))
+          return array(1, 'snmptrapd has no -n option : '.$line);
+      if (!preg_match('/-O[^ ]*n/', $line))
+          return array(1, 'snmptrapd has no -On option : '.$line);
+      if (!preg_match('/-O[^ ]*e/', $line))
+          return array(1, 'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+      return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

bin/trap_in.php

Braces +2 added lines, -4 removed lines

@@ -30,15 +30,13 @@
 
 	$Trap->add_rule_final(microtime(true) - $time1);
 	
-}
-catch (Exception $e) 
+} catch (Exception $e) 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
         $logging = new Logging();
         $logging->log("Caught exception creating Trap class",2);
-    }
-    else
+    } else
     {
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
     }

Indentation +14 added lines, -14 removed lines

@@ -15,13 +15,13 @@ 
 
 try
 {
-    //$Trap = new Trap($icingaweb2_etc);
-    //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    $Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	//$Trap = new Trap($icingaweb2_etc);
+	//$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
+	$Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
+	//$Trap->setLogging(4,'syslog'); 
     
-    // TODO : tranfer this to reset_trap cli command
-    $Trap->eraseOldTraps();
+	// TODO : tranfer this to reset_trap cli command
+	$Trap->eraseOldTraps();
 
 	$Trap->read_trap('php://stdin');
 
@@ -34,15 +34,15 @@ 
 }
 catch (Exception $e) 
 {
-    if ($Trap == null)
-    {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
-    }
-    else
-    {
+	if ($Trap == null)
+	{  // Exception in trap creation : log in display & syslog
+		$logging = new Logging();
+		$logging->log("Caught exception creating Trap class",2);
+	}
+	else
+	{
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
-    }
+	}
 }
 
 //end

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 use Trapdirector\Logging;
 
 // start
-$time1 = microtime(true);
+$time1=microtime(true);
 
 require_once ('trap_class.php');
 
@@ -17,7 +17,7 @@ 
 {
     //$Trap = new Trap($icingaweb2_etc);
     //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    $Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
+    $Trap=new Trap($icingaweb2_etc, 4, 'syslog'); // For debug
     //$Trap->setLogging(4,'syslog'); 
     
     // TODO : tranfer this to reset_trap cli command
@@ -36,12 +36,12 @@ 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
+        $logging=new Logging();
+        $logging->log("Caught exception creating Trap class", 2);
     }
     else
     {
-	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
+	   $Trap->trapLog("Exception : ".$e->getMessage(), 2, 0);
     }
 }