patrickpr / trapdirector

application/controllers/StatusController.php

Indentation +186 added lines, -186 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' ));
@@ -136,27 +136,27 @@ 
 				$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=htmlspecialchars($_FILES['mibfile']['tmp_name']);
-				        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=htmlspecialchars($_FILES['mibfile']['tmp_name']);
+						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 +95 added lines, -95 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=htmlspecialchars($_FILES['mibfile']['name']);
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+				$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";
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=htmlspecialchars($_FILES['mibfile']['tmp_name']);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
+				        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);
     }
 }

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=htmlspecialchars($_FILES['mibfile']['tmp_name']);
 				        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)
 	        {

application/controllers/HandlerController.php

Indentation +294 added lines, -295 removed lines

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

application/controllers/SettingsController.php

Indentation +234 added lines, -234 removed lines

@@ -25,16 +25,16 @@ 
    */
   private function get_param()
   {
-      $dberrorMsg=$this->params->get('dberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
-      $dberrorMsg=$this->params->get('idodberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
+	  $dberrorMsg=$this->params->get('dberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
+	  $dberrorMsg=$this->params->get('idodberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
   }
   
   /**
@@ -43,22 +43,22 @@ 
    */
   private function check_empty_config()
   {
-      $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
-      if ($this->Config()->isEmpty() == true)
-      {
-          $this->Config()->setSection('config'); // Set base config section.
-          try
-          {
-              $this->Config()->saveIni();
-              $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
-              //$emptyConfig=1;
-          }
-          catch (Exception $e)
-          {
-              $this->view->configErrorDetected=$e->getMessage();
-          }
+	  $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	  if ($this->Config()->isEmpty() == true)
+	  {
+		  $this->Config()->setSection('config'); // Set base config section.
+		  try
+		  {
+			  $this->Config()->saveIni();
+			  $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
+			  //$emptyConfig=1;
+		  }
+		  catch (Exception $e)
+		  {
+			  $this->view->configErrorDetected=$e->getMessage();
+		  }
           
-      }
+	  }
   }
   
   /**
@@ -71,57 +71,57 @@ 
    */
   private function check_db()
   {
-      $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
-              Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
-              Url::fromPath('trapdirector/settings/updateschema')),
-      );
+	  $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
+		  0	=>	array('Database configuration OK','',''),
+		  1	=>	array('Database set in config.ini','No database in config.ini',''),
+		  2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+			  Url::fromPath('config/resource')),
+		  3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  4	=>	array('Schema is set','Schema is not set for ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  5	=>	array('Schema is up to date','Schema is outdated :',
+			  Url::fromPath('trapdirector/settings/updateschema')),
+	  );
       
-      try {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->db_error=$dberror[0];
-      switch ($dberror[0])
-      {
-          case 2:
-          case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
-              break;
-          case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
-              break;
-          case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
-              break;
-          case 0:
-          case 1:
-              break;
-          default:
-              new ProgrammingError('Out of bond result from database test');
-      }
-      $this->view->message=$db_message;
+	  $this->view->db_error=$dberror[0];
+	  switch ($dberror[0])
+	  {
+		  case 2:
+		  case 4:
+			  $db_message[$dberror[0]][1] .= $dberror[1];
+			  break;
+		  case 3:
+			  $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+			  break;
+		  case 5:
+			  $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+			  break;
+		  case 0:
+		  case 1:
+			  break;
+		  default:
+			  new ProgrammingError('Out of bond result from database test');
+	  }
+	  $this->view->message=$db_message;
       
-      try {
-          $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
-      $this->view->ido_message .='<br />=&gt; Default to API use. Make sure it is configured and check is returning OK!';
+	  $this->view->ido_db_error=$dberror[0];
+	  $this->view->ido_message='IDO Database : ' . $dberror[1];
+	  $this->view->ido_message .='<br />=&gt; Default to API use. Make sure it is configured and check is returning OK!';
   }
   
   /**
@@ -131,23 +131,23 @@ 
    */
   private function check_api()
   {
-      if ($this->Config()->get('config', 'icingaAPI_host') != '')
-      {
-          $apitest=new Icinga2API($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
-          $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
-          try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
-              //$this->view->apimessageError=false;
-          } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
-              $this->view->apimessageError=true;
-          }
-      }
-      else
-      {
-          $this->view->apimessage='API parameters not configured';
-          $this->view->apimessageError=true;
-      }
+	  if ($this->Config()->get('config', 'icingaAPI_host') != '')
+	  {
+		  $apitest=new Icinga2API($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+		  $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
+		  try {
+			  list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+			  //$this->view->apimessageError=false;
+		  } catch (RuntimeException $e) {
+			  $this->view->apimessage='API config : ' . $e->getMessage();
+			  $this->view->apimessageError=true;
+		  }
+	  }
+	  else
+	  {
+		  $this->view->apimessage='API parameters not configured';
+		  $this->view->apimessageError=true;
+	  }
   }
 
   /**
@@ -158,21 +158,21 @@ 
    */
   private function check_icingaweb_path()
   {
-      $this->view->icingaEtcWarn=0;
-      $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-      if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
-      {
-          $output=array();
+	  $this->view->icingaEtcWarn=0;
+	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+	  if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
+	  {
+		  $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+		  exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
-          {
-              $this->view->icingaEtcWarn=1;
-              $this->view->icingaweb2_etc=$icingaweb2_etc;
-          }
-      }
+		  if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		  {
+			  $this->view->icingaEtcWarn=1;
+			  $this->view->icingaweb2_etc=$icingaweb2_etc;
+		  }
+	  }
       
   }
   
@@ -183,15 +183,15 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
-      foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
-      {
-          if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
-          {
-              $resources[$name] = $name;
-          }
-      }
-      return $resources;
+	  $resources = array();
+	  foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
+	  {
+		  if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
+		  {
+			  $resources[$name] = $name;
+		  }
+	  }
+	  return $resources;
   }
   
   /**
@@ -200,23 +200,23 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+	  $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
-      {
-          $output=array();
-          $retCode=255;
-          $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+	  foreach ($phpBinary as $phpBin )
+	  {
+		  $output=array();
+		  $retCode=255;
+		  $input="154865134987aaaa";
+		  exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+		  if (! isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
-          {
-              return $phpBin;
-          }          
-      }
-      return NULL;
+		  if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+		  {
+			  return $phpBin;
+		  }          
+	  }
+	  return NULL;
   }
   
   /**
@@ -235,7 +235,7 @@ 
   public function indexAction()
   {
       
-    // CHeck permissions : display tests in any case, but no configuration.
+	// CHeck permissions : display tests in any case, but no configuration.
 	$this->view->configPermission=$this->checkModuleConfigPermission(1);
 	// But check read permission
 	$this->checkReadPermission();
@@ -243,16 +243,16 @@ 
 	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');	
 	
 	// Get message : sent on configuration problems detected by controllers
-    $this->get_param();
+	$this->get_param();
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	$this->check_empty_config();
 
 	// Test Database
-    $this->check_db();
+	$this->check_db();
 	
 	// Test API
-    $this->check_api();
+	$this->check_api();
 	
 	//Test snmptrapd alive and options
 	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
@@ -266,7 +266,7 @@ 
 	$phpBinary = $this->get_php_binary();
 	if ($phpBinary === null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+		$phpBinary = ' PHP BINARY NOT FOUND ';
 	    
 	}
 	
@@ -274,11 +274,11 @@ 
 	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . $phpBinary
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -312,15 +312,15 @@ 
   public function satelliteAction()
   {
       
-      // CHeck permissions
-      $this->view->configPermission=$this->checkModuleConfigPermission();
+	  // CHeck permissions
+	  $this->view->configPermission=$this->checkModuleConfigPermission();
       
-      // Setup tabs
-      $this->view->tabs = $this->Module()->getConfigTabs()->activate('satellite');	
+	  // Setup tabs
+	  $this->view->tabs = $this->Module()->getConfigTabs()->activate('satellite');	
       
-      $this->view->masterHASet = FALSE;
+	  $this->view->masterHASet = FALSE;
       
-      $this->view->masterHAConf = array ('name' => 'masterHA1', 'icingaweb2 user'=>'User1');
+	  $this->view->masterHAConf = array ('name' => 'masterHA1', 'icingaweb2 user'=>'User1');
   }
   
   
@@ -336,8 +336,8 @@ 
 	
 	try 
 	{
-	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-	    printf('Schema already exists');
+		$this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		printf('Schema already exists');
 	    
 	} 
 	catch (DBException $e) 
@@ -348,19 +348,19 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
-        $dbType=$dbResource->get('db');
-        switch ($dbType) {
-          case 'mysql':
-              $dbFileExt='sql';
-              break;
-          case 'pgsql':
-              $dbFileExt='pgsql';
-              break;
-          default:
-              printf("Database configuration error : Unsuported DB");
-              return;
-        } 
+		$dbResource = ResourceFactory::getResourceConfig($dbName);
+		$dbType=$dbResource->get('db');
+		switch ($dbType) {
+		  case 'mysql':
+			  $dbFileExt='sql';
+			  break;
+		  case 'pgsql':
+			  $dbFileExt='pgsql';
+			  break;
+		  default:
+			  printf("Database configuration error : Unsuported DB");
+			  return;
+		} 
 
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -384,32 +384,32 @@ 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
-    		'active'	=> true,
-    		'label'		=> $this->translate('Update Schema'),
-    		'url'		=> Url::fromRequest()
-    	));
+	  $this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Update Schema'),
+			'url'		=> Url::fromRequest()
+		));
 	  // check if needed
 	  $dberror=array();
-      try
-      {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          echo 'Schema already exists and is up to date<br>';
-          return;
-      }
-      catch (DBException $e)
-      {
-          $dberror=$e->getArray(); 
-      }
+	  try
+	  {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
+	  }
+	  catch (DBException $e)
+	  {
+		  $dberror=$e->getArray(); 
+	  }
 	  
 	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
-	      echo 'Database does not exists or is not setup correctly<br>';
-	      return;
+		  echo 'Database does not exists or is not setup correctly<br>';
+		  return;
 	  }
-      // setup
+	  // setup
 	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
@@ -422,20 +422,20 @@ 
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
-	      // Check for messages and display if any
-              echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
-	      if ($message != '')
-	      {
-	          echo 'Note :<br><pre>';
-	          echo $message;
-	          echo '</pre>';
-	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
-	          echo '<br>';
-	          return;
-	      }
+		  // Check for messages and display if any
+			  echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
+		  $Trap->setLogging(2,'syslog');
+		  $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+		  if ($message != '')
+		  {
+			  echo 'Note :<br><pre>';
+			  echo $message;
+			  echo '</pre>';
+			  echo '<br>';
+			  echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+			  echo '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -450,52 +450,52 @@ 
   
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
-      {
-          // RHEL based systems
-          $sspath = '/usr/sbin/ss';
-      }
-      if(!is_executable("$sspath"))
-      {
-          return array(1,"Can not execute $sspath");
-      }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
-      if (count($psOutput) == 0)
-      {
-          $extra = "";
-          if (is_file("/.dockerenv")){ $extra = '<br />=&gt; ignore if Trapdirector is running in a different Docker container'; }
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?'. $extra);
-      }
-      $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
-      {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
-      }
-      if($selinux_state !== 'Enforcing')
-      {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
-          if (count($psOutput) == 0)
-          {
-              return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
-          }
-          // Assume there is only one line... TODO : see if there is a better way to do this
-          $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-          if (!preg_match('/-n/',$line))
-              return array(1,'snmptrapd has no -n option : '.$line);
-          if (!preg_match('/-O[^ ]*n/',$line))
-              return array(1,'snmptrapd has no -On option : '.$line);
-          if (!preg_match('/-O[^ ]*e/',$line))
-              return array(1,'snmptrapd has no -Oe option : '.$line);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  $sspath = exec('which ss 2>/dev/null');
+	  if(empty($sspath))
+	  {
+		  // RHEL based systems
+		  $sspath = '/usr/sbin/ss';
+	  }
+	  if(!is_executable("$sspath"))
+	  {
+		  return array(1,"Can not execute $sspath");
+	  }
+	  exec("$sspath -lun | grep ':162 '",$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  $extra = "";
+		  if (is_file("/.dockerenv")){ $extra = '<br />=&gt; ignore if Trapdirector is running in a different Docker container'; }
+		  return array(1,'Port UDP/162 is not open : is snmptrapd running?'. $extra);
+	  }
+	  $psOutput=array();
+	  $selinux_state = '';
+	  if(is_executable('/usr/sbin/getenforce'))
+	  {
+		  $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+	  }
+	  if($selinux_state !== 'Enforcing')
+	  {
+		  exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+		  if (count($psOutput) == 0)
+		  {
+			  return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+		  }
+		  // Assume there is only one line... TODO : see if there is a better way to do this
+		  $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
+		  if (!preg_match('/-n/',$line))
+			  return array(1,'snmptrapd has no -n option : '.$line);
+		  if (!preg_match('/-O[^ ]*n/',$line))
+			  return array(1,'snmptrapd has no -On option : '.$line);
+		  if (!preg_match('/-O[^ ]*e/',$line))
+			  return array(1,'snmptrapd has no -Oe option : '.$line);
 
-          return array(0,'snmptrapd listening to UDP/162, options : '.$line);
-      }
-      else
-      {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
-      }
+		  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  }
+	  else
+	  {
+		  return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+	  }
   }
 }

Spacing +88 added lines, -88 removed lines

@@ -72,23 +72,23 @@ 
   private function check_db()
   {
       $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+          0	=>	array('Database configuration OK', '', ''),
+          1	=>	array('Database set in config.ini', 'No database in config.ini', ''),
+          2	=>	array('Database exists in Icingaweb2 config', 'Database does not exist in Icingaweb2 : ',
               Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+          3	=>	array('Database credentials OK', 'Database does not exist/invalid credentials/no schema : ',
               Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
+          4	=>	array('Schema is set', 'Schema is not set for ',
               Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
+          5	=>	array('Schema is up to date', 'Schema is outdated :',
               Url::fromPath('trapdirector/settings/updateschema')),
       );
       
       try {
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->db_error=$dberror[0];
@@ -96,13 +96,13 @@ 
       {
           case 2:
           case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
+              $db_message[$dberror[0]][1].=$dberror[1];
               break;
           case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+              $db_message[$dberror[0]][1].=$dberror[1].', Message : '.$dberror[2];
               break;
           case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+              $db_message[$dberror[0]][1].=' version '.$dberror[1].', version needed : '.$dberror[2];
               break;
           case 0:
           case 1:
@@ -114,14 +114,14 @@ 
       
       try {
           $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
-      $this->view->ido_message .='<br />=&gt; Default to API use. Make sure it is configured and check is returning OK!';
+      $this->view->ido_message='IDO Database : '.$dberror[1];
+      $this->view->ido_message.='<br />=&gt; Default to API use. Make sure it is configured and check is returning OK!';
   }
   
   /**
@@ -133,13 +133,13 @@ 
   {
       if ($this->Config()->get('config', 'icingaAPI_host') != '')
       {
-          $apitest=new Icinga2API($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+          $apitest=new Icinga2API($this->Config()->get('config', 'icingaAPI_host'), $this->Config()->get('config', 'icingaAPI_port'));
           $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
           try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+              list($this->view->apimessageError, $this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
               //$this->view->apimessageError=false;
           } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
+              $this->view->apimessage='API config : '.$e->getMessage();
               $this->view->apimessageError=true;
           }
       }
@@ -164,10 +164,10 @@ 
       {
           $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+          exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2Etc=" ', $output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+          if (!isset($output[0]) || !preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
           {
               $this->view->icingaEtcWarn=1;
               $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -183,12 +183,12 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
+      $resources=array();
       foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
       {
           if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
           {
-              $resources[$name] = $name;
+              $resources[$name]=$name;
           }
       }
       return $resources;
@@ -200,18 +200,18 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+      $phpBinary=array(PHP_BINARY, PHP_BINDIR."/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
+      foreach ($phpBinary as $phpBin)
       {
           $output=array();
           $retCode=255;
           $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+          exec("$phpBin -r \"echo '$input';\"", $output, $retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (!isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+          if ($retCode == 0 && preg_match("/$input/", $output[0]) == 1)
           {
               return $phpBin;
           }          
@@ -240,7 +240,7 @@ 
 	// But check read permission
 	$this->checkReadPermission();
 	
-	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');	
+	$this->view->tabs=$this->Module()->getConfigTabs()->activate('config');	
 	
 	// Get message : sent on configuration problems detected by controllers
     $this->get_param();
@@ -255,39 +255,39 @@ 
     $this->check_api();
 	
 	//Test snmptrapd alive and options
-	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
+	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage)=$this->checkSnmpTrapd();
 
 	// List DB in $ressources
-	$resources = $this->get_db_list(array('mysql', 'pgsql')); 
+	$resources=$this->get_db_list(array('mysql', 'pgsql')); 
 
 	// Check standard Icingaweb2 path
 	$this->check_icingaweb_path();
 
-	$phpBinary = $this->get_php_binary();
+	$phpBinary=$this->get_php_binary();
 	if ($phpBinary === null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+	    $phpBinary=' PHP BINARY NOT FOUND ';
 	    
 	}
 	
 	// Setup path for mini documentation
-	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=$phpBinary.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.$phpBinary
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -316,18 +316,18 @@ 
       $this->view->configPermission=$this->checkModuleConfigPermission();
       
       // Setup tabs
-      $this->view->tabs = $this->Module()->getConfigTabs()->activate('satellite');	
+      $this->view->tabs=$this->Module()->getConfigTabs()->activate('satellite');	
       
-      $this->view->masterHASet = FALSE;
+      $this->view->masterHASet=FALSE;
       
-      $this->view->masterHAConf = array ('name' => 'masterHA1', 'icingaweb2 user'=>'User1');
+      $this->view->masterHAConf=array('name' => 'masterHA1', 'icingaweb2 user'=>'User1');
   }
   
   
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -348,7 +348,7 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
+        $dbResource=ResourceFactory::getResourceConfig($dbName);
         $dbType=$dbResource->get('db');
         switch ($dbType) {
           case 'mysql':
@@ -363,28 +363,28 @@ 
         } 
 
 		printf('<pre>');
-		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
+		require_once $this->Module()->getBaseDir().'/bin/trap_class.php';
 		
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=4;
-		$Trap = new Trap($icingaweb2_etc);
-		$Trap->setLogging($debug_level,'display');
+		$Trap=new Trap($icingaweb2_etc);
+		$Trap->setLogging($debug_level, 'display');
 		
 		$prefix=$this->Config()->get('config', 'database_prefix');
 		// schema file : <path>/SQL/schema_v<verion>.<dbtype>
-		$schema=$this->Module()->getBaseDir() . 
-		'/SQL/schema_v'. $this->getModuleConfig()->getDbCurVersion() . '.' . $dbFileExt;
+		$schema=$this->Module()->getBaseDir(). 
+		'/SQL/schema_v'.$this->getModuleConfig()->getDbCurVersion().'.'.$dbFileExt;
 		
-		$Trap->trapsDB->create_schema($schema,$prefix);
+		$Trap->trapsDB->create_schema($schema, $prefix);
 		echo '</pre>';
 	}
-	echo '<br><br>Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a>';
+	echo '<br><br>Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a>';
   }
 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
+      $this->getTabs()->add('get', array(
     		'active'	=> true,
     		'label'		=> $this->translate('Update Schema'),
     		'url'		=> Url::fromRequest()
@@ -402,7 +402,7 @@ 
           $dberror=$e->getArray(); 
       }
 	  
-	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
+	  echo 'Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
@@ -410,40 +410,40 @@ 
 	      return;
 	  }
       // setup
-	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	  require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
-	  $Trap = new Trap($icingaweb2_etc);
+	  $Trap=new Trap($icingaweb2_etc);
 	  
 	  
 	  $prefix=$this->Config()->get('config', 'database_prefix');
-	  $updateSchema=$this->Module()->getBaseDir() . '/SQL/';
+	  $updateSchema=$this->Module()->getBaseDir().'/SQL/';
 	  
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
 	      // Check for messages and display if any
               echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix, true);
 	      if ($message != '')
 	      {
 	          echo 'Note :<br><pre>';
 	          echo $message;
 	          echo '</pre>';
 	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="'.Url::fromPath('trapdirector/settings/updateschema').'?msgok=1">Click here to update</a>';
 	          echo '<br>';
 	          return;
 	      }
 	  }
 	  
-	  $Trap->setLogging($debug_level,'display');
+	  $Trap->setLogging($debug_level, 'display');
 	  
-	  echo 'Updating schema to '. $target_version . ': <br>';
+	  echo 'Updating schema to '.$target_version.': <br>';
 	  echo '<pre>';
 	  	  
-	  $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -452,50 +452,50 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
+      $sspath=exec('which ss 2>/dev/null');
+      if (empty($sspath))
       {
           // RHEL based systems
-          $sspath = '/usr/sbin/ss';
+          $sspath='/usr/sbin/ss';
       }
-      if(!is_executable("$sspath"))
+      if (!is_executable("$sspath"))
       {
-          return array(1,"Can not execute $sspath");
+          return array(1, "Can not execute $sspath");
       }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
+      exec("$sspath -lun | grep ':162 '", $psOutput);
       if (count($psOutput) == 0)
       {
-          $extra = "";
-          if (is_file("/.dockerenv")){ $extra = '<br />=&gt; ignore if Trapdirector is running in a different Docker container'; }
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?'. $extra);
+          $extra="";
+          if (is_file("/.dockerenv")) { $extra='<br />=&gt; ignore if Trapdirector is running in a different Docker container'; }
+          return array(1, 'Port UDP/162 is not open : is snmptrapd running?'.$extra);
       }
       $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
+      $selinux_state='';
+      if (is_executable('/usr/sbin/getenforce'))
       {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+          $selinux_state=exec('/usr/sbin/getenforce 2>/dev/null');
       }
-      if($selinux_state !== 'Enforcing')
+      if ($selinux_state !== 'Enforcing')
       {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+          exec('ps --no-headers -o command -C snmptrapd', $psOutput);
           if (count($psOutput) == 0)
           {
-              return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+              return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
           }
           // Assume there is only one line... TODO : see if there is a better way to do this
-          $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-          if (!preg_match('/-n/',$line))
-              return array(1,'snmptrapd has no -n option : '.$line);
-          if (!preg_match('/-O[^ ]*n/',$line))
-              return array(1,'snmptrapd has no -On option : '.$line);
-          if (!preg_match('/-O[^ ]*e/',$line))
-              return array(1,'snmptrapd has no -Oe option : '.$line);
+          $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+          if (!preg_match('/-n/', $line))
+              return array(1, 'snmptrapd has no -n option : '.$line);
+          if (!preg_match('/-O[^ ]*n/', $line))
+              return array(1, 'snmptrapd has no -On option : '.$line);
+          if (!preg_match('/-O[^ ]*e/', $line))
+              return array(1, 'snmptrapd has no -Oe option : '.$line);
 
-          return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+          return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
       }
       else
       {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+          return array(0, 'A daemon (hidden by SELinux) is listening on UDP/162');
       }
   }
 }

application/clicommands/MibCommand.php

Indentation +76 added lines, -76 removed lines

@@ -22,77 +22,77 @@ 
 class MibCommand extends Command
 {
 	/**
-	*	Update mib database
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib update
-	*	
-	*	OPTIONS
-	*	
-	*	--pid <file> : run in background with pid in <file>
-	*
-	*	--verb    : Set output log to verbose
-	*
-	*   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
-	*/
+	 *	Update mib database
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib update
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--pid <file> : run in background with pid in <file>
+	 *
+	 *	--verb    : Set output log to verbose
+	 *
+	 *   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
+	 */
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
-	    $pid=1;
-	    if ($background != null)
-	    {
-	        $file=@fopen($background,'w');
-	        if ($file == false)
-	        {
-	            echo 'Error : cannot open pid file '.$background;
-	            return 1;
-	        }
-	        $pid = pcntl_fork();
-	        if ($pid == -1) {
-	            echo 'Error : Cannot fork process';
-	            return 1;
-	        }
-	    }
-	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
+		$background = $this->params->get('pid', null);
+		$logLevel= $this->params->has('verb') ? 4 : 2;
+		if ($this->params->has('force-check')) { echo "Not implemented"; return;}
+		$forceCheck=$this->params->has('force-check')?True:False;
+		$pid=1;
+		if ($background != null)
+		{
+			$file=@fopen($background,'w');
+			if ($file == false)
+			{
+				echo 'Error : cannot open pid file '.$background;
+				return 1;
+			}
+			$pid = pcntl_fork();
+			if ($pid == -1) {
+				echo 'Error : Cannot fork process';
+				return 1;
+			}
+		}
+		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
 		require_once($module->getBaseDir() .'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$trap = new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+			$trap->setLogging($logLevel,'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
-		    if ($pid != 0)
-		    {
-		        // father process
-		        fwrite($file,$pid);
-		        fclose($file);
-		        echo "OK : process $pid in bckground";
-		        return 0;
-		    }
-		    else
-		    {  // son process : close all file descriptors and go to a new session
-		        fclose($file);		        
+			if ($pid != 0)
+			{
+				// father process
+				fwrite($file,$pid);
+				fclose($file);
+				echo "OK : process $pid in bckground";
+				return 0;
+			}
+			else
+			{  // son process : close all file descriptors and go to a new session
+				fclose($file);		        
 // 		        $sid = posix_setsid();
-                fclose(STDIN);
-                fclose(STDOUT);
-                fclose(STDERR);
-                try
-                {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
-                {
-                    $trap->logging->log('Error in updating : ' . $e->getMessage(),2);
-                }
-                unlink($background);
-                return 0;
-		    }
+				fclose(STDIN);
+				fclose(STDOUT);
+				fclose(STDERR);
+				try
+				{
+					$trap->mibClass->update_mib_database(false,$forceCheck);
+				}
+				catch (Exception $e)
+				{
+					$trap->logging->log('Error in updating : ' . $e->getMessage(),2);
+				}
+				unlink($background);
+				return 0;
+			}
 		    
 		}
 		
@@ -110,28 +110,28 @@ 
 		}
 		if ($pid != 1)
 		{
-		    unlink($background);
+			unlink($background);
 		}
 	}
 	/**
-	*	purge all mib database NOT IMPLEMENTED
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib purge --confirm
-	*	
-	*	OPTIONS
-	*	
-	*	--confirm : needed to execute purge
-	*/
+	 *	purge all mib database NOT IMPLEMENTED
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib purge --confirm
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--confirm : needed to execute purge
+	 */
 	public function purgeAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');
 		
 		if (!$this->params->has('confirm'))
 		{
-		    echo "This needs confirmation with '--confirm'\n";
-		    return;
+			echo "This needs confirmation with '--confirm'\n";
+			return;
 		}
 		
 		$Config = new TrapModuleConfig($db_prefix);
@@ -145,9 +145,9 @@ 
 			$db = IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
 			
 			$query = $db->delete(
-			    $Config->getMIBCacheTableName(),
-			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+				$Config->getMIBCacheTableName(),
+				'id>0');
+			echo 'Deleted '. $query . " traps and objects\n";
 		}
 		catch (Exception $e)
 		{

Spacing +19 added lines, -19 removed lines

@@ -38,39 +38,39 @@ 
 	*/
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
+	    $background=$this->params->get('pid', null);
+	    $logLevel=$this->params->has('verb') ? 4 : 2;
+	    if ($this->params->has('force-check')) { echo "Not implemented"; return; }
+	    $forceCheck=$this->params->has('force-check') ?True:False;
 	    $pid=1;
 	    if ($background != null)
 	    {
-	        $file=@fopen($background,'w');
+	        $file=@fopen($background, 'w');
 	        if ($file == false)
 	        {
 	            echo 'Error : cannot open pid file '.$background;
 	            return 1;
 	        }
-	        $pid = pcntl_fork();
+	        $pid=pcntl_fork();
 	        if ($pid == -1) {
 	            echo 'Error : Cannot fork process';
 	            return 1;
 	        }
 	    }
 	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-		$trap = new Trap($icingaweb2_etc);
+		$trap=new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+		    $trap->setLogging($logLevel, 'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
 		        // father process
-		        fwrite($file,$pid);
+		        fwrite($file, $pid);
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
@@ -84,11 +84,11 @@ 
                 fclose(STDERR);
                 try
                 {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
+                    $trap->mibClass->update_mib_database(false, $forceCheck);
                 }
                 catch (Exception $e)
                 {
-                    $trap->logging->log('Error in updating : ' . $e->getMessage(),2);
+                    $trap->logging->log('Error in updating : '.$e->getMessage(), 2);
                 }
                 unlink($background);
                 return 0;
@@ -100,13 +100,13 @@ 
 		{
 			echo "Update main mib database : \n";
 			echo "# (trap found) C (trap already processed) . (every 2 seconds) : \n";
-			$trap->mibClass->update_mib_database(true,$forceCheck);
+			$trap->mibClass->update_mib_database(true, $forceCheck);
 			echo "Done\n";
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}
 		if ($pid != 1)
 		{
@@ -134,7 +134,7 @@ 
 		    return;
 		}
 		
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
@@ -142,16 +142,16 @@ 
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
 //			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
+			$db=IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
 			
-			$query = $db->delete(
+			$query=$db->delete(
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+            echo 'Deleted '.$query." traps and objects\n";
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in DB : ' . $e->getMessage();
+			echo 'Error in DB : '.$e->getMessage();
 		}	   
 	}  	 	
 

application/clicommands/StatusCommand.php

Spacing +9 added lines, -9 removed lines

@@ -24,22 +24,22 @@
 	public function dbAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
-			printf("DB name : %s\n",$dbresource);
+			printf("DB name : %s\n", $dbresource);
 //			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
-			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
+			$dataBase=IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
 			
-			$query = $dataBase->select()->from($Config->getTrapTableName(),array('COUNT(*)'));			
-			printf("Number of traps : %s\n", $dataBase->fetchOne($query) );
-			$query = $dataBase->select()->from($Config->getTrapDataTableName(),array('COUNT(*)'));			
-			printf("Number of trap objects : %s\n", $dataBase->fetchOne($query) );
-			$query = $dataBase->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
-			printf("Number of rules : %s\n", $dataBase->fetchOne($query) );
+			$query=$dataBase->select()->from($Config->getTrapTableName(), array('COUNT(*)'));			
+			printf("Number of traps : %s\n", $dataBase->fetchOne($query));
+			$query=$dataBase->select()->from($Config->getTrapDataTableName(), array('COUNT(*)'));			
+			printf("Number of trap objects : %s\n", $dataBase->fetchOne($query));
+			$query=$dataBase->select()->from($Config->getTrapRuleName(), array('COUNT(*)'));			
+			printf("Number of rules : %s\n", $dataBase->fetchOne($query));
 			
 		}
 		catch (Exception $e)

library/Trapdirector/TrapsActions/UIDatabase.php

Indentation +260 added lines, -260 removed lines

@@ -19,30 +19,30 @@ 
  */
 class DBException extends Exception
 {
-    /** @var array $returnArray */
-    private $returnArray;
+	/** @var array $returnArray */
+	private $returnArray;
     
-    /**
-     * Buil DBException
-     * @param array $retarray
-     * @param string $message
-     * @param int $code
-     * @param Exception $previous
-     */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
-    }
+	/**
+	 * Buil DBException
+	 * @param array $retarray
+	 * @param string $message
+	 * @param int $code
+	 * @param Exception $previous
+	 */
+	public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+	{
+		parent::__construct($message,$code,$previous);
+		$this->returnArray = $retarray;
+	}
     
-    /**
-     * Get exception array
-     * @return array
-     */
-    public function getArray()
-    {
-        return $this->returnArray;
-    }
+	/**
+	 * Get exception array
+	 * @return array
+	 */
+	public function getArray()
+	{
+		return $this->returnArray;
+	}
 }
 
 /**
@@ -56,279 +56,279 @@ 
  */
 class UIDatabase //extends TrapDBQuery
 {
-    use TrapDBQuery,IdoDBQuery;
+	use TrapDBQuery,IdoDBQuery;
     
-    /** @var TrapsController $trapController TrapController 'parent' class */
-    protected  $trapController=null;
+	/** @var TrapsController $trapController TrapController 'parent' class */
+	protected  $trapController=null;
     
-    /** @var Selectable $trapDB Trap Database*/
-    protected $trapDB=null;
+	/** @var Selectable $trapDB Trap Database*/
+	protected $trapDB=null;
  
-    /** @var Selectable $trapDB Icinga IDO database*/
-    protected $idoDB=null;
+	/** @var Selectable $trapDB Icinga IDO database*/
+	protected $idoDB=null;
     
-    /** @var array $testResult */
-    protected $testResult;
+	/** @var array $testResult */
+	protected $testResult;
     
-    /**
-     * 
-     * @param TrapsController $trapCtrl
-     */
-    function __construct(TrapsController $trapCtrl)
-    {
-        $this->trapController=$trapCtrl;
-    }
+	/**
+	 * 
+	 * @param TrapsController $trapCtrl
+	 */
+	function __construct(TrapsController $trapCtrl)
+	{
+		$this->trapController=$trapCtrl;
+	}
     
-    /**
-     * Get TrapsController instance
-     * @return TrapsController
-     */
-    protected function getTrapCtrl()
-    {
-        return $this->trapController;
-    }
+	/**
+	 * Get TrapsController instance
+	 * @return TrapsController
+	 */
+	protected function getTrapCtrl()
+	{
+		return $this->trapController;
+	}
     
-    /**
-     * Test if database version >= min database version
-     * 
-     * @param \Zend_Db_Adapter_Abstract $dbConn
-     * @param int $min Minimum version
-     * @param bool $test Test mode
-     * @param string $DBname Name of DB
-     * @return bool true if OK, false if version < min version
-     * @throws Exception if error and test = true
-     */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
-    {
-        try
-        {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
-            ->where('name=\'db_version\'');
-            $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
-            {
-                if ($test === true) 
-                {
-                    $this->testResult = array(4,$DBname);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-                return false;
-            }
-            if ($version->value < $min)
-            {
-                if ($test === true) 
-                {
-                    $this->testResult = array(5,$version->value,$min);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=5');
-                return false;
-            }
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                $this->testResult = array(3,$DBname,$e->getMessage());
-                return false;
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Test if database version >= min database version
+	 * 
+	 * @param \Zend_Db_Adapter_Abstract $dbConn
+	 * @param int $min Minimum version
+	 * @param bool $test Test mode
+	 * @param string $DBname Name of DB
+	 * @return bool true if OK, false if version < min version
+	 * @throws Exception if error and test = true
+	 */
+	protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+	{
+		try
+		{
+			$query = $dbAdapter->select()
+			->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+			->where('name=\'db_version\'');
+			$version=$dbAdapter->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'value') )
+			{
+				if ($test === true) 
+				{
+					$this->testResult = array(4,$DBname);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+				return false;
+			}
+			if ($version->value < $min)
+			{
+				if ($test === true) 
+				{
+					$this->testResult = array(5,$version->value,$min);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=5');
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				$this->testResult = array(3,$DBname,$e->getMessage());
+				return false;
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+			return false;
+		}
+		return true;
+	}
     
-    /**	Get Database connexion
-     *	@param $DBname string DB name in resource.ini_ge
-     *	@param $test bool if set to true, returns error code and not database
-     *	@param $test_version bool if set to flase, does not test database version of trapDB
-     *  @throws DBException if test = true and error
-     *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    protected function getDbByName($DBname , $test = false , $test_version = true)
-    {
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                throw new DBException(array(2,$DBname));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=2');
-            return null;
-        }
+	/**	Get Database connexion
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *  @throws DBException if test = true and error
+	 *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	protected function getDbByName($DBname , $test = false , $test_version = true)
+	{
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				throw new DBException(array(2,$DBname));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=2');
+			return null;
+		}
         
-        try
-        {
-            $dbAdapter=$dbconn->getDbAdapter();
+		try
+		{
+			$dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
-        {
-            if ($test === true)
-            {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=3');
-            return null;
-        }
+		}
+		catch (Exception $e)
+		{
+			if ($test === true)
+			{
+				throw new DBException(array(3,$DBname,$e->getMessage()));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=3');
+			return null;
+		}
         
-        if ($test_version == true) {
-            $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
-            if ($testRet !== true) 
-            {
-                throw new DBException($this->testResult);
-            }
-        }
+		if ($test_version == true) {
+			$testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
+			if ($testRet !== true) 
+			{
+				throw new DBException($this->testResult);
+			}
+		}
         
-        return $dbconn;
-    }
+		return $dbconn;
+	}
 
-    /**
-     * Get Trap database
-     * @return Selectable|null : returns DB connexion or null on error.
-     */
-    public function getDb()
-    {
-        if ( $this->trapDB != null ) return $this->trapDB;
+	/**
+	 * Get Trap database
+	 * @return Selectable|null : returns DB connexion or null on error.
+	 */
+	public function getDb()
+	{
+		if ( $this->trapDB != null ) return $this->trapDB;
         
         
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-            $this->trapController->redirectNow('trapdirector/settings?dberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?dberror=1');
+			return null;
+		}
 
-        try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
-        } catch (DBException $e) {
-            return null; // Should not happen as test = false
-        }
+		try {
+			$this->trapDB = $this->getDbByName($dbresource,false,true);
+		} catch (DBException $e) {
+			return null; // Should not happen as test = false
+		}
         
-        //$this->trapDB->getConnection();
+		//$this->trapDB->getConnection();
         
-        return $this->trapDB;
-    }
+		return $this->trapDB;
+	}
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getDbConn()
-    {
-        if ($this->getDb() == null) return null;
-        return $this->getDb()->getDbAdapter();
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getDbConn()
+	{
+		if ($this->getDb() == null) return null;
+		return $this->getDb()->getDbAdapter();
 //        return $this->getDb()->getConnection();
-    }
+	}
     
-    /**
-     * Test Trap database
-     * @param boolean $test
-     * @throws DBException on error.
-     * @return \Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function testGetDb()
-    {       
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+	/**
+	 * Test Trap database
+	 * @param boolean $test
+	 * @throws DBException on error.
+	 * @return \Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function testGetDb()
+	{       
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-                throw new DBException(array(1,''));
-        }
+		if ( ! $dbresource )
+		{
+				throw new DBException(array(1,''));
+		}
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
-        return;
-    }
+		$this->trapDB = $this->getDbByName($dbresource,true,true);       
+		return;
+	}
     
 
-    /**
-     * Get IDO Database
-     * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
-     */
-    public function getIdoDb()
-    {
-        if ( $this->idoDB != null ) return $this->idoDB;
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database
+	 * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
+	 */
+	public function getIdoDb()
+	{
+		if ( $this->idoDB != null ) return $this->idoDB;
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
-            return null;
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
+		}
 
-        $this->idoDB = $dbconn;
-        return $this->idoDB;
-    }
+		$this->idoDB = $dbconn;
+		return $this->idoDB;
+	}
 
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getIdoDbConn()
-    {
-        if ($this->getIdoDb() == null) return null;
-        return $this->getIdoDb()->getConnection();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getIdoDbConn()
+	{
+		if ($this->getIdoDb() == null) return null;
+		return $this->getIdoDb()->getConnection();
+	}
     
-    /**
-     * Get IDO Database
-     * @param boolean $test
-     * @throws DBException on error
-     */
-    public function testGetIdoDb()
-    {
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database
+	 * @param boolean $test
+	 * @throws DBException on error
+	 */
+	public function testGetIdoDb()
+	{
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            throw new DBException(array(1,'No database in config.ini'));
-        }
+		if ( ! $dbresource )
+		{
+			throw new DBException(array(1,'No database in config.ini'));
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+		}
                
-        try
-        {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
-            $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
-            {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
-            }
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
-        }
+		try
+		{
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+			}
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+		}
         
-        return;
-    }
+		return;
+	}
     
 }

Braces +18 added lines, -16 removed lines

@@ -126,8 +126,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -152,8 +151,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -167,8 +165,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -195,7 +192,9 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ( $this->trapDB != null ) {
+        	return $this->trapDB;
+        }
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
@@ -223,7 +222,9 @@ 
      */
     public function getDbConn()
     {
-        if ($this->getDb() == null) return null;
+        if ($this->getDb() == null) {
+        	return null;
+        }
         return $this->getDb()->getDbAdapter();
 //        return $this->getDb()->getConnection();
     }
@@ -254,7 +255,9 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ( $this->idoDB != null ) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
@@ -267,8 +270,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -285,7 +287,9 @@ 
      */
     public function getIdoDbConn()
     {
-        if ($this->getIdoDb() == null) return null;
+        if ($this->getIdoDb() == null) {
+        	return null;
+        }
         return $this->getIdoDb()->getConnection();
     }
     
@@ -307,8 +311,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -322,8 +325,7 @@ 
             {
                 throw new DBException( array(4,"$dbresource does not look like an IDO database"));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
         }

library/Trapdirector/Icinga2API.php

Indentation +265 added lines, -265 removed lines

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

Spacing +58 added lines, -58 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);
     }
     /**
 
@@ -32,17 +32,17 @@ 
      */
     public function getHostByFilter(string $hostfilter)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'host',
             $hostfilter,
             //'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
-            array('__name','name','display_name','address','address6')
+            array('__name', 'name', 'display_name', 'address', 'address6')
             );
-        foreach ( array_keys($hosts) as $key )
+        foreach (array_keys($hosts) as $key)
         {
-            $hosts[$key]->id = $hosts[$key]->__name;
-            $hosts[$key]->ip4 = $hosts[$key]->address;
-            $hosts[$key]->ip6 = $hosts[$key]->address6;
+            $hosts[$key]->id=$hosts[$key]->__name;
+            $hosts[$key]->ip4=$hosts[$key]->address;
+            $hosts[$key]->ip6=$hosts[$key]->address6;
         }
         return $hosts;
     }
@@ -55,7 +55,7 @@ 
      */
     public function getHostByIP(string $ip) 
     {
-        return $this->getHostByFilter('match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6)');
+        return $this->getHostByFilter('match("*'.$ip.'*",host.address) || match("*'.$ip.'*",host.address6)');
     }
 
     
@@ -66,7 +66,7 @@ 
      */
     public function getHostByName(string $name)
     {
-        return $this->getHostByFilter('match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name)');
+        return $this->getHostByFilter('match("*'.$name.'*",host.name) || match("*'.$name.'*",host.display_name)');
     }
 
     /**
@@ -77,13 +77,13 @@ 
     public function getHostByNameOrIP(string $name)
     {
         return $this->getHostByFilter( 
-            'match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name) || match("*' . $name . '*",host.address) || match("*' . $name . '*",host.address6)');
+            'match("*'.$name.'*",host.name) || match("*'.$name.'*",host.display_name) || match("*'.$name.'*",host.address) || match("*'.$name.'*",host.address6)');
     }
     
     public function getHostInfoByID(string $name)
     {
-        $host = $this->getHostByFilter(
-            'host.__name=="'. $name .'"');
+        $host=$this->getHostByFilter(
+            'host.__name=="'.$name.'"');
         if (isset($host[0]))
             return $host[0];
         else
@@ -100,8 +100,8 @@ 
     {        
         return $this->standardQuery(
             'host', 
-            '"' . $hostGroup . '" in host.groups',
-            array('address','address6','name')
+            '"'.$hostGroup.'" in host.groups',
+            array('address', 'address6', 'name')
                 
         );
     }
@@ -115,26 +115,26 @@ 
      *  @param bool $passive_svc
      *	@return array display_name (of service), service_object_id
      */
-    public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
+    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';
         }
-        $services =  $this->standardQuery(
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active')
+            array('__name', 'name', 'display_name', 'active')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;
@@ -152,27 +152,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 ,'__name' => $service->__name,'display_name' => $service->display_name);
+                        array('num'=> 1, '__name' => $service->__name, 'display_name' => $service->display_name);
                 }
                 else
                 {
@@ -185,7 +185,7 @@ 
         {
             if ($values['num'] >= $hostNum)
             {
-                array_push($commonServices,array($key,$values['display_name']));
+                array_push($commonServices, array($key, $values['display_name']));
             }
         }
         return $commonServices;
@@ -199,15 +199,15 @@ 
      */
     public function getHostGroupByName($name)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'hostgroup',
-            'match("*' . $name . '*",hostgroup.name)',
-            array('__name','name','display_name')
+            'match("*'.$name.'*",hostgroup.name)',
+            array('__name', 'name', 'display_name')
             
             );
-        foreach ( array_keys($hosts) as $key )
+        foreach (array_keys($hosts) as $key)
         {
-            $hosts[$key]->id = $hosts[$key]->__name;
+            $hosts[$key]->id=$hosts[$key]->__name;
         }
         return $hosts;
     }
@@ -220,13 +220,13 @@ 
      */
     public function getHostGroupById($name)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'hostgroup',
-            'hostgroup.__name=="'. $name .'"',
-            array('__name','name','display_name')
+            'hostgroup.__name=="'.$name.'"',
+            array('__name', 'name', 'display_name')
             
             );
-        $hosts[0]->id = $hosts[0]->__name;
+        $hosts[0]->id=$hosts[0]->__name;
         return $hosts[0];
     }
     
@@ -239,26 +239,26 @@ 
      *  @param bool $passive_svc : if true, return only service accepting passive checks
      *	@return array  service id
      */
-    public function getServiceIDByName($hostname,$name,bool $active = TRUE, bool $passive_svc = TRUE)
+    public function getServiceIDByName($hostname, $name, bool $active=TRUE, bool $passive_svc=TRUE)
     {
-        $filter = 'service.__name=="' . $hostname . '!'. $name .'"';
+        $filter='service.__name=="'.$hostname.'!'.$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';
         }
-        $services =  $this->standardQuery(
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
+            array('__name', 'name', 'display_name', 'active', 'enable_passive_checks')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;
@@ -271,16 +271,16 @@ 
      */
     public function getServiceById($name)
     {
-        $filter = 'service.__name=="' .  $name .'"';
-        $services =  $this->standardQuery(
+        $filter='service.__name=="'.$name.'"';
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
+            array('__name', 'name', 'display_name', 'active', 'enable_passive_checks')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;
@@ -293,16 +293,16 @@ 
      */
     public function getNOKService()
     {
-        $filter = 'service.state != ServiceOK && !(service.acknowledgement || service.downtime_depth || service.host.downtime_depth)';
-        $services =  $this->standardQuery(
+        $filter='service.state != ServiceOK && !(service.acknowledgement || service.downtime_depth || service.host.downtime_depth)';
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','last_check','host_name','state')
+            array('__name', 'name', 'last_check', 'host_name', 'state')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;

library/Trapdirector/TrapsProcess/MibDatabase.php

Indentation +154 added lines, -154 removed lines

@@ -12,184 +12,184 @@
  */
 trait MibDatabase
 {   
-    /** @var array $oidDesc MUST be overide by calling class */
-    //protected $oidDesc;
+	/** @var array $oidDesc MUST be overide by calling class */
+	//protected $oidDesc;
     
-    /** @var array $dbOidIndex MUST be overide by calling class */
-    //protected $dbOidIndex;
+	/** @var array $dbOidIndex MUST be overide by calling class */
+	//protected $dbOidIndex;
     
-    /** @return \Trapdirector\Logging */
-    abstract public function getLogging();
+	/** @return \Trapdirector\Logging */
+	abstract public function getLogging();
     
-    /** @return \Trapdirector\Database */
-    abstract public function getTrapsDB();
+	/** @return \Trapdirector\Database */
+	abstract public function getTrapsDB();
 
     
-    /**
-     * Update or add an OID to database uses $this->dbOidIndex for mem cache
-     * and $this->oidDesc doe data
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    public function update_oid()
-    {
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Quote description.
-        $this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
+	/**
+	 * Update or add an OID to database uses $this->dbOidIndex for mem cache
+	 * and $this->oidDesc doe data
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	public function update_oid()
+	{
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Quote description.
+		$this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
         
-        if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
-        { // oid exists in db, so update
-            return $this->update_oid_update();
-        }
-        // create new OID.
-        return $this->update_oid_create();
+		if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
+		{ // oid exists in db, so update
+			return $this->update_oid_update();
+		}
+		// create new OID.
+		return $this->update_oid_create();
         
-    }
+	}
     
-    /**
-     * Update object in DB with object in dbOidIndex if name/mib/type has changed.
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_update()
-    {
+	/**
+	 * Update object in DB with object in dbOidIndex if name/mib/type has changed.
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_update()
+	{
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
         
-        if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
-        { // newly created.
-            return 0;
-        }
-        $oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
-        $dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
-        if ( $this->oidDesc['name'] != $dbOid['name'] ||
-            $this->oidDesc['mib'] != $dbOid['mib'] ||
-            $this->oidDesc['type'] !=$dbOid['type']
-            )
-        { // Do update
-            $sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
-                'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
-                ', syntax = :syntax, type_enum = :type_enum, description = :description '.
-                ' WHERE id= :id';
-            $sqlQuery=$db_conn->prepare($sql);
+		if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
+		{ // newly created.
+			return 0;
+		}
+		$oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
+		$dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
+		if ( $this->oidDesc['name'] != $dbOid['name'] ||
+			$this->oidDesc['mib'] != $dbOid['mib'] ||
+			$this->oidDesc['type'] !=$dbOid['type']
+			)
+		{ // Do update
+			$sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
+				'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
+				', syntax = :syntax, type_enum = :type_enum, description = :description '.
+				' WHERE id= :id';
+			$sqlQuery=$db_conn->prepare($sql);
             
-            $sqlParam=array(
-                ':name' => $this->oidDesc['name'],
-                ':type' => $this->oidDesc['type'],
-                ':mib' => $this->oidDesc['mib'],
-                ':tc' =>  $this->oidDesc['textconv']??'null',
-                ':display_hint' => $this->oidDesc['dispHint']??'null' ,
-                ':syntax' => $this->oidDesc['syntax']==null??'null',
-                ':type_enum' => $this->oidDesc['type_enum']??'null',
-                ':description' => $this->oidDesc['description']??'null',
-                ':id' => $this->dbOidIndex[$this->oidDesc['oid']]['id']
+			$sqlParam=array(
+				':name' => $this->oidDesc['name'],
+				':type' => $this->oidDesc['type'],
+				':mib' => $this->oidDesc['mib'],
+				':tc' =>  $this->oidDesc['textconv']??'null',
+				':display_hint' => $this->oidDesc['dispHint']??'null' ,
+				':syntax' => $this->oidDesc['syntax']==null??'null',
+				':type_enum' => $this->oidDesc['type_enum']??'null',
+				':description' => $this->oidDesc['description']??'null',
+				':id' => $this->dbOidIndex[$this->oidDesc['oid']]['id']
 //                ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
-            );
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
-            }
-            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 1;
-        }
-        else
-        {
-            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 0;
-        }
-    }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
+			}
+			$this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 1;
+		}
+		else
+		{
+			$this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 0;
+		}
+	}
 
-    /**
-     * Create object in DB with object in dbOidIndex
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_create()
-    {
-        // Insert data
+	/**
+	 * Create object in DB with object in dbOidIndex
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_create()
+	{
+		// Insert data
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        $sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
-            '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
-            'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-            ', :syntax, :type_enum, :description )';
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		$sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
+			'(oid, name, type , mib, textual_convention, display_hint '.
+			', syntax, type_enum , description ) ' .
+			'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
         
-        $sqlQuery=$db_conn->prepare($sql);
+		$sqlQuery=$db_conn->prepare($sql);
         
-        $sqlParam=array(
-            ':oid' => $this->oidDesc['oid'],
-            ':name' => $this->oidDesc['name'],
-            ':type' => $this->oidDesc['type'],
-            ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  $this->oidDesc['textconv']??'null',
-            ':display_hint' => $this->oidDesc['dispHint']??'null',
-            ':syntax' => $this->oidDesc['syntax']??'null',
-            ':type_enum' => $this->oidDesc['type_enum']??'null',
-            ':description' => $this->oidDesc['description']??'null'
-        );
+		$sqlParam=array(
+			':oid' => $this->oidDesc['oid'],
+			':name' => $this->oidDesc['name'],
+			':type' => $this->oidDesc['type'],
+			':mib' => $this->oidDesc['mib'],
+			':tc' =>  $this->oidDesc['textconv']??'null',
+			':display_hint' => $this->oidDesc['dispHint']??'null',
+			':syntax' => $this->oidDesc['syntax']??'null',
+			':type_enum' => $this->oidDesc['type_enum']??'null',
+			':description' => $this->oidDesc['description']??'null'
+		);
         
-        if ($sqlQuery->execute($sqlParam) === false) {
-            $this->getLogging()->log('Error in query : ' . $sql,1,'');
-        }
+		if ($sqlQuery->execute($sqlParam) === false) {
+			$this->getLogging()->log('Error in query : ' . $sql,1,'');
+		}
         
-        switch ($this->getTrapsDB()->trapDBType)
-        {
-            case 'pgsql':
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->getLogging()->log('Error getting id - pgsql - ',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
-                    return 0;
-                }
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
-                    return 0;
-                }
+		switch ($this->getTrapsDB()->trapDBType)
+		{
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
+					$this->getLogging()->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
+					return 0;
+				}
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
+					return 0;
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
-                break;
-            default:
-                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
-                return 0;
-        }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
+				break;
+			default:
+				$this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
+				return 0;
+		}
         
-        // Set as newly created.
-        $this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
-        return 2;
-    }
+		// Set as newly created.
+		$this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
+		return 2;
+	}
 
-    /**
-     * get all objects for a trap.
-     * @param integer $trapId
-     * @return array : array of cached objects
-     */
-    private function cache_db_objects($trapId)
-    {
-        $dbObjects=array(); // cache of objects for trap in db
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Get all objects
-        $sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->getLogging()->log('No result in query : ' . $sql,1,'');
-        }
-        $dbObjectsRaw=$ret_code->fetchAll();
+	/**
+	 * get all objects for a trap.
+	 * @param integer $trapId
+	 * @return array : array of cached objects
+	 */
+	private function cache_db_objects($trapId)
+	{
+		$dbObjects=array(); // cache of objects for trap in db
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Get all objects
+		$sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+		$this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->getLogging()->log('No result in query : ' . $sql,1,'');
+		}
+		$dbObjectsRaw=$ret_code->fetchAll();
         
-        foreach ($dbObjectsRaw as $val)
-        {
-            $dbObjects[$val['object_id']]=1;
-        }
-        return $dbObjects;
-    }
+		foreach ($dbObjectsRaw as $val)
+		{
+			$dbObjects[$val['object_id']]=1;
+		}
+		return $dbObjects;
+	}
     
 
 }

Spacing +26 added lines, -26 removed lines

@@ -60,9 +60,9 @@ 
         }
         $oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
         $dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
-        if ( $this->oidDesc['name'] != $dbOid['name'] ||
+        if ($this->oidDesc['name'] != $dbOid['name'] ||
             $this->oidDesc['mib'] != $dbOid['mib'] ||
-            $this->oidDesc['type'] !=$dbOid['type']
+            $this->oidDesc['type'] != $dbOid['type']
             )
         { // Do update
             $sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
@@ -75,24 +75,24 @@ 
                 ':name' => $this->oidDesc['name'],
                 ':type' => $this->oidDesc['type'],
                 ':mib' => $this->oidDesc['mib'],
-                ':tc' =>  $this->oidDesc['textconv']??'null',
-                ':display_hint' => $this->oidDesc['dispHint']??'null' ,
-                ':syntax' => $this->oidDesc['syntax']==null??'null',
-                ':type_enum' => $this->oidDesc['type_enum']??'null',
-                ':description' => $this->oidDesc['description']??'null',
+                ':tc' =>  $this->oidDesc['textconv'] ?? 'null',
+                ':display_hint' => $this->oidDesc['dispHint'] ?? 'null',
+                ':syntax' => $this->oidDesc['syntax'] == null ?? 'null',
+                ':type_enum' => $this->oidDesc['type_enum'] ?? 'null',
+                ':description' => $this->oidDesc['description'] ?? 'null',
                 ':id' => $this->dbOidIndex[$this->oidDesc['oid']]['id']
 //                ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
+                $this->getLogging()->log('Error in query : '.$sql, ERROR, '');
             }
-            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
             return 1;
         }
         else
         {
-            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
             return 0;
         }
     }
@@ -108,11 +108,11 @@ 
         $db_conn=$this->getTrapsDB()->db_connect_trap();
         $sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
             '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
+            ', syntax, type_enum , description ) '.
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql.='RETURNING id';
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -121,15 +121,15 @@ 
             ':name' => $this->oidDesc['name'],
             ':type' => $this->oidDesc['type'],
             ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  $this->oidDesc['textconv']??'null',
-            ':display_hint' => $this->oidDesc['dispHint']??'null',
-            ':syntax' => $this->oidDesc['syntax']??'null',
-            ':type_enum' => $this->oidDesc['type_enum']??'null',
-            ':description' => $this->oidDesc['description']??'null'
+            ':tc' =>  $this->oidDesc['textconv'] ?? 'null',
+            ':display_hint' => $this->oidDesc['dispHint'] ?? 'null',
+            ':syntax' => $this->oidDesc['syntax'] ?? 'null',
+            ':type_enum' => $this->oidDesc['type_enum'] ?? 'null',
+            ':description' => $this->oidDesc['description'] ?? 'null'
         );
         
         if ($sqlQuery->execute($sqlParam) === false) {
-            $this->getLogging()->log('Error in query : ' . $sql,1,'');
+            $this->getLogging()->log('Error in query : '.$sql, 1, '');
         }
         
         switch ($this->getTrapsDB()->trapDBType)
@@ -137,10 +137,10 @@ 
             case 'pgsql':
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->getLogging()->log('Error getting id - pgsql - ',1,'');
+                    $this->getLogging()->log('Error getting id - pgsql - ', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->getLogging()->log('Error getting id - pgsql - empty.', ERROR);
                     return 0;
                 }
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
@@ -149,16 +149,16 @@ 
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
+                    $this->getLogging()->log('Erreur getting id - mysql - ', ERROR);
                     return 0;
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
                 break;
             default:
-                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
+                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType, ERROR);
                 return 0;
         }
         
@@ -178,9 +178,9 @@ 
         $db_conn=$this->getTrapsDB()->db_connect_trap();
         // Get all objects
         $sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
+        $this->getLogging()->log('SQL query get all traps: '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->getLogging()->log('No result in query : ' . $sql,1,'');
+            $this->getLogging()->log('No result in query : '.$sql, 1, '');
         }
         $dbObjectsRaw=$ret_code->fetchAll();
         

library/Trapdirector/TrapsProcess/TrapConfig.php

Indentation +186 added lines, -186 removed lines

@@ -15,197 +15,197 @@
 trait TrapConfig
 {
 
-    /** @return \Trapdirector\Logging   */
-    abstract public function getLogging();
-    /** @return \Trapdirector\TrapApi   */
-    abstract public function getTrapApi();
+	/** @return \Trapdirector\Logging   */
+	abstract public function getLogging();
+	/** @return \Trapdirector\TrapApi   */
+	abstract public function getTrapApi();
 
-    // TODO : Get default values from TrapModuleConfig 
-    /** @var bool	Use SnmpTrapAddess as source adress */
-    public $useSnmpTrapAddess=TRUE;
-    /** @var string	Special OID to get IP source address of trap emitter */
-    public $snmpTrapAddressOID='.1.3.6.1.6.3.18.1.3';
+	// TODO : Get default values from TrapModuleConfig 
+	/** @var bool	Use SnmpTrapAddess as source adress */
+	public $useSnmpTrapAddess=TRUE;
+	/** @var string	Special OID to get IP source address of trap emitter */
+	public $snmpTrapAddressOID='.1.3.6.1.6.3.18.1.3';
     
-    /**
-     * Get option from array of ini file, send message if empty
-     * @param string $option_array Array of ini file
-     * @param string $option_category category in ini file
-     * @param string $option_name name of option in category
-     * @param mixed $option_var variable to fill if found, left untouched if not found
-     * @param integer $log_level default 2 (warning)
-     * @param string $message warning message if not found
-     * @return boolean true if found, or false
-     */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
-    {
-        if (!isset($option_array[$option_category][$option_name]))
-        {
-            if ($message === null)
-            {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
-            }
-            $this->getLogging()->log($message,$log_level);
-            return false;
-        }
-        else
-        {
-            $option_var=$option_array[$option_category][$option_name];
-            return true;
-        }
-    }
+	/**
+	 * Get option from array of ini file, send message if empty
+	 * @param string $option_array Array of ini file
+	 * @param string $option_category category in ini file
+	 * @param string $option_name name of option in category
+	 * @param mixed $option_var variable to fill if found, left untouched if not found
+	 * @param integer $log_level default 2 (warning)
+	 * @param string $message warning message if not found
+	 * @return boolean true if found, or false
+	 */
+	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
+	{
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+			}
+			$this->getLogging()->log($message,$log_level);
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
+	}
 
-    /**
-     * Get options in database
-     */
-    protected function getDatabaseOptions()
-    {
-        // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
-        {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
-        }
-        
-        $tmpVal = -1; // Get boolean coded in database as 1/0
-        $this->getDBConfigIfSet('use_SnmpTrapAddess', $tmpVal);
-        if ($tmpVal != -1) $this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
-        
-        $this->getDBConfigIfSet('SnmpTrapAddess_oid', $this->snmpTrapAddressOID); // Get oid then replace '.' with '\.' to use in regexp whrn reading traps
-        $this->snmpTrapAddressOID = preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
-    }
-        
-    /** Set $variable to value if $element found in database config table
-     * @param string $element
-     * @param string $variable
-     */
-    protected function getDBConfigIfSet($element,&$variable)
-    {
-        $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
-    }
+	/**
+	 * Get options in database
+	 */
+	protected function getDatabaseOptions()
+	{
+		// Database options
+		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		{
+			$this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+		}
+        
+		$tmpVal = -1; // Get boolean coded in database as 1/0
+		$this->getDBConfigIfSet('use_SnmpTrapAddess', $tmpVal);
+		if ($tmpVal != -1) $this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        
+		$this->getDBConfigIfSet('SnmpTrapAddess_oid', $this->snmpTrapAddressOID); // Get oid then replace '.' with '\.' to use in regexp whrn reading traps
+		$this->snmpTrapAddressOID = preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
+	}
+        
+	/** Set $variable to value if $element found in database config table
+	 * @param string $element
+	 * @param string $variable
+	 */
+	protected function getDBConfigIfSet($element,&$variable)
+	{
+		$value=$this->getDBConfig($element);
+		if ($value != null) $variable=$value;
+	}
     
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    protected function getDBConfig($element)  // TODO : put this in DB class
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	protected function getDBConfig($element)  // TODO : put this in DB class
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
     
-    /**
-     * Get options from ini file
-     * @param array $trap_config : ini file array
-     */
-    protected function getMainOptions($trapConfig)
-    {
-        
-        $nodeStatus='';
-        $this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
-        if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
-        {
-            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
-            $this->getTrapApi()->setStatusMaster();
-        }
-        else 
-        {
-            if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
-            {
-                // Get options to connect to API
-                $IP = $port = $user =  $pass = null;
-                $this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
-                $this->getTrapApi()->setParams($IP, $port, $user, $pass);
-                return;
-            }
-        }
-        
-        // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
-        
-        // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
-        
-        // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
-        
-        // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
-        
-        // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
-        {
-            $this->apiUse=true;
-            // Get API options or throw exception as not configured correctly
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
-        }
-    }
+	/**
+	 * Get options from ini file
+	 * @param array $trap_config : ini file array
+	 */
+	protected function getMainOptions($trapConfig)
+	{
+        
+		$nodeStatus='';
+		$this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
+		if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
+		{
+			$this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
+			$this->getTrapApi()->setStatusMaster();
+		}
+		else 
+		{
+			if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
+			{
+				// Get options to connect to API
+				$IP = $port = $user =  $pass = null;
+				$this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
+				$this->getTrapApi()->setParams($IP, $port, $user, $pass);
+				return;
+			}
+		}
+        
+		// Snmptranslate binary path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        
+		// mibs path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        
+		// icinga2cmd path
+		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        
+		// table prefix
+		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        
+		// API options
+		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+		{
+			$this->apiUse=true;
+			// Get API options or throw exception as not configured correctly
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
+		}
+	}
     
-    /**
-     * Create and setup database class for trap & ido (if no api) db
-     * @param array $trap_config : ini file array
-     */
-    protected function setupDatabase($trapConfig)
-    {
-        // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
-        
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        if (!array_key_exists($dbTrapName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
-        
-        $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
-        
-        //TODO enable this again when API queries are all done :
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
-        
-        // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-        {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
-        }
-        $dbIdoName=$trapConfig['config']['IDOdatabase'];
-        
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
-    }
+	/**
+	 * Create and setup database class for trap & ido (if no api) db
+	 * @param array $trap_config : ini file array
+	 */
+	protected function setupDatabase($trapConfig)
+	{
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        
+		if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        
+		$this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
+        
+		//TODO enable this again when API queries are all done :
+		if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+        
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];
+        
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+	}
     
 }

Spacing +40 added lines, -40 removed lines

@@ -36,15 +36,15 @@ 
      * @param string $message warning message if not found
      * @return boolean true if found, or false
      */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
+    protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=WARN, $message=null)
     {
         if (!isset($option_array[$option_category][$option_name]))
         {
             if ($message === null)
             {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+                $message='No '.$option_name.' in config file: '.$this->trapModuleConfig;
             }
-            $this->getLogging()->log($message,$log_level);
+            $this->getLogging()->log($message, $log_level);
             return false;
         }
         else
@@ -62,24 +62,24 @@ 
         // Database options
         if ($this->logSetup === false) // Only if logging was no setup in constructor
         {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+            $this->getDBConfigIfSet('log_level', $this->getLogging()->debugLevel);
+            $this->getDBConfigIfSet('log_destination', $this->getLogging()->outputMode);
+            $this->getDBConfigIfSet('log_file', $this->getLogging()->outputFile);
         }
         
-        $tmpVal = -1; // Get boolean coded in database as 1/0
+        $tmpVal=-1; // Get boolean coded in database as 1/0
         $this->getDBConfigIfSet('use_SnmpTrapAddess', $tmpVal);
-        if ($tmpVal != -1) $this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        if ($tmpVal != -1) $this->useSnmpTrapAddess=($tmpVal == 1) ? TRUE : FALSE;
         
         $this->getDBConfigIfSet('SnmpTrapAddess_oid', $this->snmpTrapAddressOID); // Get oid then replace '.' with '\.' to use in regexp whrn reading traps
-        $this->snmpTrapAddressOID = preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
+        $this->snmpTrapAddressOID=preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
     }
         
     /** Set $variable to value if $element found in database config table
      * @param string $element
      * @param string $variable
      */
-    protected function getDBConfigIfSet($element,&$variable)
+    protected function getDBConfigIfSet($element, &$variable)
     {
         $value=$this->getDBConfig($element);
         if ($value != null) $variable=$value;
@@ -95,7 +95,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -114,10 +114,10 @@ 
     {
         
         $nodeStatus='';
-        $this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
+        $this->getOptionIfSet($trapConfig, 'config', 'node', $nodeStatus);
         if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
         {
-            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
+            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER', WARN);
             $this->getTrapApi()->setStatusMaster();
         }
         else 
@@ -125,36 +125,36 @@ 
             if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
             {
                 // Get options to connect to API
-                $IP = $port = $user =  $pass = null;
-                $this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
+                $IP=$port=$user=$pass=null;
+                $this->getOptionIfSet($trapConfig, 'config', 'masterIP', $IP, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterPort', $port, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterUser', $user, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterPass', $pass, ERROR);
                 $this->getTrapApi()->setParams($IP, $port, $user, $pass);
                 return;
             }
         }
         
         // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
         
         // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
         
         // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        $this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
         
         // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        $this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->dbPrefix);
         
         // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+        if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->apiHostname))
         {
             $this->apiUse=true;
             // Get API options or throw exception as not configured correctly
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->apiPort, ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->apiUsername, ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->apiPassword, ERROR);
         }
     }
     
@@ -165,43 +165,43 @@ 
     protected function setupDatabase($trapConfig)
     {
         // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
+        if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trapModuleConfig, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+        if (($dbConfig=parse_ini_file($this->icingaweb2Ressources, true)) === false)
         {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
-        if (!array_key_exists($dbTrapName,$dbConfig))
+        if (!array_key_exists($dbTrapName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->dbPrefix);
         
-        $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
+        $this->logging->log("API Use : ".print_r($this->apiUse, true), DEBUG);
         
         //TODO enable this again when API queries are all done :
         if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
         
         // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+        if (!array_key_exists('IDOdatabase', $trapConfig['config']))
         {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig, ERROR, '');
         }
         $dbIdoName=$trapConfig['config']['IDOdatabase'];
         
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+        $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         

Braces +15 added lines, -8 removed lines

@@ -46,8 +46,7 @@ 
             }
             $this->getLogging()->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -60,16 +59,20 @@ 
     protected function getDatabaseOptions()
     {
         // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
+        if ($this->logSetup === false) {
+        	// Only if logging was no setup in constructor
         {
             $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
             $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
         }
         
         $tmpVal = -1; // Get boolean coded in database as 1/0
         $this->getDBConfigIfSet('use_SnmpTrapAddess', $tmpVal);
-        if ($tmpVal != -1) $this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        if ($tmpVal != -1) {
+        	$this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        }
         
         $this->getDBConfigIfSet('SnmpTrapAddess_oid', $this->snmpTrapAddressOID); // Get oid then replace '.' with '\.' to use in regexp whrn reading traps
         $this->snmpTrapAddressOID = preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
@@ -82,7 +85,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
+        if ($value != null) {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -119,8 +124,7 @@ 
         {
             $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
             $this->getTrapApi()->setStatusMaster();
-        }
-        else 
+        } else 
         {
             if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
             {
@@ -189,7 +193,10 @@ 
         $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
         
         //TODO enable this again when API queries are all done :
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+        if ($this->apiUse === true) {
+        	return;
+        }
+        // In case of API use, no IDO is necessary
         
         // IDO Database
         if (!array_key_exists('IDOdatabase',$trapConfig['config']))