patrickpr / trapdirector

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;

application/controllers/StatusController.php

Braces +19 added lines, -29 removed lines

@@ -22,7 +22,9 @@ 
 		try
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -41,8 +43,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getUIDatabase()->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +57,7 @@ 
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getUIDatabase()->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -69,8 +69,7 @@ 
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
 		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 		    $this->displayExitError('status',$e->getMessage());
 		}		
@@ -120,8 +119,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -137,22 +135,19 @@ 
 				if (!is_dir($destDir))
 				{
 				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
-				}
-				else
+				} else
 				{
 				    if (!is_writable($destDir))
 				    {
 				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
+				    } else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
+    				    } else
     				    {
     				        $this->view->uploadStatus="File $name uploaded in $destDir";
     				    }
@@ -177,18 +172,15 @@ 
 			    {		    
     				$this->view->snmptranslate='works fine';
     				$this->view->snmptranslate_state='ok';
-			    }
-			    else
+			    } else
 			    {
 			        $this->view->snmptranslate='works fine but missing basic MIBs';
 			    }
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='Can execute but no OID to name resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='Cannot execute';
 		}
@@ -209,15 +201,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}
@@ -256,8 +246,7 @@ 
 	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
 	        {
 	            $this->view->setError='Max rows must be a number';
-	        }
-	        else
+	        } else
 	        {
 	            $this->setitemListDisplay($maxRows);
 	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
@@ -276,8 +265,9 @@ 
 	        $index = $this->getRequest()->getPost('index',NULL);
 	        $newname = $this->getRequest()->getPost('newname',NULL);
 
-	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
-	            $this->_helper->json(array('status'=>'Bad index'));
+	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1) {
+	        	            $this->_helper->json(array('status'=>'Bad index'));
+	        }
 	        
 	        switch ($type)
 	        {

Indentation +187 added lines, -187 removed lines

@@ -21,8 +21,8 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $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');
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -51,7 +51,7 @@ 
 		
 		try
 		{		
-		    $this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
+			$this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
 			$this->view->logDestinations=$this->getModuleConfig()->getLogDestinations();
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
@@ -65,23 +65,23 @@ 
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
-		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+			$this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+			$this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
+			$this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status',$e->getMessage());
 		}		
 		
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -100,22 +100,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -123,7 +123,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -131,32 +131,32 @@ 
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
+				$name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
 				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
-				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
+					$this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
 				}
 				else
 				{
-				    if (!is_writable($destDir))
-				    {
-				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
-				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
-    				    {
-    				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
-    				    {
-    				        $this->view->uploadStatus="File $name uploaded in $destDir";
-    				    }
-				    }
+					if (!is_writable($destDir))
+					{
+						$this->view->uploadStatus="ERROR : $destDir directory is not writable";
+					}
+					else
+					{
+						$destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+						$sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
+						if (move_uploaded_file($sourceTmpNam,$destination)===false)
+						{
+							$this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
+						}
+						else
+						{
+							$this->view->uploadStatus="File $name uploaded in $destDir";
+						}
+					}
 				}
 
 			}
@@ -172,16 +172,16 @@ 
 			$translate=exec($snmptranslate . ' 1');
 			if (preg_match('/iso/',$translate))
 			{
-			    $translate=exec($snmptranslate . ' 1.3.6.1.4');
-			    if (preg_match('/private/',$translate))
-			    {		    
-    				$this->view->snmptranslate='works fine';
-    				$this->view->snmptranslate_state='ok';
-			    }
-			    else
-			    {
-			        $this->view->snmptranslate='works fine but missing basic MIBs';
-			    }
+				$translate=exec($snmptranslate . ' 1.3.6.1.4');
+				if (preg_match('/private/',$translate))
+				{		    
+					$this->view->snmptranslate='works fine';
+					$this->view->snmptranslate_state='ok';
+				}
+				else
+				{
+					$this->view->snmptranslate='works fine but missing basic MIBs';
+				}
 			}
 			else
 			{
@@ -244,63 +244,63 @@ 
 	/** UI options */
 	public function uimgtAction()
 	{
-	    $this->prepareTabs()->activate('uimgt');
+		$this->prepareTabs()->activate('uimgt');
 	    
-	    $this->view->setError='';
-	    $this->view->setOKMsg='';
+		$this->view->setError='';
+		$this->view->setOKMsg='';
 	    
-	    //max_rows=25&row_update=update
-	    if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
-	    {
-	        $maxRows = $this->getRequest()->getParam('max_rows');
-	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
-	        {
-	            $this->view->setError='Max rows must be a number';
-	        }
-	        else
-	        {
-	            $this->setitemListDisplay($maxRows);
-	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
-	        }
-	    }
+		//max_rows=25&row_update=update
+		if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
+		{
+			$maxRows = $this->getRequest()->getParam('max_rows');
+			if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
+			{
+				$this->view->setError='Max rows must be a number';
+			}
+			else
+			{
+				$this->setitemListDisplay($maxRows);
+				$this->view->setOKMsg='Set max rows to ' . $maxRows;
+			}
+		}
 	    
-	    if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
-	    {
-	        $addCat = $this->getRequest()->getParam('add_category');
-            $this->addHandlersCategory($addCat);
-	    }
+		if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
+		{
+			$addCat = $this->getRequest()->getParam('add_category');
+			$this->addHandlersCategory($addCat);
+		}
 	    
-	    if ( $this->getRequest()->getPost('type',NULL) !== NULL )
-	    {
-	        $type = $this->getRequest()->getPost('type',NULL);
-	        $index = $this->getRequest()->getPost('index',NULL);
-	        $newname = $this->getRequest()->getPost('newname',NULL);
+		if ( $this->getRequest()->getPost('type',NULL) !== NULL )
+		{
+			$type = $this->getRequest()->getPost('type',NULL);
+			$index = $this->getRequest()->getPost('index',NULL);
+			$newname = $this->getRequest()->getPost('newname',NULL);
 
-	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
-	            $this->_helper->json(array('status'=>'Bad index'));
+			if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
+				$this->_helper->json(array('status'=>'Bad index'));
 	        
-	        switch ($type)
-	        {
-	            case 'delete':
-	                $this->delHandlersCategory($index);
-	                $this->_helper->json(array('status'=>'OK'));
-	                return;
-	                break;
-	            case 'rename':
-	                $this->renameHandlersCategory($index, $newname);
-	                $this->_helper->json(array('status'=>'OK'));
-	                return;
-	                break;
-	            default:
-	                $this->_helper->json(array('status'=>'Unknwon command'));
-	                return;
-	                break;
-	        }
-	    }
+			switch ($type)
+			{
+				case 'delete':
+					$this->delHandlersCategory($index);
+					$this->_helper->json(array('status'=>'OK'));
+					return;
+					break;
+				case 'rename':
+					$this->renameHandlersCategory($index, $newname);
+					$this->_helper->json(array('status'=>'OK'));
+					return;
+					break;
+				default:
+					$this->_helper->json(array('status'=>'Unknwon command'));
+					return;
+					break;
+			}
+		}
 	    
-	    $this->view->maxRows = $this->itemListDisplay();
+		$this->view->maxRows = $this->itemListDisplay();
 	    
-	    $this->view->categories = $this->getHandlersCategory();
+		$this->view->categories = $this->getHandlersCategory();
 	    
 	    
 	    
@@ -349,47 +349,47 @@ 
 	 */
 	public function pluginsAction()
 	{
-	    $this->prepareTabs()->activate('plugins');
+		$this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+		require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+		$Trap = new Trap($icingaweb2_etc,4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+		$this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+		$enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+		$pluginList = $Trap->pluginClass->pluginList();
 	    
-	    // Plugin list and fill function name list
-	    $functionList=array();
-	    $this->view->pluginArray=array();
-	    foreach ($pluginList as $plugin)
-	    {
-	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
-	        array_push($this->view->pluginArray, $pluginDetails);
-	        // Get functions for function details
-	        foreach ($pluginDetails->funcArray as $function)
-	        {
-	            array_push($functionList,$function);
-	        }
-	    }
+		// Plugin list and fill function name list
+		$functionList=array();
+		$this->view->pluginArray=array();
+		foreach ($pluginList as $plugin)
+		{
+			$pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
+			$pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
+			$pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
+			$pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
+			$pluginDetails->description = htmlentities($pluginDetails->description);
+			$pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+			array_push($this->view->pluginArray, $pluginDetails);
+			// Get functions for function details
+			foreach ($pluginDetails->funcArray as $function)
+			{
+				array_push($functionList,$function);
+			}
+		}
 	    
-	    // Function list with details
-	    $this->view->functionList=array();
-	    foreach ($functionList as $function)
-	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
-	        array_push($this->view->functionList, $functionDetail);
-	    }
+		// Function list with details
+		$this->view->functionList=array();
+		foreach ($functionList as $function)
+		{
+			$functionDetail = $Trap->pluginClass->getFunctionDetails($function);
+			$functionDetail->params = htmlentities($functionDetail->params);
+			$functionDetail->description = htmlentities($functionDetail->description);
+			$functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+			array_push($this->view->functionList, $functionDetail);
+		}
 
 	}
 
@@ -398,47 +398,47 @@ 
 	 */
 	public function debugAction()
 	{
-	    $this->view->answer='No answer';
-	    $this->view->input1 = '';
+		$this->view->answer='No answer';
+		$this->view->input1 = '';
 	    
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['input1']))
-	    {
-	        $input1 = $postData['input1'];
-	        $input2 = $postData['input2'];
-	        $input3 = $postData['input3'];
-	        $this->view->input1 = $input1;
-	        //$this->view->answer=$input1 . '/' . $input2  . '/' . $input3;
-	        try {
-	            $this->view->answer = 'Answer : ';
-	            $API = $this->getIdoConn();
-	            $DB = $this->getUIDatabase();
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['input1']))
+		{
+			$input1 = $postData['input1'];
+			$input2 = $postData['input2'];
+			$input3 = $postData['input3'];
+			$this->view->input1 = $input1;
+			//$this->view->answer=$input1 . '/' . $input2  . '/' . $input3;
+			try {
+				$this->view->answer = 'Answer : ';
+				$API = $this->getIdoConn();
+				$DB = $this->getUIDatabase();
 
-	            //$hosts = $DB->getServicesByHostGroupid($input1);
-	            //$this->view->answer .= 'services : '.print_r($hosts,true);
+				//$hosts = $DB->getServicesByHostGroupid($input1);
+				//$this->view->answer .= 'services : '.print_r($hosts,true);
 	            
-	            $hosts = $API->getServicesByHostGroupid($input1);
-	            $this->view->answer .= 'services : '.print_r($hosts,true);
+				$hosts = $API->getServicesByHostGroupid($input1);
+				$this->view->answer .= 'services : '.print_r($hosts,true);
 	            
 
 	            
-	            return;
-	            $hosts = $API->getHostByIP($input1);
-	            $this->view->answer .= 'Host : '. print_r($hosts,true);
-	            $hosts = $API->getHostGroupByName($input1);
-	            $this->view->answer .= 'Group : '.print_r($hosts,true);
-	            $hosts = $API->getServicesByHostid($input1);
-	            $this->view->answer .= 'service : '.print_r($hosts,true);
+				return;
+				$hosts = $API->getHostByIP($input1);
+				$this->view->answer .= 'Host : '. print_r($hosts,true);
+				$hosts = $API->getHostGroupByName($input1);
+				$this->view->answer .= 'Group : '.print_r($hosts,true);
+				$hosts = $API->getServicesByHostid($input1);
+				$this->view->answer .= 'service : '.print_r($hosts,true);
 	            
-	            /* $hosts = $API->getHostsIPByHostGroup($input1);
+				/* $hosts = $API->getHostsIPByHostGroup($input1);
 	            $this->view->answer .= "\n Hostgrp : " . print_r($hosts,true); */
 	            
-	        } catch (Exception $e)
-	        {
-	            $this->view->answer = "Exception : " . print_r($e);
-	        }
+			} catch (Exception $e)
+			{
+				$this->view->answer = "Exception : " . print_r($e);
+			}
 	        
-	    }
+		}
 	    
 	}
 	
@@ -450,36 +450,36 @@ 
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
-	    )->add('uimgt', array(
-	        'label' => $this->translate('UI Configuration'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
-        )->add('services', array(
+		)->add('uimgt', array(
+			'label' => $this->translate('UI Configuration'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
+		)->add('services', array(
 			'label' => $this->translate('Services management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
-	    )->add('plugins', array(
-	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
-	    );
+		)->add('plugins', array(
+			'label' => $this->translate('Plugins management'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+		);
 	} 
 }
 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }

Spacing +97 added lines, -97 removed lines

@@ -21,19 +21,19 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,20 +59,20 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+		    $this->view->useSnmpTrapAddess=($this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1) ? TRUE : FALSE;
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+		    $this->view->SnmpTrapAddressOIDDefault=($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid']) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+		    $this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -98,7 +98,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -107,32 +107,32 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+			    $name=filter_var($_FILES['mibfile']['name'], FILTER_SANITIZE_STRING);
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
@@ -146,9 +146,9 @@ 
 				    }
 				    else
 				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'], FILTER_SANITIZE_STRING);
+				        if (move_uploaded_file($sourceTmpNam, $destination) === false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
     				    }
@@ -164,16 +164,16 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
-			    $translate=exec($snmptranslate . ' 1.3.6.1.4');
-			    if (preg_match('/private/',$translate))
+			    $translate=exec($snmptranslate.' 1.3.6.1.4');
+			    if (preg_match('/private/', $translate))
 			    {		    
     				$this->view->snmptranslate='works fine';
     				$this->view->snmptranslate_state='ok';
@@ -196,46 +196,46 @@ 
 		// mib database
 		
 		$this->view->mibDbCount=$this->getMIB()->countObjects();
-		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21);
+		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21);
 		
 		// mib dirs
 		$DirConf=$this->Config()->get('config', 'snmptranslate_dirs');
-		$dirArray=explode(':',$DirConf);
+		$dirArray=explode(':', $DirConf);
 
 		// Get base directories from net-snmp-config
 		$output=$matches=array();
 		$retVal=0;
-		$sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal);
-		if ($retVal==0)
+		$sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal);
+		if ($retVal == 0)
 		{
-			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
+			$dirArray=array_merge($dirArray, explode(':', $sysDirs));
 		}
 		else
 		{
-			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
-			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
+			$translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
+			if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches))
 			{
-				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
+				$dirArray=array_merge($dirArray, explode(':', $matches[1]));
 			}
 			else
 			{
-				array_push($dirArray,'Install net-snmp-config to see system directories');
+				array_push($dirArray, 'Install net-snmp-config to see system directories');
 			}
 		}
 		
 		$this->view->dirArray=$dirArray;
 		
 		$output=null;
-		foreach (explode(':',$DirConf) as $mibdir)
+		foreach (explode(':', $DirConf) as $mibdir)
 		{
-			exec('ls '.$mibdir.' | grep -v traplist.txt',$output);
+			exec('ls '.$mibdir.' | grep -v traplist.txt', $output);
 		}
 		//$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++];
 		//$this->view->fileList=explode(' ',$listFiles);
 		$this->view->fileList=$output;
 		
 		// Zend form 
-		$this->view->form= new UploadForm();
+		$this->view->form=new UploadForm();
 		//$this->view->form= new Form('upload-form');
 		
 		
@@ -250,9 +250,9 @@ 
 	    $this->view->setOKMsg='';
 	    
 	    //max_rows=25&row_update=update
-	    if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
+	    if ($this->getRequest()->getParam('max_rows', NULL) !== NULL)
 	    {
-	        $maxRows = $this->getRequest()->getParam('max_rows');
+	        $maxRows=$this->getRequest()->getParam('max_rows');
 	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
 	        {
 	            $this->view->setError='Max rows must be a number';
@@ -260,21 +260,21 @@ 
 	        else
 	        {
 	            $this->setitemListDisplay($maxRows);
-	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
+	            $this->view->setOKMsg='Set max rows to '.$maxRows;
 	        }
 	    }
 	    
-	    if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
+	    if ($this->getRequest()->getParam('add_category', NULL) !== NULL)
 	    {
-	        $addCat = $this->getRequest()->getParam('add_category');
+	        $addCat=$this->getRequest()->getParam('add_category');
             $this->addHandlersCategory($addCat);
 	    }
 	    
-	    if ( $this->getRequest()->getPost('type',NULL) !== NULL )
+	    if ($this->getRequest()->getPost('type', NULL) !== NULL)
 	    {
-	        $type = $this->getRequest()->getPost('type',NULL);
-	        $index = $this->getRequest()->getPost('index',NULL);
-	        $newname = $this->getRequest()->getPost('newname',NULL);
+	        $type=$this->getRequest()->getPost('type', NULL);
+	        $index=$this->getRequest()->getPost('index', NULL);
+	        $newname=$this->getRequest()->getPost('newname', NULL);
 
 	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
 	            $this->_helper->json(array('status'=>'Bad index'));
@@ -298,9 +298,9 @@ 
 	        }
 	    }
 	    
-	    $this->view->maxRows = $this->itemListDisplay();
+	    $this->view->maxRows=$this->itemListDisplay();
 	    
-	    $this->view->categories = $this->getHandlersCategory();
+	    $this->view->categories=$this->getHandlersCategory();
 	    
 	    
 	    
@@ -324,18 +324,18 @@ 
 		$this->view->templateForm_output='';
 		if (isset($postData['template_name']) && isset($postData['template_revert_time']))
 		{
-			$template_create = 'icingacli director service create --json \'{ "check_command": "dummy", ';
-			$template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
-			$template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
+			$template_create='icingacli director service create --json \'{ "check_command": "dummy", ';
+			$template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
+			$template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
 			$output=array();
 			$ret_code=0;
-			exec($template_create,$output,$ret_code);
+			exec($template_create, $output, $ret_code);
 			if ($ret_code != 0)
 			{
-				$this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create);
+				$this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create);
 			}
-			exec('icingacli director config deploy',$output,$ret_code);
-			$this->view->templateForm_output='Template '.$postData['template_name']. ' created';
+			exec('icingacli director config deploy', $output, $ret_code);
+			$this->view->templateForm_output='Template '.$postData['template_name'].' created';
 		}
 		
 		// template creation form
@@ -351,15 +351,15 @@ 
 	{
 	    $this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	    require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+	    $Trap=new Trap($icingaweb2_etc, 4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+	    $this->view->pluginLoaded=htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+	    $enabledPlugins=$Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+	    $pluginList=$Trap->pluginClass->pluginList();
 	    
 	    // Plugin list and fill function name list
 	    $functionList=array();
@@ -367,16 +367,16 @@ 
 	    foreach ($pluginList as $plugin)
 	    {
 	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+	        $pluginDetails->enabled=(in_array($plugin, $enabledPlugins)) ? true : false;
+	        $pluginDetails->catchAllTraps=($pluginDetails->catchAllTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->processTraps=($pluginDetails->processTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->description=htmlentities($pluginDetails->description);
+	        $pluginDetails->description=preg_replace('/\n/', '<br>', $pluginDetails->description);
 	        array_push($this->view->pluginArray, $pluginDetails);
 	        // Get functions for function details
 	        foreach ($pluginDetails->funcArray as $function)
 	        {
-	            array_push($functionList,$function);
+	            array_push($functionList, $function);
 	        }
 	    }
 	    
@@ -384,10 +384,10 @@ 
 	    $this->view->functionList=array();
 	    foreach ($functionList as $function)
 	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+	        $functionDetail=$Trap->pluginClass->getFunctionDetails($function);
+	        $functionDetail->params=htmlentities($functionDetail->params);
+	        $functionDetail->description=htmlentities($functionDetail->description);
+	        $functionDetail->description=preg_replace('/\n/', '<br>', $functionDetail->description);
 	        array_push($this->view->functionList, $functionDetail);
 	    }
 
@@ -399,43 +399,43 @@ 
 	public function debugAction()
 	{
 	    $this->view->answer='No answer';
-	    $this->view->input1 = '';
+	    $this->view->input1='';
 	    
 	    $postData=$this->getRequest()->getPost();
 	    if (isset($postData['input1']))
 	    {
-	        $input1 = $postData['input1'];
-	        $input2 = $postData['input2'];
-	        $input3 = $postData['input3'];
-	        $this->view->input1 = $input1;
+	        $input1=$postData['input1'];
+	        $input2=$postData['input2'];
+	        $input3=$postData['input3'];
+	        $this->view->input1=$input1;
 	        //$this->view->answer=$input1 . '/' . $input2  . '/' . $input3;
 	        try {
-	            $this->view->answer = 'Answer : ';
-	            $API = $this->getIdoConn();
-	            $DB = $this->getUIDatabase();
+	            $this->view->answer='Answer : ';
+	            $API=$this->getIdoConn();
+	            $DB=$this->getUIDatabase();
 
 	            //$hosts = $DB->getServicesByHostGroupid($input1);
 	            //$this->view->answer .= 'services : '.print_r($hosts,true);
 	            
-	            $hosts = $API->getServicesByHostGroupid($input1);
-	            $this->view->answer .= 'services : '.print_r($hosts,true);
+	            $hosts=$API->getServicesByHostGroupid($input1);
+	            $this->view->answer.='services : '.print_r($hosts, true);
 	            
 
 	            
 	            return;
-	            $hosts = $API->getHostByIP($input1);
-	            $this->view->answer .= 'Host : '. print_r($hosts,true);
-	            $hosts = $API->getHostGroupByName($input1);
-	            $this->view->answer .= 'Group : '.print_r($hosts,true);
-	            $hosts = $API->getServicesByHostid($input1);
-	            $this->view->answer .= 'service : '.print_r($hosts,true);
+	            $hosts=$API->getHostByIP($input1);
+	            $this->view->answer.='Host : '.print_r($hosts, true);
+	            $hosts=$API->getHostGroupByName($input1);
+	            $this->view->answer.='Group : '.print_r($hosts, true);
+	            $hosts=$API->getServicesByHostid($input1);
+	            $this->view->answer.='service : '.print_r($hosts, true);
 	            
 	            /* $hosts = $API->getHostsIPByHostGroup($input1);
 	            $this->view->answer .= "\n Hostgrp : " . print_r($hosts,true); */
 	            
 	        } catch (Exception $e)
 	        {
-	            $this->view->answer = "Exception : " . print_r($e);
+	            $this->view->answer="Exception : ".print_r($e);
 	        }
 	        
 	    }
@@ -446,19 +446,19 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 	    )->add('uimgt', array(
 	        'label' => $this->translate('UI Configuration'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/uimgt')
         )->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 	    )->add('plugins', array(
 	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/plugins')
 	    );
 	} 
 }
@@ -466,7 +466,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -475,11 +475,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $file=new File('mib-file');
         $file->setLabel('Mib upload');
              //->setAttrib('multiple', null);
         $this->addElement($file);
-		$button = new Submit("upload",array('ignore'=>false));
-		$this->addElement($button);//->setIgnore(false);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }

library/Trapdirector/Icinga2Api.php

Indentation +132 added lines, -132 removed lines

@@ -10,151 +10,151 @@
 class Icinga2API extends IcingaApiBase
 {
     
-    /**
-     * Creates Icinga2API object
-     * 
-     * @param string $host host name or IP
-     * @param number $port API port
-     */
-    public function __construct($host, $port = 5665)
-    {
-        parent::__construct($host,$port);
-    }
-    /**
+	/**
+	 * Creates Icinga2API object
+	 * 
+	 * @param string $host host name or IP
+	 * @param number $port API port
+	 */
+	public function __construct($host, $port = 5665)
+	{
+		parent::__construct($host,$port);
+	}
+	/**
 
 /************ Host query ************/  
   
-    /**
-     * return array of host by IP (4 or 6) or name
-     * @param string $ip
-     * @throws Exception
-     * @return array objects : array('__name','name','display_name')
-     */
-    public function getHostByIP(string $ip) 
-    {
-        return $this->standardQuery(
-            'host', 
-            'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
-            array('__name','name','display_name')
-        );
-    }
+	/**
+	 * return array of host by IP (4 or 6) or name
+	 * @param string $ip
+	 * @throws Exception
+	 * @return array objects : array('__name','name','display_name')
+	 */
+	public function getHostByIP(string $ip) 
+	{
+		return $this->standardQuery(
+			'host', 
+			'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
+			array('__name','name','display_name')
+		);
+	}
 
     
-    /**
-     * Get host(s) by name in API
-     * @param string $name
-     * @return array|NULL[] : see getHostByIP
-     */
-    public function getHostByName(string $name)
-    {
-        return $this->getHostByIP($name);
-    }
+	/**
+	 * Get host(s) by name in API
+	 * @param string $name
+	 * @return array|NULL[] : see getHostByIP
+	 */
+	public function getHostByName(string $name)
+	{
+		return $this->getHostByIP($name);
+	}
  
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostsIPByHostGroup($hostGroup)
-    {        
-        return $this->standardQuery(
-            'host', 
-            '"' . $hostGroup . '" in host.groups',
-            array('address','address6','name')
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostsIPByHostGroup($hostGroup)
+	{        
+		return $this->standardQuery(
+			'host', 
+			'"' . $hostGroup . '" in host.groups',
+			array('address','address6','name')
                 
-        );
-    }
+		);
+	}
     
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostGroupByName($name)
-    {
-        return $this->standardQuery(
-            'hostgroup',
-            'match("*' . $name . '*",hostgroup.name)',
-            array('name','display_name')
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostGroupByName($name)
+	{
+		return $this->standardQuery(
+			'hostgroup',
+			'match("*' . $name . '*",hostgroup.name)',
+			array('name','display_name')
             
-            );
-    }
+			);
+	}
 
-    /** Get services from host in API
-     *	
-     *  @throws Exception
-     *	@param $id string host name
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
-    {
-        $filter = 'match("' . $id . '!*", service.__name)';
-        if ($active === TRUE)
-        {
-            $filter .= ' && service.active==true';
-        }
-        if ($passive_svc === TRUE)
-        {
-            $filter .= ' && service.enable_passive_checks==true';
-        }
-        return $this->standardQuery(
-            'service',
-            $filter,
-            array('__name','name','display_name','active')
-            );
+	/** Get services from host in API
+	 *	
+	 *  @throws Exception
+	 *	@param $id string host name
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
+	{
+		$filter = 'match("' . $id . '!*", service.__name)';
+		if ($active === TRUE)
+		{
+			$filter .= ' && service.active==true';
+		}
+		if ($passive_svc === TRUE)
+		{
+			$filter .= ' && service.enable_passive_checks==true';
+		}
+		return $this->standardQuery(
+			'service',
+			$filter,
+			array('__name','name','display_name','active')
+			);
         
-    }
+	}
 
-    /**
-     * return array of host by IP (4 or 6) or name
-     * @param string $group Host group name
-     * @throws Exception
-     * @return array objects : array('name','display_name')
-     */
-    public function getHostsByGroup(string $group)
-    {
-         return $this->standardQuery(
-            'host',
-            '"' . $group . '" in host.groups',
-            array('name','display_name')
-            );
-    }
+	/**
+	 * return array of host by IP (4 or 6) or name
+	 * @param string $group Host group name
+	 * @throws Exception
+	 * @return array objects : array('name','display_name')
+	 */
+	public function getHostsByGroup(string $group)
+	{
+		 return $this->standardQuery(
+			'host',
+			'"' . $group . '" in host.groups',
+			array('name','display_name')
+			);
+	}
     
-    public function getServicesByHostGroupid(string $group)
-    {
-        $hostList = $this->getHostsByGroup($group);
-        //return $hostList;
-        $hostNum = count($hostList);
-        $serviceList=array();
-        foreach ($hostList as $curHost)
-        {
-            $services = $this->getServicesByHostid($curHost->name);
-            foreach ($services as $service)
-            {
-                //return $service;
-                if (! isset($serviceList[$service->name]))
-                {
-                    $serviceList[$service->name]=
-                        array('num'=> 1 ,'display_name' => $service->display_name);
-                }
-                else
-                {
-                    $serviceList[$service->name]['num']++;
-                }
-            }
-        }
-        $commonServices=array();
-        foreach ($serviceList as $serviceName => $values)
-        {
-            if ($values['num'] >= $hostNum)
-            {
-                $commonServices[$serviceName] = $values['display_name'];
-            }
-        }
-        return $commonServices;
-    }
+	public function getServicesByHostGroupid(string $group)
+	{
+		$hostList = $this->getHostsByGroup($group);
+		//return $hostList;
+		$hostNum = count($hostList);
+		$serviceList=array();
+		foreach ($hostList as $curHost)
+		{
+			$services = $this->getServicesByHostid($curHost->name);
+			foreach ($services as $service)
+			{
+				//return $service;
+				if (! isset($serviceList[$service->name]))
+				{
+					$serviceList[$service->name]=
+						array('num'=> 1 ,'display_name' => $service->display_name);
+				}
+				else
+				{
+					$serviceList[$service->name]['num']++;
+				}
+			}
+		}
+		$commonServices=array();
+		foreach ($serviceList as $serviceName => $values)
+		{
+			if ($values['num'] >= $hostNum)
+			{
+				$commonServices[$serviceName] = $values['display_name'];
+			}
+		}
+		return $commonServices;
+	}
     
 }
 

Spacing +21 added lines, -21 removed lines

@@ -16,9 +16,9 @@ 
      * @param string $host host name or IP
      * @param number $port API port
      */
-    public function __construct($host, $port = 5665)
+    public function __construct($host, $port=5665)
     {
-        parent::__construct($host,$port);
+        parent::__construct($host, $port);
     }
     /**
 
@@ -34,8 +34,8 @@ 
     {
         return $this->standardQuery(
             'host', 
-            'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
-            array('__name','name','display_name')
+            'match("*'.$ip.'*",host.address) || match("*'.$ip.'*",host.address6) || match("*'.$ip.'*",host.name) || match("*'.$ip.'*",host.display_name)',
+            array('__name', 'name', 'display_name')
         );
     }
 
@@ -60,8 +60,8 @@ 
     {        
         return $this->standardQuery(
             'host', 
-            '"' . $hostGroup . '" in host.groups',
-            array('address','address6','name')
+            '"'.$hostGroup.'" in host.groups',
+            array('address', 'address6', 'name')
                 
         );
     }
@@ -76,8 +76,8 @@ 
     {
         return $this->standardQuery(
             'hostgroup',
-            'match("*' . $name . '*",hostgroup.name)',
-            array('name','display_name')
+            'match("*'.$name.'*",hostgroup.name)',
+            array('name', 'display_name')
             
             );
     }
@@ -88,21 +88,21 @@ 
      *	@param $id string host name
      *	@return array display_name (of service), service_object_id
      */
-    public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
+    public function getServicesByHostid(string $id, bool $active=TRUE, bool $passive_svc=TRUE)
     {
-        $filter = 'match("' . $id . '!*", service.__name)';
+        $filter='match("'.$id.'!*", service.__name)';
         if ($active === TRUE)
         {
-            $filter .= ' && service.active==true';
+            $filter.=' && service.active==true';
         }
         if ($passive_svc === TRUE)
         {
-            $filter .= ' && service.enable_passive_checks==true';
+            $filter.=' && service.enable_passive_checks==true';
         }
         return $this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active')
+            array('__name', 'name', 'display_name', 'active')
             );
         
     }
@@ -117,27 +117,27 @@ 
     {
          return $this->standardQuery(
             'host',
-            '"' . $group . '" in host.groups',
-            array('name','display_name')
+            '"'.$group.'" in host.groups',
+            array('name', 'display_name')
             );
     }
     
     public function getServicesByHostGroupid(string $group)
     {
-        $hostList = $this->getHostsByGroup($group);
+        $hostList=$this->getHostsByGroup($group);
         //return $hostList;
-        $hostNum = count($hostList);
+        $hostNum=count($hostList);
         $serviceList=array();
         foreach ($hostList as $curHost)
         {
-            $services = $this->getServicesByHostid($curHost->name);
+            $services=$this->getServicesByHostid($curHost->name);
             foreach ($services as $service)
             {
                 //return $service;
-                if (! isset($serviceList[$service->name]))
+                if (!isset($serviceList[$service->name]))
                 {
                     $serviceList[$service->name]=
-                        array('num'=> 1 ,'display_name' => $service->display_name);
+                        array('num'=> 1, 'display_name' => $service->display_name);
                 }
                 else
                 {
@@ -150,7 +150,7 @@ 
         {
             if ($values['num'] >= $hostNum)
             {
-                $commonServices[$serviceName] = $values['display_name'];
+                $commonServices[$serviceName]=$values['display_name'];
             }
         }
         return $commonServices;

Braces +1 added lines, -2 removed lines

@@ -138,8 +138,7 @@
                 {
                     $serviceList[$service->name]=
                         array('num'=> 1 ,'display_name' => $service->display_name);
-                }
-                else
+                } else
                 {
                     $serviceList[$service->name]['num']++;
                 }

library/Trapdirector/IcingaApi/IcingaApiBase.php

Indentation +308 added lines, -308 removed lines

@@ -8,342 +8,342 @@
 
 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');
+	}
 
-    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'))
-        {
+	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":"host.group==\"test_trap\"","attrs": ["address" ,"address6"]}'
          
          {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        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;
@@ -90,18 +90,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;
@@ -116,12 +116,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');
     }
     
     
@@ -136,7 +136,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');
             }
@@ -153,7 +153,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
@@ -172,9 +172,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;
             }
@@ -182,21 +182,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));
     }
   
     /**
@@ -206,18 +206,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');
         }
@@ -233,23 +233,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,
@@ -260,14 +260,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');
         }
@@ -281,7 +281,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()));
@@ -301,7 +301,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'
@@ -310,7 +310,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");
         }
@@ -318,11 +318,11 @@ 
         $body=array();
         if ($filter !== NULL)
         {
-            $body['filter'] = $filter;
+            $body['filter']=$filter;
         }
         if (count($attributes) != 0)
         {
-            $body['attrs'] = $attributes;
+            $body['attrs']=$attributes;
         }
 
         try
@@ -337,9 +337,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;

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');
             }

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'
 ));