patrickpr / trapdirector

library/Trapdirector/Tables/TrapDirectorTableFilter.php

Spacing +6 added lines, -6 removed lines

@@ -8,10 +8,10 @@ 
     
     /********* Filter ********/
     /** @var string $filterString : string filter for db columns */
-    protected $filterString = '';
+    protected $filterString='';
     
     /** @var array $filterColumn : columns to apply filter to */
-    protected $filterColumn = array();
+    protected $filterColumn=array();
     
     protected $filterQuery='';
     
@@ -29,7 +29,7 @@ 
         {
             if ($filter != "") $filter.=' OR ';
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
-            $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
+            $filter.=$column." LIKE '%".$this->filterString."%'";
         }
         //echo $filter;
         
@@ -40,8 +40,8 @@ 
 
     public function setFilter(string $filter, array $filterCol)
     {
-        $this->filterString = $filter;
-        $this->filterColumn = $filterCol;
+        $this->filterString=$filter;
+        $this->filterColumn=$filterCol;
         return $this;
     }
    
@@ -63,7 +63,7 @@ 
     {
         if (isset($getVars['f']))
         {
-            $this->filterQuery = $getVars['f'];
+            $this->filterQuery=$getVars['f'];
             $this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
         }
     }

Braces +6 added lines, -2 removed lines

@@ -27,7 +27,9 @@ 
         $filter='';
         foreach ($this->filterColumn as $column)
         {
-            if ($filter != "") $filter.=' OR ';
+            if ($filter != "") {
+            	$filter.=' OR ';
+            }
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
             $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
         }
@@ -70,7 +72,9 @@ 
     
     protected function curFilterQuery()
     {
-        if ($this->filterQuery == '') return '';
+        if ($this->filterQuery == '') {
+        	return '';
+        }
         return 'f='.$this->filterQuery;
     }
     

Indentation +53 added lines, -53 removed lines

@@ -6,75 +6,75 @@
 trait TrapDirectorTableFilter
 {
     
-    /********* Filter ********/
-    /** @var string $filterString : string filter for db columns */
-    protected $filterString = '';
+	/********* Filter ********/
+	/** @var string $filterString : string filter for db columns */
+	protected $filterString = '';
     
-    /** @var array $filterColumn : columns to apply filter to */
-    protected $filterColumn = array();
+	/** @var array $filterColumn : columns to apply filter to */
+	protected $filterColumn = array();
     
-    protected $filterQuery='';
+	protected $filterQuery='';
     
-    /**** var & func of TrapDirectorTable used ***/
-    protected $query;
-    abstract protected function getCurrentURLAndQS(string $caller);
+	/**** var & func of TrapDirectorTable used ***/
+	protected $query;
+	abstract protected function getCurrentURLAndQS(string $caller);
     
-    /**************** Filtering ******************/
+	/**************** Filtering ******************/
     
-    public function applyFilter()
-    {
-        if ($this->filterString == '' || count($this->filterColumn) == 0)
-        {
-            return $this;
-        }
-        $filter='';
-        foreach ($this->filterColumn as $column)
-        {
-            if ($filter != "") $filter.=' OR ';
-            //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
-            $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
-        }
-        //echo $filter;
+	public function applyFilter()
+	{
+		if ($this->filterString == '' || count($this->filterColumn) == 0)
+		{
+			return $this;
+		}
+		$filter='';
+		foreach ($this->filterColumn as $column)
+		{
+			if ($filter != "") $filter.=' OR ';
+			//$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
+			$filter .= $column  . " LIKE '%" . $this->filterString. "%'";
+		}
+		//echo $filter;
         
-        $this->query=$this->query->where($filter);
+		$this->query=$this->query->where($filter);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function setFilter(string $filter, array $filterCol)
-    {
-        $this->filterString = $filter;
-        $this->filterColumn = $filterCol;
-        return $this;
-    }
+	public function setFilter(string $filter, array $filterCol)
+	{
+		$this->filterString = $filter;
+		$this->filterColumn = $filterCol;
+		return $this;
+	}
    
-    public function renderFilter()
-    {
+	public function renderFilter()
+	{
         
-        $html=' <form id="genfilter" name="mainFilterGen"
+		$html=' <form id="genfilter" name="mainFilterGen"
 			enctype="application/x-www-form-urlencoded"
 			action="'.$this->getCurrentURLAndQS('filter').'"
 			method="get">';
-        $html.='<input type="text" name="f" title="Search is simple! Try to combine multiple words"
+		$html.='<input type="text" name="f" title="Search is simple! Try to combine multiple words"
 	placeholder="Search..."  value="'.$this->filterQuery.'">';
 
-        $html.='</form>';
-        return $html;
-    }
+		$html.='</form>';
+		return $html;
+	}
  
-    public function getFilterQuery(array $getVars)
-    {
-        if (isset($getVars['f']))
-        {
-            $this->filterQuery = $getVars['f'];
-            $this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
-        }
-    }
+	public function getFilterQuery(array $getVars)
+	{
+		if (isset($getVars['f']))
+		{
+			$this->filterQuery = $getVars['f'];
+			$this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
+		}
+	}
     
-    protected function curFilterQuery()
-    {
-        if ($this->filterQuery == '') return '';
-        return 'f='.$this->filterQuery;
-    }
+	protected function curFilterQuery()
+	{
+		if ($this->filterQuery == '') return '';
+		return 'f='.$this->filterQuery;
+	}
     
 }
\ No newline at end of file

library/Trapdirector/Tables/TrapDirectorTable.php

Indentation +164 added lines, -164 removed lines

@@ -6,195 +6,195 @@
 abstract class TrapDirectorTable
 {
     
-    use TrapDirectorTableFilter;
-    use TrapDirectorTablePaging;
-    use TrapDirectorTableOrder;
-    use TrapDirectorTableGrouping;
+	use TrapDirectorTableFilter;
+	use TrapDirectorTablePaging;
+	use TrapDirectorTableOrder;
+	use TrapDirectorTableGrouping;
     
-    /** @var array $titles table titles (name, display value) */
-    protected $titles = null;
+	/** @var array $titles table titles (name, display value) */
+	protected $titles = null;
 
-    /** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
-    protected $content = null;
+	/** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
+	protected $content = null;
     
-    /** @var array $columnNames names of columns for filtering */
-    protected $columnNames = array();
+	/** @var array $columnNames names of columns for filtering */
+	protected $columnNames = array();
     
-    /** @var mixed $dbConn connection to database  */
-    protected $dbConn = null;
+	/** @var mixed $dbConn connection to database  */
+	protected $dbConn = null;
     
-    /** Current view **/
-    protected $view;
+	/** Current view **/
+	protected $view;
     
-    protected $urlPath;
+	protected $urlPath;
     
-    // Database stuff
+	// Database stuff
    /** @var array $table (db ref, name) */
-    protected $table = array();
-    
-    /** @var mixed  $query Query in database; */
-    protected $query = null;
-    
-    function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
-    {
-        $this->table = $table;
-        $this->titles = $titles;
-        $this->content = $columns;
-        $this->columnNames = $columnNames;
-        $this->dbConn = $dbConn;
+	protected $table = array();
+    
+	/** @var mixed  $query Query in database; */
+	protected $query = null;
+    
+	function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
+	{
+		$this->table = $table;
+		$this->titles = $titles;
+		$this->content = $columns;
+		$this->columnNames = $columnNames;
+		$this->dbConn = $dbConn;
         
-        $this->view = $view;
-        $this->urlPath = $urlPath;
+		$this->view = $view;
+		$this->urlPath = $urlPath;
         
-        return $this;
-    }
+		return $this;
+	}
 
     
-    /************** GET variables and URLs *************/
-    public function getParams(array $getVars)
-    {
-        $this->getFilterQuery($getVars);
-        $this->getPagingQuery($getVars);
-        $this->getOrderQuery($getVars);
-    }
-    
-    public function getCurrentURL()
-    {
-        return '?';
-    }
-    
-    protected function getCurrentURLAndQS(string $caller)
-    {
-        $actionURL = $this->getCurrentURL() . '?' ;
-        $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+	/************** GET variables and URLs *************/
+	public function getParams(array $getVars)
+	{
+		$this->getFilterQuery($getVars);
+		$this->getPagingQuery($getVars);
+		$this->getOrderQuery($getVars);
+	}
+    
+	public function getCurrentURL()
+	{
+		return '?';
+	}
+    
+	protected function getCurrentURLAndQS(string $caller)
+	{
+		$actionURL = $this->getCurrentURL() . '?' ;
+		$QSList=array();
+		if ($caller != 'filter' && $this->curFilterQuery() != '')
+			array_push($QSList , $this->curFilterQuery());
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+		if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
+			array_push($QSList , $this->curPagingQuery());
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+		if ($caller != 'order' && $this->curOrderQuery() != '')
+			array_push($QSList , $this->curOrderQuery());
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+		if (count($QSList) != 0)
+			$actionURL .=  implode('&', $QSList) . '&';
         
-        return $actionURL;
-    }
-    
-    /************* DB queries ******************/
-    /**
-     * Get base query in $this->query
-     * @return  TrapDirectorTable
-     */
-    public function getBaseQuery()
-    {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query->from(
-            $this->table,
-            $this->content
-            );
+		return $actionURL;
+	}
+    
+	/************* DB queries ******************/
+	/**
+	 * Get base query in $this->query
+	 * @return  TrapDirectorTable
+	 */
+	public function getBaseQuery()
+	{
+		$this->query = $this->dbConn->select();
+		$this->query = $this->query->from(
+			$this->table,
+			$this->content
+			);
         
-        return $this;
-    }
-    
-    public function fullQuery()
-    {
-        $this->getBaseQuery()
-        ->applyFilter()
-        ->applyPaging()
-        ->applyOrder();
+		return $this;
+	}
+    
+	public function fullQuery()
+	{
+		$this->getBaseQuery()
+		->applyFilter()
+		->applyPaging()
+		->applyOrder();
         
-        return $this->dbConn->fetchAll($this->query);
-        //return $this->query->fetchAll();
-    }
+		return $this->dbConn->fetchAll($this->query);
+		//return $this->query->fetchAll();
+	}
      
-    /*************** Rendering *************************/
-    
-    public function titleOrder($name)
-    {
-        return $this->content[$name];
-    }
-    
-    public function renderTitles()
-    {
-        $html = "<thead>\n<tr>\n";
-        foreach ($this->titles as $name => $values)
-        {
-            $titleOrder = $this->titleOrder($name);  // TODO : put this as function of order trait
-            if ($titleOrder != NULL)
-            {
-                if (isset($this->order[$titleOrder]))
-                {
-                    if ($this->order[$titleOrder] == 'ASC')
-                    {
-                        $titleOrder.='DESC';
-                    }
-                    else
-                    {
-                        $titleOrder.='ASC';
-                    }
-                }
-                else 
-                {
-                    $titleOrder.='ASC';
-                }
-                $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
-                $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
-            }
-            else 
-            {
-                $html .= '<th>' . $values . '</th>';
-            }          
-        }
-        $html .= "</tr>\n</thead>\n";
-        return $html;
-    }
-    
-    public function renderLine( $value)
-    {
-        $html = '';
-        $titleNames = array_keys($this->titles);
-        foreach ($titleNames as $name )
-        {
-            $html .= '<td>';
-            $html .= $value->$name;
-            $html .= "</td>\n";
-        }
-        return $html;
-    }
-    
-    public function renderTable(array $values)
-    {
-       $html = '<tbody id="obj_table_body">';
-       foreach($values as $value)
-       {
-           $html .= $this->groupingNextLine($value);
+	/*************** Rendering *************************/
+    
+	public function titleOrder($name)
+	{
+		return $this->content[$name];
+	}
+    
+	public function renderTitles()
+	{
+		$html = "<thead>\n<tr>\n";
+		foreach ($this->titles as $name => $values)
+		{
+			$titleOrder = $this->titleOrder($name);  // TODO : put this as function of order trait
+			if ($titleOrder != NULL)
+			{
+				if (isset($this->order[$titleOrder]))
+				{
+					if ($this->order[$titleOrder] == 'ASC')
+					{
+						$titleOrder.='DESC';
+					}
+					else
+					{
+						$titleOrder.='ASC';
+					}
+				}
+				else 
+				{
+					$titleOrder.='ASC';
+				}
+				$actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
+				$html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
+			}
+			else 
+			{
+				$html .= '<th>' . $values . '</th>';
+			}          
+		}
+		$html .= "</tr>\n</thead>\n";
+		return $html;
+	}
+    
+	public function renderLine( $value)
+	{
+		$html = '';
+		$titleNames = array_keys($this->titles);
+		foreach ($titleNames as $name )
+		{
+			$html .= '<td>';
+			$html .= $value->$name;
+			$html .= "</td>\n";
+		}
+		return $html;
+	}
+    
+	public function renderTable(array $values)
+	{
+	   $html = '<tbody id="obj_table_body">';
+	   foreach($values as $value)
+	   {
+		   $html .= $this->groupingNextLine($value);
            
-           $html .= "<tr>\n";
-           $html .= $this->renderLine($value);
-           $html .= "</tr>\n";
-       }
-       $html .= '</tbody>';
-       return $html;
-    }
-    
-    public function render()
-    {
-        $html = '';
+		   $html .= "<tr>\n";
+		   $html .= $this->renderLine($value);
+		   $html .= "</tr>\n";
+	   }
+	   $html .= '</tbody>';
+	   return $html;
+	}
+    
+	public function render()
+	{
+		$html = '';
         
         
-        $values = $this->fullQuery();
-        $this->initGrouping();
+		$values = $this->fullQuery();
+		$this->initGrouping();
         
-        $html.="<table class='simple common-table table-row-selectable'>\n";
+		$html.="<table class='simple common-table table-row-selectable'>\n";
         
-        $html .= $this->renderTitles();
-        $html .= $this->renderTable($values);
-        $html .= '</table>'; 
+		$html .= $this->renderTitles();
+		$html .= $this->renderTable($values);
+		$html .= '</table>'; 
         
 
-        return $html;
-    }
+		return $html;
+	}
     
 }
\ No newline at end of file

Spacing +46 added lines, -46 removed lines

@@ -12,16 +12,16 @@ 
     use TrapDirectorTableGrouping;
     
     /** @var array $titles table titles (name, display value) */
-    protected $titles = null;
+    protected $titles=null;
 
     /** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
-    protected $content = null;
+    protected $content=null;
     
     /** @var array $columnNames names of columns for filtering */
-    protected $columnNames = array();
+    protected $columnNames=array();
     
     /** @var mixed $dbConn connection to database  */
-    protected $dbConn = null;
+    protected $dbConn=null;
     
     /** Current view **/
     protected $view;
@@ -30,21 +30,21 @@ 
     
     // Database stuff
    /** @var array $table (db ref, name) */
-    protected $table = array();
+    protected $table=array();
     
     /** @var mixed  $query Query in database; */
-    protected $query = null;
+    protected $query=null;
     
-    function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
+    function __construct(array $table, array $titles, array $columns, array $columnNames, $dbConn, $view, $urlPath)
     {
-        $this->table = $table;
-        $this->titles = $titles;
-        $this->content = $columns;
-        $this->columnNames = $columnNames;
-        $this->dbConn = $dbConn;
+        $this->table=$table;
+        $this->titles=$titles;
+        $this->content=$columns;
+        $this->columnNames=$columnNames;
+        $this->dbConn=$dbConn;
         
-        $this->view = $view;
-        $this->urlPath = $urlPath;
+        $this->view=$view;
+        $this->urlPath=$urlPath;
         
         return $this;
     }
@@ -65,19 +65,19 @@ 
     
     protected function getCurrentURLAndQS(string $caller)
     {
-        $actionURL = $this->getCurrentURL() . '?' ;
+        $actionURL=$this->getCurrentURL().'?';
         $QSList=array();
         if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+            array_push($QSList, $this->curFilterQuery());
         
         if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+            array_push($QSList, $this->curPagingQuery());
  
         if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+            array_push($QSList, $this->curOrderQuery());
         
         if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+            $actionURL.=implode('&', $QSList).'&';
         
         return $actionURL;
     }
@@ -89,8 +89,8 @@ 
      */
     public function getBaseQuery()
     {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query->from(
+        $this->query=$this->dbConn->select();
+        $this->query=$this->query->from(
             $this->table,
             $this->content
             );
@@ -118,10 +118,10 @@ 
     
     public function renderTitles()
     {
-        $html = "<thead>\n<tr>\n";
+        $html="<thead>\n<tr>\n";
         foreach ($this->titles as $name => $values)
         {
-            $titleOrder = $this->titleOrder($name);  // TODO : put this as function of order trait
+            $titleOrder=$this->titleOrder($name); // TODO : put this as function of order trait
             if ($titleOrder != NULL)
             {
                 if (isset($this->order[$titleOrder]))
@@ -139,59 +139,59 @@ 
                 {
                     $titleOrder.='ASC';
                 }
-                $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
-                $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
+                $actionURL=$this->getCurrentURLAndQS('order').'o='.$titleOrder;
+                $html.='<th><a href="'.$actionURL.'">'.$values.'</a></th>';
             }
             else 
             {
-                $html .= '<th>' . $values . '</th>';
+                $html.='<th>'.$values.'</th>';
             }          
         }
-        $html .= "</tr>\n</thead>\n";
+        $html.="</tr>\n</thead>\n";
         return $html;
     }
     
-    public function renderLine( $value)
+    public function renderLine($value)
     {
-        $html = '';
-        $titleNames = array_keys($this->titles);
-        foreach ($titleNames as $name )
+        $html='';
+        $titleNames=array_keys($this->titles);
+        foreach ($titleNames as $name)
         {
-            $html .= '<td>';
-            $html .= $value->$name;
-            $html .= "</td>\n";
+            $html.='<td>';
+            $html.=$value->$name;
+            $html.="</td>\n";
         }
         return $html;
     }
     
     public function renderTable(array $values)
     {
-       $html = '<tbody id="obj_table_body">';
-       foreach($values as $value)
+       $html='<tbody id="obj_table_body">';
+       foreach ($values as $value)
        {
-           $html .= $this->groupingNextLine($value);
+           $html.=$this->groupingNextLine($value);
            
-           $html .= "<tr>\n";
-           $html .= $this->renderLine($value);
-           $html .= "</tr>\n";
+           $html.="<tr>\n";
+           $html.=$this->renderLine($value);
+           $html.="</tr>\n";
        }
-       $html .= '</tbody>';
+       $html.='</tbody>';
        return $html;
     }
     
     public function render()
     {
-        $html = '';
+        $html='';
         
         
-        $values = $this->fullQuery();
+        $values=$this->fullQuery();
         $this->initGrouping();
         
         $html.="<table class='simple common-table table-row-selectable'>\n";
         
-        $html .= $this->renderTitles();
-        $html .= $this->renderTable($values);
-        $html .= '</table>'; 
+        $html.=$this->renderTitles();
+        $html.=$this->renderTable($values);
+        $html.='</table>'; 
         
 
         return $html;

Braces +15 added lines, -14 removed lines

@@ -67,17 +67,21 @@ 
     {
         $actionURL = $this->getCurrentURL() . '?' ;
         $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+        if ($caller != 'filter' && $this->curFilterQuery() != '') {
+                    array_push($QSList , $this->curFilterQuery());
+        }
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '') {
+                    array_push($QSList , $this->curPagingQuery());
+        }
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+        if ($caller != 'order' && $this->curOrderQuery() != '') {
+                    array_push($QSList , $this->curOrderQuery());
+        }
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+        if (count($QSList) != 0) {
+                    $actionURL .=  implode('&', $QSList) . '&';
+        }
         
         return $actionURL;
     }
@@ -129,20 +133,17 @@ 
                     if ($this->order[$titleOrder] == 'ASC')
                     {
                         $titleOrder.='DESC';
-                    }
-                    else
+                    } else
                     {
                         $titleOrder.='ASC';
                     }
-                }
-                else 
+                } else 
                 {
                     $titleOrder.='ASC';
                 }
                 $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
                 $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
-            }
-            else 
+            } else 
             {
                 $html .= '<th>' . $values . '</th>';
             }          

library/Trapdirector/Tables/TrapDirectorTablePaging.php

Braces +14 added lines, -8 removed lines

@@ -46,7 +46,9 @@ 
 
     protected function curPagingQuery()
     {
-        if ($this->currentPage == '') return '';
+        if ($this->currentPage == '') {
+        	return '';
+        }
         return 'page='.$this->currentPage;
     }
     
@@ -58,10 +60,14 @@ 
             return  'count : ' . $this->count() . '<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) {
+        	$this->currentPage = 1;
+        }
         
         $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        if ($count % $this->maxPerPage != 0 ) {
+        	$numPages++;
+        }
         
         $html = '<div class="pagination-control" role="navigation">';
         $html .= '<ul class="nav tab-nav">';
@@ -75,8 +81,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
+        } else 
         {
             $html .= '
                 <li class="nav-item">
@@ -92,7 +97,9 @@ 
             $active = ($this->currentPage == $i) ? 'active' : '';
             $first = ($i-1)*$this->maxPerPage+1;
             $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
+            if ($last > $count) {
+            	$last = $count;
+            }
             $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
             $html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
@@ -111,8 +118,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
+        } else
         {
             $html .= '
                 <li class="nav-item">

Indentation +84 added lines, -84 removed lines

@@ -6,72 +6,72 @@ 
 trait TrapDirectorTablePaging
 {
    
-    /*************** Paging *************/
-    protected $maxPerPage = 25;
+	/*************** Paging *************/
+	protected $maxPerPage = 25;
     
-    protected $currentPage = 0;
+	protected $currentPage = 0;
         
-    /**** var & func of TrapDirectorTable used ***/
-    protected $query;
-    abstract protected function getCurrentURLAndQS(string $caller);
-    abstract public function applyFilter();
+	/**** var & func of TrapDirectorTable used ***/
+	protected $query;
+	abstract protected function getCurrentURLAndQS(string $caller);
+	abstract public function applyFilter();
     
-    /*****************  Paging and counting *********/
+	/*****************  Paging and counting *********/
     
-    public function countQuery()
-    {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query
-            ->from(
-                $this->table,
-                array('COUNT(*)')
-                );
-        $this->applyFilter();                   
-    }
+	public function countQuery()
+	{
+		$this->query = $this->dbConn->select();
+		$this->query = $this->query
+			->from(
+				$this->table,
+				array('COUNT(*)')
+				);
+		$this->applyFilter();                   
+	}
     
-    public function count()
-    {
-        $this->countQuery();
-        return $this->dbConn->fetchOne($this->query);
-    }
+	public function count()
+	{
+		$this->countQuery();
+		return $this->dbConn->fetchOne($this->query);
+	}
     
-    public function setMaxPerPage(int $max)
-    {
-        $this->maxPerPage = $max;
-    }
+	public function setMaxPerPage(int $max)
+	{
+		$this->maxPerPage = $max;
+	}
     
-    protected function getPagingQuery(array $getVars)
-    {
-        if (isset($getVars['page']))
-        {
-            $this->currentPage = $getVars['page'];
-        }
-    }
+	protected function getPagingQuery(array $getVars)
+	{
+		if (isset($getVars['page']))
+		{
+			$this->currentPage = $getVars['page'];
+		}
+	}
 
-    protected function curPagingQuery()
-    {
-        if ($this->currentPage == '') return '';
-        return 'page='.$this->currentPage;
-    }
+	protected function curPagingQuery()
+	{
+		if ($this->currentPage == '') return '';
+		return 'page='.$this->currentPage;
+	}
     
-    public function renderPagingHeader()
-    {
-        $count = $this->count();
-        if ($count <= $this->maxPerPage )
-        {
-            return  'count : ' . $this->count() . '<br>';
-        }
+	public function renderPagingHeader()
+	{
+		$count = $this->count();
+		if ($count <= $this->maxPerPage )
+		{
+			return  'count : ' . $this->count() . '<br>';
+		}
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+		if ($this->currentPage == 0) $this->currentPage = 1;
         
-        $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+		$numPages = intdiv($count , $this->maxPerPage);
+		if ($count % $this->maxPerPage != 0 ) $numPages++;
         
-        $html = '<div class="pagination-control" role="navigation">';
-        $html .= '<ul class="nav tab-nav">';
-        if ($this->currentPage <=1)
-        {
-            $html .= '
+		$html = '<div class="pagination-control" role="navigation">';
+		$html .= '<ul class="nav tab-nav">';
+		if ($this->currentPage <=1)
+		{
+			$html .= '
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -79,35 +79,35 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
-        {
-            $html .= '
+		}
+		else 
+		{
+			$html .= '
                 <li class="nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage - 1 ).'" class="previous-page" >
                             <i aria-hidden="true" class="icon-angle-double-left"></i>            
                      </a>
                 </li>
             ';
-        }
+		}
         
-        for ($i=1; $i <= $numPages ; $i++)
-        {
-            $active = ($this->currentPage == $i) ? 'active' : '';
-            $first = ($i-1)*$this->maxPerPage+1;
-            $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
-            $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
-            $html .= '<li class="' . $active . ' nav-item">
+		for ($i=1; $i <= $numPages ; $i++)
+		{
+			$active = ($this->currentPage == $i) ? 'active' : '';
+			$first = ($i-1)*$this->maxPerPage+1;
+			$last = $i * $this->maxPerPage;
+			if ($last > $count) $last = $count;
+			$display = 'Show rows '. $first . ' to '. $last .' of '. $count;
+			$html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
                     '.$i.'                
                     </a>
                 </li>';
-        }
+		}
         
-        if ($this->currentPage == $numPages)
-        {
-            $html .= '
+		if ($this->currentPage == $numPages)
+		{
+			$html .= '
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -115,28 +115,28 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
-        {
-            $html .= '
+		}
+		else
+		{
+			$html .= '
                 <li class="nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage + 1 ).'" class="next-page">
                             <i aria-hidden="true" class="icon-angle-double-right"></i>
                      </a>
                 </li>
             ';
-        }
+		}
         
-        $html .= '</ul> </div>';
+		$html .= '</ul> </div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
-    public function applyPaging()
-    {
-        $this->query->limitPage($this->currentPage,$this->maxPerPage);
-        return $this;
-    }
+	public function applyPaging()
+	{
+		$this->query->limitPage($this->currentPage,$this->maxPerPage);
+		return $this;
+	}
     
     
 }
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -7,9 +7,9 @@ 
 {
    
     /*************** Paging *************/
-    protected $maxPerPage = 25;
+    protected $maxPerPage=25;
     
-    protected $currentPage = 0;
+    protected $currentPage=0;
         
     /**** var & func of TrapDirectorTable used ***/
     protected $query;
@@ -20,8 +20,8 @@ 
     
     public function countQuery()
     {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query
+        $this->query=$this->dbConn->select();
+        $this->query=$this->query
             ->from(
                 $this->table,
                 array('COUNT(*)')
@@ -37,14 +37,14 @@ 
     
     public function setMaxPerPage(int $max)
     {
-        $this->maxPerPage = $max;
+        $this->maxPerPage=$max;
     }
     
     protected function getPagingQuery(array $getVars)
     {
         if (isset($getVars['page']))
         {
-            $this->currentPage = $getVars['page'];
+            $this->currentPage=$getVars['page'];
         }
     }
 
@@ -56,22 +56,22 @@ 
     
     public function renderPagingHeader()
     {
-        $count = $this->count();
-        if ($count <= $this->maxPerPage )
+        $count=$this->count();
+        if ($count <= $this->maxPerPage)
         {
-            return  'count : ' . $this->count() . '<br>';
+            return  'count : '.$this->count().'<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) $this->currentPage=1;
         
-        $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        $numPages=intdiv($count, $this->maxPerPage);
+        if ($count % $this->maxPerPage != 0) $numPages++;
         
-        $html = '<div class="pagination-control" role="navigation">';
-        $html .= '<ul class="nav tab-nav">';
-        if ($this->currentPage <=1)
+        $html='<div class="pagination-control" role="navigation">';
+        $html.='<ul class="nav tab-nav">';
+        if ($this->currentPage <= 1)
         {
-            $html .= '
+            $html.='
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -82,24 +82,24 @@ 
         }
         else 
         {
-            $html .= '
+            $html.='
                 <li class="nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage - 1 ).'" class="previous-page" >
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.($this->currentPage - 1).'" class="previous-page" >
                             <i aria-hidden="true" class="icon-angle-double-left"></i>            
                      </a>
                 </li>
             ';
         }
         
-        for ($i=1; $i <= $numPages ; $i++)
+        for ($i=1; $i <= $numPages; $i++)
         {
-            $active = ($this->currentPage == $i) ? 'active' : '';
-            $first = ($i-1)*$this->maxPerPage+1;
-            $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
-            $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
-            $html .= '<li class="' . $active . ' nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
+            $active=($this->currentPage == $i) ? 'active' : '';
+            $first=($i - 1) * $this->maxPerPage + 1;
+            $last=$i * $this->maxPerPage;
+            if ($last > $count) $last=$count;
+            $display='Show rows '.$first.' to '.$last.' of '.$count;
+            $html.='<li class="'.$active.' nav-item">
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.$i.'" title="'.$display.'" aria-label="'.$display.'">
                     '.$i.'                
                     </a>
                 </li>';
@@ -107,7 +107,7 @@ 
         
         if ($this->currentPage == $numPages)
         {
-            $html .= '
+            $html.='
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -118,23 +118,23 @@ 
         }
         else
         {
-            $html .= '
+            $html.='
                 <li class="nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage + 1 ).'" class="next-page">
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.($this->currentPage + 1).'" class="next-page">
                             <i aria-hidden="true" class="icon-angle-double-right"></i>
                      </a>
                 </li>
             ';
         }
         
-        $html .= '</ul> </div>';
+        $html.='</ul> </div>';
         
         return $html;
     }
     
     public function applyPaging()
     {
-        $this->query->limitPage($this->currentPage,$this->maxPerPage);
+        $this->query->limitPage($this->currentPage, $this->maxPerPage);
         return $this;
     }
     

library/Trapdirector/Tables/TrapDirectorTableOrder.php

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,9 @@ 
         $orderSQL='';
         foreach ($this->order as $column => $direction)
         {
-            if ($orderSQL != "") $orderSQL.=',';
+            if ($orderSQL != "") {
+            	$orderSQL.=',';
+            }
             
             $orderSQL .= $column . ' ' . $direction;
         }
@@ -37,7 +39,9 @@ 
 
     public function isOrderSet()
     {
-        if (count($this->order) == 0) return FALSE;
+        if (count($this->order) == 0) {
+        	return FALSE;
+        }
         return TRUE;
     }
     
@@ -58,7 +62,9 @@ 
     
     protected function curOrderQuery()
     {
-        if ($this->orderQuery == '') return '';
+        if ($this->orderQuery == '') {
+        	return '';
+        }
         return 'o='.$this->orderQuery;
     }
         

Indentation +50 added lines, -50 removed lines

@@ -5,65 +5,65 @@
 
 trait TrapDirectorTableOrder
 { 
-    /** @var array $order : (db column, 'ASC' | 'DESC') */
-    protected $order = array();
-    /** @var string $orderQuery passed by GET */
-    protected $orderQuery = '';   
+	/** @var array $order : (db column, 'ASC' | 'DESC') */
+	protected $order = array();
+	/** @var string $orderQuery passed by GET */
+	protected $orderQuery = '';   
     
-    /** used var & functions of trapDirectorTable **/
-    protected $query;
+	/** used var & functions of trapDirectorTable **/
+	protected $query;
     
    /***************** Ordering ********************/
     
-    public function applyOrder()
-    {
-        if (count($this->order) == 0)
-        {
-            return $this;
-        }
-        $orderSQL='';
-        foreach ($this->order as $column => $direction)
-        {
-            if ($orderSQL != "") $orderSQL.=',';
+	public function applyOrder()
+	{
+		if (count($this->order) == 0)
+		{
+			return $this;
+		}
+		$orderSQL='';
+		foreach ($this->order as $column => $direction)
+		{
+			if ($orderSQL != "") $orderSQL.=',';
             
-            $orderSQL .= $column . ' ' . $direction;
-        }
-        $this->query = $this->query->order($orderSQL);
+			$orderSQL .= $column . ' ' . $direction;
+		}
+		$this->query = $this->query->order($orderSQL);
         
-        return $this;
-    }
+		return $this;
+	}
     
-    public function setOrder(array $order)
-    {
-        $this->order = $order;
-        return $this;
-    }
+	public function setOrder(array $order)
+	{
+		$this->order = $order;
+		return $this;
+	}
 
-    public function isOrderSet()
-    {
-        if (count($this->order) == 0) return FALSE;
-        return TRUE;
-    }
+	public function isOrderSet()
+	{
+		if (count($this->order) == 0) return FALSE;
+		return TRUE;
+	}
     
-    public function getOrderQuery(array $getVars)
-    {
-        if (isset($getVars['o']))
-        {
-            $this->orderQuery = $getVars['o'];
-            $match = array();
-            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
-            {
-                $orderArray=array($match[1] => $match[2]);
-                echo "$match[1] => $match[2]";
-                $this->setOrder($orderArray);
-            }
-        }
-    }
+	public function getOrderQuery(array $getVars)
+	{
+		if (isset($getVars['o']))
+		{
+			$this->orderQuery = $getVars['o'];
+			$match = array();
+			if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
+			{
+				$orderArray=array($match[1] => $match[2]);
+				echo "$match[1] => $match[2]";
+				$this->setOrder($orderArray);
+			}
+		}
+	}
     
-    protected function curOrderQuery()
-    {
-        if ($this->orderQuery == '') return '';
-        return 'o='.$this->orderQuery;
-    }
+	protected function curOrderQuery()
+	{
+		if ($this->orderQuery == '') return '';
+		return 'o='.$this->orderQuery;
+	}
         
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -6,9 +6,9 @@ 
 trait TrapDirectorTableOrder
 { 
     /** @var array $order : (db column, 'ASC' | 'DESC') */
-    protected $order = array();
+    protected $order=array();
     /** @var string $orderQuery passed by GET */
-    protected $orderQuery = '';   
+    protected $orderQuery='';   
     
     /** used var & functions of trapDirectorTable **/
     protected $query;
@@ -26,16 +26,16 @@ 
         {
             if ($orderSQL != "") $orderSQL.=',';
             
-            $orderSQL .= $column . ' ' . $direction;
+            $orderSQL.=$column.' '.$direction;
         }
-        $this->query = $this->query->order($orderSQL);
+        $this->query=$this->query->order($orderSQL);
         
         return $this;
     }
     
     public function setOrder(array $order)
     {
-        $this->order = $order;
+        $this->order=$order;
         return $this;
     }
 
@@ -49,9 +49,9 @@ 
     {
         if (isset($getVars['o']))
         {
-            $this->orderQuery = $getVars['o'];
-            $match = array();
-            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
+            $this->orderQuery=$getVars['o'];
+            $match=array();
+            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery, $match))
             {
                 $orderArray=array($match[1] => $match[2]);
                 echo "$match[1] => $match[2]";

library/Trapdirector/Config/TrapModuleConfig.php

Indentation +35 added lines, -35 removed lines

@@ -4,18 +4,18 @@ 
 
 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
 		'log_file' => '/tmp/trapdirector.log', // Log file
 		'log_level' => 2, // log level
 		'use_SnmpTrapAddess' => 1, // use SnmpTrapAddress by default
-	    'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
-	    'max_rows_in_list' => 25, // Max rows displayed in table before paging
-	    'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
+		'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
+		'max_rows_in_list' => 25, // Max rows displayed in table before paging
+		'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
 	);
 	// get default values for dbconfig
 	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
@@ -122,27 +122,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'
+		);
 	}
 	
 	
@@ -157,13 +157,13 @@ 
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
 			'rule'			=> 'r.rule',
-		    'comment'	    => 'r.comment',
-		    'category'	    => 'r.rule_type',
+			'comment'	    => 'r.comment',
+			'category'	    => 'r.rule_type',
 			'action_match'	=> 'r.action_match',
 			'action_nomatch'=> 'r.action_nomatch',
 			'service_name'	=> 'r.service_name',
 			'num_match'		=> 'r.num_match',
-		    'rule_type'     => 'r.rule_type',
+			'rule_type'     => 'r.rule_type',
 			'id'           	=> 'r.id'
 		);
 	}
@@ -184,17 +184,17 @@ 
 	}
 	public function getHandlerColumns()
 	{
-	    return array(
-	        'r.host_name', 'r.host_group_name',
-	        'r.ip4', 'r.ip6',
-	        'r.trap_oid',
-	        'r.rule',
-	        'r.action_match',
-	        'r.action_nomatch',
-	        'r.service_name',
-	        'r.num_match',
-	        'r.id'
-	    );
+		return array(
+			'r.host_name', 'r.host_group_name',
+			'r.ip4', 'r.ip6',
+			'r.trap_oid',
+			'r.rule',
+			'r.action_match',
+			'r.action_nomatch',
+			'r.service_name',
+			'r.num_match',
+			'r.id'
+		);
 	}
 
 	// handler update (<key> => <sql select>)
@@ -214,9 +214,9 @@ 
 			'revert_ok'		=> 'r.revert_ok',
 			'display'		=> 'r.display',
 			'modified'		=> 'UNIX_TIMESTAMP(r.modified)',
-            'modifier'		=> 'r.modifier',
-		    'comment'       => 'r.comment',
-		    'category'      => 'r.rule_type'
+			'modifier'		=> 'r.modifier',
+			'comment'       => 'r.comment',
+			'category'      => 'r.rule_type'
 		);
 	}	
 		

Spacing +31 added lines, -31 removed lines

@@ -18,27 +18,27 @@ 
 	    'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	/** Minimum DB version
 	 * @return number
 	 */
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	/** Current DB version
 	 * @return number
 	 */
-	static public function getDbCurVersion() { return 2;}
+	static public function getDbCurVersion() { return 2; }
 
 	/************ Module configuration **********************/
 	// Module base path
 	static public function urlPath() { return 'trapdirector'; }
-	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/hostgroup", "objects/query/Service" , "actions/process-check-result"); } //< api user permissions required
+	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/hostgroup", "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)
 	{
@@ -49,29 +49,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 *******************/
@@ -152,7 +152,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',
@@ -224,32 +224,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 OBSOLETE TODO : remove after all tables moved to trapdirectorTable
 	public function itemListDisplay() { return 25; }

library/Trapdirector/Tables/TrapDirectorTableGrouping.php

Indentation +69 added lines, -69 removed lines

@@ -7,86 +7,86 @@
 {
     
   
-    /*************** Grouping ************/
+	/*************** Grouping ************/
     
-    /** @var boolean $grouppingActive set to true if grouping is active by query or function call */
-    protected $grouppingActive=false;
+	/** @var boolean $grouppingActive set to true if grouping is active by query or function call */
+	protected $grouppingActive=false;
     
-    /** @var string $groupingColumn Name of column (can be hidden) for grouping */
-    protected $groupingColumn='';
+	/** @var string $groupingColumn Name of column (can be hidden) for grouping */
+	protected $groupingColumn='';
     
-    /**@var string $groupingVal Current value of grouping column in row (used while rendering) */
-    protected $groupingVal='';
+	/**@var string $groupingVal Current value of grouping column in row (used while rendering) */
+	protected $groupingVal='';
     
-    /** @var integer $groupingColSpan colspan of grouping line : set to table titles in init */
-    protected $groupingColSpan=1;
+	/** @var integer $groupingColSpan colspan of grouping line : set to table titles in init */
+	protected $groupingColSpan=1;
       
-    /*****************  Grouping ****************/
+	/*****************  Grouping ****************/
     
-    /**
-     * Set grouping. column must be DB name
-     * @param string $columnDBName
-     */
-    public function setGrouping(string $columnDBName)
-    {
-        $this->groupingColumn = $columnDBName;
-        $this->grouppingActive = TRUE;
-    }
+	/**
+	 * Set grouping. column must be DB name
+	 * @param string $columnDBName
+	 */
+	public function setGrouping(string $columnDBName)
+	{
+		$this->groupingColumn = $columnDBName;
+		$this->grouppingActive = TRUE;
+	}
     
-    /**
-     * Init of grouping before rendering
-     */
-    public function initGrouping()
-    {
-        $this->groupingVal = '';
-        $this->groupingColSpan = count($this->titles);
-    }
+	/**
+	 * Init of grouping before rendering
+	 */
+	public function initGrouping()
+	{
+		$this->groupingVal = '';
+		$this->groupingColSpan = count($this->titles);
+	}
     
-    /**
-     * Function to print grouping value (for ovveride in specific tables)
-     * @param string $value
-     * @return string
-     */
-    public function groupingPrintData( string $value )
-    {
-        $html = "$value";
-        return $html;
-    }
+	/**
+	 * Function to print grouping value (for ovveride in specific tables)
+	 * @param string $value
+	 * @return string
+	 */
+	public function groupingPrintData( string $value )
+	{
+		$html = "$value";
+		return $html;
+	}
     
-    /**
-     * When to display new grouping line  (for ovveride in specific tables)
-     * @param string $val1 Current value in grouping
-     * @param string $val2 Value of current line
-     * @return boolean TRUE if a new grouping line is needed.
-     */
-    public function groupingEvalNext(string $val1, string $val2)
-    {
-        if ($val1 != $val2)
-            return TRUE;
-        else
-            return FALSE;
-    }
+	/**
+	 * When to display new grouping line  (for ovveride in specific tables)
+	 * @param string $val1 Current value in grouping
+	 * @param string $val2 Value of current line
+	 * @return boolean TRUE if a new grouping line is needed.
+	 */
+	public function groupingEvalNext(string $val1, string $val2)
+	{
+		if ($val1 != $val2)
+			return TRUE;
+		else
+			return FALSE;
+	}
     
-    /**
-     * Called before each line to check if grouping line is needed.
-     * @param mixed $values
-     * @return string with line or empty.
-     */
-    public function groupingNextLine( $values)
-    {
-        if ($this->grouppingActive === FALSE) return '';
+	/**
+	 * Called before each line to check if grouping line is needed.
+	 * @param mixed $values
+	 * @return string with line or empty.
+	 */
+	public function groupingNextLine( $values)
+	{
+		if ($this->grouppingActive === FALSE) return '';
 
-        $dbcol = $this->groupingColumn;
-        $dbVal = $values->$dbcol;
-        if ( $dbVal === NULL ) $dbVal = '0'; // Set default to 0
-        if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal ,$dbVal) === TRUE )
-        {
-            $this->groupingVal = $dbVal;
-            $html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
-            return $html;
-        }
-        return '';
+		$dbcol = $this->groupingColumn;
+		$dbVal = $values->$dbcol;
+		if ( $dbVal === NULL ) $dbVal = '0'; // Set default to 0
+		if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal ,$dbVal) === TRUE )
+		{
+			$this->groupingVal = $dbVal;
+			$html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
+			return $html;
+		}
+		return '';
 
-    }
+	}
  
 }

Spacing +13 added lines, -13 removed lines

@@ -29,8 +29,8 @@ 
      */
     public function setGrouping(string $columnDBName)
     {
-        $this->groupingColumn = $columnDBName;
-        $this->grouppingActive = TRUE;
+        $this->groupingColumn=$columnDBName;
+        $this->grouppingActive=TRUE;
     }
     
     /**
@@ -38,8 +38,8 @@ 
      */
     public function initGrouping()
     {
-        $this->groupingVal = '';
-        $this->groupingColSpan = count($this->titles);
+        $this->groupingVal='';
+        $this->groupingColSpan=count($this->titles);
     }
     
     /**
@@ -47,9 +47,9 @@ 
      * @param string $value
      * @return string
      */
-    public function groupingPrintData( string $value )
+    public function groupingPrintData(string $value)
     {
-        $html = "$value";
+        $html="$value";
         return $html;
     }
     
@@ -72,17 +72,17 @@ 
      * @param mixed $values
      * @return string with line or empty.
      */
-    public function groupingNextLine( $values)
+    public function groupingNextLine($values)
     {
         if ($this->grouppingActive === FALSE) return '';
 
-        $dbcol = $this->groupingColumn;
-        $dbVal = $values->$dbcol;
-        if ( $dbVal === NULL ) $dbVal = '0'; // Set default to 0
-        if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal ,$dbVal) === TRUE )
+        $dbcol=$this->groupingColumn;
+        $dbVal=$values->$dbcol;
+        if ($dbVal === NULL) $dbVal='0'; // Set default to 0
+        if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal, $dbVal) === TRUE)
         {
-            $this->groupingVal = $dbVal;
-            $html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
+            $this->groupingVal=$dbVal;
+            $html='<tr><th colspan="'.$this->groupingColSpan.'">'.$this->groupingPrintData($this->groupingVal).'</th></tr>';
             return $html;
         }
         return '';

Braces +12 added lines, -6 removed lines

@@ -61,10 +61,11 @@ 
      */
     public function groupingEvalNext(string $val1, string $val2)
     {
-        if ($val1 != $val2)
-            return TRUE;
-        else
-            return FALSE;
+        if ($val1 != $val2) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     /**
@@ -74,11 +75,16 @@ 
      */
     public function groupingNextLine( $values)
     {
-        if ($this->grouppingActive === FALSE) return '';
+        if ($this->grouppingActive === FALSE) {
+        	return '';
+        }
 
         $dbcol = $this->groupingColumn;
         $dbVal = $values->$dbcol;
-        if ( $dbVal === NULL ) $dbVal = '0'; // Set default to 0
+        if ( $dbVal === NULL ) {
+        	$dbVal = '0';
+        }
+        // Set default to 0
         if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal ,$dbVal) === TRUE )
         {
             $this->groupingVal = $dbVal;

library/Trapdirector/IcingaApi/IcingaApiBase.php

Braces +7 added lines, -9 removed lines

@@ -80,18 +80,19 @@ 
        try
         {
             $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return array(true, 'Error with API : '.$e->getMessage());
         }
         //var_dump($result);
         $permOk=1;
         $permMissing='';
-        if ($permissions === NULL || count($permissions) == 0) // If no permission check return OK after connexion
+        if ($permissions === NULL || count($permissions) == 0) {
+        	// If no permission check return OK after connexion
         {
             return array(false,'OK');
         }
+        }
         if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
         {
             
@@ -177,8 +178,7 @@ 
             if (property_exists($result,'status'))
             {
                 $message=$result->status;
-            }
-            else 
+            } else 
             {
                 $message="Unkown status";
             }
@@ -189,8 +189,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');
             }
@@ -211,8 +210,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');
             }

Indentation +313 added lines, -313 removed lines

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

Spacing +50 added lines, -50 removed lines

@@ -8,15 +8,15 @@ 
 
 class IcingaApiBase
 {
-    protected $version = 'v1';      //< icinga2 api version
+    protected $version='v1'; //< icinga2 api version
     
-    protected $host;                //< icinga2 host name or IP
-    protected $port;                //< icinga2 api port
+    protected $host; //< icinga2 host name or IP
+    protected $port; //< icinga2 api port
     
-    protected $user;                //< user name
-    protected $pass;                //< user password
-    protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
-    protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
+    protected $user; //< user name
+    protected $pass; //< user password
+    protected $usercert; //< user key for certificate auth (NOT IMPLEMENTED)
+    protected $authmethod='pass'; //< Authentication : 'pass' or 'cert'
 
     protected $queryURL=array(
         'host'  => 'objects/hosts',
@@ -26,7 +26,7 @@ 
     
     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.',
@@ -37,7 +37,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
@@ -45,7 +45,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;
@@ -55,7 +55,7 @@ 
      * @param string $user
      * @param string $pass
      */
-    public function setCredentials($user,$pass)
+    public function setCredentials($user, $pass)
     {
         $this->user=$user;
         $this->pass=$pass;
@@ -67,7 +67,7 @@ 
      * @param string $user
      * @param string $usercert
      */
-    public function setCredentialskey($user,$usercert)
+    public function setCredentialskey($user, $usercert)
     {
         $this->user=$user;
         $this->usercert=$usercert;
@@ -95,18 +95,18 @@ 
         $permMissing='';
         if ($permissions === NULL || count($permissions) == 0) // If no permission check return OK after connexion
         {
-            return array(false,'OK');
+            return array(false, 'OK');
         }
         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;
@@ -121,12 +121,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');
     }
     
     
@@ -141,7 +141,7 @@ 
      */
     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 === false) {
                 throw new Exception('CURL INIT ERROR');
             }
@@ -158,7 +158,7 @@ 
      * @param string $perfdata : performance data as string
      * @return array (status = true (oK) or false (nok), string message)
      */
-    public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
+    public function serviceCheckResult($host, $service, $state, $display, $perfdata='')
     {
         //Send a POST request to the URL endpoint /v1/actions/process-check-result
         //actions/process-check-result?service=example.localdomain!passive-ping6
@@ -177,9 +177,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;
             }
@@ -187,21 +187,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));
     }
   
     /**
@@ -211,18 +211,18 @@ 
      */
     public function checkResultStatus(\stdClass $result) 
     {
-        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'))
+        if (!property_exists($result, 'results'))
         {
             throw new Exception('Unkown result');
         }
@@ -238,23 +238,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,
@@ -265,14 +265,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');
         }
@@ -286,7 +286,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()));
@@ -306,7 +306,7 @@ 
         return $this->errorReference[$errorCode];
     }
 
-    public function standardQuery(string $urlType , string $filter, array $attributes)
+    public function standardQuery(string $urlType, string $filter, array $attributes)
     {
         /*
          *  curl -k -s -u  trapdirector:trapdirector -H 'X-HTTP-Method-Override: GET' -X POST 'https://localhost:5665/v1/objects/hosts' 
@@ -315,7 +315,7 @@ 
          {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        if (! isset($this->queryURL[$urlType] ))
+        if (!isset($this->queryURL[$urlType]))
         {
             throw new Exception("Unkown object type");
         }
@@ -323,11 +323,11 @@ 
         $body=array();
         if ($filter !== NULL)
         {
-            $body['filter'] = $filter;
+            $body['filter']=$filter;
         }
         if (count($attributes) != 0)
         {
-            $body['attrs'] = $attributes;
+            $body['attrs']=$attributes;
         }
 
         try
@@ -342,9 +342,9 @@ 
         
         $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;

configuration.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 $this->providePermission('trapdirector/config', $this->translate('Allow to create and modify traps services'));
 
 $this->provideConfigTab('config', array(
-    'title' => 'Configuration',
-    'url'   => 'settings'
+	'title' => 'Configuration',
+	'url'   => 'settings'
 ));
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -17,22 +17,22 @@
 ));
 **/
 
-$section = $this->menuSection(N_('Traps'),array (
+$section=$this->menuSection(N_('Traps'), array(
 	'icon'	=> 'filter',
 	'url'	=> 'trapdirector'
 ));
 
-$section->add(N_('Status & Mibs'),array(
+$section->add(N_('Status & Mibs'), array(
 	'url'			=> 'trapdirector/status/',
 	'permission' 	=> 'trapdirector/view'
 ));
 
-$section->add(N_('Received'),array(
+$section->add(N_('Received'), array(
 	'url'			=> 'trapdirector/received/',
 	'permission' 	=> 'trapdirector/view'
 ));
 
-$section->add(N_('Handlers'),array(
+$section->add(N_('Handlers'), array(
 	'url'			=> 'trapdirector/handler/',
 	'permission' 	=> 'trapdirector/config'
 ));

library/Trapdirector/TrapsController.php

Braces +15 added lines, -5 removed lines

@@ -131,9 +131,11 @@ 
     	    $this->icingaAPI = new Icinga2API($host,$port);
     	    $this->icingaAPI->setCredentials($user, $pass);
     	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
-    	    if ($ret === TRUE) // On error, switch to ido DB
+    	    if ($ret === TRUE) {
+    	    	// On error, switch to ido DB
     	    {
     	        $this->apiMode = FALSE;
+    	    }
     	        return $this->getUIDatabase();
     	    }
     	    $this->apiMode = TRUE;
@@ -213,7 +215,9 @@ 
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
@@ -283,7 +287,9 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
+	        if ($catString != '' ) {
+	        	$catString .= '!';
+	        }
 	        $catString .= $index . ':' . $value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
@@ -293,8 +299,12 @@ 
 	{
 	    $catArray = $this->getHandlersCategory();
 	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
+	    while (isset($catArray[$i]) && $i < 100) {
+	    	$i++;
+	    }
+	    if ($i == 100) {
+	    	throw new ProgrammingError('Category array error');
+	    }
 	    $catArray[$i] = $catName;
 	    $this->setHandlerCategory($catArray);
 	}

Indentation +110 added lines, -110 removed lines

@@ -49,8 +49,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -82,12 +82,12 @@ 
 	 */
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	/**
@@ -108,12 +108,12 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 
 	/**
@@ -122,41 +122,41 @@ 
 	 */
 	public function getIdoConn()
 	{
-	    if ($this->icingaAPI === NULL)
-	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    if ($host == '')
-    	    {
-    	        $this->apiMode = FALSE;
-    	        return $this->getUIDatabase();
-    	    }
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
-    	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
-    	    if ($ret === TRUE) // On error, switch to ido DB
-    	    {
-    	        $this->apiMode = FALSE;
-    	        return $this->getUIDatabase();
-    	    }
-    	    $this->apiMode = TRUE;
+		if ($this->icingaAPI === NULL)
+		{
+			$host = $this->Config()->get('config', 'icingaAPI_host');
+			if ($host == '')
+			{
+				$this->apiMode = FALSE;
+				return $this->getUIDatabase();
+			}
+			$port = $this->Config()->get('config', 'icingaAPI_port');
+			$user = $this->Config()->get('config', 'icingaAPI_user');
+			$pass = $this->Config()->get('config', 'icingaAPI_password');
+			$this->icingaAPI = new Icinga2API($host,$port);
+			$this->icingaAPI->setCredentials($user, $pass);
+			list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
+			if ($ret === TRUE) // On error, switch to ido DB
+			{
+				$this->apiMode = FALSE;
+				return $this->getUIDatabase();
+			}
+			$this->apiMode = TRUE;
     	    
-	    }
-	    return $this->icingaAPI;
+		}
+		return $this->icingaAPI;
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -165,33 +165,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -211,18 +211,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -232,13 +232,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{
@@ -251,72 +251,72 @@ 
 
 	/************************ UI elements **************************/
 	
-    /**
-     * get max rows to display before paging.
-     * @return number
-     */
+	/**
+	 * get max rows to display before paging.
+	 * @return number
+	 */
 	public function itemListDisplay()
 	{
-	    return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
+		return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
 	}
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+		return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
 	}
 	
-    /**
-     * get Handlers categories list (index => textvalue).
-     * @return array
-     */	
+	/**
+	 * get Handlers categories list (index => textvalue).
+	 * @return array
+	 */	
 	public function getHandlersCategory()
 	{
-	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
-	    $retArray=array();
-	    foreach ($catListArray as $category)
-	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
-	    }
-	    return $retArray; 
+		//<index>:<name>!<index>:<name>
+		$catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
+		$catListArray=explode('!',$catList);
+		$retArray=array();
+		foreach ($catListArray as $category)
+		{
+			$catArray=explode(':',$category);
+			$retArray[$catArray[0]] = $catArray[1];
+		}
+		return $retArray; 
 	}
 
 	public function setHandlerCategory(array $catArray)
 	{
-	    $catString='';
-	    foreach ($catArray as $index => $value)
-	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
-	    }
-	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
+		$catString='';
+		foreach ($catArray as $index => $value)
+		{
+			if ($catString != '' ) $catString .= '!';
+			$catString .= $index . ':' . $value;
+		}
+		$this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$i=1;
+		while (isset($catArray[$i]) && $i < 100) $i++;
+		if ($i == 100) throw new ProgrammingError('Category array error');
+		$catArray[$i] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    unset($catArray[$catIndex]);
-	    $this->setHandlerCategory($catArray);
-	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
+		$catArray = $this->getHandlersCategory();
+		unset($catArray[$catIndex]);
+		$this->setHandlerCategory($catArray);
+		$this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
 	}
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$catArray[$catIndex] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 }

Spacing +44 added lines, -44 removed lines

@@ -39,11 +39,11 @@ 
 	/** @var Trap $trapClass Trap class for bin/trap_class.php */
 	protected $trapClass;
 	/** @var UIDatabase $UIDatabase */
-	protected $UIDatabase = NULL;
+	protected $UIDatabase=NULL;
 	/** @var Icinga2API $IcingaAPI */
-	protected $icingaAPI = NULL;
+	protected $icingaAPI=NULL;
 	/** @var bool $apiMode connection to icinngaDB is by api (true) od ido DB (false) */
-	protected $apiMode = FALSE;
+	protected $apiMode=FALSE;
 	
 	
 	
@@ -60,7 +60,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -84,7 +84,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -97,7 +97,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -110,7 +110,7 @@ 
 	{
 	    if ($this->UIDatabase == Null)
 	    {
-	        $this->UIDatabase = new UIDatabase($this);
+	        $this->UIDatabase=new UIDatabase($this);
 	       
 	    }
 	    return $this->UIDatabase;
@@ -124,56 +124,56 @@ 
 	{
 	    if ($this->icingaAPI === NULL)
 	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
+    	    $host=$this->Config()->get('config', 'icingaAPI_host');
     	    if ($host == '')
     	    {
-    	        $this->apiMode = FALSE;
+    	        $this->apiMode=FALSE;
     	        return $this->getUIDatabase();
     	    }
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
+    	    $port=$this->Config()->get('config', 'icingaAPI_port');
+    	    $user=$this->Config()->get('config', 'icingaAPI_user');
+    	    $pass=$this->Config()->get('config', 'icingaAPI_password');
+    	    $this->icingaAPI=new Icinga2API($host, $port);
     	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
+    	    list($ret, $message)=$this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
     	    if ($ret === TRUE) // On error, switch to ido DB
     	    {
-    	        $this->apiMode = FALSE;
+    	        $this->apiMode=FALSE;
     	        return $this->getUIDatabase();
     	    }
-    	    $this->apiMode = TRUE;
+    	    $this->apiMode=TRUE;
     	    
 	    }
 	    return $this->icingaAPI;
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -184,10 +184,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -199,10 +199,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -217,7 +217,7 @@ 
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
@@ -237,10 +237,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}
@@ -262,7 +262,7 @@ 
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list', $maxRows);
 	}
 	
     /**
@@ -272,13 +272,13 @@ 
 	public function getHandlersCategory()
 	{
 	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
+	    $catList=$this->getUIDatabase()->getDBConfigValue('handler_categories');
+	    $catListArray=explode('!', $catList);
 	    $retArray=array();
 	    foreach ($catListArray as $category)
 	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
+	        $catArray=explode(':', $category);
+	        $retArray[$catArray[0]]=$catArray[1];
 	    }
 	    return $retArray; 
 	}
@@ -288,25 +288,25 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
+	        if ($catString != '') $catString.='!';
+	        $catString.=$index.':'.$value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    $i=1;
 	    while (isset($catArray[$i]) && $i < 100) $i++;
 	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
+	    $catArray[$i]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    unset($catArray[$catIndex]);
 	    $this->setHandlerCategory($catArray);
 	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
@@ -314,8 +314,8 @@ 
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
+	    $catArray=$this->getHandlersCategory();
+	    $catArray[$catIndex]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}