patrickpr / trapdirector

application/controllers/HelperController.php

Indentation +128 added lines, -128 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()
 	{
 		
@@ -243,7 +243,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+				$this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
 			}
 			catch (Exception $e)
 			{
@@ -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
@@ -319,9 +319,9 @@ 
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+			$this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
+			$this->getUIDatabase()->setDBConfigValue('log_file',$file);
+			$this->getUIDatabase()->setDBConfigValue('log_level',$level);
 		}
 		catch (Exception $e)
 		{
@@ -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];
 	}
 }

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->getUIDatabase()->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->getUIDatabase()->setDBConfigValue('log_destination',$destination);
 		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
 		    $this->getUIDatabase()->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;

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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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,20 +235,20 @@ 
 		
 		$postData=$this->getRequest()->getPost();
 		
-		$days = $this->checkPostVar($postData, 'days', '^[0-9]+$');
+		$days=$this->checkPostVar($postData, 'days', '^[0-9]+$');
 		$days=intval($days);
 
-		$action = $this->checkPostVar($postData, 'action', 'save|execute');
+		$action=$this->checkPostVar($postData, 'action', 'save|execute');
 		
 		if ($action == 'save')
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+			    $this->getUIDatabase()->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'));
@@ -258,16 +258,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'));
@@ -285,7 +285,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$destination = $this->checkPostVar($postData, 'destination', '.*');
+		$destination=$this->checkPostVar($postData, 'destination', '.*');
 		$logDest=$this->getModuleConfig()->getLogDestinations();
 		if (!isset($logDest[$destination]))
 		{
@@ -296,7 +296,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));
@@ -316,17 +316,17 @@ 
 			}
 		}
 
-		$level = $this->checkPostVar($postData, 'level', '[0-9]');
+		$level=$this->checkPostVar($postData, 'level', '[0-9]');
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+		    $this->getUIDatabase()->setDBConfigValue('log_destination', $destination);
+		    $this->getUIDatabase()->setDBConfigValue('log_file', $file);
+		    $this->getUIDatabase()->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'));
@@ -344,29 +344,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));
 	    }
 	    
@@ -381,15 +381,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);
@@ -397,7 +397,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)
@@ -419,45 +419,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/TrapsController.php

Indentation +48 added lines, -48 removed lines

@@ -43,8 +43,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -76,12 +76,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;
 	}
 	
 	/**
@@ -102,23 +102,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 ?)
@@ -127,33 +127,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 **********************/
@@ -173,18 +173,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()
 			);
 		}
@@ -194,13 +194,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +20 added lines, -20 removed lines

@@ -54,7 +54,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -65,7 +65,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -78,7 +78,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -91,7 +91,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -104,38 +104,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');
         }		
 	}
 	
@@ -146,10 +146,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;
         }
@@ -161,10 +161,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;
@@ -179,7 +179,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'),
@@ -199,10 +199,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 +3 added lines, -1 removed lines

@@ -180,7 +180,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'),

library/Trapdirector/TrapsActions/IdoDBQuery.php

Spacing +28 added lines, -28 removed lines

@@ -23,14 +23,14 @@ 
     public 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->getIdoDbConn();
+        $dbConn=$this->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',
@@ -46,14 +46,14 @@ 
     public 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->getIdoDbConn();
+        $dbConn=$this->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',
@@ -69,13 +69,13 @@ 
     public 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->getIdoDbConn();
+        $dbConn=$this->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',
@@ -91,8 +91,8 @@ 
      */
     public function getHostInfoByID($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -113,18 +113,18 @@ 
      */
     public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->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);
     }
     
@@ -136,17 +136,17 @@ 
     public 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->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->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);
     }
@@ -159,8 +159,8 @@ 
      */
     public function getServicesByHostGroupid($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -177,11 +177,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
                         {
@@ -197,7 +197,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']));
                     }
                 }
                 
@@ -210,9 +210,9 @@ 
      *	@param $name string service name
      *	@return array  service id
      */
-    public function getServiceIDByName($hostname,$name)
+    public function getServiceIDByName($hostname, $name)
     {
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         if ($name == null)
@@ -223,7 +223,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',
@@ -241,14 +241,14 @@ 
     public 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->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->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);

Braces +28 added lines, -11 removed lines

@@ -24,7 +24,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->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()
@@ -47,7 +49,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->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()
@@ -70,7 +74,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->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(
@@ -93,7 +99,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->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'),
@@ -115,7 +123,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->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'),
@@ -138,7 +148,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->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'),
@@ -161,7 +173,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->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'),
@@ -182,8 +196,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;
@@ -213,7 +226,9 @@ 
     public function getServiceIDByName($hostname,$name)
     {
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         if ($name == null)
         {
@@ -243,7 +258,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->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->select()
         ->from(

Indentation +222 added lines, -222 removed lines

@@ -18,247 +18,247 @@
 trait IdoDBQuery
 {
 
-    /** @return TrapsController */
-    abstract protected function getTrapCtrl();
+	/** @return TrapsController */
+	abstract protected function getTrapCtrl();
     
-    /** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
-    abstract public function getIdoDbConn();
+	/** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
+	abstract public function getIdoDbConn();
     
-    /** 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)
-     */
-    public 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->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** 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)
+	 */
+	public 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->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'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host(s) by name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public 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->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get host(s) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public 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->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'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("a.name1 = '$name'");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("a.name1 = '$name'");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host groups by  name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public 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->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'))
-            ->join(
-                array('b' => 'icinga_hostgroups'),
-                'b.hostgroup_object_id=a.object_id',
-                array('display_name' => 'b.alias'))
-                ->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+	/** Get host groups by  name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public 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->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'))
+			->join(
+				array('b' => 'icinga_hostgroups'),
+				'b.hostgroup_object_id=a.object_id',
+				array('display_name' => 'b.alias'))
+				->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
  
-    /** Get host IP (v4 and v6) by name in IDO database
-     *	does not catch exceptions
-     *	@return array ( name, display_name, ip4, ip6)
-     */
-    public function getHostInfoByID($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
-                ->where("a.object_id = '".$id."'");
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host IP (v4 and v6) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
+	public function getHostInfoByID($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
+				->where("a.object_id = '".$id."'");
+				return $dbConn->fetchRow($query);
+	}
         
-    /** Get host by objectid  in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( id, name, display_name, ip, ip6,  )
-     */
-    public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->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'))
-            ->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);
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host by objectid  in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
+	public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->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'))
+			->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);
+				return $dbConn->fetchRow($query);
+	}
     
-    /** 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
-     */
-    public 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->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'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                array('is_active'=>'a.is_active','name2'=>'a.name2'))
-                ->where('s.host_object_id='.$id.' AND a.is_active = 1');
-                return $dbConn->fetchAll($query);
-    }
+	/** 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
+	 */
+	public 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->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'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				array('is_active'=>'a.is_active','name2'=>'a.name2'))
+				->where('s.host_object_id='.$id.' AND a.is_active = 1');
+				return $dbConn->fetchAll($query);
+	}
     
-    /** 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
-     */
-    public function getServicesByHostGroupid($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_hostgroup_members'),
-            array('host_object_id' => 's.host_object_id'))
-            ->join(
-                array('a' => 'icinga_hostgroups'),
-                's.hostgroup_id=a.hostgroup_id',
-                'hostgroup_object_id')
-                ->where('a.hostgroup_object_id='.$id);
-                $hosts=$dbConn->fetchAll($query);
-                $common_services=array();
-                $num_hosts=count($hosts);
-                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)
-                    {
-                        if (isset($common_services[$service->name2]['num']))
-                        {
-                            $common_services[$service->name2]['num'] +=1;
-                        }
-                        else
-                        {
-                            $common_services[$service->name2]['num']=1;
-                            $common_services[$service->name2]['name']=$service->name;
-                        }
-                    }
-                }
-                $result=array();
+	/** 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
+	 */
+	public function getServicesByHostGroupid($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_hostgroup_members'),
+			array('host_object_id' => 's.host_object_id'))
+			->join(
+				array('a' => 'icinga_hostgroups'),
+				's.hostgroup_id=a.hostgroup_id',
+				'hostgroup_object_id')
+				->where('a.hostgroup_object_id='.$id);
+				$hosts=$dbConn->fetchAll($query);
+				$common_services=array();
+				$num_hosts=count($hosts);
+				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)
+					{
+						if (isset($common_services[$service->name2]['num']))
+						{
+							$common_services[$service->name2]['num'] +=1;
+						}
+						else
+						{
+							$common_services[$service->name2]['num']=1;
+							$common_services[$service->name2]['name']=$service->name;
+						}
+					}
+				}
+				$result=array();
                 
-                //print_r($common_services);
-                foreach (array_keys($common_services) as $key)
-                {
-                    if ($common_services[$key]['num'] == $num_hosts)
-                    {
-                        array_push($result,array($key,$common_services[$key]['name']));
-                    }
-                }
+				//print_r($common_services);
+				foreach (array_keys($common_services) as $key)
+				{
+					if ($common_services[$key]['num'] == $num_hosts)
+					{
+						array_push($result,array($key,$common_services[$key]['name']));
+					}
+				}
                 
-                return $result;
-    }
+				return $result;
+	}
     
-    /** 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
-     */
-    public function getServiceIDByName($hostname,$name)
-    {
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** 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
+	 */
+	public function getServiceIDByName($hostname,$name)
+	{
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        if ($name == null)
-        {
-            return array();
-        }
+		if ($name == null)
+		{
+			return array();
+		}
         
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                'is_active')
-                ->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_services'),
+			array('name' => 's.display_name','id' => 's.service_object_id'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				'is_active')
+				->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
                 
-                return $dbConn->fetchAll($query);
-    }
+				return $dbConn->fetchAll($query);
+	}
     
-    /** 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)
-     */
-    public 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->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** 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)
+	 */
+	public 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->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'))
-            ->where('a.object_id='.$id.' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name1' => 'a.name1','name2' => 'a.name2'))
+			->where('a.object_id='.$id.' AND a.is_active = 1');
             
-            return $dbConn->fetchRow($query);
-    }
+			return $dbConn->fetchRow($query);
+	}
     
     
 }
\ No newline at end of file

library/Trapdirector/TrapsProcess/MibDatabase.php

Braces +7 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
             }
             $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
             return 1;
-        }
-        else
+        } else
         {
             $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
             return 0;
@@ -97,7 +96,9 @@ 
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->getTrapsDB()->trapDBType == 'pgsql') {
+        	$sql .= 'RETURNING id';
+        }
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -139,7 +140,9 @@ 
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id==false) {
+                	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                }
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
                 break;
             default:

Indentation +154 added lines, -154 removed lines

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

Spacing +26 added lines, -26 removed lines

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

library/Trapdirector/TrapsProcess/Mib.php

Indentation +455 added lines, -455 removed lines

@@ -14,57 +14,57 @@ 
  */
 class Mib
 {
-    use \MibDatabase;
+	use \MibDatabase;
     
-    /** @var Logging $logging logging class */
-    protected $logging;
-    /** @var Database $trapsDB Database class */
-    protected $trapsDB;
+	/** @var Logging $logging logging class */
+	protected $logging;
+	/** @var Database $trapsDB Database class */
+	protected $trapsDB;
     
-    /** @var string $snmptranslate */
-    public $snmptranslate;
-    /** @var string $snmptranslateDirs */
-    public $snmptranslateDirs;
+	/** @var string $snmptranslate */
+	public $snmptranslate;
+	/** @var string $snmptranslateDirs */
+	public $snmptranslateDirs;
     
-    private $dbOidAll; //< All oid in database;
-    private $dbOidIndex; //< Index of oid in dbOidAll
-    private $objectsAll; //< output lines of snmptranslate list
-    private $trapObjectsIndex; //< array of traps objects (as OID)
+	private $dbOidAll; //< All oid in database;
+	private $dbOidIndex; //< Index of oid in dbOidAll
+	private $objectsAll; //< output lines of snmptranslate list
+	private $trapObjectsIndex; //< array of traps objects (as OID)
     
-    private $oidDesc=array(); //< $oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL
+	private $oidDesc=array(); //< $oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL
 
-    // Timing vars for update
-    private $timing=array();
+	// Timing vars for update
+	private $timing=array();
     
-    /**
-     * Setup Mib Class
-     * @param Logging $logClass : where to log
-     * @param Database $dbClass : Database
-     */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
-    {
-        $this->logging=$logClass;
-        $this->trapsDB=$dbClass;
-        $this->snmptranslate=$snmptrans;
-        $this->snmptranslateDirs=$snmptransdir;
+	/**
+	 * Setup Mib Class
+	 * @param Logging $logClass : where to log
+	 * @param Database $dbClass : Database
+	 */
+	function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+	{
+		$this->logging=$logClass;
+		$this->trapsDB=$dbClass;
+		$this->snmptranslate=$snmptrans;
+		$this->snmptranslateDirs=$snmptransdir;
 
-    }
+	}
     
-    /**
-     * @return \Trapdirector\Logging
-     */
-    public function getLogging()
-    {
-        return $this->logging;
-    }
+	/**
+	 * @return \Trapdirector\Logging
+	 */
+	public function getLogging()
+	{
+		return $this->logging;
+	}
 
-    /**
-     * @return \Trapdirector\Database
-     */
-    public function getTrapsDB()
-    {
-        return $this->trapsDB;
-    }
+	/**
+	 * @return \Trapdirector\Database
+	 */
+	public function getTrapsDB()
+	{
+		return $this->trapsDB;
+	}
 
 /**
  * Get object details & mib , returns snmptranslate output
@@ -72,478 +72,478 @@ 
  * @param string $trapmib : mib of trap
  * @return NULL|array : null if not found, or output of snmptranslate
  */
-    private function get_object_details($object,$trapmib)
-    {
-        $match=$snmptrans=array();
-        $retVal=0;
-        $this->oidDesc['mib']=$trapmib;
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-        if ($retVal!=0)
-        {
-            // Maybe not trap mib, search with IR
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-            { // Not found -> continue with warning
-                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-                return null;
-            }
-            $this->oidDesc['mib']=$match[1];
+	private function get_object_details($object,$trapmib)
+	{
+		$match=$snmptrans=array();
+		$retVal=0;
+		$this->oidDesc['mib']=$trapmib;
+		exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+			' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+		if ($retVal!=0)
+		{
+			// Maybe not trap mib, search with IR
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+			{ // Not found -> continue with warning
+				$this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+				return null;
+			}
+			$this->oidDesc['mib']=$match[1];
             
-            // Do the snmptranslate again.
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
-            if ($retVal!=0) {
-                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
-                return null;
-            }
+			// Do the snmptranslate again.
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
+			if ($retVal!=0) {
+				$this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
+				return null;
+			}
             
-        }
-        return $snmptrans;
-    }
+		}
+		return $snmptrans;
+	}
 
 /**
  * Parse snmptranslate output and set  $this->oidDesc with elements 
  * @param array $snmptrans : multi line output of snmptrans
  */
-    private function parse_object($snmptrans)
-    {
-        $tmpdesc=''; // For multiline description
-        $indesc=false; // true if currently inside multiline description
-        $match=array();
+	private function parse_object($snmptrans)
+	{
+		$tmpdesc=''; // For multiline description
+		$indesc=false; // true if currently inside multiline description
+		$match=array();
         
-        foreach ($snmptrans as $line)
-        {
-            if ($indesc===true)
-            {
-                $line=preg_replace('/[\t ]+/',' ',$line);
-                if (preg_match('/(.*)"$/', $line,$match))
-                {
-                    $this->oidDesc['description'] = $tmpdesc . $match[1];
-                    $indesc=false;
-                }
-                $tmpdesc.=$line;
-                continue;
-            }
-            if (preg_match('/^\.[0-9\.]+$/', $line))
-            {
-                $this->oidDesc['oid']=$line;
-                continue;
-            }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-            {
-                $this->oidDesc['syntax']=$match[1];
-                $this->oidDesc['type_enum']=$match[2];
-                continue;
-            }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-            {
-                $this->oidDesc['syntax']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-            {
-                $this->oidDesc['dispHint']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-            {
-                $this->oidDesc['description']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-            {
-                $tmpdesc=$match[1];
-                $indesc=true;
-                continue;
-            }
-            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-            {
-                $this->oidDesc['textconv']=$match[1];
-                continue;
-            }
-        }
-    }
+		foreach ($snmptrans as $line)
+		{
+			if ($indesc===true)
+			{
+				$line=preg_replace('/[\t ]+/',' ',$line);
+				if (preg_match('/(.*)"$/', $line,$match))
+				{
+					$this->oidDesc['description'] = $tmpdesc . $match[1];
+					$indesc=false;
+				}
+				$tmpdesc.=$line;
+				continue;
+			}
+			if (preg_match('/^\.[0-9\.]+$/', $line))
+			{
+				$this->oidDesc['oid']=$line;
+				continue;
+			}
+			if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+			{
+				$this->oidDesc['syntax']=$match[1];
+				$this->oidDesc['type_enum']=$match[2];
+				continue;
+			}
+			if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+			{
+				$this->oidDesc['syntax']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+			{
+				$this->oidDesc['dispHint']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+			{
+				$this->oidDesc['description']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+			{
+				$tmpdesc=$match[1];
+				$indesc=true;
+				continue;
+			}
+			if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+			{
+				$this->oidDesc['textconv']=$match[1];
+				continue;
+			}
+		}
+	}
 
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
-    {              
-        $trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
+	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	{              
+		$trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
         
-        if ($check_existing === true)
-        {
-            $dbObjects=$this->cache_db_objects($trapId);
-        }
+		if ($check_existing === true)
+		{
+			$dbObjects=$this->cache_db_objects($trapId);
+		}
         
-        foreach ($objects as $object)
-        {
+		foreach ($objects as $object)
+		{
             
-            $this->reset_oidDesc();
+			$this->reset_oidDesc();
             
-            $snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
-            if ($snmptrans === null) continue; // object not found
+			$snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
+			if ($snmptrans === null) continue; // object not found
             
-            $this->parse_object($snmptrans);
+			$this->parse_object($snmptrans);
 
-            $this->oidDesc['name'] = $object;
+			$this->oidDesc['name'] = $object;
             
-            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
+			$this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
 
-            // Update
-            $this->update_oid();
+			// Update
+			$this->update_oid();
             
-            if (isset($dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]))
-            {   // if link exists, continue
-                $dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]=2;
-                continue;
-            }
-            if ($check_existing === true)
-            {
-                // TODO : check link trap - objects exists, mark them.
-            }
-            // Associate in object table
-            $db_conn=$this->trapsDB->db_connect_trap();
-            $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
-                'values (:trap_id, :object_id)';
-            $sqlQuery=$db_conn->prepare($sql);
-            $sqlParam=array(
-                ':trap_id' => $trapId,
-                ':object_id' => $this->dbOidIndex[$this->oidDesc['oid']]['id'],
-            );
+			if (isset($dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true)
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$db_conn=$this->trapsDB->db_connect_trap();
+			$sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
+				'values (:trap_id, :object_id)';
+			$sqlQuery=$db_conn->prepare($sql);
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$this->oidDesc['oid']]['id'],
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
-            }
-        }
-        if ($check_existing === true)
-        {
-            // TODO : remove link trap - objects that wasn't marked.
-        }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
         
-    }
+	}
 
-    private function reset_oidDesc()
-    {
-        $this->oidDesc['oid']=null;
-        $this->oidDesc['name']=null;
-        $this->oidDesc['type']=null;
-        $this->oidDesc['mib']=null;
-        $this->oidDesc['textconv']=null;
-        $this->oidDesc['dispHint'] =null;
-        $this->oidDesc['syntax']=null;
-        $this->oidDesc['type_enum']=null;
-        $this->oidDesc['description']=null;
-    }
+	private function reset_oidDesc()
+	{
+		$this->oidDesc['oid']=null;
+		$this->oidDesc['name']=null;
+		$this->oidDesc['type']=null;
+		$this->oidDesc['mib']=null;
+		$this->oidDesc['textconv']=null;
+		$this->oidDesc['dispHint'] =null;
+		$this->oidDesc['syntax']=null;
+		$this->oidDesc['type_enum']=null;
+		$this->oidDesc['description']=null;
+	}
     
-    /**
-     * Fills $this->objectsAll with all mibs from snmptranslate
-     * @return integer : number of elements 
-     */
-    private function load_mibs_snmptranslate()
-    {
-        $retVal=0;
-        // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
-        unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
-        }
-        // Count elements to show progress
-        $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
-        return $numElements;
-    }
+	/**
+	 * Fills $this->objectsAll with all mibs from snmptranslate
+	 * @return integer : number of elements 
+	 */
+	private function load_mibs_snmptranslate()
+	{
+		$retVal=0;
+		// Get all mib objects from all mibs
+		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		unset($this->objectsAll);
+		exec($snmpCommand,$this->objectsAll,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR,'');
+		}
+		// Count elements to show progress
+		$numElements=count($this->objectsAll);
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		return $numElements;
+	}
 
-    /**
-     * load all mib objects db in dbOidAll (raw) and index in dbOidIndex
-     */
-    private function load_mibs_from_db()
-    {
-        // Get all mibs from databse to have a memory index
+	/**
+	 * load all mib objects db in dbOidAll (raw) and index in dbOidIndex
+	 */
+	private function load_mibs_from_db()
+	{
+		// Get all mibs from databse to have a memory index
         
-        $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $this->dbOidAll=$ret_code->fetchAll();
-        $this->dbOidIndex=array();
-        // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
-        {
-            $this->dbOidIndex[$val['oid']]['key']=$key;
-            $this->dbOidIndex[$val['oid']]['id']=$val['id'];
-        }
-    }
+		$sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$this->dbOidAll=$ret_code->fetchAll();
+		$this->dbOidIndex=array();
+		// Create the index for db;
+		foreach($this->dbOidAll as $key=>$val)
+		{
+			$this->dbOidIndex[$val['oid']]['key']=$key;
+			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
+		}
+	}
 
-    /**
-     * Reset all update timers & count to zero
-     */
-    private function reset_update_timers()
-    {
-        $this->timing['base_parse_time']=0;
-        $this->timing['base_check_time']=0;
-        $this->timing['type0_check_time']=0;
-        $this->timing['nottrap_time']=0;
-        $this->timing['update_time']=0;
-        $this->timing['objects_time']=0;
-        $this->timing['base_parse_num']=0;
-        $this->timing['base_check_num']=0;
-        $this->timing['type0_check_num']=0;
-        $this->timing['nottrap_num']=0;
-        $this->timing['update_num']=0;
-        $this->timing['objects_num']=0;
-        $this->timing['num_traps']=0;
-    }
+	/**
+	 * Reset all update timers & count to zero
+	 */
+	private function reset_update_timers()
+	{
+		$this->timing['base_parse_time']=0;
+		$this->timing['base_check_time']=0;
+		$this->timing['type0_check_time']=0;
+		$this->timing['nottrap_time']=0;
+		$this->timing['update_time']=0;
+		$this->timing['objects_time']=0;
+		$this->timing['base_parse_num']=0;
+		$this->timing['base_check_num']=0;
+		$this->timing['type0_check_num']=0;
+		$this->timing['nottrap_num']=0;
+		$this->timing['update_num']=0;
+		$this->timing['objects_num']=0;
+		$this->timing['num_traps']=0;
+	}
 
-    /**
-     * Detect if $this->objectsAll[$curElement] is a trap 
-     * @param integer $curElement
-     * @param bool $onlyTraps : set to false to get all and not only traps.
-     * @return boolean : false if it's a trap , true if not
-     */
-    private function detect_trap($curElement,$onlyTraps)
-    {
-        // Get oid or pass if not found
-        if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
-        {
-            $this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_parse_num'] ++;
-            return true;
-        }
-        $this->oidDesc['oid']=$this->objectsAll[$curElement];
+	/**
+	 * Detect if $this->objectsAll[$curElement] is a trap 
+	 * @param integer $curElement
+	 * @param bool $onlyTraps : set to false to get all and not only traps.
+	 * @return boolean : false if it's a trap , true if not
+	 */
+	private function detect_trap($curElement,$onlyTraps)
+	{
+		// Get oid or pass if not found
+		if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+		{
+			$this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['base_parse_num'] ++;
+			return true;
+		}
+		$this->oidDesc['oid']=$this->objectsAll[$curElement];
         
-        // get next line
-        $curElement++;
-        $match=$snmptrans=array();
-        if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-            $this->objectsAll[$curElement],$match))
-        {
-            $this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_check_num']++;
-            return true;
-        }
+		// get next line
+		$curElement++;
+		$match=$snmptrans=array();
+		if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
+			$this->objectsAll[$curElement],$match))
+		{
+			$this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['base_check_num']++;
+			return true;
+		}
         
-        $this->oidDesc['name']=$match[1]; // Name
-        $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
+		$this->oidDesc['name']=$match[1]; // Name
+		$this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
-        {
-            // Check if next is suboid -> in that case is cannot be a trap
-            if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
-            {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
-                $this->timing['type0_check_num']++;
-                return true;
-            }
-            unset($snmptrans);
-            $retVal=0;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
-                $this->timing['type0_check_num']++;
-                return true;
-            }
-            //echo "\n v1 trap found : $this->oidDesc['oid'] \n";
-            // Force as trap.
-            $this->oidDesc['type']=21;
-        }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
-        {
-            $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['nottrap_num']++;
-            return true;
-        }
-        return false;
-    }
+		if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+		{
+			// Check if next is suboid -> in that case is cannot be a trap
+			if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
+			{
+				$this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+				$this->timing['type0_check_num']++;
+				return true;
+			}
+			unset($snmptrans);
+			$retVal=0;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				$this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+				$this->timing['type0_check_num']++;
+				return true;
+			}
+			//echo "\n v1 trap found : $this->oidDesc['oid'] \n";
+			// Force as trap.
+			$this->oidDesc['type']=21;
+		}
+		if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+		{
+			$this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['nottrap_num']++;
+			return true;
+		}
+		return false;
+	}
    
-    /**
-     * get_trap_mib_description
-     * @return array|null : array of snmptranslate output or null on error
-    **/
-    private function get_trap_mib_description()
-    {
-        $retVal=0;
-        $match=$snmptrans=array();
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR);
-            return $snmptrans;
-        }
+	/**
+	 * get_trap_mib_description
+	 * @return array|null : array of snmptranslate output or null on error
+	 **/
+	private function get_trap_mib_description()
+	{
+		$retVal=0;
+		$match=$snmptrans=array();
+		exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+			' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR);
+			return $snmptrans;
+		}
         
-        if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
-        {
-            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
-            return $snmptrans;
-        }
-        $this->oidDesc['mib']=$match[1];
+		if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+		{
+			$this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
+			return $snmptrans;
+		}
+		$this->oidDesc['mib']=$match[1];
         
-        $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
-        if (isset($snmptrans[$numLine]))
-        {
-            $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+		$numLine=1;
+		while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+		if (isset($snmptrans[$numLine]))
+		{
+			$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
             
-            while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-            {
-                $this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-                $numLine++;
-            }
-            if (isset($snmptrans[$numLine])) {
-                $this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
-                $this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
-            }
+			while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+			{
+				$this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+				$numLine++;
+			}
+			if (isset($snmptrans[$numLine])) {
+				$this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
+				$this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
+			}
             
-        }
-        return $snmptrans;
-    }
+		}
+		return $snmptrans;
+	}
 
-    /**
-     * Get trap objects
-     * @param array $snmptrans : output of snmptranslate for TrapModuleConfig
-     * @return array|null : array of objects or null if not found
-    **/
-    private function get_trap_objects($snmptrans)
-    {
-        $objectName=null;
-        $match=array();
-        foreach ($snmptrans as $line)
-        {
-            if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-            {
-                $objectName=$match[1];
-            }
-        }
-        if ($objectName == null)
-        {
-            $this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-            return null;
-        }
+	/**
+	 * Get trap objects
+	 * @param array $snmptrans : output of snmptranslate for TrapModuleConfig
+	 * @return array|null : array of objects or null if not found
+	 **/
+	private function get_trap_objects($snmptrans)
+	{
+		$objectName=null;
+		$match=array();
+		foreach ($snmptrans as $line)
+		{
+			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+			{
+				$objectName=$match[1];
+			}
+		}
+		if ($objectName == null)
+		{
+			$this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
+			$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+			return null;
+		}
         
-        $trapObjects=array();
-        while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
-        {
-            array_push($trapObjects,$match[1]);
-            $objectName=preg_replace('/'.$match[0].'/','',$objectName);
-        }
-        return $trapObjects;
-    }
+		$trapObjects=array();
+		while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
+		{
+			array_push($trapObjects,$match[1]);
+			$objectName=preg_replace('/'.$match[0].'/','',$objectName);
+		}
+		return $trapObjects;
+	}
     
-    /**
-     * Cache mib in database
-     * @param boolean $display_progress : Display progress on standard output
-     * @param boolean $check_change : Force check of trap params & objects
-     * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
-     * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-     */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
-    {
-        // Global Timing
-        $timeTaken = microtime(true);
+	/**
+	 * Cache mib in database
+	 * @param boolean $display_progress : Display progress on standard output
+	 * @param boolean $check_change : Force check of trap params & objects
+	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
+	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
+	 */
+	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	{
+		// Global Timing
+		$timeTaken = microtime(true);
         
-        $numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
+		$numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
         
-        $this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
+		$this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
         
-        $step=$basestep=$numElements/10; // output display of % done
-        $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$step=$basestep=$numElements/10; // output display of % done
+		$num_step=0;
+		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
         
-        // Create index for trap objects
-        $this->trapObjectsIndex=array();
+		// Create index for trap objects
+		$this->trapObjectsIndex=array();
         
-        // detailed timing (time_* vars)
-        $this->reset_update_timers();
+		// detailed timing (time_* vars)
+		$this->reset_update_timers();
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
-        {
-            $this->timing['base_time']= microtime(true);
-            if ($display_progress)
-            {
-                if ((microtime(true)-$timeFiveSec) > 2)
-                { // echo a . every 2 sec
-                    echo '.';
-                    $timeFiveSec = microtime(true);
-                }
-                if ($curElement>$step)
-                { // display progress
-                    $num_step++;
-                    $step+=$basestep;   
-                    echo "\n" . ($num_step*10). '% : ';
-                }
-            }
+		for ($curElement=0;$curElement < $numElements;$curElement++)
+		{
+			$this->timing['base_time']= microtime(true);
+			if ($display_progress)
+			{
+				if ((microtime(true)-$timeFiveSec) > 2)
+				{ // echo a . every 2 sec
+					echo '.';
+					$timeFiveSec = microtime(true);
+				}
+				if ($curElement>$step)
+				{ // display progress
+					$num_step++;
+					$step+=$basestep;   
+					echo "\n" . ($num_step*10). '% : ';
+				}
+			}
             
-            $this->reset_oidDesc();
-            if ($this->detect_trap($curElement,$onlyTraps)===true)
-            {
-                continue;
-            }
+			$this->reset_oidDesc();
+			if ($this->detect_trap($curElement,$onlyTraps)===true)
+			{
+				continue;
+			}
             
-            $this->timing['num_traps']++;
+			$this->timing['num_traps']++;
             
-            $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+			$this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
+			if ($display_progress) echo '#'; // echo a # when trap found
 
-            // get trap objects & source MIB
+			// get trap objects & source MIB
             
-            $snmptrans=$this->get_trap_mib_description(); // get MIB & description
+			$snmptrans=$this->get_trap_mib_description(); // get MIB & description
 
 
-            $update=$this->update_oid(); // Do update of trap.
+			$update=$this->update_oid(); // Do update of trap.
             
-            $this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['update_num']++;
+			$this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['update_num']++;
             
-            $this->timing['base_time']= microtime(true); // Reset to check object time
+			$this->timing['base_time']= microtime(true); // Reset to check object time
             
-            if (($update==0) && ($check_change===false))
-            { // Trapd didn't change & force check disabled
-                $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-                if ($display_progress) echo "C";
-                continue;
-            }
+			if (($update==0) && ($check_change===false))
+			{ // Trapd didn't change & force check disabled
+				$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+				if ($display_progress) echo "C";
+				continue;
+			}
             
-            $trapObjects=$this->get_trap_objects($snmptrans); // Get trap objects from snmptranslate output            
-            if ($trapObjects == null)
-            {
-                continue;
-            }
+			$trapObjects=$this->get_trap_objects($snmptrans); // Get trap objects from snmptranslate output            
+			if ($trapObjects == null)
+			{
+				continue;
+			}
            
-            $this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
+			$this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
             
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['objects_num']++;
-        }
+			$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['objects_num']++;
+		}
         
-        if ($display_progress)
-        {
-            echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
-            echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
-            echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
-            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
-            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
+		if ($display_progress)
+		{
+			echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
+			echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
+			echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
+			echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
+			echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
             
-            $timeTaken=microtime(true) - $timeTaken;
-            echo "Global time : ".round($timeTaken)." seconds\n";
-        }
-    }
+			$timeTaken=microtime(true) - $timeTaken;
+			echo "Global time : ".round($timeTaken)." seconds\n";
+		}
+	}
     
     
 }
\ No newline at end of file

Spacing +93 added lines, -93 removed lines

@@ -41,7 +41,7 @@ 
      * @param Logging $logClass : where to log
      * @param Database $dbClass : Database
      */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+    function __construct($logClass, $dbClass, $snmptrans, $snmptransdir)
     {
         $this->logging=$logClass;
         $this->trapsDB=$dbClass;
@@ -72,30 +72,30 @@ 
  * @param string $trapmib : mib of trap
  * @return NULL|array : null if not found, or output of snmptranslate
  */
-    private function get_object_details($object,$trapmib)
+    private function get_object_details($object, $trapmib)
     {
         $match=$snmptrans=array();
         $retVal=0;
         $this->oidDesc['mib']=$trapmib;
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -On -Td '.$this->oidDesc['mib'].'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+        if ($retVal != 0)
         {
             // Maybe not trap mib, search with IR
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+            if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
             { // Not found -> continue with warning
-                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
                 return null;
             }
             $this->oidDesc['mib']=$match[1];
             
             // Do the snmptranslate again.
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
-            if ($retVal!=0) {
-                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -On -Td '.$this->oidDesc['mib'].'::'.$object, $snmptrans, $retVal);
+            if ($retVal != 0) {
+                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object, 2, '');
                 return null;
             }
             
@@ -115,12 +115,12 @@ 
         
         foreach ($snmptrans as $line)
         {
-            if ($indesc===true)
+            if ($indesc === true)
             {
-                $line=preg_replace('/[\t ]+/',' ',$line);
-                if (preg_match('/(.*)"$/', $line,$match))
+                $line=preg_replace('/[\t ]+/', ' ', $line);
+                if (preg_match('/(.*)"$/', $line, $match))
                 {
-                    $this->oidDesc['description'] = $tmpdesc . $match[1];
+                    $this->oidDesc['description']=$tmpdesc.$match[1];
                     $indesc=false;
                 }
                 $tmpdesc.=$line;
@@ -131,34 +131,34 @@ 
                 $this->oidDesc['oid']=$line;
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 $this->oidDesc['type_enum']=$match[2];
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['dispHint']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['description']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
             {
                 $tmpdesc=$match[1];
                 $indesc=true;
                 continue;
             }
-            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['textconv']=$match[1];
                 continue;
@@ -173,9 +173,9 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+    public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
     {              
-        $trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
+        $trapId=$this->dbOidIndex[$trapOID]['id']; // Get id of trap
         
         if ($check_existing === true)
         {
@@ -192,9 +192,9 @@ 
             
             $this->parse_object($snmptrans);
 
-            $this->oidDesc['name'] = $object;
+            $this->oidDesc['name']=$object;
             
-            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
+            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'], DEBUG);
 
             // Update
             $this->update_oid();
@@ -219,7 +219,7 @@ 
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
+                $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$this->oidDesc['oid']]['id'], 1, '');
             }
         }
         if ($check_existing === true)
@@ -236,7 +236,7 @@ 
         $this->oidDesc['type']=null;
         $this->oidDesc['mib']=null;
         $this->oidDesc['textconv']=null;
-        $this->oidDesc['dispHint'] =null;
+        $this->oidDesc['dispHint']=null;
         $this->oidDesc['syntax']=null;
         $this->oidDesc['type_enum']=null;
         $this->oidDesc['description']=null;
@@ -250,17 +250,17 @@ 
     {
         $retVal=0;
         // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+        $snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
+        $this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
         unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
+        exec($snmpCommand, $this->objectsAll, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
+            $this->logging->log('error executing snmptranslate', ERROR, '');
         }
         // Count elements to show progress
         $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
         return $numElements;
     }
 
@@ -274,14 +274,14 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
+        $this->logging->log('SQL query : '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
+            $this->logging->log('No result in query : '.$sql, ERROR, '');
         }
         $this->dbOidAll=$ret_code->fetchAll();
         $this->dbOidIndex=array();
         // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
+        foreach ($this->dbOidAll as $key=>$val)
         {
             $this->dbOidIndex[$val['oid']]['key']=$key;
             $this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -314,13 +314,13 @@ 
      * @param bool $onlyTraps : set to false to get all and not only traps.
      * @return boolean : false if it's a trap , true if not
      */
-    private function detect_trap($curElement,$onlyTraps)
+    private function detect_trap($curElement, $onlyTraps)
     {
         // Get oid or pass if not found
-        if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+        if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
         {
-            $this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_parse_num'] ++;
+            $this->timing['base_parse_time']+=microtime(true) - $this->timing['base_time'];
+            $this->timing['base_parse_num']++;
             return true;
         }
         $this->oidDesc['oid']=$this->objectsAll[$curElement];
@@ -329,9 +329,9 @@ 
         $curElement++;
         $match=$snmptrans=array();
         if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-            $this->objectsAll[$curElement],$match))
+            $this->objectsAll[$curElement], $match))
         {
-            $this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['base_check_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['base_check_num']++;
             return true;
         }
@@ -339,22 +339,22 @@ 
         $this->oidDesc['name']=$match[1]; // Name
         $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+        if ($this->oidDesc['type'] == 0) // object type=0 : check if v1 trap
         {
             // Check if next is suboid -> in that case is cannot be a trap
-            if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
+            if (preg_match("/^".$this->oidDesc['oid']."/", $this->objectsAll[$curElement + 1]))
             {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['type0_check_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
             unset($snmptrans);
             $retVal=0;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
-            if ($retVal!=0)
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -Td '.$this->oidDesc['oid'].' | grep OBJECTS ', $snmptrans, $retVal);
+            if ($retVal != 0)
             {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['type0_check_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -362,9 +362,9 @@ 
             // Force as trap.
             $this->oidDesc['type']=21;
         }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+        if ($onlyTraps === true && $this->oidDesc['type'] != 21) // if only traps and not a trap, continue
         {
-            $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['nottrap_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -379,35 +379,35 @@ 
     {
         $retVal=0;
         $match=$snmptrans=array();
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -Td '.$this->oidDesc['oid'], $snmptrans, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR);
+            $this->logging->log('error executing snmptranslate', ERROR);
             return $snmptrans;
         }
         
-        if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+        if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
         {
-            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
+            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : '.$snmptrans[0], ERROR);
             return $snmptrans;
         }
         $this->oidDesc['mib']=$match[1];
         
         $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $snmptrans[$numLine], $match)) $numLine++;
         if (isset($snmptrans[$numLine]))
         {
-            $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+            $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
             
-            while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+            while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
             {
-                $this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+                $this->oidDesc['description'].=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
                 $numLine++;
             }
             if (isset($snmptrans[$numLine])) {
-                $this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
-                $this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
+                $this->oidDesc['description'].=preg_replace('/".*/', '', $snmptrans[$numLine]);
+                $this->oidDesc['description']=preg_replace('/[\t ]+/', ' ', $this->oidDesc['description']);
             }
             
         }
@@ -425,23 +425,23 @@ 
         $match=array();
         foreach ($snmptrans as $line)
         {
-            if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+            if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
             {
                 $objectName=$match[1];
             }
         }
         if ($objectName == null)
         {
-            $this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->logging->log('No objects for '.$this->oidDesc['oid'], DEBUG);
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             return null;
         }
         
         $trapObjects=array();
-        while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
+        while (preg_match('/ *([^ ,]+) *,* */', $objectName, $match))
         {
-            array_push($trapObjects,$match[1]);
-            $objectName=preg_replace('/'.$match[0].'/','',$objectName);
+            array_push($trapObjects, $match[1]);
+            $objectName=preg_replace('/'.$match[0].'/', '', $objectName);
         }
         return $trapObjects;
     }
@@ -453,18 +453,18 @@ 
      * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
      * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
      */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+    public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
     {
         // Global Timing
-        $timeTaken = microtime(true);
+        $timeTaken=microtime(true);
         
         $numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
         
         $this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
         
-        $step=$basestep=$numElements/10; // output display of % done
+        $step=$basestep=$numElements / 10; // output display of % done
         $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+        $timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
         
         // Create index for trap objects
         $this->trapObjectsIndex=array();
@@ -472,33 +472,33 @@ 
         // detailed timing (time_* vars)
         $this->reset_update_timers();
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
+        for ($curElement=0; $curElement < $numElements; $curElement++)
         {
-            $this->timing['base_time']= microtime(true);
+            $this->timing['base_time']=microtime(true);
             if ($display_progress)
             {
-                if ((microtime(true)-$timeFiveSec) > 2)
+                if ((microtime(true) - $timeFiveSec) > 2)
                 { // echo a . every 2 sec
                     echo '.';
-                    $timeFiveSec = microtime(true);
+                    $timeFiveSec=microtime(true);
                 }
-                if ($curElement>$step)
+                if ($curElement > $step)
                 { // display progress
                     $num_step++;
                     $step+=$basestep;   
-                    echo "\n" . ($num_step*10). '% : ';
+                    echo "\n".($num_step * 10).'% : ';
                 }
             }
             
             $this->reset_oidDesc();
-            if ($this->detect_trap($curElement,$onlyTraps)===true)
+            if ($this->detect_trap($curElement, $onlyTraps) === true)
             {
                 continue;
             }
             
             $this->timing['num_traps']++;
             
-            $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
+            $this->logging->log('Found trap : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], INFO);
             if ($display_progress) echo '#'; // echo a # when trap found
 
             // get trap objects & source MIB
@@ -508,14 +508,14 @@ 
 
             $update=$this->update_oid(); // Do update of trap.
             
-            $this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['update_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['update_num']++;
             
-            $this->timing['base_time']= microtime(true); // Reset to check object time
+            $this->timing['base_time']=microtime(true); // Reset to check object time
             
-            if (($update==0) && ($check_change===false))
+            if (($update == 0) && ($check_change === false))
             { // Trapd didn't change & force check disabled
-                $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
                 if ($display_progress) echo "C";
                 continue;
             }
@@ -528,17 +528,17 @@ 
            
             $this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
             
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['objects_num']++;
         }
         
         if ($display_progress)
         {
-            echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
-            echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
-            echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
-            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
-            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
+            echo "\nNumber of processed traps :  ".$this->timing['num_traps']."\n";
+            echo "\nParsing : ".number_format($this->timing['base_parse_time'] + $this->timing['base_check_time'], 1)." sec / ".($this->timing['base_parse_num'] + $this->timing['base_check_num'])." occurences\n";
+            echo "Detecting traps : ".number_format($this->timing['type0_check_time'] + $this->timing['nottrap_time'], 1)." sec / ".($this->timing['type0_check_num'] + $this->timing['nottrap_num'])." occurences\n";
+            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'], 1)." sec , ";
+            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'], 1)." sec \n";
             
             $timeTaken=microtime(true) - $timeTaken;
             echo "Global time : ".round($timeTaken)." seconds\n";

Braces +20 added lines, -6 removed lines

@@ -188,7 +188,10 @@ 
             $this->reset_oidDesc();
             
             $snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
-            if ($snmptrans === null) continue; // object not found
+            if ($snmptrans === null) {
+            	continue;
+            }
+            // object not found
             
             $this->parse_object($snmptrans);
 
@@ -339,12 +342,14 @@ 
         $this->oidDesc['name']=$match[1]; // Name
         $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+        if ($this->oidDesc['type']==0) {
+        	// object type=0 : check if v1 trap
         {
             // Check if next is suboid -> in that case is cannot be a trap
             if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
             {
                 $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+        }
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -362,9 +367,11 @@ 
             // Force as trap.
             $this->oidDesc['type']=21;
         }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+        if ($onlyTraps===true && $this->oidDesc['type']!=21) {
+        	// if only traps and not a trap, continue
         {
             $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+        }
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -395,7 +402,9 @@ 
         $this->oidDesc['mib']=$match[1];
         
         $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+        	$numLine++;
+        }
         if (isset($snmptrans[$numLine]))
         {
             $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -499,7 +508,10 @@ 
             $this->timing['num_traps']++;
             
             $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+            if ($display_progress) {
+            	echo '#';
+            }
+            // echo a # when trap found
 
             // get trap objects & source MIB
             
@@ -516,7 +528,9 @@ 
             if (($update==0) && ($check_change===false))
             { // Trapd didn't change & force check disabled
                 $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-                if ($display_progress) echo "C";
+                if ($display_progress) {
+                	echo "C";
+                }
                 continue;
             }
             

application/controllers/HandlerController.php

Indentation +250 added lines, -251 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->getUIDatabase()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getUIDatabase()->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->getUIDatabase()->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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();
@@ -428,7 +427,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
+				$this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
 			}
 			catch (Exception $e)
 			{
@@ -438,7 +437,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -465,7 +464,7 @@ 
 			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
 			if (! $isHostGroup ) 
 			{  // checks if selection by host 
-			    $hostAddr=$this->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
+				$hostAddr=$this->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
 				$params['ip6']['val']=$hostAddr->ip6;
 				$checkHostName=$hostAddr->name;
@@ -476,8 +475,8 @@ 
 				}
 				if (!is_numeric($params['serviceid']['val']))
 				{
-				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
-				    return;
+					$this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+					return;
 				}
 				$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
 				if ($params['service_name']['val'] != $serviceName->name2)
@@ -488,7 +487,7 @@ 
 			}
 			else
 			{
-			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
+				$object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
 				{
 					$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
@@ -509,11 +508,11 @@ 
 			// echo '<br>';	print_r($dbparams);echo '<br>';
 			if ($params['db_rule']['val'] == -1 ) 
 			{
-			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
+				$ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
 			}
 			else
 			{
-			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
@@ -527,9 +526,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');  }
@@ -545,14 +544,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)
@@ -566,9 +565,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');  }
@@ -584,7 +583,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -600,10 +599,10 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object|array : column objects in db 
-	*
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object|array : column objects in db 
+	 *
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -614,7 +613,7 @@ 
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -631,7 +630,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +82 added lines, -82 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->getUIDatabase()->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->getUIDatabase()->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
+	        $serviceID=$this->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
@@ -476,7 +476,7 @@ 
 				}
 				if (!is_numeric($params['serviceid']['val']))
 				{
-				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+				    $this->_helper->json(array('status'=>"Invalid service id ".$params['serviceid']['val']));
 				    return;
 				}
 				$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
@@ -495,25 +495,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->getUIDatabase()->addHandlerRule($dbparams);
 			}
 			else
 			{
-			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
+			    $this->getUIDatabase()->updateHandlerRule($dbparams, $params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
@@ -532,10 +532,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;
@@ -545,19 +545,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;
 		}
 
@@ -571,10 +571,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;
@@ -584,15 +584,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();
 		}
 
@@ -606,24 +606,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;
@@ -636,7 +636,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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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 !="")
@@ -485,8 +485,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -510,14 +509,12 @@ 
 			if ($params['db_rule']['val'] == -1 ) 
 			{
 			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 			    $this->getUIDatabase()->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;
@@ -536,7 +533,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;
@@ -554,8 +553,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;
@@ -575,7 +573,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;
@@ -589,8 +589,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();
@@ -610,7 +609,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
 		{		
@@ -618,9 +619,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());

tests/expr_test.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
   $inputStream=fopen('php://stdin', 'r');
   if ($inputStream === false)
   {
-      exit(1);
+	  exit(1);
   }
   $rule=chop(fgets($inputStream));
 } else

Spacing +10 added lines, -10 removed lines

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

Braces +3 added lines, -3 removed lines

@@ -23,8 +23,9 @@ 
       exit(1);
   }
   $rule=chop(fgets($inputStream));
-} else
+} else {
   $rule=$options['r'];
+}
 
 try
 {
@@ -34,7 +35,6 @@ 
   $val = $trap->ruleClass->evaluation($rule,$item);
   if ($val==true) { printf( "true"); } else { printf( "false");}
   printf("\n");
-}
-catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
+} catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
 
 exit(0);

library/Trapdirector/TrapsProcess/RuleUtils.php

Braces +13 added lines, -6 removed lines

@@ -71,11 +71,13 @@ 
         $start=$item;
         $parenthesisCount=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesisCount > 0) ) // Closing ')' or embeded ()
+            && ( ($rule[$item] != ')' ) || $parenthesisCount > 0) ) {
+        	// Closing ')' or embeded ()
         {
             if ($rule[$item] == '"' )
             { // pass through string
                 $item++;
+        }
                 $item=$this->eval_getNext($rule,$item,'"');
                 continue;
             }
@@ -121,10 +123,12 @@ 
     {
         // 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);}
         
         // get parameters between parenthesis
@@ -167,12 +171,13 @@ 
      */
     private function check_negate_first(string $rule,int &$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;
         }
@@ -199,7 +204,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;

Indentation +180 added lines, -180 removed lines

@@ -12,204 +12,204 @@
 trait RuleUtils
 {
     
-    /** rule eval starting from $token
-     * @param string $rule
-     * @param int $item
-     */
-    abstract public function evaluation($rule,&$item);
+	/** rule eval starting from $token
+	 * @param string $rule
+	 * @param int $item
+	 */
+	abstract public function evaluation($rule,&$item);
 
-    /**
-     * Get full number
-     * @param string $rule Rule as string
-     * @param int $item current eval position
-     * @return array<int,string>
-     */
-    private function get_number(string $rule,int &$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";
+	/**
+	 * Get full number
+	 * @param string $rule Rule as string
+	 * @param int $item current eval position
+	 * @return array<int,string>
+	 */
+	private function get_number(string $rule,int &$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);
+	}
 
-    /**
-     * Get a string (between ") 
-     * @param string $rule Rule as string
-     * @param int $item current eval position
-     * @return array<int,string>
-     */
-    private function get_string(string $rule,int &$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);
+	/**
+	 * Get a string (between ") 
+	 * @param string $rule Rule as string
+	 * @param int $item current eval position
+	 * @return array<int,string>
+	 */
+	private function get_string(string $rule,int &$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;
-        $parenthesisCount=0;
-        while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesisCount > 0) ) // Closing ')' or embeded ()
-        {
-            if ($rule[$item] == '"' )
-            { // pass through string
-                $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
-                continue;
-            }
-            if ($rule[$item] == '(')
-            {
-                $parenthesisCount++;
-            }
-            if ($rule[$item] == ')')
-            {
-                $parenthesisCount--;
-            }
-            $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;
+		$parenthesisCount=0;
+		while (($item < strlen($rule)) // Not end of string AND
+			&& ( ($rule[$item] != ')' ) || $parenthesisCount > 0) ) // Closing ')' or embeded ()
+		{
+			if ($rule[$item] == '"' )
+			{ // pass through string
+				$item++;
+				$item=$this->eval_getNext($rule,$item,'"');
+				continue;
+			}
+			if ($rule[$item] == '(')
+			{
+				$parenthesisCount++;
+			}
+			if ($rule[$item] == ')')
+			{
+				$parenthesisCount--;
+			}
+			$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<int,string>
-     */
-    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<int,string>
+	 */
+	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));
+	}
     
-    /**
-     * @param string $rule
-     * @param int $item
-     * @throws Exception
-     * @return array<int,string>
-     */
-    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);}
+	/**
+	 * @param string $rule
+	 * @param int $item
+	 * @throws Exception
+	 * @return array<int,string>
+	 */
+	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));
         
-    }
+	}
 
-    /** Find next token $tok in $rule starting at $item 
-     * @param string $rule
-     * @param int $item
-     * @param string $tok : token to search for
-     * @throws Exception
-     * @return int Position after next token
-     */
-    protected function eval_getNext(string $rule,int $item,string $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;
-    }
+	/** Find next token $tok in $rule starting at $item 
+	 * @param string $rule
+	 * @param int $item
+	 * @param string $tok : token to search for
+	 * @throws Exception
+	 * @return int Position after next token
+	 */
+	protected function eval_getNext(string $rule,int $item,string $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;
+	}
 
-    /** get negate (!) and return true if found - and pass it with item++ - 
-     * @param string $rule
-     * @param int $item
-     * @return boolean
-     */
-    private function check_negate_first(string $rule,int &$item)
-    {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
-        {
-            $item++;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+	/** get negate (!) and return true if found - and pass it with item++ - 
+	 * @param string $rule
+	 * @param int $item
+	 * @return boolean
+	 */
+	private function check_negate_first(string $rule,int &$item)
+	{
+		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		{
+			$item++;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
 
-    /** Remove all whitespaces (when not quoted)
-     * @param string $rule
-     * @throws Exception
-     * @return string
-     */
-    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)
+	 * @param string $rule
+	 * @throws Exception
+	 * @return string
+	 */
+	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;
+	}
     
 }
\ No newline at end of file

Spacing +37 added lines, -37 removed lines

@@ -16,7 +16,7 @@ 
      * @param string $rule
      * @param int $item
      */
-    abstract public function evaluation($rule,&$item);
+    abstract public function evaluation($rule, &$item);
 
     /**
      * Get full number
@@ -24,20 +24,20 @@ 
      * @param int $item current eval position
      * @return array<int,string>
      */
-    private function get_number(string $rule,int &$item)
+    private function get_number(string $rule, int &$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);
     }
 
     /**
@@ -46,14 +46,14 @@ 
      * @param int $item current eval position
      * @return array<int,string>
      */
-    private function get_string(string $rule,int &$item)
+    private function get_string(string $rule, int &$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);
         
     }
     
@@ -65,18 +65,18 @@ 
      * @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;
         $parenthesisCount=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesisCount > 0) ) // Closing ')' or embeded ()
+            && (($rule[$item] != ')') || $parenthesisCount > 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, '"');
                 continue;
             }
             if ($rule[$item] == '(')
@@ -90,8 +90,8 @@ 
             $item++;
         }
         
-        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;
     }
@@ -102,13 +102,13 @@ 
      * @param int $item
      * @return array<int,string>
      */
-    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));
     }
     
     /**
@@ -117,25 +117,25 @@ 
      * @throws Exception
      * @return array<int,string>
      */
-    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));
         
     }
 
@@ -146,18 +146,18 @@ 
      * @throws Exception
      * @return int Position after next token
      */
-    protected function eval_getNext(string $rule,int $item,string $tok)
+    protected function eval_getNext(string $rule, int $item, string $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;
     }
 
     /** get negate (!) and return true if found - and pass it with item++ - 
@@ -165,9 +165,9 @@ 
      * @param int $item
      * @return boolean
      */
-    private function check_negate_first(string $rule,int &$item)
+    private function check_negate_first(string $rule, int &$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ($rule[$item] == '!') // If '!' found, negate next expression.
         {
             $item++;
             return true;
@@ -189,17 +189,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;

library/Trapdirector/TrapsProcess/Rule.php

Indentation +201 added lines, -201 removed lines

@@ -6,233 +6,233 @@
 
 class Rule
 {
-    use \RuleUtils;
+	use \RuleUtils;
     
-    /** @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;
+	}
     
     
-    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_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 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]);
+		}
+	}
     
-    /**
-     * 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 +59 added lines, -59 removed lines

@@ -26,14 +26,14 @@ 
     }
     
     
-    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);
         }
@@ -50,52 +50,52 @@ 
         { // 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_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 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;
     }
@@ -108,56 +108,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]);
         }
@@ -178,7 +178,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;
     }
@@ -189,50 +189,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 +36 added lines, -13 removed lines

@@ -32,7 +32,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);
@@ -56,7 +58,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -95,7 +99,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;
     }
@@ -116,10 +123,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;
         }
         
@@ -128,31 +139,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])
         {
@@ -191,10 +212,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)
         {