patrickpr / trapdirector

application/controllers/HelperController.php

Braces +16 added lines, -32 removed lines

@@ -65,8 +65,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -77,8 +76,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -114,8 +112,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -146,8 +143,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -169,8 +165,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -185,8 +180,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -209,8 +203,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -244,8 +237,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -263,8 +255,7 @@ 
 				$trap = new Trap($icingaweb2_etc);
 				$trap->setLogging($debug_level,'syslog');
 				$trap->eraseOldTraps($days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
 				return;
@@ -301,14 +292,12 @@ 
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			    return;
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 				return;
@@ -322,8 +311,7 @@ 
 			$this->setDBConfigValue('log_destination',$destination);
 			$this->setDBConfigValue('log_file',$file);
 			$this->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -359,8 +347,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;
@@ -393,8 +380,7 @@ 
             $action=($action == 'enable') ? true : false;
             $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
             return;
@@ -402,8 +388,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -434,8 +419,7 @@ 
 	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
 	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
 	        return;

Indentation +124 added lines, -124 removed lines

@@ -12,8 +12,8 @@ 
 {
 	
 	/** Get host list with filter (IP or name) : host=<filter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -32,8 +32,8 @@ 
 	}
 	
 	/** Get hostgroup list with filter (name) : hostgroup=<hostFilter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostgroupsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -52,11 +52,11 @@ 
 	}
 	
 	/** Get service list by host name ( host=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		hostid = host object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		hostid = host object id or -1 if not found.
+	 */
 	public function getservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -98,11 +98,11 @@ 
 	}
 	
 	/** Get service list by host group ( name=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		groupid = group object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		groupid = group object id or -1 if not found.
+	 */
 	public function gethostgroupservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -132,10 +132,10 @@ 
 	}
 
 	/** Get traps from mib  : entry : mib=<mib>
-	*	returns in JSON : 
-	*		status=>OK/No mib/Error getting mibs
-	*		traps=>array of array( oid -> name)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No mib/Error getting mibs
+	 *		traps=>array of array( oid -> name)
+	 */
 	public function gettrapsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -155,10 +155,10 @@ 
 	}	
 
 	/** Get trap objects from mib  : entry : trap=<oid>
-	*	returns in JSON : 
-	*		status=>OK/no trap/not found
-	*		objects=>array of array( oid -> name, oid->mib)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/no trap/not found
+	 *		objects=>array of array( oid -> name, oid->mib)
+	 */
 	public function gettrapobjectsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -178,8 +178,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -194,10 +194,10 @@ 
 	}
 	
 	/** Get MIB::Name from OID : entry : oid
-	*		status=>OK/No oid/not found
-	*		mib=>string
-	*		name=>string
-	*/	
+	 *		status=>OK/No oid/not found
+	 *		mib=>string
+	 *		name=>string
+	 */	
 	public function translateoidAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -218,7 +218,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -226,10 +226,10 @@ 
 	}
 	
 	/** Save or execute database purge of <n> days
-	*	days=>int 
-	*	action=>save/execute
-	*	return : status=>OK/Message error
-	*/
+	 *	days=>int 
+	 *	action=>save/execute
+	 *	return : status=>OK/Message error
+	 */
 	public function dbmaintenanceAction()
 	{
 		
@@ -275,11 +275,11 @@ 
 	}	
 
 	/** Save log output to db
-	*	destination=>log destination 
-	*	file=>file name
-	*	level => int 
-	*	return : status=>OK/Message error
-	*/
+	 *	destination=>log destination 
+	 *	file=>file name
+	 *	level => int 
+	 *	return : status=>OK/Message error
+	 */
 	public function logdestinationAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -298,8 +298,8 @@ 
 			$fileHandler=@fopen($file,'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
-			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
-			    return;
+				$this->_helper->json(array('status'=>'File not writable :  '.$file));
+				return;
 			}
 		}
 		else
@@ -341,33 +341,33 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+		$rule = $this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+		$action = $this->checkPostVar($postData, 'action', 'evaluate');
 
-	    if ($action == 'evaluate')
-	    {
-	        try
-	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
-	            // Cleanup spaces before eval
-	            $rule=$trap->ruleClass->eval_cleanup($rule);
-	            // Eval
-	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
-	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
-	            return;
-	        }
-	        $return=($rule==true)?'true':'false';
-	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
-	    }
+		if ($action == 'evaluate')
+		{
+			try
+			{
+				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+				$trap = new Trap($icingaweb2_etc);
+				// Cleanup spaces before eval
+				$rule=$trap->ruleClass->eval_cleanup($rule);
+				// Eval
+				$item=0;
+				$rule=$trap->ruleClass->evaluation($rule,$item);
+			}
+			catch (Exception $e)
+			{
+				$this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+				return;
+			}
+			$return=($rule==true)?'true':'false';
+			$this->_helper->json(array('status'=>'OK', 'message' => $return));
+		}
 	    
 	}	
 
@@ -378,35 +378,35 @@ 
 	 */
 	public function pluginAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+		$pluginName = $this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+		$action = $this->checkPostVar($postData, 'action', 'enable|disable');
 	    
-        try
-        {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
-            // Enable plugin.
-            $action=($action == 'enable') ? true : false;
-            $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2_etc);
+			// Enable plugin.
+			$action=($action == 'enable') ? true : false;
+			$retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
-        {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-            return;
-        }
-        if ($retVal === true)
-        {
-            $this->_helper->json(array('status'=>'OK'));
-        }
-        else
-        {
-            $this->_helper->json(array('status'=>'Error, see logs'));
-        }
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
+		if ($retVal === true)
+		{
+			$this->_helper->json(array('status'=>'OK'));
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'Error, see logs'));
+		}
 	}
 	
 	/** Function evaluation
@@ -416,49 +416,49 @@ 
 	 */
 	public function functionAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+		$functionString = $this->checkPostVar($postData, 'function', '.*');
 	    
-	    $this->checkPostVar($postData, 'action', 'evaluate');
+		$this->checkPostVar($postData, 'action', 'evaluate');
 	    
-	    // Only one action possible for now, no tests on action.
-	    try
-	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
-	        // load all plugins in case tested function is not enabled.
-	        $trap->pluginClass->registerAllPlugins(false);
-	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
-	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-	        return;
-	    }
+		// Only one action possible for now, no tests on action.
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2Etc);
+			// load all plugins in case tested function is not enabled.
+			$trap->pluginClass->registerAllPlugins(false);
+			// Clean all spaces
+			$functionString = $trap->ruleClass->eval_cleanup($functionString);
+			// Eval functions
+			$result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+		$result = ($result === true)?'True':'False';
+		$this->_helper->json(array('status'=>'OK','message' => $result));
 	}
 
-    /**************   Utilities **********************/
+	/**************   Utilities **********************/
 
 	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
 	{
-	    if (!isset ($postData[$postVar]))
-	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
-	        return '';
-	    }
-	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
-	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
-	        return '';
-	    }
-	    return $postData[$postVar];
+		if (!isset ($postData[$postVar]))
+		{
+			$this->_helper->json(array('status'=>'No ' . $postVar));
+			return '';
+		}
+		if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
+		{
+			$this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+			return '';
+		}
+		return $postData[$postVar];
 	}
 }

Spacing +60 added lines, -60 removed lines

@@ -18,14 +18,14 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostByIP($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -38,14 +38,14 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -68,31 +68,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -107,26 +107,26 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$host = $this->checkPostVar($postData, 'host', '.+');
+		$host=$this->checkPostVar($postData, 'host', '.+');
 		
 		$hostArray=$this->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -140,12 +140,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$mib = $this->checkPostVar($postData, 'mib', '.*');
+		$mib=$this->checkPostVar($postData, 'mib', '.*');
 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -163,12 +163,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$trap = $this->checkPostVar($postData, 'trap', '.*');
+		$trap=$this->checkPostVar($postData, 'trap', '.*');
 		
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -202,7 +202,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$oid = $this->checkPostVar($postData, 'oid', '.*');
+		$oid=$this->checkPostVar($postData, 'oid', '.*');
 		
 		// Try to get oid name from snmptranslate
 		if (($object=$this->getMIB()->translateOID($oid)) == null)
@@ -235,19 +235,19 @@ 
 		
 		$postData=$this->getRequest()->getPost();
 		
-		$days = $this->checkPostVar($postData, 'days', '^[0-9]+$');
+		$days=$this->checkPostVar($postData, 'days', '^[0-9]+$');
 
-		$action = $this->checkPostVar($postData, 'action', 'save|execute');
+		$action=$this->checkPostVar($postData, 'action', 'save|execute');
 		
 		if ($action == 'save')
 		{
 			try
 			{
-				$this->setDBConfigValue('db_remove_days',$days);
+				$this->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -257,16 +257,16 @@ 
 		{
 			try
 			{
-				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 				$debug_level=4;
-				$trap = new Trap($icingaweb2_etc);
-				$trap->setLogging($debug_level,'syslog');
+				$trap=new Trap($icingaweb2_etc);
+				$trap->setLogging($debug_level, 'syslog');
 				$trap->eraseOldTraps($days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage()));
 				return;
 			}			
 			$this->_helper->json(array('status'=>'OK'));
@@ -284,7 +284,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$destination = $this->checkPostVar($postData, 'destination', '.*');
+		$destination=$this->checkPostVar($postData, 'destination', '.*');
 		$logDest=$this->getModuleConfig()->getLogDestinations();
 		if (!isset($logDest[$destination]))
 		{
@@ -295,7 +295,7 @@ 
 		if (isset($postData['file']))
 		{ 
 			$file=$postData['file'];
-			$fileHandler=@fopen($file,'w');
+			$fileHandler=@fopen($file, 'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
@@ -315,17 +315,17 @@ 
 			}
 		}
 
-		$level = $this->checkPostVar($postData, 'level', '[0-9]');
+		$level=$this->checkPostVar($postData, 'level', '[0-9]');
 				
 		try
 		{
-			$this->setDBConfigValue('log_destination',$destination);
-			$this->setDBConfigValue('log_file',$file);
-			$this->setDBConfigValue('log_level',$level);
+			$this->setDBConfigValue('log_destination', $destination);
+			$this->setDBConfigValue('log_file', $file);
+			$this->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -343,29 +343,29 @@ 
 	    
 	    $postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+	    $rule=$this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+	    $action=$this->checkPostVar($postData, 'action', 'evaluate');
 
 	    if ($action == 'evaluate')
 	    {
 	        try
 	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
+	            $trap=new Trap($icingaweb2_etc);
 	            // Cleanup spaces before eval
 	            $rule=$trap->ruleClass->eval_cleanup($rule);
 	            // Eval
 	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
+	            $rule=$trap->ruleClass->evaluation($rule, $item);
 	        }
 	        catch (Exception $e)
 	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage()));
 	            return;
 	        }
-	        $return=($rule==true)?'true':'false';
+	        $return=($rule == true) ? 'true' : 'false';
 	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
 	    }
 	    
@@ -380,15 +380,15 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+	    $pluginName=$this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+	    $action=$this->checkPostVar($postData, 'action', 'enable|disable');
 	    
         try
         {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
             $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
+            $trap=new Trap($icingaweb2_etc);
             // Enable plugin.
             $action=($action == 'enable') ? true : false;
             $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
@@ -396,7 +396,7 @@ 
         }
         catch (Exception $e)
         {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
             return;
         }
         if ($retVal === true)
@@ -418,45 +418,45 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+	    $functionString=$this->checkPostVar($postData, 'function', '.*');
 	    
 	    $this->checkPostVar($postData, 'action', 'evaluate');
 	    
 	    // Only one action possible for now, no tests on action.
 	    try
 	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	        require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
+	        $trap=new Trap($icingaweb2Etc);
 	        // load all plugins in case tested function is not enabled.
 	        $trap->pluginClass->registerAllPlugins(false);
 	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
+	        $functionString=$trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+	        $result=$trap->pluginClass->evaluateFunctionString($functionString);	        
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
 	        return;
 	    }
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+        $result=($result === true) ? 'True' : 'False';
+        $this->_helper->json(array('status'=>'OK', 'message' => $result));
 	}
 
     /**************   Utilities **********************/
 
-	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
+	private function checkPostVar(array $postData, string $postVar, string $validRegexp) : string
 	{
 	    if (!isset ($postData[$postVar]))
 	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
+	        $this->_helper->json(array('status'=>'No '.$postVar));
 	        return '';
 	    }
 	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
 	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+	        $this->_helper->json(array('status'=>'Unknown '.$postVar.' value '.$postData[$postVar]));
 	        return '';
 	    }
 	    return $postData[$postVar];

library/Trapdirector/Plugins/NetworkRule.php

Indentation +83 added lines, -83 removed lines

@@ -21,104 +21,104 @@
  */
 class NetworkRule extends PluginTemplate
 {        
-    /** @var string $description Description of plugin */
-    public $description='Network functions to use into rules
+	/** @var string $description Description of plugin */
+	public $description='Network functions to use into rules
 test test test';
     
-    /** @var array[] $functions Functions of this plugin for rule eval. 
-     * If no functions are declared, set to empty array
-     * $functions[<name>]['function'] : Name of the function to be called in this class
-     * $functions[<name>]['params'] : Description of input parameters of function.
-     * $functions[<name>]['description'] : Description. Can be multiline.
-    */
-    public $functions=array(
-        'inNetwork' => array( // The name of the function in rules
-            'function'      =>  'isInNetwork', // Name of the function 
-            'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
-            'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
+	/** @var array[] $functions Functions of this plugin for rule eval. 
+	 * If no functions are declared, set to empty array
+	 * $functions[<name>]['function'] : Name of the function to be called in this class
+	 * $functions[<name>]['params'] : Description of input parameters of function.
+	 * $functions[<name>]['description'] : Description. Can be multiline.
+	 */
+	public $functions=array(
+		'inNetwork' => array( // The name of the function in rules
+			'function'      =>  'isInNetwork', // Name of the function 
+			'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
+			'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
 Does not work with IPV6' // Description (can be multiline).
-        ),
-        'test' => array( // The name of the function in rules
-            'function'      =>  'testParam', // Name of the function
-            'params'        =>  '<boolean to return as string>', // parameters description
-            'description'   =>  'Returns value passed as argument' // Description (can be multiline).
-        )
-    );
+		),
+		'test' => array( // The name of the function in rules
+			'function'      =>  'testParam', // Name of the function
+			'params'        =>  '<boolean to return as string>', // parameters description
+			'description'   =>  'Returns value passed as argument' // Description (can be multiline).
+		)
+	);
     
-    /** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
-    public $catchAllTraps=false;
+	/** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
+	public $catchAllTraps=false;
     
-    /** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
-    public $processTraps=false;
+	/** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
+	public $processTraps=false;
     
-    /**
-     * Constructor. Can throw exceptions on error, but no logging at this point.
-     * @throws \Exception
-     * @return \Trapdirector\Plugins\NetworkRule
-     */
-    function __construct()
-    {
-        $this->name=basename(__FILE__,'.php');
-        return $this;
-    }
+	/**
+	 * Constructor. Can throw exceptions on error, but no logging at this point.
+	 * @throws \Exception
+	 * @return \Trapdirector\Plugins\NetworkRule
+	 */
+	function __construct()
+	{
+		$this->name=basename(__FILE__,'.php');
+		return $this;
+	}
     
-    /**
-     * Function called by trapdirector if found in rules
-     * Parameters check has to be done in function.
-     * @param array $params Function parameters
-     * @throws Exception
-     * @return bool Evaluation 
-     */
-    public function isInNetwork(array $params) : bool
-    {
-        // Check param numbers and thrown exception if not correct.
-        if (count($params)!=3)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($params));
-        }
+	/**
+	 * Function called by trapdirector if found in rules
+	 * Parameters check has to be done in function.
+	 * @param array $params Function parameters
+	 * @throws Exception
+	 * @return bool Evaluation 
+	 */
+	public function isInNetwork(array $params) : bool
+	{
+		// Check param numbers and thrown exception if not correct.
+		if (count($params)!=3)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($params));
+		}
         
-        $ip = $params[0];
-        $net = $params[1];
-        $masq = $params[2];
+		$ip = $params[0];
+		$net = $params[1];
+		$masq = $params[2];
         
         
-        $this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
+		$this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
         
-        $ip2 = ip2long($ip);
-        $net2 = ip2long($net);
+		$ip2 = ip2long($ip);
+		$net2 = ip2long($net);
         
-        if ($ip2 === false )
-        {
-            $this->log('Invalid IP : #' . $ip.'#',WARN);
-            throw new Exception('Invalid IP');
-        }
-        if ($net2 === false)
-        {
-            $this->log('Invalid network',WARN);
-            throw new Exception('Invalid net');
-        }
-        if ($masq<1 || $masq > 32)
-        {
-            $this->log('Invalid masq',WARN);
-            throw new Exception('Invalid net masq');
-        }
-        // $range is in IP/CIDR format eg 127.0.0.1/24
+		if ($ip2 === false )
+		{
+			$this->log('Invalid IP : #' . $ip.'#',WARN);
+			throw new Exception('Invalid IP');
+		}
+		if ($net2 === false)
+		{
+			$this->log('Invalid network',WARN);
+			throw new Exception('Invalid net');
+		}
+		if ($masq<1 || $masq > 32)
+		{
+			$this->log('Invalid masq',WARN);
+			throw new Exception('Invalid net masq');
+		}
+		// $range is in IP/CIDR format eg 127.0.0.1/24
 
-        $masq = pow( 2, ( 32 - $masq ) ) - 1;
-        $masq = ~ $masq;
-        return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
+		$masq = pow( 2, ( 32 - $masq ) ) - 1;
+		$masq = ~ $masq;
+		return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
         
-    }
+	}
     
-    public function testParam(array $param)
-    {
-        if (count($param)!=1)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($param));
-        }
-        if ($param[0] == 'true') return true;
-        return false;
-    }
+	public function testParam(array $param)
+	{
+		if (count($param)!=1)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($param));
+		}
+		if ($param[0] == 'true') return true;
+		return false;
+	}
 }
 
 

Spacing +19 added lines, -19 removed lines

@@ -58,7 +58,7 @@ 
      */
     function __construct()
     {
-        $this->name=basename(__FILE__,'.php');
+        $this->name=basename(__FILE__, '.php');
         return $this;
     }
     
@@ -72,49 +72,49 @@ 
     public function isInNetwork(array $params) : bool
     {
         // Check param numbers and thrown exception if not correct.
-        if (count($params)!=3)
+        if (count($params) != 3)
         {
-            throw new Exception('Invalid number of parameters : ' . count($params));
+            throw new Exception('Invalid number of parameters : '.count($params));
         }
         
-        $ip = $params[0];
-        $net = $params[1];
-        $masq = $params[2];
+        $ip=$params[0];
+        $net=$params[1];
+        $masq=$params[2];
         
         
-        $this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
+        $this->log('#'.$ip.'# / #'.$net.'# / #'.$masq, DEBUG);
         
-        $ip2 = ip2long($ip);
-        $net2 = ip2long($net);
+        $ip2=ip2long($ip);
+        $net2=ip2long($net);
         
-        if ($ip2 === false )
+        if ($ip2 === false)
         {
-            $this->log('Invalid IP : #' . $ip.'#',WARN);
+            $this->log('Invalid IP : #'.$ip.'#', WARN);
             throw new Exception('Invalid IP');
         }
         if ($net2 === false)
         {
-            $this->log('Invalid network',WARN);
+            $this->log('Invalid network', WARN);
             throw new Exception('Invalid net');
         }
-        if ($masq<1 || $masq > 32)
+        if ($masq < 1 || $masq > 32)
         {
-            $this->log('Invalid masq',WARN);
+            $this->log('Invalid masq', WARN);
             throw new Exception('Invalid net masq');
         }
         // $range is in IP/CIDR format eg 127.0.0.1/24
 
-        $masq = pow( 2, ( 32 - $masq ) ) - 1;
-        $masq = ~ $masq;
-        return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
+        $masq=pow(2, (32 - $masq)) - 1;
+        $masq=~ $masq;
+        return (($ip2 & $masq) == ($net2 & $masq));
         
     }
     
     public function testParam(array $param)
     {
-        if (count($param)!=1)
+        if (count($param) != 1)
         {
-            throw new Exception('Invalid number of parameters : ' . count($param));
+            throw new Exception('Invalid number of parameters : '.count($param));
         }
         if ($param[0] == 'true') return true;
         return false;

Braces +3 added lines, -1 removed lines

@@ -116,7 +116,9 @@
         {
             throw new Exception('Invalid number of parameters : ' . count($param));
         }
-        if ($param[0] == 'true') return true;
+        if ($param[0] == 'true') {
+        	return true;
+        }
         return false;
     }
 }

library/Trapdirector/TrapsProcess/Rule.php

Indentation +342 added lines, -342 removed lines

@@ -7,396 +7,396 @@
 class Rule
 {
     
-    /** @var Logging $logging logging class*/
-    protected $logging;
+	/** @var Logging $logging logging class*/
+	protected $logging;
     
-    /** @var Trap $trapClass */
-    protected $trapClass;
+	/** @var Trap $trapClass */
+	protected $trapClass;
     
-    /**
-     * Setup Rule Class
-     * @param Trap $trapClass : To get logging class & plugin class
-     */
-    function __construct($trapClass)
-    {
-        $this->trapClass=$trapClass;
-        $this->logging=$trapClass->logging;
-    }
+	/**
+	 * Setup Rule Class
+	 * @param Trap $trapClass : To get logging class & plugin class
+	 */
+	function __construct($trapClass)
+	{
+		$this->trapClass=$trapClass;
+		$this->logging=$trapClass->logging;
+	}
 
 /**
  * Get full number 
  * @return array<number,string>
  */
-    private function get_number($rule,&$item)
-    {
-        $item2=$item+1;
-        while (
-            ($item2!=strlen($rule)) 
-            && (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
-        { 
-            $item2++ ;
-        }
-        $val=substr($rule,$item,$item2-$item);
-        $item=$item2;
-        //echo "number ".$val."\n";
+	private function get_number($rule,&$item)
+	{
+		$item2=$item+1;
+		while (
+			($item2!=strlen($rule)) 
+			&& (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
+		{ 
+			$item2++ ;
+		}
+		$val=substr($rule,$item,$item2-$item);
+		$item=$item2;
+		//echo "number ".$val."\n";
         
-        return array(0,$val);
-    }
+		return array(0,$val);
+	}
 
-    private function get_string($rule,&$item)
-    {
-        $item++;
-        $item2=$this->eval_getNext($rule,$item,'"');
-        $val=substr($rule,$item,$item2-$item-1);
-        $item=$item2;
-        //echo "string : ".$val."\n";
-        return array(1,$val);
+	private function get_string($rule,&$item)
+	{
+		$item++;
+		$item2=$this->eval_getNext($rule,$item,'"');
+		$val=substr($rule,$item,$item2-$item-1);
+		$item=$item2;
+		//echo "string : ".$val."\n";
+		return array(1,$val);
         
-    }
+	}
     
-    /**
-     * Parse elements inside () : jumps over "" and count parenthesis.
-     * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
-     * @param string $rule : the current rule
-     * @param int $item : actual position in rule
-     * @throws Exception
-     * @return string : everything inside parenthesis
-     */
-    private function parse_parenthesis(string $rule,int &$item) : string
-    {
-        $item++;
-        $start=$item;
-        $parenthesis_count=0;
-        while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
-        {
-            if ($rule[$item] == '"' )
-            { // pass through string
-                $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
-            }
-            else{
-                if ($rule[$item] == '(')
-                {
-                    $parenthesis_count++;
-                }
-                if ($rule[$item] == ')')
-                {
-                    $parenthesis_count--;
-                }
-                $item++;
-            }
-        }
+	/**
+	 * Parse elements inside () : jumps over "" and count parenthesis.
+	 * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
+	 * @param string $rule : the current rule
+	 * @param int $item : actual position in rule
+	 * @throws Exception
+	 * @return string : everything inside parenthesis
+	 */
+	private function parse_parenthesis(string $rule,int &$item) : string
+	{
+		$item++;
+		$start=$item;
+		$parenthesis_count=0;
+		while (($item < strlen($rule)) // Not end of string AND
+			&& ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+		{
+			if ($rule[$item] == '"' )
+			{ // pass through string
+				$item++;
+				$item=$this->eval_getNext($rule,$item,'"');
+			}
+			else{
+				if ($rule[$item] == '(')
+				{
+					$parenthesis_count++;
+				}
+				if ($rule[$item] == ')')
+				{
+					$parenthesis_count--;
+				}
+				$item++;
+			}
+		}
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
-        $item++;
-        return $val;
-    }
+		if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
+		$val=substr($rule,$start,$item-$start);
+		$item++;
+		return $val;
+	}
 
     
-    /**
-     * Get and eval a grouped condition - ex : (1==1)
-     * @param string $rule
-     * @param int $item
-     * @return array
-     */
-    private function get_group(string $rule,int &$item) : array
-    {
-        // gets eveything inside parenthesis
-        $val=$this->parse_parenthesis($rule, $item);
-        // Returns boolean with evaluation of all inside parenthesis
-        $start=0;
-        return array(2,$this->evaluation($val,$start));
-    }
+	/**
+	 * Get and eval a grouped condition - ex : (1==1)
+	 * @param string $rule
+	 * @param int $item
+	 * @return array
+	 */
+	private function get_group(string $rule,int &$item) : array
+	{
+		// gets eveything inside parenthesis
+		$val=$this->parse_parenthesis($rule, $item);
+		// Returns boolean with evaluation of all inside parenthesis
+		$start=0;
+		return array(2,$this->evaluation($val,$start));
+	}
 
-    private function get_function(string $rule,int &$item) : array
-    {
-        // function is : __function(param1,param2...)
-        $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
-        {
-            $item++;
-        }        
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+	private function get_function(string $rule,int &$item) : array
+	{
+		// function is : __function(param1,param2...)
+		$start=$item; 
+		while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+		{
+			$item++;
+		}        
+		if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
-        // get parameters between parenthesis
+		// get parameters between parenthesis
         
-        $this->parse_parenthesis($rule, $item);
+		$this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+		$val=substr($rule,$start,$item-$start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+		$this->logging->log('got function ' . $val,DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+		return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
         
-    }
+	}
     
-    protected function eval_getElement($rule,&$item)
-    {
-        if ($item >= strlen($rule))
-        {
-            throw new Exception("Early end of string ".$rule ." at " .$item );
-        }
-        while ($rule[$item]==' ') $item++;
-        if (preg_match('/[\-0-9\.]/',$rule[$item]))
-        { // number
-            return $this->get_number($rule, $item);
-        }
-        if ($rule[$item] == '"')
-        { // string
-            return $this->get_string($rule, $item);
-        }
+	protected function eval_getElement($rule,&$item)
+	{
+		if ($item >= strlen($rule))
+		{
+			throw new Exception("Early end of string ".$rule ." at " .$item );
+		}
+		while ($rule[$item]==' ') $item++;
+		if (preg_match('/[\-0-9\.]/',$rule[$item]))
+		{ // number
+			return $this->get_number($rule, $item);
+		}
+		if ($rule[$item] == '"')
+		{ // string
+			return $this->get_string($rule, $item);
+		}
         
-        if ($rule[$item] == '(')
-        { // grouping
-            return $this->get_group($rule, $item);
-        }
-        if ($rule[$item] == '_')
-        { // function
-            return $this->get_function($rule, $item);
-        }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+		if ($rule[$item] == '(')
+		{ // grouping
+			return $this->get_group($rule, $item);
+		}
+		if ($rule[$item] == '_')
+		{ // function
+			return $this->get_function($rule, $item);
+		}
+		throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
         
-    }
+	}
     
-    protected function eval_getNext($rule,$item,$tok)
-    {
-        while (
-            ($rule[$item] != $tok ) 
-            && ($item < strlen($rule))) 
-        { 
-            $item++;
-        }
-        if ($item==strlen($rule)) {
-            throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
-        }
-        return $item+1;
-    }
+	protected function eval_getNext($rule,$item,$tok)
+	{
+		while (
+			($rule[$item] != $tok ) 
+			&& ($item < strlen($rule))) 
+		{ 
+			$item++;
+		}
+		if ($item==strlen($rule)) {
+			throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		}
+		return $item+1;
+	}
     
-    protected function eval_getOper($rule,&$item)
-    {
-        while ($rule[$item]==' ') $item++;
-        switch ($rule[$item])
-        {
-            case '<':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-                $item++; return array(0,"<");
-            case '>':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-                $item++; return array(0,">");
-            case '=':
-                $item++; return array(0,"=");
-            case '!':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
-            case '~':
-                $item++; return array(0,"~");
-            case '|':
-                $item++; return array(1,"|");
-            case '&':
-                $item++; return array(1,"&");
-            default	:
-                throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
-        }
-    }
+	protected function eval_getOper($rule,&$item)
+	{
+		while ($rule[$item]==' ') $item++;
+		switch ($rule[$item])
+		{
+			case '<':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
+				$item++; return array(0,"<");
+			case '>':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
+				$item++; return array(0,">");
+			case '=':
+				$item++; return array(0,"=");
+			case '!':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
+				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+			case '~':
+				$item++; return array(0,"~");
+			case '|':
+				$item++; return array(1,"|");
+			case '&':
+				$item++; return array(1,"&");
+			default	:
+				throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+		}
+	}
     
-    private function check_negate_first($rule,&$item)
-    {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
-        {
-            $item++;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+	private function check_negate_first($rule,&$item)
+	{
+		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		{
+			$item++;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
 
-    private function do_compare($val1,$val2,$comp,$negate)
-    {
-        switch ($comp){
-            case '<':	$retVal= ($val1 < $val2); break;
-            case '<=':	$retVal= ($val1 <= $val2); break;
-            case '>':	$retVal= ($val1 > $val2); break;
-            case '>=':	$retVal= ($val1 >= $val2); break;
-            case '=':	$retVal= ($val1 == $val2); break;
-            case '!=':	$retVal= ($val1 != $val2); break;
-            case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-            case '|':	$retVal= ($val1 || $val2); break;
-            case '&':	$retVal= ($val1 && $val2); break;
-            default:  throw new Exception("Error in expression - unknown comp : ".$comp);
-        }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+	private function do_compare($val1,$val2,$comp,$negate)
+	{
+		switch ($comp){
+			case '<':	$retVal= ($val1 < $val2); break;
+			case '<=':	$retVal= ($val1 <= $val2); break;
+			case '>':	$retVal= ($val1 > $val2); break;
+			case '>=':	$retVal= ($val1 >= $val2); break;
+			case '=':	$retVal= ($val1 == $val2); break;
+			case '!=':	$retVal= ($val1 != $val2); break;
+			case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
+			case '|':	$retVal= ($val1 || $val2); break;
+			case '&':	$retVal= ($val1 && $val2); break;
+			default:  throw new Exception("Error in expression - unknown comp : ".$comp);
+		}
+		if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
         
-        return $retVal;
-    }
+		return $retVal;
+	}
     
-    /** Evaluation : makes token and evaluate.
-     *	Public function for expressions testing
-     *	accepts : < > = <= >= !=  (typec = 0)
-     *	operators : & | (typec=1)
-     *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
-     *   comparison int vs strings will return null (error)
-     *	return : bool or null on error
-     */
-    public function evaluation($rule,&$item)
-    {
-        //echo "Evaluation of ".substr($rule,$item)."\n";
-        $negate=$this->check_negate_first($rule, $item);
-        // First element : number, string or ()
-        list($type1,$val1) = $this->eval_getElement($rule,$item);
-        //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
+	/** Evaluation : makes token and evaluate.
+	 *	Public function for expressions testing
+	 *	accepts : < > = <= >= !=  (typec = 0)
+	 *	operators : & | (typec=1)
+	 *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
+	 *   comparison int vs strings will return null (error)
+	 *	return : bool or null on error
+	 */
+	public function evaluation($rule,&$item)
+	{
+		//echo "Evaluation of ".substr($rule,$item)."\n";
+		$negate=$this->check_negate_first($rule, $item);
+		// First element : number, string or ()
+		list($type1,$val1) = $this->eval_getElement($rule,$item);
+		//echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
-        {
-            if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
-            return $val1;
-        }
+		if ($item==strlen($rule)) // If only element, return value, but only boolean
+		{
+			if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
+			if ($negate === true) $val1= ! $val1;
+			return $val1;
+		}
         
-        // Second element : operator
-        list($typec,$comp) = $this->eval_getOper($rule,$item);
-        //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
+		// Second element : operator
+		list($typec,$comp) = $this->eval_getOper($rule,$item);
+		//echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
-        // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
-        {
-            $item++;
-            if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-            $val2= ! $this->evaluation($rule,$item);
-            $type2=2; // result is a boolean
-        }
-        else
-        {
-            list($type2,$val2) = $this->eval_getElement($rule,$item);
-        }
-        //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
+		// Third element : number, string or ()
+		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+		{
+			$item++;
+			if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+			$val2= ! $this->evaluation($rule,$item);
+			$type2=2; // result is a boolean
+		}
+		else
+		{
+			list($type2,$val2) = $this->eval_getElement($rule,$item);
+		}
+		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
-        {
-            throw new Exception("Cannot compare string & number : ".$rule);
-        }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
-        {
-            throw new Exception("Cannot use boolean operators with string & number : ".$rule);
-        }
+		if ($type1!=$type2)  // cannot compare different types
+		{
+			throw new Exception("Cannot compare string & number : ".$rule);
+		}
+		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+		{
+			throw new Exception("Cannot use boolean operators with string & number : ".$rule);
+		}
         
-        $retVal = $this->do_compare($val1, $val2, $comp, $negate);
+		$retVal = $this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
-        // check for logical operator :
-        switch ($rule[$item])
-        {
-            case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-            case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+		if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+		// check for logical operator :
+		switch ($rule[$item])
+		{
+			case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
+			case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
             
-            default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
-        }
-    }
+			default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
+		}
+	}
     
-    // Remove all whitespaces (when not quoted)
-    public function eval_cleanup($rule)
-    {
-        $item=0;
-        $rule2='';
-        while ($item < strlen($rule))
-        {
-            if ($rule[$item]==' ') { $item++; continue; }
-            if ($rule[$item]=='"')
-            {
-                $rule2.=$rule[$item];
-                $item++;
-                while (($item < strlen($rule)) && ($rule[$item]!='"') )
-                {
-                    $rule2.=$rule[$item];
-                    $item++;
-                }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
-                $rule2.=$rule[$item];
-                $item++;
-                continue;
-            }
+	// Remove all whitespaces (when not quoted)
+	public function eval_cleanup($rule)
+	{
+		$item=0;
+		$rule2='';
+		while ($item < strlen($rule))
+		{
+			if ($rule[$item]==' ') { $item++; continue; }
+			if ($rule[$item]=='"')
+			{
+				$rule2.=$rule[$item];
+				$item++;
+				while (($item < strlen($rule)) && ($rule[$item]!='"') )
+				{
+					$rule2.=$rule[$item];
+					$item++;
+				}
+				if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				$rule2.=$rule[$item];
+				$item++;
+				continue;
+			}
             
-            $rule2.=$rule[$item];
-            $item++;
-        }
+			$rule2.=$rule[$item];
+			$item++;
+		}
         
-        return $rule2;
-    }
+		return $rule2;
+	}
 
 
-    /**
-     * Get '*' or '**' and transform in [0-9]+ or .* in return string
-     * @param string $oid OID in normal or regexp format. '*' will be escaped ('\*')
-     * @return string correct regexp format
-     */
-    public function regexp_eval(string &$oid)
-    {
-        // ** replaced by .*
-        $oidR=preg_replace('/\*\*/', '.*', $oid);
-        // * replaced by [0-9]+
-        $oidR=preg_replace('/\*/', '[0-9]+', $oidR);
+	/**
+	 * Get '*' or '**' and transform in [0-9]+ or .* in return string
+	 * @param string $oid OID in normal or regexp format. '*' will be escaped ('\*')
+	 * @return string correct regexp format
+	 */
+	public function regexp_eval(string &$oid)
+	{
+		// ** replaced by .*
+		$oidR=preg_replace('/\*\*/', '.*', $oid);
+		// * replaced by [0-9]+
+		$oidR=preg_replace('/\*/', '[0-9]+', $oidR);
         
-        // replace * with \* in oid for preg_replace
-        $oid=preg_replace('/\*/', '\*', $oid);
+		// replace * with \* in oid for preg_replace
+		$oid=preg_replace('/\*/', '\*', $oid);
         
-        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
+		$this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
         
-        return $oidR;
-    }
+		return $oidR;
+	}
     
     
-    /** Evaluation rule (uses eval_* functions recursively)
-     *	@param string $rule : rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
-     *  @param array $oidList : OIDs values to sustitute.
-     *	@return bool : true : rule match, false : rule don't match , throw exception on error.
-     */   
-    public function eval_rule($rule,$oidList)
-    {
-        if ($rule==null || $rule == '') // Empty rule is always true
-        {
-            return true;
-        }
-        $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
-        {
-            $oid=$matches[1];
-            $found=0;
-            // Test and transform regexp
-            $oidR = $this->regexp_eval($oid);
+	/** Evaluation rule (uses eval_* functions recursively)
+	 *	@param string $rule : rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
+	 *  @param array $oidList : OIDs values to sustitute.
+	 *	@return bool : true : rule match, false : rule don't match , throw exception on error.
+	 */   
+	public function eval_rule($rule,$oidList)
+	{
+		if ($rule==null || $rule == '') // Empty rule is always true
+		{
+			return true;
+		}
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+		{
+			$oid=$matches[1];
+			$found=0;
+			// Test and transform regexp
+			$oidR = $this->regexp_eval($oid);
             
-            foreach($oidList as $val)
-            {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
-                {
-                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
-                    { // If not a number, change " to ' and put " around it
-                        $val->value=preg_replace('/"/',"'",$val->value);
-                        $val->value='"'.$val->value.'"';
-                    }
-                    $rep=0;
-                    $rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-                    if ($rep==0)
-                    {
-                        $this->logging->log("Error in rule_eval",WARN,'');
-                        return false;
-                    }
-                    $found=1;
-                    break;
-                }
-            }
-            if ($found==0)
-            {	// OID not found : throw error
-                throw new Exception('OID '.$oid.' not found in trap');
-            }
-        }
-        $item=0;
-        $rule=$this->eval_cleanup($rule);
-        $this->logging->log('Rule after clenup: '.$rule,INFO );
+			foreach($oidList as $val)
+			{
+				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				{
+					if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
+					{ // If not a number, change " to ' and put " around it
+						$val->value=preg_replace('/"/',"'",$val->value);
+						$val->value='"'.$val->value.'"';
+					}
+					$rep=0;
+					$rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
+					if ($rep==0)
+					{
+						$this->logging->log("Error in rule_eval",WARN,'');
+						return false;
+					}
+					$found=1;
+					break;
+				}
+			}
+			if ($found==0)
+			{	// OID not found : throw error
+				throw new Exception('OID '.$oid.' not found in trap');
+			}
+		}
+		$item=0;
+		$rule=$this->eval_cleanup($rule);
+		$this->logging->log('Rule after clenup: '.$rule,INFO );
         
-        return  $this->evaluation($rule,$item);
-    }
+		return  $this->evaluation($rule,$item);
+	}
     
 }
\ No newline at end of file

Spacing +96 added lines, -96 removed lines

@@ -27,30 +27,30 @@ 
  * Get full number 
  * @return array<number,string>
  */
-    private function get_number($rule,&$item)
+    private function get_number($rule, &$item)
     {
-        $item2=$item+1;
+        $item2=$item + 1;
         while (
-            ($item2!=strlen($rule)) 
-            && (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
+            ($item2 != strlen($rule)) 
+            && (preg_match('/[\-0-9\.]/', $rule[$item2]))) 
         { 
-            $item2++ ;
+            $item2++;
         }
-        $val=substr($rule,$item,$item2-$item);
+        $val=substr($rule, $item, $item2 - $item);
         $item=$item2;
         //echo "number ".$val."\n";
         
-        return array(0,$val);
+        return array(0, $val);
     }
 
-    private function get_string($rule,&$item)
+    private function get_string($rule, &$item)
     {
         $item++;
-        $item2=$this->eval_getNext($rule,$item,'"');
-        $val=substr($rule,$item,$item2-$item-1);
+        $item2=$this->eval_getNext($rule, $item, '"');
+        $val=substr($rule, $item, $item2 - $item - 1);
         $item=$item2;
         //echo "string : ".$val."\n";
-        return array(1,$val);
+        return array(1, $val);
         
     }
     
@@ -62,20 +62,20 @@ 
      * @throws Exception
      * @return string : everything inside parenthesis
      */
-    private function parse_parenthesis(string $rule,int &$item) : string
+    private function parse_parenthesis(string $rule, int &$item) : string
     {
         $item++;
         $start=$item;
         $parenthesis_count=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+            && (($rule[$item] != ')') || $parenthesis_count > 0)) // Closing ')' or embeded ()
         {
-            if ($rule[$item] == '"' )
+            if ($rule[$item] == '"')
             { // pass through string
                 $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
+                $item=$this->eval_getNext($rule, $item, '"');
             }
-            else{
+            else {
                 if ($rule[$item] == '(')
                 {
                     $parenthesis_count++;
@@ -88,8 +88,8 @@ 
             }
         }
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
+        if ($item == strlen($rule)) {throw new Exception("no closing () in ".$rule." at ".$item); }
+        $val=substr($rule, $start, $item - $start);
         $item++;
         return $val;
     }
@@ -101,45 +101,45 @@ 
      * @param int $item
      * @return array
      */
-    private function get_group(string $rule,int &$item) : array
+    private function get_group(string $rule, int &$item) : array
     {
         // gets eveything inside parenthesis
         $val=$this->parse_parenthesis($rule, $item);
         // Returns boolean with evaluation of all inside parenthesis
         $start=0;
-        return array(2,$this->evaluation($val,$start));
+        return array(2, $this->evaluation($val, $start));
     }
 
-    private function get_function(string $rule,int &$item) : array
+    private function get_function(string $rule, int &$item) : array
     {
         // function is : __function(param1,param2...)
         $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(')) // Not end of string AND not opening '('
         {
             $item++;
         }        
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+        if ($item == strlen($rule)) {throw new Exception("no opening () for function in ".$rule." at ".$item); }
         
         // get parameters between parenthesis
         
         $this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+        $val=substr($rule, $start, $item - $start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+        $this->logging->log('got function '.$val, DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+        return array(2, $this->trapClass->pluginClass->evaluateFunctionString($val));
         
     }
     
-    protected function eval_getElement($rule,&$item)
+    protected function eval_getElement($rule, &$item)
     {
         if ($item >= strlen($rule))
         {
-            throw new Exception("Early end of string ".$rule ." at " .$item );
+            throw new Exception("Early end of string ".$rule." at ".$item);
         }
-        while ($rule[$item]==' ') $item++;
-        if (preg_match('/[\-0-9\.]/',$rule[$item]))
+        while ($rule[$item] == ' ') $item++;
+        if (preg_match('/[\-0-9\.]/', $rule[$item]))
         { // number
             return $this->get_number($rule, $item);
         }
@@ -156,54 +156,54 @@ 
         { // function
             return $this->get_function($rule, $item);
         }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+        throw new Exception("number/string not found in ".$rule." at ".$item.' : '.$rule[$item]);
         
     }
     
-    protected function eval_getNext($rule,$item,$tok)
+    protected function eval_getNext($rule, $item, $tok)
     {
         while (
-            ($rule[$item] != $tok ) 
+            ($rule[$item] != $tok) 
             && ($item < strlen($rule))) 
         { 
             $item++;
         }
-        if ($item==strlen($rule)) {
-            throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+        if ($item == strlen($rule)) {
+            throw new Exception("closing '".$tok."' not found in ".$rule." at ".$item);
         }
-        return $item+1;
+        return $item + 1;
     }
     
-    protected function eval_getOper($rule,&$item)
+    protected function eval_getOper($rule, &$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item] == ' ') $item++;
         switch ($rule[$item])
         {
             case '<':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-                $item++; return array(0,"<");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "<="); }
+                $item++; return array(0, "<");
             case '>':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-                $item++; return array(0,">");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, ">="); }
+                $item++; return array(0, ">");
             case '=':
-                $item++; return array(0,"=");
+                $item++; return array(0, "=");
             case '!':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "!="); }
+                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule." at ".$item);
             case '~':
-                $item++; return array(0,"~");
+                $item++; return array(0, "~");
             case '|':
-                $item++; return array(1,"|");
+                $item++; return array(1, "|");
             case '&':
-                $item++; return array(1,"&");
+                $item++; return array(1, "&");
             default	:
-                throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+                throw new Exception("Erreur in expr - operator not found in ".$rule." at ".$item);
         }
     }
     
-    private function check_negate_first($rule,&$item)
+    private function check_negate_first($rule, &$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ($rule[$item] == '!') // If '!' found, negate next expression.
         {
             $item++;
             return true;
@@ -214,21 +214,21 @@ 
         }
     }
 
-    private function do_compare($val1,$val2,$comp,$negate)
+    private function do_compare($val1, $val2, $comp, $negate)
     {
-        switch ($comp){
-            case '<':	$retVal= ($val1 < $val2); break;
-            case '<=':	$retVal= ($val1 <= $val2); break;
-            case '>':	$retVal= ($val1 > $val2); break;
-            case '>=':	$retVal= ($val1 >= $val2); break;
-            case '=':	$retVal= ($val1 == $val2); break;
-            case '!=':	$retVal= ($val1 != $val2); break;
-            case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-            case '|':	$retVal= ($val1 || $val2); break;
-            case '&':	$retVal= ($val1 && $val2); break;
+        switch ($comp) {
+            case '<':	$retVal=($val1 < $val2); break;
+            case '<=':	$retVal=($val1 <= $val2); break;
+            case '>':	$retVal=($val1 > $val2); break;
+            case '>=':	$retVal=($val1 >= $val2); break;
+            case '=':	$retVal=($val1 == $val2); break;
+            case '!=':	$retVal=($val1 != $val2); break;
+            case '~':	$retVal=(preg_match('/'.preg_replace('/"/', '', $val2).'/', $val1)); break;
+            case '|':	$retVal=($val1 || $val2); break;
+            case '&':	$retVal=($val1 && $val2); break;
             default:  throw new Exception("Error in expression - unknown comp : ".$comp);
         }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+        if ($negate === true) $retVal=!$retVal; // Inverse result if negate before expression
         
         return $retVal;
     }
@@ -241,56 +241,56 @@ 
      *   comparison int vs strings will return null (error)
      *	return : bool or null on error
      */
-    public function evaluation($rule,&$item)
+    public function evaluation($rule, &$item)
     {
         //echo "Evaluation of ".substr($rule,$item)."\n";
         $negate=$this->check_negate_first($rule, $item);
         // First element : number, string or ()
-        list($type1,$val1) = $this->eval_getElement($rule,$item);
+        list($type1, $val1)=$this->eval_getElement($rule, $item);
         //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
+        if ($item == strlen($rule)) // If only element, return value, but only boolean
         {
             if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
+            if ($negate === true) $val1=!$val1;
             return $val1;
         }
         
         // Second element : operator
-        list($typec,$comp) = $this->eval_getOper($rule,$item);
+        list($typec, $comp)=$this->eval_getOper($rule, $item);
         //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
         // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+        if ($rule[$item] == '!') // starts with a ! so evaluate whats next
         {
             $item++;
             if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-            $val2= ! $this->evaluation($rule,$item);
+            $val2=!$this->evaluation($rule, $item);
             $type2=2; // result is a boolean
         }
         else
         {
-            list($type2,$val2) = $this->eval_getElement($rule,$item);
+            list($type2, $val2)=$this->eval_getElement($rule, $item);
         }
         //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
+        if ($type1 != $type2)  // cannot compare different types
         {
             throw new Exception("Cannot compare string & number : ".$rule);
         }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+        if ($typec == 1 && $type1 != 2) // cannot use & or | with string/number
         {
             throw new Exception("Cannot use boolean operators with string & number : ".$rule);
         }
         
-        $retVal = $this->do_compare($val1, $val2, $comp, $negate);
+        $retVal=$this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+        if ($item == strlen($rule)) return $retVal; // End of string : return evaluation
         // check for logical operator :
         switch ($rule[$item])
         {
-            case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-            case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+            case '|':	$item++; return ($retVal || $this->evaluation($rule, $item));
+            case '&':	$item++; return ($retVal && $this->evaluation($rule, $item));
             
             default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
         }
@@ -303,17 +303,17 @@ 
         $rule2='';
         while ($item < strlen($rule))
         {
-            if ($rule[$item]==' ') { $item++; continue; }
-            if ($rule[$item]=='"')
+            if ($rule[$item] == ' ') { $item++; continue; }
+            if ($rule[$item] == '"')
             {
                 $rule2.=$rule[$item];
                 $item++;
-                while (($item < strlen($rule)) && ($rule[$item]!='"') )
+                while (($item < strlen($rule)) && ($rule[$item] != '"'))
                 {
                     $rule2.=$rule[$item];
                     $item++;
                 }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                if ($item == strlen($rule)) throw new Exception("closing '\"' not found in ".$rule." at ".$item);
                 $rule2.=$rule[$item];
                 $item++;
                 continue;
@@ -342,7 +342,7 @@ 
         // replace * with \* in oid for preg_replace
         $oid=preg_replace('/\*/', '\*', $oid);
         
-        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
+        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR, DEBUG);
         
         return $oidR;
     }
@@ -353,50 +353,50 @@ 
      *  @param array $oidList : OIDs values to sustitute.
      *	@return bool : true : rule match, false : rule don't match , throw exception on error.
      */   
-    public function eval_rule($rule,$oidList)
+    public function eval_rule($rule, $oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule == null || $rule == '') // Empty rule is always true
         {
             return true;
         }
         $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+        while (preg_match('/_OID\(([0-9\.\*]+)\)/', $rule, $matches) == 1)
         {
             $oid=$matches[1];
             $found=0;
             // Test and transform regexp
-            $oidR = $this->regexp_eval($oid);
+            $oidR=$this->regexp_eval($oid);
             
-            foreach($oidList as $val)
+            foreach ($oidList as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
+                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/', $val->value))
                     { // If not a number, change " to ' and put " around it
-                        $val->value=preg_replace('/"/',"'",$val->value);
+                        $val->value=preg_replace('/"/', "'", $val->value);
                         $val->value='"'.$val->value.'"';
                     }
                     $rep=0;
-                    $rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-                    if ($rep==0)
+                    $rule=preg_replace('/_OID\('.$oid.'\)/', $val->value, $rule, -1, $rep);
+                    if ($rep == 0)
                     {
-                        $this->logging->log("Error in rule_eval",WARN,'');
+                        $this->logging->log("Error in rule_eval", WARN, '');
                         return false;
                     }
                     $found=1;
                     break;
                 }
             }
-            if ($found==0)
+            if ($found == 0)
             {	// OID not found : throw error
                 throw new Exception('OID '.$oid.' not found in trap');
             }
         }
         $item=0;
         $rule=$this->eval_cleanup($rule);
-        $this->logging->log('Rule after clenup: '.$rule,INFO );
+        $this->logging->log('Rule after clenup: '.$rule, INFO);
         
-        return  $this->evaluation($rule,$item);
+        return  $this->evaluation($rule, $item);
     }
     
 }
\ No newline at end of file

Braces +50 added lines, -21 removed lines

@@ -68,14 +68,15 @@ 
         $start=$item;
         $parenthesis_count=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) {
+        	// Closing ')' or embeded ()
         {
             if ($rule[$item] == '"' )
             { // pass through string
                 $item++;
+        }
                 $item=$this->eval_getNext($rule,$item,'"');
-            }
-            else{
+            } else{
                 if ($rule[$item] == '(')
                 {
                     $parenthesis_count++;
@@ -114,9 +115,11 @@ 
     {
         // function is : __function(param1,param2...)
         $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(' )) {
+        	// Not end of string AND not opening '('
         {
             $item++;
+        }
         }        
         if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
@@ -138,7 +141,9 @@ 
         {
             throw new Exception("Early end of string ".$rule ." at " .$item );
         }
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         if (preg_match('/[\-0-9\.]/',$rule[$item]))
         { // number
             return $this->get_number($rule, $item);
@@ -176,7 +181,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -203,12 +210,13 @@ 
     
     private function check_negate_first($rule,&$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ( $rule[$item] == '!') {
+        	// If '!' found, negate next expression.
         {
             $item++;
-            return true;
         }
-        else
+            return true;
+        } else
         {
             return false;
         }
@@ -228,7 +236,10 @@ 
             case '&':	$retVal= ($val1 && $val2); break;
             default:  throw new Exception("Error in expression - unknown comp : ".$comp);
         }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+        if ($negate === true) {
+        	$retVal = ! $retVal;
+        }
+        // Inverse result if negate before expression
         
         return $retVal;
     }
@@ -249,10 +260,14 @@ 
         list($type1,$val1) = $this->eval_getElement($rule,$item);
         //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
+        if ($item==strlen($rule)) {
+        	// If only element, return value, but only boolean
         {
             if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
+        }
+            if ($negate === true) {
+            	$val1= ! $val1;
+            }
             return $val1;
         }
         
@@ -261,31 +276,41 @@ 
         //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
         // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+        if ( $rule[$item] == '!') {
+        	// starts with a ! so evaluate whats next
         {
             $item++;
-            if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+        }
+            if ($typec != 1) {
+            	throw new Exception("Mixing boolean and comparison : ".$rule);
+            }
             $val2= ! $this->evaluation($rule,$item);
             $type2=2; // result is a boolean
-        }
-        else
+        } else
         {
             list($type2,$val2) = $this->eval_getElement($rule,$item);
         }
         //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
+        if ($type1!=$type2) {
+        	// cannot compare different types
         {
             throw new Exception("Cannot compare string & number : ".$rule);
         }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+        }
+        if ($typec==1 && $type1 !=2) {
+        	// cannot use & or | with string/number
         {
             throw new Exception("Cannot use boolean operators with string & number : ".$rule);
         }
+        }
         
         $retVal = $this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+        if ($item==strlen($rule)) {
+        	return $retVal;
+        }
+        // End of string : return evaluation
         // check for logical operator :
         switch ($rule[$item])
         {
@@ -313,7 +338,9 @@ 
                     $rule2.=$rule[$item];
                     $item++;
                 }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                if ($item == strlen ($rule)) {
+                	throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                }
                 $rule2.=$rule[$item];
                 $item++;
                 continue;
@@ -355,10 +382,12 @@ 
      */   
     public function eval_rule($rule,$oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule==null || $rule == '') {
+        	// Empty rule is always true
         {
             return true;
         }
+        }
         $matches=array();
         while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
         {

library/Trapdirector/TrapsController.php

Indentation +131 added lines, -131 removed lines

@@ -44,8 +44,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -77,12 +77,12 @@ 
 	 */
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	/**
@@ -103,23 +103,23 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -128,33 +128,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -174,18 +174,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -195,14 +195,14 @@ 
 	/**************************  Database queries *******************/
 	
 	/** Get host(s) by IP (v4 or v6) or by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
@@ -218,16 +218,16 @@ 
 	}
 
 	/** Get host(s) by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
-	    // TODO : check for SQL injections
+		// TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -241,14 +241,14 @@ 
 	}	
 	
 	/** Get host groups by  name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
@@ -264,9 +264,9 @@ 
 
 	
 	/** Get host IP (v4 and v6) by name in IDO database
-	*	does not catch exceptions
-	*	@return array ( name, display_name, ip4, ip6)
-	*/
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
 	protected function getHostInfoByID($id) 
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -286,9 +286,9 @@ 
 
 	
 	/** Get host by objectid  in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( id, name, display_name, ip, ip6,  )
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -307,10 +307,10 @@ 
 	}	
 	
 	/** Get services from object ( host_object_id) in IDO database
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -330,11 +330,11 @@ 
 	}	
 	
 	/** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
-	* 	gets all hosts in hostgroup and return common services
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 * 	gets all hosts in hostgroup and return common services
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostGroupid($id) 
 	{		
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -373,7 +373,7 @@ 
 		//print_r($common_services);
 		foreach (array_keys($common_services) as $key)
 		{
-		    if ($common_services[$key]['num'] == $num_hosts)
+			if ($common_services[$key]['num'] == $num_hosts)
 			{
 				array_push($result,array($key,$common_services[$key]['name']));
 			}
@@ -383,15 +383,15 @@ 
 	}	
 
 	/** Get services object id by host name / service name in IDO database
-	*	does not catch exceptions
-	*	@param $hostname string host name
-	*	@param $name string service name
-	*	@return array  service id
-	*/
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return array  service id
+	 */
 	protected function getServiceIDByName($hostname,$name) 
 	{
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 		if ($name == null)
 		{
@@ -412,10 +412,10 @@ 
 	}
 	
 	/** Get object name from object_id  in IDO database
-	*	does not catch exceptions
-	*	@param int $id object_id (default to null, used first if not null)
-	*	@return array name1 (host) name2 (service)
-	*/
+	 *	does not catch exceptions
+	 *	@param int $id object_id (default to null, used first if not null)
+	 *	@return array name1 (host) name2 (service)
+	 */
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -433,14 +433,14 @@ 
 	}		
 
 	/** Add handler rule in traps DB
-	*	@param array $params : array(<db item>=><value>)
-	*	@return int inserted id
-	*/
+	 *	@param array $params : array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-	    $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');
 		// Add last modified date = creation date and username
 		$params['created'] = new Zend_Db_Expr('NOW()');
 		$params['modified'] = new 	Zend_Db_Expr('NOW()');
@@ -458,15 +458,15 @@ 
 	}	
 
 	/** Update handler rule in traps DB
-	*	@param array $params : (<db item>=><value>)
-	*   @param integer $ruleID : rule id in db
-	*	@return array affected rows
-	*/
+	 *	@param array $params : (<db item>=><value>)
+	 *   @param integer $ruleID : rule id in db
+	 *	@return array affected rows
+	 */
 	protected function updateHandlerRule($params,$ruleID)
 	{
 		// TODO Check for rule consistency
-	    $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');
 		// Add last modified date = creation date and username
 		$params['modified'] = new 	Zend_Db_Expr('NOW()');
 		$params['modifier'] = $this->Auth()->getUser()->getUsername();
@@ -480,8 +480,8 @@ 
 	}	
 	
 	/** Delete rule by id
-	*	@param int $ruleID rule id
-	*/
+	 *	@param int $ruleID rule id
+	 */
 	protected function deleteRule($ruleID)
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
@@ -497,14 +497,14 @@ 
 	}
 
 	/** Delete trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function deleteTrap($ip,$oid)
 	{
 		
-	    $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');
 		$condition=null;
 		if ($ip != null)
 		{
@@ -526,14 +526,14 @@ 
    
 
 	/** count trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function countTrap($ip,$oid)
 	{
 		
-	    $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');
 	    
 		$condition=null;
 		if ($ip != null)
@@ -556,15 +556,15 @@ 
 	}		
 	
 	/** get configuration value
-	*	@param string $element : configuration name in db
-	*/
+	 *	@param string $element : configuration name in db
+	 */
 	protected function getDBConfigValue($element)
 	{
 	
-	    $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()
+		$query=$dbConn->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
@@ -589,17 +589,17 @@ 
 	}
 
 	/** add configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 		
 	protected function addDBConfigValue($element,$value)
 	{
 	
-	    $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->insert(
+		$query=$dbConn->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array(
 					'name' => $element,
@@ -610,16 +610,16 @@ 
 	}
 
 	/** set configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 	protected function setDBConfigValue($element,$value)
 	{
 	
-	    $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->update(
+		$query=$dbConn->update(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>$value),
 				'name=\''.$element.'\''
@@ -628,13 +628,13 @@ 
 	}
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +78 added lines, -78 removed lines

@@ -55,7 +55,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -66,7 +66,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -79,7 +79,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -92,7 +92,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -105,38 +105,38 @@ 
 	{
 	    if ($this->UIDatabase == Null)
 	    {
-	        $this->UIDatabase = new UIDatabase($this);
+	        $this->UIDatabase=new UIDatabase($this);
 	       
 	    }
 	    return $this->UIDatabase;
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -147,10 +147,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -162,10 +162,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -180,7 +180,7 @@ 
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
@@ -201,14 +201,14 @@ 
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
+	    $dbConn=$this->getUIDatabase()->getIdoDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -224,14 +224,14 @@ 
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
+	    $dbConn=$this->getUIDatabase()->getIdoDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 	    // TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -247,13 +247,13 @@ 
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
+	    $dbConn=$this->getUIDatabase()->getIdoDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hostgroups'),
 					'b.hostgroup_object_id=a.object_id',
@@ -269,8 +269,8 @@ 
 	*/
 	protected function getHostInfoByID($id) 
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$dbConn=$this->getUIDatabase()->getIdoDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$query=$dbConn->select()
 				->from(
@@ -291,18 +291,18 @@ 
 	*/
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$dbConn=$this->getUIDatabase()->getIdoDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'a.object_id'))
+					array('name' => 'a.name1', 'id' => 'a.object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
-					array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-				->where('a.object_id = ?',$id);
+					array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?', $id);
 		return $dbConn->fetchRow($query);
 	}	
 	
@@ -314,17 +314,17 @@ 
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$dbConn=$this->getUIDatabase()->getIdoDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$query=$dbConn->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
-					array('is_active'=>'a.is_active','name2'=>'a.name2'))
+					array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
 				->where('s.host_object_id='.$id.' AND a.is_active = 1');
 		return $dbConn->fetchAll($query);
 	}	
@@ -337,8 +337,8 @@ 
 	*/
 	protected function getServicesByHostGroupid($id) 
 	{		
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$dbConn=$this->getUIDatabase()->getIdoDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$query=$dbConn->select()
 				->from(
@@ -355,11 +355,11 @@ 
 		foreach ($hosts as $key => $host)
 		{ // For each host, get all services and add in common_services if not found or add counter
 			$host_services=$this->getServicesByHostid($host->host_object_id);
-			foreach($host_services as $service)
+			foreach ($host_services as $service)
 			{
 				if (isset($common_services[$service->name2]['num']))
 				{
-					$common_services[$service->name2]['num'] +=1;
+					$common_services[$service->name2]['num']+=1;
 				}
 				else
 				{
@@ -375,7 +375,7 @@ 
 		{
 		    if ($common_services[$key]['num'] == $num_hosts)
 			{
-				array_push($result,array($key,$common_services[$key]['name']));
+				array_push($result, array($key, $common_services[$key]['name']));
 			}
 		}
 		
@@ -388,9 +388,9 @@ 
 	*	@param $name string service name
 	*	@return array  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
+	    $dbConn=$this->getUIDatabase()->getIdoDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 		if ($name == null)
@@ -401,7 +401,7 @@ 
 		$query=$dbConn->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
@@ -419,14 +419,14 @@ 
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$dbConn = $this->getUIDatabase()->getIdoDbConn();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$dbConn=$this->getUIDatabase()->getIdoDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name1' => 'a.name1','name2' => 'a.name2'))
+					array('name1' => 'a.name1', 'name2' => 'a.name2'))
 				->where('a.object_id='.$id.' AND a.is_active = 1');
 
 		return $dbConn->fetchRow($query);
@@ -439,18 +439,18 @@ 
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// Add last modified date = creation date and username
-		$params['created'] = new Zend_Db_Expr('NOW()');
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['created']=new Zend_Db_Expr('NOW()');
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$query=$dbConn->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$params
 		);
-		if($query==false)
+		if ($query == false)
 		{
 		  return null;
 		}
@@ -462,14 +462,14 @@ 
 	*   @param integer $ruleID : rule id in db
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$dbConn->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -484,9 +484,9 @@ 
 	*/
 	protected function deleteRule($ruleID)
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
 
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		$query=$dbConn->delete(
@@ -500,10 +500,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function deleteTrap($ip,$oid)
+	protected function deleteTrap($ip, $oid)
 	{
 		
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$condition=null;
 		if ($ip != null)
@@ -512,10 +512,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if ($condition === null) return null;
 		$query=$dbConn->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -529,10 +529,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function countTrap($ip,$oid)
+	protected function countTrap($ip, $oid)
 	{
 		
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 		$condition=null;
@@ -542,10 +542,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return 0;
+		if ($condition === null) return 0;
 		$query=$dbConn->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -561,28 +561,28 @@ 
 	protected function getDBConfigValue($element)
 	{
 	
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 	    $query=$dbConn->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
-			->where('name=?',$element);
+			->where('name=?', $element);
 		$return_row=$dbConn->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row == null)  // value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+			if (!isset($default[$element])) return null; // no default and not value
 			
-			$this->addDBConfigValue($element,$default[$element]);
+			$this->addDBConfigValue($element, $default[$element]);
 			return $default[$element];
 		}
 		if ($return_row->value == null) // value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
-			$this->setDBConfigValue($element,$default[$element]);
+			if (!isset($default[$element])) return null; // no default and not value
+			$this->setDBConfigValue($element, $default[$element]);
 			return $default[$element];			
 		}
 		return $return_row->value;		
@@ -593,10 +593,10 @@ 
 	*   @param string $value : value
 	*/
 		
-	protected function addDBConfigValue($element,$value)
+	protected function addDBConfigValue($element, $value)
 	{
 	
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 	    $query=$dbConn->insert(
@@ -613,10 +613,10 @@ 
 	*	@param string $element : name of config element
 	*   @param string $value : value
 	*/
-	protected function setDBConfigValue($element,$value)
+	protected function setDBConfigValue($element, $value)
 	{
 	
-	    $dbConn = $this->getUIDatabase()->getDbConn();
+	    $dbConn=$this->getUIDatabase()->getDbConn();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 	    $query=$dbConn->update(
@@ -633,10 +633,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

Braces +75 added lines, -26 removed lines

@@ -181,7 +181,9 @@ 
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
@@ -202,7 +204,9 @@ 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
 	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
@@ -225,7 +229,9 @@ 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
 	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 	    // TODO : check for SQL injections
 		$query=$dbConn->select()
@@ -248,7 +254,9 @@ 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
 	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 		// TODO : check for SQL injections
 		$query=$dbConn->select()
 				->from(
@@ -271,7 +279,9 @@ 
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
 		$dbConn = $this->getUIDatabase()->getIdoDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -293,7 +303,9 @@ 
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
 		$dbConn = $this->getUIDatabase()->getIdoDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$query=$dbConn->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -316,7 +328,9 @@ 
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
 		$dbConn = $this->getUIDatabase()->getIdoDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$query=$dbConn->select()
 				->from(
 					array('s' => 'icinga_services'),
@@ -339,7 +353,9 @@ 
 	{		
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
 		$dbConn = $this->getUIDatabase()->getIdoDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$query=$dbConn->select()
 				->from(
 					array('s' => 'icinga_hostgroup_members'),
@@ -360,8 +376,7 @@ 
 				if (isset($common_services[$service->name2]['num']))
 				{
 					$common_services[$service->name2]['num'] +=1;
-				}
-				else
+				} else
 				{
 					$common_services[$service->name2]['num']=1;
 					$common_services[$service->name2]['name']=$service->name;
@@ -391,7 +406,9 @@ 
 	protected function getServiceIDByName($hostname,$name) 
 	{
 	    $dbConn = $this->getUIDatabase()->getIdoDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 		if ($name == null)
 		{
@@ -421,7 +438,9 @@ 
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
 		$dbConn = $this->getUIDatabase()->getIdoDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		$query=$dbConn->select()
 				->from(
@@ -440,7 +459,9 @@ 
 	{
 		// TODO Check for rule consistency
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 		// Add last modified date = creation date and username
 		$params['created'] = new Zend_Db_Expr('NOW()');
 		$params['modified'] = new 	Zend_Db_Expr('NOW()');
@@ -466,7 +487,9 @@ 
 	{
 		// TODO Check for rule consistency
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 		// Add last modified date = creation date and username
 		$params['modified'] = new 	Zend_Db_Expr('NOW()');
 		$params['modifier'] = $this->Auth()->getUser()->getUsername();
@@ -487,7 +510,9 @@ 
 		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
 
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		$query=$dbConn->delete(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -504,7 +529,9 @@ 
 	{
 		
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 		$condition=null;
 		if ($ip != null)
 		{
@@ -515,7 +542,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if($condition === null) {
+			return null;
+		}
 		$query=$dbConn->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -533,7 +562,9 @@ 
 	{
 		
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 		$condition=null;
 		if ($ip != null)
@@ -545,7 +576,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return 0;
+		if($condition === null) {
+			return 0;
+		}
 		$query=$dbConn->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -562,7 +595,9 @@ 
 	{
 	
 	    $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(
@@ -570,18 +605,28 @@ 
 				array('value'=>'value'))
 			->where('name=?',$element);
 		$return_row=$dbConn->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row==null) {
+			// value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			
 			$this->addDBConfigValue($element,$default[$element]);
 			return $default[$element];
 		}
-		if ($return_row->value == null) // value id empty
+		if ($return_row->value == null) {
+			// value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			$this->setDBConfigValue($element,$default[$element]);
 			return $default[$element];			
 		}
@@ -597,7 +642,9 @@ 
 	{
 	
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 		
 	    $query=$dbConn->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
@@ -617,7 +664,9 @@ 
 	{
 	
 	    $dbConn = $this->getUIDatabase()->getDbConn();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 	    $query=$dbConn->update(
 				$this->getModuleConfig()->getDbConfigTableName(),

library/Trapdirector/Config/MIBLoader.php

Indentation +46 added lines, -46 removed lines

@@ -31,10 +31,10 @@ 
 				
 	}
 
-    /**
-     * Get all mibs in db which have at least one trap
-     * @return array
-     */	
+	/**
+	 * Get all mibs in db which have at least one trap
+	 * @return array
+	 */	
 	
 	public function getMIBList()
 	{
@@ -58,9 +58,9 @@ 
 	
 	
 	/** Get trap list from a mib 
-	*	@param $mib string mib name
-	*	@return array : traps
-	*/
+	 *	@param $mib string mib name
+	 *	@return array : traps
+	 */
 	public function getTrapList($mib)
 	{
 		$traps=array();
@@ -68,7 +68,7 @@ 
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
-				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
+					array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
 				->where("mib = '".$mib."' AND type='21'") ;
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
@@ -79,9 +79,9 @@ 
 	}
 	
 	/** Get objects a trap can have
-	*	@param int $trap oid of trap
-	*	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
-	*/
+	 *	@param int $trap oid of trap
+	 *	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
+	 */
 	public function getObjectList($trap)
 	{
 		$objects=array();
@@ -97,15 +97,15 @@ 
 		if ( ($id == null) || ! property_exists($id,'id') ) return null;
 		
 		$query=$dbconn->select()
-		        ->from(
-		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-		                'description' => 'c.description'))
-		        ->join(
-		            array('o' => $this->config->getMIBCacheTableTrapObjName()),
-		            'o.trap_id='.$id->id )
-		        ->where("o.object_id = c.id");
+				->from(
+					array('c' => $this->config->getMIBCacheTableName()),
+					array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+						'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+						'description' => 'c.description'))
+				->join(
+					array('o' => $this->config->getMIBCacheTableTrapObjName()),
+					'o.trap_id='.$id->id )
+				->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
 		if ( count($listObjects)==0 ) return null;
 		
@@ -123,12 +123,12 @@ 
 	}
 
 	/** translate oid in MIB::Name 
-	*	@param string $oid
-	*	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
-	*/
+	 *	@param string $oid
+	 *	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
+	 */
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
+		if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
 		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
 		$dbconn = $this->db;
 
@@ -136,7 +136,7 @@ 
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
 					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
-					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
+						'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
 		if ($object != null) 
@@ -152,7 +152,7 @@ 
 		// Try to get oid name from snmptranslate
 		$matches=array();
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code===false) {
 			return null;
@@ -164,8 +164,8 @@ 
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
 		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
 		{
-		    $retArray['type']=$matches[1];
-		    $retArray['type_enum']=$matches[2];
+			$retArray['type']=$matches[1];
+			$retArray['type_enum']=$matches[2];
 		}
 		else
 		{
@@ -229,25 +229,25 @@ 
 	 */
 	public function getTrapDetails($oid=null,$id=null)
 	{	    
-	    // Get trap id in DB
-	    if ($oid===null)
-	    {
-	        $where="c.id = '$id'";
-	    }
-	    else
-	    {
-	        $where="c.oid = '$oid'";
-	    }
-	    $query=$this->db->select()
-           ->from(
-            array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-                'description' => 'c.description'))
-            ->where($where);
-        $trap=$this->db->fetchRow($query);
+		// Get trap id in DB
+		if ($oid===null)
+		{
+			$where="c.id = '$id'";
+		}
+		else
+		{
+			$where="c.oid = '$oid'";
+		}
+		$query=$this->db->select()
+		   ->from(
+			array('c' => $this->config->getMIBCacheTableName()),
+			array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+				'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+				'description' => 'c.description'))
+			->where($where);
+		$trap=$this->db->fetchRow($query);
         
-        return $trap;
+		return $trap;
 	}
 	
 }

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param \Zend_Db_Adapter_Abstract $db current database
 	 * @param TrapModuleConfig $config TrapModuleConfig class instance
 	 */
-	public function __construct($snmptranslate,$snmptranslate_dirs,$db,$config)
+	public function __construct($snmptranslate, $snmptranslate_dirs, $db, $config)
 	{
 		$this->snmptranslate=$snmptranslate;
 		$this->snmptranslate_dirs=$snmptranslate_dirs;
@@ -38,19 +38,19 @@ 
 	
 	public function getMIBList()
 	{
-		$dbconn = $this->db;
+		$dbconn=$this->db;
 		$query=$dbconn->select()
 				->distinct()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('mib' => 'mib'))
 				->where("type = '21'")
-				->order('mib ASC');				;
+				->order('mib ASC'); ;
 		$names=$dbconn->fetchAll($query);
 		$mib=array();
-		foreach($names as $val)
+		foreach ($names as $val)
 		{
-			array_push($mib,$val->mib);
+			array_push($mib, $val->mib);
 		}
 		return $mib;
 		
@@ -64,12 +64,12 @@ 
 	public function getTrapList($mib)
 	{
 		$traps=array();
-		$dbconn = $this->db;
+		$dbconn=$this->db;
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
-				->where("mib = '".$mib."' AND type='21'") ;
+				->where("mib = '".$mib."' AND type='21'");
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
 		{
@@ -87,19 +87,19 @@ 
 		$objects=array();
 		
 		// Get trap id in DB
-		$dbconn = $this->db;
+		$dbconn=$this->db;
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('id' => 'id'))
-				->where("oid = '".$trap."'") ;
+				->where("oid = '".$trap."'");
 		$id=$dbconn->fetchRow($query);
-		if ( ($id == null) || ! property_exists($id,'id') ) return null;
+		if (($id == null) || !property_exists($id, 'id')) return null;
 		
 		$query=$dbconn->select()
 		        ->from(
 		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+		            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
 		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
 		                'description' => 'c.description'))
 		        ->join(
@@ -107,7 +107,7 @@ 
 		            'o.trap_id='.$id->id )
 		        ->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
-		if ( count($listObjects)==0 ) return null;
+		if (count($listObjects) == 0) return null;
 		
 		foreach ($listObjects as $val)
 		{
@@ -128,14 +128,14 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
-		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
-		$dbconn = $this->db;
+	    if (!preg_match('/^\./', $oid)) $oid='.'.$oid; // Add a leading '.'
+		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null, 'type'=>null);
+		$dbconn=$this->db;
 
 		$query=$dbconn->select()
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
-					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
+					array('mib'=>'o.mib', 'name' => 'o.name', 'type'=>'o.syntax',
 					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
@@ -151,18 +151,18 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$matches=array();
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code===false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return null;
 		} 
 		$retArray['mib']=$matches[1];
 		$retArray['name']=$matches[2];
 		
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On ' . $matches[0] .
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On '.$matches[0].
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
-		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
+		if (preg_match('/(.*)\{(.*)\}/', $translate, $matches))
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
@@ -197,9 +197,9 @@ 
 	 * @param string $type filter by type (21=trap)
 	 * @return number number of entries in db.
 	 */
-	public function countObjects($mib=null,$type=null)
+	public function countObjects($mib=null, $type=null)
 	{
-		$dbconn = $this->db;
+		$dbconn=$this->db;
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
@@ -207,11 +207,11 @@ 
 		$where=null;
 		if ($mib !== null)
 		{
-			$where ="mib = '$mib' ";
+			$where="mib = '$mib' ";
 		}
 		if ($type !== null)
 		{
-			$where=($where !== null)?' AND ':'';
+			$where=($where !== null) ? ' AND ' : '';
 			$where.="type='$type'";
 		}
 		if ($where !== null)
@@ -227,10 +227,10 @@ 
 	 * @param integer $id
 	 * @return array trap details
 	 */
-	public function getTrapDetails($oid=null,$id=null)
+	public function getTrapDetails($oid=null, $id=null)
 	{	    
 	    // Get trap id in DB
-	    if ($oid===null)
+	    if ($oid === null)
 	    {
 	        $where="c.id = '$id'";
 	    }
@@ -241,7 +241,7 @@ 
 	    $query=$this->db->select()
            ->from(
             array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
                 'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
                 'description' => 'c.description'))
             ->where($where);

Braces +12 added lines, -7 removed lines

@@ -94,7 +94,9 @@ 
 					array('id' => 'id'))
 				->where("oid = '".$trap."'") ;
 		$id=$dbconn->fetchRow($query);
-		if ( ($id == null) || ! property_exists($id,'id') ) return null;
+		if ( ($id == null) || ! property_exists($id,'id') ) {
+			return null;
+		}
 		
 		$query=$dbconn->select()
 		        ->from(
@@ -107,7 +109,9 @@ 
 		            'o.trap_id='.$id->id )
 		        ->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
-		if ( count($listObjects)==0 ) return null;
+		if ( count($listObjects)==0 ) {
+			return null;
+		}
 		
 		foreach ($listObjects as $val)
 		{
@@ -128,7 +132,10 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
+	    if (!preg_match('/^\./',$oid)) {
+	    	$oid = '.' . $oid;
+	    }
+	    // Add a leading '.'
 		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
 		$dbconn = $this->db;
 
@@ -166,8 +173,7 @@ 
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
-		}
-		else
+		} else
 		{
 			$retArray['type']=$translate;
 			$retArray['type_enum']='';			
@@ -233,8 +239,7 @@ 
 	    if ($oid===null)
 	    {
 	        $where="c.id = '$id'";
-	    }
-	    else
+	    } else
 	    {
 	        $where="c.oid = '$oid'";
 	    }

application/controllers/ReceivedController.php

Indentation +24 added lines, -24 removed lines

@@ -40,8 +40,8 @@ 
 	}
 
 	/** 
-	*	Trap detail page
-	*/	
+	 *	Trap detail page
+	 */	
 	public function trapdetailAction() 
 	{
 		
@@ -74,7 +74,7 @@ 
 		// Do DB query for trap. 
 		try
 		{
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
@@ -107,7 +107,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$dbConn->fetchAll($query);
@@ -144,24 +144,24 @@ 
 	 */
 	public function hostsAction()
 	{
-	    $this->checkReadPermission();
-	    $this->prepareTabs()->activate('hosts');
+		$this->checkReadPermission();
+		$this->prepareTabs()->activate('hosts');
 	    
-	    $dbConn = $this->getUIDatabase()->getDb();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getDb();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
-	    $this->getTrapHostListTable()->setConnection($dbConn);
+		$this->getTrapHostListTable()->setConnection($dbConn);
 	    
-	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+		// Apply pagination limits
+		$this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
 	    
-	    // Set Filter
-	    //$postData=$this->getRequest()->getPost();
-	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
-	    $filter['done']=$this->params->get('done');
-	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+		// Set Filter
+		//$postData=$this->getRequest()->getPost();
+		$filter=array();
+		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['done']=$this->params->get('done');
+		$this->view->filter=$filter;
+		$this->view->table->updateFilter(Url::fromRequest(),$filter);
 	}
 	
 	public function deleteAction()
@@ -181,12 +181,12 @@ 
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received')
-		    )
-		    ->add('hosts', array(
-		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
-		    )
-		    ->add('delete', array(
+			)
+			->add('hosts', array(
+				'label' => $this->translate('Hosts'),
+				'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+			)
+			->add('delete', array(
 			'label' => $this->translate('Delete'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
 		  );

Spacing +33 added lines, -33 removed lines

@@ -20,20 +20,20 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('traps');
 
-		$dbConn = $this->getUIDatabase()->getDb();
+		$dbConn=$this->getUIDatabase()->getDb();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$this->getTrapListTable()->setConnection($dbConn);
 		
 		// Apply pagination limits
-		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
 		//$postData=$this->getRequest()->getPost();
 		$filter=array();
-		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 		$filter['done']=$this->params->get('done');
 		$this->view->filter=$filter;
-		$this->view->table->updateFilter(Url::fromRequest(),$filter);
+		$this->view->table->updateFilter(Url::fromRequest(), $filter);
 		
 		//$this->view->filterEditor = $this->getTrapListTable()->getFilterEditor($this->getRequest());
 
@@ -47,7 +47,7 @@ 
 		
 		$this->checkReadPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Detailed status'),
 			'url'		=> Url::fromRequest()
@@ -57,12 +57,12 @@ 
 		$this->view->trapid=$trapid;
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
-			$this->getModuleConfig()->urlPath() . '/handler/add',
+			$this->getModuleConfig()->urlPath().'/handler/add',
 			array('fromid' => $trapid));
 		// ***************  Get main data
 		// extract columns and titles;
@@ -74,28 +74,28 @@ 
 		// Do DB query for trap. 
 		try
 		{
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 			return;
 		}
 
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=strftime('%c', $trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
-			array_push($queryArray[$key],$cval);
+			array_push($queryArray[$key], $cval);
 		}
-		$this->view->rowset = $queryArray;
+		$this->view->rowset=$queryArray;
 
 		// **************   Check for additionnal data
 		
@@ -107,17 +107,17 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$dbConn->fetchAll($query);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 		// TODO : code this in a better & simpler way
-		if ($trapDetail == null ) 
+		if ($trapDetail == null) 
 		{
 			$this->view->data=false;
 		}
@@ -129,9 +129,9 @@ 
 			foreach ($trapDetail as $key => $val) 
 			{	
 				$trapval[$key]=array();
-				foreach (array_keys($queryArrayData) as $vkey ) 
+				foreach (array_keys($queryArrayData) as $vkey) 
 				{
-					array_push($trapval[$key],$val->$vkey);
+					array_push($trapval[$key], $val->$vkey);
 				}
 			}
 			$this->view->data_val=$trapval;
@@ -147,21 +147,21 @@ 
 	    $this->checkReadPermission();
 	    $this->prepareTabs()->activate('hosts');
 	    
-	    $dbConn = $this->getUIDatabase()->getDb();
+	    $dbConn=$this->getUIDatabase()->getDb();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 	    $this->getTrapHostListTable()->setConnection($dbConn);
 	    
 	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(), $this->getModuleConfig()->itemListDisplay());
 	    
 	    // Set Filter
 	    //$postData=$this->getRequest()->getPost();
 	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+	    $filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 	    $filter['done']=$this->params->get('done');
 	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+	    $this->view->table->updateFilter(Url::fromRequest(), $filter);
 	}
 	
 	public function deleteAction()
@@ -180,15 +180,15 @@ 
 	{
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received')
+			'url'   => $this->getModuleConfig()->urlPath().'/received')
 		    )
 		    ->add('hosts', array(
 		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+		        'url'   => $this->getModuleConfig()->urlPath().'/received/hosts')
 		    )
 		    ->add('delete', array(
 			'label' => $this->translate('Delete'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
+			'url'   => $this->getModuleConfig()->urlPath().'/received/delete')
 		  );
 	} 
 
@@ -215,14 +215,14 @@ 
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;
 		}
-		if ($action =="count")
+		if ($action == "count")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->countTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->countTrap($ip, $oid)));
 			return;
 		}
-		if ($action =="delete")
+		if ($action == "delete")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->deleteTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->deleteTrap($ip, $oid)));
 			return;
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));

Braces +16 added lines, -12 removed lines

@@ -21,7 +21,9 @@ 
 		$this->prepareTabs()->activate('traps');
 
 		$dbConn = $this->getUIDatabase()->getDb();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$this->getTrapListTable()->setConnection($dbConn);
 		
 		// Apply pagination limits
@@ -58,7 +60,9 @@ 
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
@@ -78,9 +82,10 @@ 
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 			return;
@@ -111,8 +116,7 @@ 
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$dbConn->fetchAll($query);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 		}
@@ -120,8 +124,7 @@ 
 		if ($trapDetail == null ) 
 		{
 			$this->view->data=false;
-		}
-		else
+		} else
 		{
 			$this->view->data=true;
 			// Store result in array.
@@ -148,7 +151,9 @@ 
 	    $this->prepareTabs()->activate('hosts');
 	    
 	    $dbConn = $this->getUIDatabase()->getDb();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 	    $this->getTrapHostListTable()->setConnection($dbConn);
 	    
@@ -209,8 +214,7 @@ 
 			$ip=$postData['IP'];
 			$oid=$postData['OID'];
 			$action=$postData['action'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;

application/controllers/StatusController.php

Indentation +88 added lines, -88 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(*)')
@@ -65,10 +65,10 @@ 
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -87,22 +87,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -110,7 +110,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -118,32 +118,32 @@ 
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
+				$name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
 				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
-				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
+					$this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
 				}
 				else
 				{
-				    if (!is_writable($destDir))
-				    {
-				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
-				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
-    				    {
-    				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
-    				    {
-    				        $this->view->uploadStatus="File $name uploaded in $destDir";
-    				    }
-				    }
+					if (!is_writable($destDir))
+					{
+						$this->view->uploadStatus="ERROR : $destDir directory is not writable";
+					}
+					else
+					{
+						$destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+						$sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
+						if (move_uploaded_file($sourceTmpNam,$destination)===false)
+						{
+							$this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
+						}
+						else
+						{
+							$this->view->uploadStatus="File $name uploaded in $destDir";
+						}
+					}
 				}
 
 			}
@@ -263,47 +263,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);
+		}
 
 	}
 	
@@ -318,30 +318,30 @@ 
 		)->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 +63 added lines, -63 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,7 +59,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -85,7 +85,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -94,32 +94,32 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+			    $name=filter_var($_FILES['mibfile']['name'], FILTER_SANITIZE_STRING);
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
@@ -133,9 +133,9 @@ 
 				    }
 				    else
 				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'], FILTER_SANITIZE_STRING);
+				        if (move_uploaded_file($sourceTmpNam, $destination) === false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
     				    }
@@ -151,13 +151,13 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
@@ -175,46 +175,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');
 		
 		
@@ -238,18 +238,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
@@ -265,15 +265,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();
@@ -281,16 +281,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);
 	        }
 	    }
 	    
@@ -298,10 +298,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);
 	    }
 
@@ -311,16 +311,16 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 	    )->add('plugins', array(
 	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/plugins')
 	    );
 	} 
 }
@@ -328,7 +328,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -337,11 +337,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 +13 added lines, -21 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->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +57,7 @@ 
 			$this->view->currentLogFile=$this->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}		
@@ -107,8 +107,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -124,22 +123,19 @@ 
 				if (!is_dir($destDir))
 				{
 				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
-				}
-				else
+				} else
 				{
 				    if (!is_writable($destDir))
 				    {
 				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
+				    } else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
+    				    } else
     				    {
     				        $this->view->uploadStatus="File $name uploaded in $destDir";
     				    }
@@ -161,13 +157,11 @@ 
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='can execute but no resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='cannot execute';
 		}
@@ -188,15 +182,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}

application/controllers/SettingsController.php

Indentation +188 added lines, -188 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,56 +71,56 @@ 
    */
   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_db_error=$dberror[0];
+	  $this->view->ido_message='IDO Database : ' . $dberror[1];
   }
   
   /**
@@ -130,23 +130,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;
+	  }
   }
 
   /**
@@ -157,21 +157,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;
+		  }
+	  }
       
   }
   
@@ -182,15 +182,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;
   }
   
   /**
@@ -209,7 +209,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();
@@ -217,16 +217,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();
@@ -241,11 +241,11 @@ 
 	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . PHP_BINARY
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -275,8 +275,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) 
@@ -287,19 +287,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';
@@ -323,32 +323,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;
@@ -361,20 +361,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');
@@ -388,28 +388,28 @@ 
 
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
-      }
-      $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
-      }
-      // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+	  }
+	  $psOutput=array();
+	  exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+	  }
+	  // Assume there is only one line... TODO : see if there is a better way to do this
+	  $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
+	  if (!preg_match('/-n/',$line))
+		  return array(1,'snmptrapd has no -n option : '.$line);
+	  if (!preg_match('/-O[^ ]*n/',$line))
+		  return array(1,'snmptrapd has no -On option : '.$line);
+	  if (!preg_match('/-O[^ ]*e/',$line))
+		  return array(1,'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

Spacing +65 added lines, -65 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,13 +114,13 @@ 
       
       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='IDO Database : '.$dberror[1];
   }
   
   /**
@@ -132,13 +132,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;
           }
       }
@@ -163,10 +163,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;
@@ -182,12 +182,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;
@@ -214,7 +214,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();
@@ -229,32 +229,32 @@ 
     $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();
 	
 	// Setup path for mini documentation
-	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=PHP_BINARY.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.PHP_BINARY
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -266,7 +266,7 @@ 
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -287,7 +287,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':
@@ -302,28 +302,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()
@@ -341,7 +341,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)
 	  {
@@ -349,40 +349,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>';
   }  
 
@@ -390,26 +390,26 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+      exec('netstat -an |grep -E "udp.*:162"', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+          return array(1, 'Port UDP/162 is not open : snmptrapd must not be started');
       }
       $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+      exec('ps fax |grep snmptrapd |grep -v grep', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+          return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+      if (!preg_match('/-n/', $line))
+          return array(1, 'snmptrapd has no -n option : '.$line);
+      if (!preg_match('/-O[^ ]*n/', $line))
+          return array(1, 'snmptrapd has no -On option : '.$line);
+      if (!preg_match('/-O[^ ]*e/', $line))
+          return array(1, 'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+      return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

Braces +13 added lines, -14 removed lines

@@ -52,8 +52,7 @@ 
               $this->Config()->saveIni();
               $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
               //$emptyConfig=1;
-          }
-          catch (Exception $e)
+          } catch (Exception $e)
           {
               $this->view->configErrorDetected=$e->getMessage();
           }
@@ -141,8 +140,7 @@ 
               $this->view->apimessage='API config : ' . $e->getMessage();
               $this->view->apimessageError=true;
           }
-      }
-      else
+      } else
       {
           $this->view->apimessage='API parameters not configured';
           $this->view->apimessageError=true;
@@ -278,8 +276,7 @@ 
 	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
 	    printf('Schema already exists');
 	    
-	} 
-	catch (DBException $e) 
+	} catch (DBException $e) 
 	{
 
 		printf('Creating schema : <br>');
@@ -335,8 +332,7 @@ 
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
           echo 'Schema already exists and is up to date<br>';
           return;
-      }
-      catch (DBException $e)
+      } catch (DBException $e)
       {
           $dberror=$e->getArray(); 
       }
@@ -403,12 +399,15 @@ 
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
       $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      if (!preg_match('/-n/',$line)) {
+                return array(1,'snmptrapd has no -n option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*n/',$line)) {
+                return array(1,'snmptrapd has no -On option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*e/',$line)) {
+                return array(1,'snmptrapd has no -Oe option : '.$line);
+      }
       
       return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }

application/controllers/HandlerController.php

Indentation +243 added lines, -244 removed lines

@@ -11,13 +11,12 @@ 
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -41,22 +40,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='';
+		}
 	}
 	
 	/**
@@ -64,31 +63,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;
 	}
 	
 	/**
@@ -97,102 +96,102 @@ 
 	 */
 	private function add_from_existing($trapid)
 	{
-	    /********** Setup from existing trap ***************/
-	    // Get the full trap info
-	    $trapDetail=$this->getTrapDetail($trapid);
+		/********** Setup from existing trap ***************/
+		// Get the full trap info
+		$trapDetail=$this->getTrapDetail($trapid);
 	    
-	    $hostfilter=$trapDetail->source_ip;
+		$hostfilter=$trapDetail->source_ip;
 	    
-	    // Get host
-	    try
-	    {
-	        $hosts=$this->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getHostByIP($hostfilter);
+		}
+		catch (Exception $e)
+		{
+			$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+		}
 	    
 	    
-	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
-	        $this->view->hostname=$hosts[0]->name;
-	        //$hostid=$hosts[0]->id;
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
+		// if one unique host found -> put id text input
+		if (count($hosts)==1) {
+			$this->view->hostname=$hosts[0]->name;
+			//$hostid=$hosts[0]->id;
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
 	        
-	    }
-	    else
-	    {
-	        foreach($hosts as $key=>$val)
-	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
-	        }
-	    }
+		}
+		else
+		{
+			foreach($hosts as $key=>$val)
+			{
+				array_push($this->view->hostlist,$hosts[$key]->name);
+			}
+		}
 	    
-	    // set up trap oid and objects received by the trap
+		// set up trap oid and objects received by the trap
 	    
-	    $this->view->mainoid=$trapDetail->trap_oid;
-	    if ($trapDetail->trap_name_mib != null)
-	    {
-	        $this->view->mib=$trapDetail->trap_name_mib;
-	        $this->view->name=$trapDetail->trap_name;
-	        $this->view->trapListForMIB=$this->getMIB()
-	        ->getTrapList($trapDetail->trap_name_mib);
-	    }
+		$this->view->mainoid=$trapDetail->trap_oid;
+		if ($trapDetail->trap_name_mib != null)
+		{
+			$this->view->mib=$trapDetail->trap_name_mib;
+			$this->view->name=$trapDetail->trap_name;
+			$this->view->trapListForMIB=$this->getMIB()
+			->getTrapList($trapDetail->trap_name_mib);
+		}
 	    
-	    // Get all objects that can be in trap from MIB
-	    $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
-	    // Get all objects in current Trap
-	    $currentTrapObjects=$this->getTrapobjects($trapid);
-	    $oid_index=1;
-	    foreach ($currentTrapObjects as $key => $val)
-	    {
-	        $currentObjectType='Unknown';
-	        $currentObjectTypeEnum='Unknown';
-	        if (isset($allObjects[$val->oid]['type']))
-	        {
-	            $currentObjectType=$allObjects[$val->oid]['type'];
-	            $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
-	        }
-	        $currentObject=array(
-	            $oid_index,
-	            $val->oid,
-	            $val->oid_name_mib,
-	            $val->oid_name,
-	            $val->value,
-	            $currentObjectType,
-	            $currentObjectTypeEnum
-	        );
-	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
-	        // set currrent object to null in allObjects
-	        if (isset($allObjects[$val->oid]))
-	        {
-	            $allObjects[$val->oid]=null;
-	        }
-	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
-	    {
-	        foreach ($allObjects as $key => $val)
-	        {
-	            if ($val==null) { continue; }
-	            array_push($this->view->objectList, array(
-	                $oid_index,
-	                $key,
-	                $allObjects[$key]['mib'],
-	                $allObjects[$key]['name'],
-	                '',
-	                $allObjects[$key]['type'],
-	                $allObjects[$key]['type_enum']
-	            ));
-	            $oid_index++;
-	        }
-	    }
+		// Get all objects that can be in trap from MIB
+		$allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
+		// Get all objects in current Trap
+		$currentTrapObjects=$this->getTrapobjects($trapid);
+		$oid_index=1;
+		foreach ($currentTrapObjects as $key => $val)
+		{
+			$currentObjectType='Unknown';
+			$currentObjectTypeEnum='Unknown';
+			if (isset($allObjects[$val->oid]['type']))
+			{
+				$currentObjectType=$allObjects[$val->oid]['type'];
+				$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
+			}
+			$currentObject=array(
+				$oid_index,
+				$val->oid,
+				$val->oid_name_mib,
+				$val->oid_name,
+				$val->value,
+				$currentObjectType,
+				$currentObjectTypeEnum
+			);
+			$oid_index++;
+			array_push($this->view->objectList,$currentObject);
+			// set currrent object to null in allObjects
+			if (isset($allObjects[$val->oid]))
+			{
+				$allObjects[$val->oid]=null;
+			}
+		}
+		if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+		{
+			foreach ($allObjects as $key => $val)
+			{
+				if ($val==null) { continue; }
+				array_push($this->view->objectList, array(
+					$oid_index,
+					$key,
+					$allObjects[$key]['mib'],
+					$allObjects[$key]['name'],
+					'',
+					$allObjects[$key]['type'],
+					$allObjects[$key]['type_enum']
+				));
+				$oid_index++;
+			}
+		}
 	    
-	    // Add a simple display
-	    $this->view->display='Trap '.$trapDetail->trap_name.' received';
-	    $this->view->create_basic_rule=true;
+		// Add a simple display
+		$this->view->display='Trap '.$trapDetail->trap_name.' received';
+		$this->view->create_basic_rule=true;
 	}
 
 	/**
@@ -201,29 +200,29 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
-	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
-	        $this->view->serviceGet=false;
-	    }
-	    else
-	    {
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
-	        // get service id for form to set :
-	        $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
-	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
-	        {
-	            $this->view->serviceSet=$serviceID[0]->id;
-	        }
-	    }
+		if (count($host_get)==0)
+		{
+			$this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+			$this->view->serviceGet=false;
+		}
+		else
+		{
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
+			// get service id for form to set :
+			$serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
+			if (count($serviceID) ==0)
+			{
+				$this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+			else
+			{
+				$this->view->serviceSet=$serviceID[0]->id;
+			}
+		}
 	}
 
 	/**
@@ -232,33 +231,33 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
-	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
-	        $this->view->serviceGroupGet=false;
-	    }
-	    else
-	    {
-	        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
-	        $foundGrpService=0;
-	        foreach ($grpServices as $grpService)
-	        {
-	            if ($grpService[0] == $ruleDetail->service_name)
-	            {
-	                $foundGrpService=1;
-	                $this->view->serviceSet=$ruleDetail->service_name;
-	            }
-	        }
+		// Check if groupe exists
+		$group_get=$this->getHostGroupByName($this->view->hostgroupname);
+		if (count($group_get)==0)
+		{
+			$this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+			$this->view->serviceGroupGet=false;
+		}
+		else
+		{
+			$grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
+			$foundGrpService=0;
+			foreach ($grpServices as $grpService)
+			{
+				if ($grpService[0] == $ruleDetail->service_name)
+				{
+					$foundGrpService=1;
+					$this->view->serviceSet=$ruleDetail->service_name;
+				}
+			}
 	        
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
-	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	    }
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGroupGet=true;
+			if ($foundGrpService==0)
+			{
+				$this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+		}
 	}
 	
 	/**
@@ -270,52 +269,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();
@@ -334,8 +333,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;
 		}
 		
@@ -360,14 +359,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;
@@ -395,9 +394,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();
@@ -438,7 +437,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -522,9 +521,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');  }
@@ -540,14 +539,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)
@@ -561,9 +560,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');  }
@@ -579,7 +578,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -595,10 +594,10 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object : column objects in db 
-	*
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object : column objects in db 
+	 *
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -609,7 +608,7 @@ 
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -626,7 +625,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +81 added lines, -81 removed lines

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

Braces +44 added lines, -42 removed lines

@@ -24,7 +24,9 @@ 
 		$this->prepareTabs()->activate('status');
 
 		$dbConn = $this->getUIDatabase()->getDb();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		$this->getHandlerListTable()->setConnection($dbConn);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
@@ -52,8 +54,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -107,8 +108,7 @@ 
 	    try
 	    {
 	        $hosts=$this->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 	    }
@@ -121,8 +121,7 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        
-	    }
-	    else
+	    } else
 	    {
 	        foreach($hosts as $key=>$val)
 	        {
@@ -172,11 +171,14 @@ 
 	            $allObjects[$val->oid]=null;
 	        }
 	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+	    if ($allObjects!=null) {
+	    	// in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val==null) { continue;
+	    }
+	    }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -208,8 +210,7 @@ 
 	    {
 	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
@@ -218,8 +219,7 @@ 
 	        if (count($serviceID) ==0)
 	        {
 	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
+	        } else
 	        {
 	            $this->view->serviceSet=$serviceID[0]->id;
 	        }
@@ -238,8 +238,7 @@ 
 	    {
 	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
 	        $foundGrpService=0;
@@ -291,8 +290,7 @@ 
 	                $object['type'],
 	                $object['type_enum']
 	            ));
-	        }
-	        else
+	        } else
 	        {
 	            array_push($curObjectList, array(
 	                $index,
@@ -363,8 +361,7 @@ 
 			    $this->view->selectGroup=false;
 			    // Check if hostname still exists
 			    $this->add_check_host_exists($ruleDetail);
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
@@ -372,9 +369,11 @@ 
 			
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
-			if ($oidName != null)  // oid is found in mibs
+			if ($oidName != null) {
+				// oid is found in mibs
 			{
-				$this->view->mib=$oidName['mib']; 
+				$this->view->mib=$oidName['mib'];
+			}
 				$this->view->name=$oidName['name'];
 				$this->view->trapListForMIB=$this->getMIB()
 					->getTrapList($oidName['mib']);				
@@ -429,8 +428,7 @@ 
 			try
 			{
 				$this->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -444,13 +442,15 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
+			if ($params[$key]['post']==null) {
+				continue;
+			}
+			// data not sent in post vars
 			if (! isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
 				$this->_helper->json(array('status'=>'No ' . $key));
-			}
-			else
+			} else
 			{
 				$data=$postData[$params[$key]['post']];
 				if ($data!=null && $data !="")
@@ -480,8 +480,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 				$object=$this->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -505,14 +504,12 @@ 
 			if ($params['db_rule']['val'] == -1 ) 
 			{
 				$ruleID=$this->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>$e->getMessage()));
 			return;
@@ -531,7 +528,9 @@ 
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -549,8 +548,7 @@ 
 			    $trapDetail = 'NULL';
 			    throw new Exception('No traps was found with id = '.$trapid);
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
 			return;
@@ -570,7 +568,9 @@ 
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -584,8 +584,7 @@ 
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
 			return array();
@@ -605,7 +604,9 @@ 
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		try
 		{		
@@ -613,9 +614,10 @@ 
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
-		}
-		catch (Exception $e)
+			if ( $ruleDetail == null ) {
+				throw new Exception('No rule was found with id = '.$ruleid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
 			throw new Exception('Error : ',$e->getMessage());