patrickpr / trapdirector

application/controllers/HelperController.php

Indentation +168 added lines, -168 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();
@@ -40,8 +40,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();
@@ -68,11 +68,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();
@@ -112,11 +112,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();
@@ -153,10 +153,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();
@@ -182,10 +182,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();
@@ -211,8 +211,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -227,10 +227,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();
@@ -258,7 +258,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -267,10 +267,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()
 	{
 		
@@ -339,11 +339,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();
@@ -367,8 +367,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
@@ -418,50 +418,50 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['rule']))
-	    {
-	        $rule=$postData['rule'];
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No Rule'));
-	    }
-	    if (isset($postData['action']))
-	    {
-	        $action=$postData['action'];
-	        if ($action != 'evaluate')
-	        {
-	            $this->_helper->json(array('status'=>'unknown action '.$action));
-	            return;
-	        }
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No action'));
-	        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));
-	    }
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['rule']))
+		{
+			$rule=$postData['rule'];
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No Rule'));
+		}
+		if (isset($postData['action']))
+		{
+			$action=$postData['action'];
+			if ($action != 'evaluate')
+			{
+				$this->_helper->json(array('status'=>'unknown action '.$action));
+				return;
+			}
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No action'));
+			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));
+		}
 	    
 	}	
 
@@ -472,53 +472,53 @@ 
 	 */
 	public function pluginAction()
 	{
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['name']))
-	    {
-	        $pluginName=$postData['name'];
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No plugin name'));
-	    }
-	    if (isset($postData['action']))
-	    {
-	        $action=$postData['action'];
-	        if ($action != 'enable' && $action != 'disable')
-	        {
-	            $this->_helper->json(array('status'=>'unknown action '.$action));
-	            return;
-	        }
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No action'));
-	        return;
-	    }
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['name']))
+		{
+			$pluginName=$postData['name'];
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No plugin name'));
+		}
+		if (isset($postData['action']))
+		{
+			$action=$postData['action'];
+			if ($action != 'enable' && $action != 'disable')
+			{
+				$this->_helper->json(array('status'=>'unknown action '.$action));
+				return;
+			}
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No action'));
+			return;
+		}
 
-        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
@@ -528,46 +528,46 @@ 
 	 */
 	public function functionAction()
 	{
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['function']))
-	    {
-	        $functionString=$postData['function'];
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No function name'));
-	    }
-	    if (isset($postData['action']))
-	    {
-	        $action=$postData['action'];
-	        if ($action != 'evaluate')
-	        {
-	            $this->_helper->json(array('status'=>'unknown action '.$action));
-	            return;
-	        }
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No action'));
-	        return;
-	    }
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['function']))
+		{
+			$functionString=$postData['function'];
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No function name'));
+		}
+		if (isset($postData['action']))
+		{
+			$action=$postData['action'];
+			if ($action != 'evaluate')
+			{
+				$this->_helper->json(array('status'=>'unknown action '.$action));
+				return;
+			}
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No action'));
+			return;
+		}
 	    
-	    try
-	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	        $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $Trap = new Trap($icingaweb2_etc);
-	        // load plugins.
-	        $Trap->pluginClass->registerAllPlugins(false);
-	        $result = $Trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-	        return;
-	    }
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$Trap = new Trap($icingaweb2_etc);
+			// load plugins.
+			$Trap->pluginClass->registerAllPlugins(false);
+			$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));
 	}
 }

Spacing +44 added lines, -44 removed lines

@@ -27,12 +27,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostByIP($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -55,12 +55,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -82,31 +82,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -126,28 +126,28 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -172,7 +172,7 @@ 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -201,7 +201,7 @@ 
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -278,7 +278,7 @@ 
 		if (isset($postData['days']))
 		{
 			$days=$postData['days'];
-			if (!preg_match('/^[0-9]+$/',$days))
+			if (!preg_match('/^[0-9]+$/', $days))
 			{
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
@@ -292,7 +292,7 @@ 
 		if (isset($postData['action']))
 		{
 			$action=$postData['action'];
-			if ($action != 'save' && $action !='execute')
+			if ($action != 'save' && $action != 'execute')
 			{
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
@@ -307,11 +307,11 @@ 
 		{
 			try
 			{
-				$this->setDBConfigValue('db_remove_days',$days);
+				$this->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -321,16 +321,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'));
@@ -364,7 +364,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));
@@ -396,13 +396,13 @@ 
 		
 		try
 		{
-			$this->setDBConfigValue('log_destination',$destination);
-			$this->setDBConfigValue('log_file',$file);
-			$this->setDBConfigValue('log_level',$level);
+			$this->setDBConfigValue('log_destination', $destination);
+			$this->setDBConfigValue('log_file', $file);
+			$this->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -445,21 +445,21 @@ 
 	    {
 	        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));
 	    }
 	    
@@ -498,9 +498,9 @@ 
 
         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);
@@ -508,7 +508,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)
@@ -554,20 +554,20 @@ 
 	    
 	    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);
 	        // load plugins.
 	        $Trap->pluginClass->registerAllPlugins(false);
-	        $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));
 	}
 }

Braces +32 added lines, -64 removed lines

@@ -20,8 +20,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'KO'));
 			return;
@@ -48,8 +47,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Error : no filter'));
 			return;
@@ -79,8 +77,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -91,8 +88,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;
@@ -123,8 +119,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -135,8 +130,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;
@@ -163,8 +157,7 @@ 
 		if (isset($postData['mib']))
 		{
 			$mib=$postData['mib'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No mib'));
 			return;
@@ -173,8 +166,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -192,8 +184,7 @@ 
 		if (isset($postData['trap']))
 		{
 			$trap=$postData['trap'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No trap'));
 			return;
@@ -202,8 +193,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -218,8 +208,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -237,8 +226,7 @@ 
 		if (isset($postData['oid']))
 		{
 			$oid=$postData['oid'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No oid'));
 			return;
@@ -249,8 +237,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -283,8 +270,7 @@ 
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No days'));
 			return;
@@ -297,8 +283,7 @@ 
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No action'));
 			return;
@@ -308,8 +293,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -327,8 +311,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;
@@ -356,8 +339,7 @@ 
 				$this->_helper->json(array('status'=>'invalid destination : '.$destination));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No destination'));
 		}
@@ -370,14 +352,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;
@@ -387,8 +367,7 @@ 
 		if (isset($postData['level']))
 		{ 
 			$level=$postData['level'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No level'));
 			return;
@@ -399,8 +378,7 @@ 
 			$this->setDBConfigValue('log_destination',$destination);
 			$this->setDBConfigValue('log_file',$file);
 			$this->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -422,8 +400,7 @@ 
 	    if (isset($postData['rule']))
 	    {
 	        $rule=$postData['rule'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No Rule'));
 	    }
@@ -435,8 +412,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -453,8 +429,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;
@@ -476,8 +451,7 @@ 
 	    if (isset($postData['name']))
 	    {
 	        $pluginName=$postData['name'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No plugin name'));
 	    }
@@ -489,8 +463,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -505,8 +478,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;
@@ -514,8 +486,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -532,8 +503,7 @@ 
 	    if (isset($postData['function']))
 	    {
 	        $functionString=$postData['function'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No function name'));
 	    }
@@ -545,8 +515,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -560,8 +529,7 @@ 
 	        // load plugins.
 	        $Trap->pluginClass->registerAllPlugins(false);
 	        $result = $Trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
 	        return;

application/controllers/StatusController.php

Indentation +84 added lines, -84 removed lines

@@ -64,10 +64,10 @@ 
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -86,22 +86,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -109,7 +109,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -122,26 +122,26 @@ 
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
-				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
+					$this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
 				}
 				else
 				{
-				    if (!is_writable($destDir))
-				    {
-				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
-				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-    				    if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
-    				    {
-    				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
-    				    {
-    				        $this->view->uploadStatus="File $name uploaded in $destDir";
-    				    }
-				    }
+					if (!is_writable($destDir))
+					{
+						$this->view->uploadStatus="ERROR : $destDir directory is not writable";
+					}
+					else
+					{
+						$destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+						if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
+						{
+							$this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
+						}
+						else
+						{
+							$this->view->uploadStatus="File $name uploaded in $destDir";
+						}
+					}
 				}
 
 			}
@@ -261,47 +261,47 @@ 
 	 */
 	public function pluginsAction()
 	{
-	    $this->prepareTabs()->activate('plugins');
+		$this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+		require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+		$Trap = new Trap($icingaweb2_etc,4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+		$this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+		$enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+		$pluginList = $Trap->pluginClass->pluginList();
 	    
-	    // Plugin list and fill function name list
-	    $functionList=array();
-	    $this->view->pluginArray=array();
-	    foreach ($pluginList as $plugin)
-	    {
-	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
-	        array_push($this->view->pluginArray, $pluginDetails);
-	        // Get functions for function details
-	        foreach ($pluginDetails->funcArray as $function)
-	        {
-	            array_push($functionList,$function);
-	        }
-	    }
+		// Plugin list and fill function name list
+		$functionList=array();
+		$this->view->pluginArray=array();
+		foreach ($pluginList as $plugin)
+		{
+			$pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
+			$pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
+			$pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
+			$pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
+			$pluginDetails->description = htmlentities($pluginDetails->description);
+			$pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+			array_push($this->view->pluginArray, $pluginDetails);
+			// Get functions for function details
+			foreach ($pluginDetails->funcArray as $function)
+			{
+				array_push($functionList,$function);
+			}
+		}
 	    
-	    // Function list with details
-	    $this->view->functionList=array();
-	    foreach ($functionList as $function)
-	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
-	        array_push($this->view->functionList, $functionDetail);
-	    }
+		// Function list with details
+		$this->view->functionList=array();
+		foreach ($functionList as $function)
+		{
+			$functionDetail = $Trap->pluginClass->getFunctionDetails($function);
+			$functionDetail->params = htmlentities($functionDetail->params);
+			$functionDetail->description = htmlentities($functionDetail->description);
+			$functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+			array_push($this->view->functionList, $functionDetail);
+		}
 
 	}
 	
@@ -316,30 +316,30 @@ 
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
-	    )->add('plugins', array(
-	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
-	    );
+		)->add('plugins', array(
+			'label' => $this->translate('Plugins management'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+		);
 	} 
 }
 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }

Spacing +61 added lines, -61 removed lines

@@ -21,18 +21,18 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-			$db = $this->getDb()->getConnection();
-			$query = $db->select()->from(
+			$db=$this->getDb()->getConnection();
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -43,7 +43,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -58,7 +58,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -84,7 +84,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -93,32 +93,32 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
 				$name=$_FILES['mibfile']['name'];
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
@@ -132,8 +132,8 @@ 
 				    }
 				    else
 				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-    				    if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+    				    if (move_uploaded_file($_FILES['mibfile']['tmp_name'], $destination) === false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
     				    }
@@ -149,13 +149,13 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
@@ -173,46 +173,46 @@ 
 		// mib database
 		
 		$this->view->mibDbCount=$this->getMIB()->countObjects();
-		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21);
+		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21);
 		
 		// mib dirs
 		$DirConf=$this->Config()->get('config', 'snmptranslate_dirs');
-		$dirArray=explode(':',$DirConf);
+		$dirArray=explode(':', $DirConf);
 
 		// Get base directories from net-snmp-config
 		$output=$matches=array();
 		$retVal=0;
-		$sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal);
-		if ($retVal==0)
+		$sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal);
+		if ($retVal == 0)
 		{
-			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
+			$dirArray=array_merge($dirArray, explode(':', $sysDirs));
 		}
 		else
 		{
-			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
-			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
+			$translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
+			if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches))
 			{
-				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
+				$dirArray=array_merge($dirArray, explode(':', $matches[1]));
 			}
 			else
 			{
-				array_push($dirArray,'Install net-snmp-config to see system directories');
+				array_push($dirArray, 'Install net-snmp-config to see system directories');
 			}
 		}
 		
 		$this->view->dirArray=$dirArray;
 		
 		$output=null;
-		foreach (explode(':',$DirConf) as $mibdir)
+		foreach (explode(':', $DirConf) as $mibdir)
 		{
-			exec('ls '.$mibdir.' | grep -v traplist.txt',$output);
+			exec('ls '.$mibdir.' | grep -v traplist.txt', $output);
 		}
 		//$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++];
 		//$this->view->fileList=explode(' ',$listFiles);
 		$this->view->fileList=$output;
 		
 		// Zend form 
-		$this->view->form= new UploadForm();
+		$this->view->form=new UploadForm();
 		//$this->view->form= new Form('upload-form');
 		
 		
@@ -236,18 +236,18 @@ 
 		$this->view->templateForm_output='';
 		if (isset($postData['template_name']) && isset($postData['template_revert_time']))
 		{
-			$template_create = 'icingacli director service create --json \'{ "check_command": "dummy", ';
-			$template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
-			$template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
+			$template_create='icingacli director service create --json \'{ "check_command": "dummy", ';
+			$template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
+			$template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
 			$output=array();
 			$ret_code=0;
-			exec($template_create,$output,$ret_code);
+			exec($template_create, $output, $ret_code);
 			if ($ret_code != 0)
 			{
-				$this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create);
+				$this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create);
 			}
-			exec('icingacli director config deploy',$output,$ret_code);
-			$this->view->templateForm_output='Template '.$postData['template_name']. ' created';
+			exec('icingacli director config deploy', $output, $ret_code);
+			$this->view->templateForm_output='Template '.$postData['template_name'].' created';
 		}
 		
 		// template creation form
@@ -263,15 +263,15 @@ 
 	{
 	    $this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	    require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+	    $Trap=new Trap($icingaweb2_etc, 4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+	    $this->view->pluginLoaded=htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+	    $enabledPlugins=$Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+	    $pluginList=$Trap->pluginClass->pluginList();
 	    
 	    // Plugin list and fill function name list
 	    $functionList=array();
@@ -279,16 +279,16 @@ 
 	    foreach ($pluginList as $plugin)
 	    {
 	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+	        $pluginDetails->enabled=(in_array($plugin, $enabledPlugins)) ? true : false;
+	        $pluginDetails->catchAllTraps=($pluginDetails->catchAllTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->processTraps=($pluginDetails->processTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->description=htmlentities($pluginDetails->description);
+	        $pluginDetails->description=preg_replace('/\n/', '<br>', $pluginDetails->description);
 	        array_push($this->view->pluginArray, $pluginDetails);
 	        // Get functions for function details
 	        foreach ($pluginDetails->funcArray as $function)
 	        {
-	            array_push($functionList,$function);
+	            array_push($functionList, $function);
 	        }
 	    }
 	    
@@ -296,10 +296,10 @@ 
 	    $this->view->functionList=array();
 	    foreach ($functionList as $function)
 	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+	        $functionDetail=$Trap->pluginClass->getFunctionDetails($function);
+	        $functionDetail->params=htmlentities($functionDetail->params);
+	        $functionDetail->description=htmlentities($functionDetail->description);
+	        $functionDetail->description=preg_replace('/\n/', '<br>', $functionDetail->description);
 	        array_push($this->view->functionList, $functionDetail);
 	    }
 
@@ -309,16 +309,16 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 	    )->add('plugins', array(
 	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/plugins')
 	    );
 	} 
 }
@@ -326,7 +326,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -335,11 +335,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $file=new File('mib-file');
         $file->setLabel('Mib upload');
              //->setAttrib('multiple', null);
         $this->addElement($file);
-		$button = new Submit("upload",array('ignore'=>false));
-		$this->addElement($button);//->setIgnore(false);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }

library/Trapdirector/TrapsProcess/Logging.php

Indentation +102 added lines, -102 removed lines

@@ -9,113 +9,113 @@
 class Logging
 {
 
-    //**** Options from config database
-    // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
-    public $outputMode='syslog'; // alert type : file, syslog, display
-    public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
-    protected $outputList=array('file', 'syslog', 'display');
+	//**** Options from config database
+	// Default values
+	public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+	public $outputMode='syslog'; // alert type : file, syslog, display
+	public $outputFile="/tmp/trapdebug.txt";
+	protected $logLevels=array("","Error","Warning","Info","Debug");
+	protected $outputList=array('file', 'syslog', 'display');
     
-    /** Send log. Throws exception on critical error
-     *	@param	string $message Message to log
-     *	@param	int $level 1=critical 2=warning 3=trace 4=debug
-     *	@param  string $destination file/syslog/display
-     *	@return void
-     *  @throws Exception
-     **/
-    public function log( $message, $level, $destination ='')
-    {
-        if ($this->debugLevel >= $level)
-        {
-            $date = '['.  date("Y/m/d H:i:s") . '] '; // no date in syslog as already there
-            $message = '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+	/** Send log. Throws exception on critical error
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 *  @throws Exception
+	 **/
+	public function log( $message, $level, $destination ='')
+	{
+		if ($this->debugLevel >= $level)
+		{
+			$date = '['.  date("Y/m/d H:i:s") . '] '; // no date in syslog as already there
+			$message = '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
-            switch ($output)
-            {
-                case 'file':
-                    file_put_contents ($this->outputFile, $date.$message , FILE_APPEND);
-                    break;
-                case 'syslog':
-                    switch($level)
-                    {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_INFO;break; // LOG_DEBUG isn't always displayed in syslog
-                        default: $prio = LOG_ERR;
-                    }
-                    syslog($prio,$message);
-                    break;
-                case 'display':
-                    echo $date.$message;
-                    break;
-                default : // nothing we can do at this point
-                    throw new Exception($date.$message);
-            }
-        }
-        if ($level == 1)
-        {
-            throw new Exception($message);
-        }
-    }
+			$output = ( $destination != '' ) ? $destination : $this->outputMode;
+			switch ($output)
+			{
+				case 'file':
+					file_put_contents ($this->outputFile, $date.$message , FILE_APPEND);
+					break;
+				case 'syslog':
+					switch($level)
+					{
+						case 1 : $prio = LOG_ERR;break;
+						case 2 : $prio = LOG_WARNING;break;
+						case 3 : $prio = LOG_INFO;break;
+						case 4 : $prio = LOG_INFO;break; // LOG_DEBUG isn't always displayed in syslog
+						default: $prio = LOG_ERR;
+					}
+					syslog($prio,$message);
+					break;
+				case 'display':
+					echo $date.$message;
+					break;
+				default : // nothing we can do at this point
+					throw new Exception($date.$message);
+			}
+		}
+		if ($level == 1)
+		{
+			throw new Exception($message);
+		}
+	}
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
-    {
-        $this->setLevel($debugLvl);
-        switch ($outputType)
-        {
-            case 'file':
-                if ($outputFile == null) throw new Exception("File logging without file !");
-                $this->setFile($outputFile);
-                $this->setDestination('file');
-                break;
-            default:
-                $this->setDestination($outputType);
-        }
-    }
+	public function setLogging($debugLvl,$outputType,$outputFile=null)
+	{
+		$this->setLevel($debugLvl);
+		switch ($outputType)
+		{
+			case 'file':
+				if ($outputFile == null) throw new Exception("File logging without file !");
+				$this->setFile($outputFile);
+				$this->setDestination('file');
+				break;
+			default:
+				$this->setDestination($outputType);
+		}
+	}
     
-    /**
-     * Set logging level
-     * @param integer $level
-     * @throws Exception
-     */
-    public function setLevel($level)
-    {
-        if (!is_integer($level) || $level < 0 || $level > 10)
-        {
-            throw new Exception('Invalid log level');
-        }
-        $this->debugLevel=$level;
-    }
+	/**
+	 * Set logging level
+	 * @param integer $level
+	 * @throws Exception
+	 */
+	public function setLevel($level)
+	{
+		if (!is_integer($level) || $level < 0 || $level > 10)
+		{
+			throw new Exception('Invalid log level');
+		}
+		$this->debugLevel=$level;
+	}
 
-    /**
-     * Set logging destination
-     * @param string $destination
-     * @throws Exception
-     */
-    public function setDestination($destination)
-    {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
-        {
-            throw new Exception('Invalid log destination');
-        }
-        $this->outputMode=$destination;
-    }
-    /**
-     * Set file destination
-     * @param string $file
-     * @throws Exception
-     */
-    public function setFile($file)
-    {
-        if (!is_string($file))
-        {
-            throw new Exception('Invalid log file');
-        }
-        $this->outputFile=$file;
-    }
+	/**
+	 * Set logging destination
+	 * @param string $destination
+	 * @throws Exception
+	 */
+	public function setDestination($destination)
+	{
+		if (!is_string($destination) || ! in_array($destination, $this->outputList))
+		{
+			throw new Exception('Invalid log destination');
+		}
+		$this->outputMode=$destination;
+	}
+	/**
+	 * Set file destination
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function setFile($file)
+	{
+		if (!is_string($file))
+		{
+			throw new Exception('Invalid log file');
+		}
+		$this->outputFile=$file;
+	}
     
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -4,17 +4,17 @@ 
 
 use Exception;
 
-define("ERROR", 1);define("WARN", 2);define("INFO", 3);define("DEBUG", 4);
+define("ERROR", 1); define("WARN", 2); define("INFO", 3); define("DEBUG", 4);
 
 class Logging
 {
 
     //**** Options from config database
     // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+    public $debugLevel=2; // 0=No output 1=critical 2=warning 3=trace 4=ALL
     public $outputMode='syslog'; // alert type : file, syslog, display
     public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
+    protected $logLevels=array("", "Error", "Warning", "Info", "Debug");
     protected $outputList=array('file', 'syslog', 'display');
     
     /** Send log. Throws exception on critical error
@@ -24,29 +24,29 @@ 
      *	@return void
      *  @throws Exception
      **/
-    public function log( $message, $level, $destination ='')
+    public function log($message, $level, $destination='')
     {
         if ($this->debugLevel >= $level)
         {
-            $date = '['.  date("Y/m/d H:i:s") . '] '; // no date in syslog as already there
-            $message = '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+            $date='['.date("Y/m/d H:i:s").'] '; // no date in syslog as already there
+            $message='[TrapDirector] ['.$this->logLevels[$level].']: '.$message."\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
+            $output=($destination != '') ? $destination : $this->outputMode;
             switch ($output)
             {
                 case 'file':
-                    file_put_contents ($this->outputFile, $date.$message , FILE_APPEND);
+                    file_put_contents($this->outputFile, $date.$message, FILE_APPEND);
                     break;
                 case 'syslog':
-                    switch($level)
+                    switch ($level)
                     {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_INFO;break; // LOG_DEBUG isn't always displayed in syslog
-                        default: $prio = LOG_ERR;
+                        case 1 : $prio=LOG_ERR; break;
+                        case 2 : $prio=LOG_WARNING; break;
+                        case 3 : $prio=LOG_INFO; break;
+                        case 4 : $prio=LOG_INFO; break; // LOG_DEBUG isn't always displayed in syslog
+                        default: $prio=LOG_ERR;
                     }
-                    syslog($prio,$message);
+                    syslog($prio, $message);
                     break;
                 case 'display':
                     echo $date.$message;
@@ -62,7 +62,7 @@ 
     }
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
+    public function setLogging($debugLvl, $outputType, $outputFile=null)
     {
         $this->setLevel($debugLvl);
         switch ($outputType)
@@ -98,7 +98,7 @@ 
      */
     public function setDestination($destination)
     {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
+        if (!is_string($destination) || !in_array($destination, $this->outputList))
         {
             throw new Exception('Invalid log destination');
         }

library/Trapdirector/TrapsProcess/Trap.php

Indentation +951 added lines, -951 removed lines

@@ -9,941 +9,941 @@ 
 
 class Trap
 {
-    // Configuration files and dirs
-    /** @var string Icinga etc path */
-    protected $icingaweb2_etc;
-    protected $trap_module_config; //< config.ini of module
-    protected $icingaweb2_ressources; //< resources.ini of icingaweb2
-    // Options from config.ini
-    protected $snmptranslate='/usr/bin/snmptranslate';
-    protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
-    protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
-    protected $db_prefix='traps_';
-    
-    // API
-    protected $api_use=false;
-    protected $icinga2api=null;
-    protected $api_hostname='';
-    protected $api_port=0;
-    protected $api_username='';
-    protected $api_password='';
-    
-    // Logs
-    /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
-    /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
-    
-    // Databases
-    /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
-    
-    // Trap received data
-    protected $receivingHost;
-    /** @var array	Main trap data (oid, source...) */
-    public $trap_data=array();
-    public $trap_data_ext=array(); //< Additional trap data objects (oid/value).
-    public $trap_id=null; //< trap_id after sql insert
-    public $trap_action=null; //< trap action for final write
-    protected $trap_to_db=true; //< log trap to DB
-    
-    /** @var Mib mib class */
-    public $mibClass = null;
-    
-    /** @var Rule rule class */
-    public $ruleClass = null;
-    
-    /** @var Plugins plugins manager **/
-    public $pluginClass = null;
-    
-    function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
-    {
-        // Paths of ini files
-        $this->icingaweb2_etc=$etc_dir;
-        $this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";
-        $this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
-        
-        //************* Setup logging
-        $this->logging = new Logging();
-        if ($baseLogLevel != null)
-        {
-            $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-            $this->logSetup=true;
-        }
-        else
-        {
-            $this->logSetup=false;
-        }
-        $this->logging->log('Loggin started', INFO);
-        
-        //*************** Get options from ini files
-        if (! is_file($this->trap_module_config))
-        {
-            throw new Exception("Ini file ".$this->trap_module_config." does not exists");
-        }
-        $trapConfig=parse_ini_file($this->trap_module_config,true);
-        if ($trapConfig == false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
-            throw new Exception("Error reading ini file : ".$this->trap_module_config);
-        }
-        $this->getMainOptions($trapConfig); // Get main options from ini file
-        
-        //*************** Setup database class & get options
-        $this->setupDatabase($trapConfig);
-        
-        $this->getDatabaseOptions(); // Get options in database
-        
-        //*************** Setup API
-        if ($this->api_use === true) $this->getAPI(); // Setup API
-        
-        //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
-        
-        //*************** Setup Rule
-        $this->ruleClass = new Rule($this->logging); //< Create Rule class
-        
-        $this->trap_data=array(  // TODO : put this in a reset function (DAEMON_MODE)
-            'source_ip'	=> 'unknown',
-            'source_port'	=> 'unknown',
-            'destination_ip'	=> 'unknown',
-            'destination_port'	=> 'unknown',
-            'trap_oid'	=> 'unknown'
-        );
-        
-        //*************** Setup Plugins
-        //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+	// Configuration files and dirs
+	/** @var string Icinga etc path */
+	protected $icingaweb2_etc;
+	protected $trap_module_config; //< config.ini of module
+	protected $icingaweb2_ressources; //< resources.ini of icingaweb2
+	// Options from config.ini
+	protected $snmptranslate='/usr/bin/snmptranslate';
+	protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
+	protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
+	protected $db_prefix='traps_';
+    
+	// API
+	protected $api_use=false;
+	protected $icinga2api=null;
+	protected $api_hostname='';
+	protected $api_port=0;
+	protected $api_username='';
+	protected $api_password='';
+    
+	// Logs
+	/** @var Logging Logging class. */
+	public $logging;    //< Logging class.
+	/** @var bool true if log was setup in constructor */
+	protected $logSetup;   //< bool true if log was setup in constructor
+    
+	// Databases
+	/** @var Database $trapsDB  Database class*/
+	public $trapsDB = null;
+    
+	// Trap received data
+	protected $receivingHost;
+	/** @var array	Main trap data (oid, source...) */
+	public $trap_data=array();
+	public $trap_data_ext=array(); //< Additional trap data objects (oid/value).
+	public $trap_id=null; //< trap_id after sql insert
+	public $trap_action=null; //< trap action for final write
+	protected $trap_to_db=true; //< log trap to DB
+    
+	/** @var Mib mib class */
+	public $mibClass = null;
+    
+	/** @var Rule rule class */
+	public $ruleClass = null;
+    
+	/** @var Plugins plugins manager **/
+	public $pluginClass = null;
+    
+	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	{
+		// Paths of ini files
+		$this->icingaweb2_etc=$etc_dir;
+		$this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";
+		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
+        
+		//************* Setup logging
+		$this->logging = new Logging();
+		if ($baseLogLevel != null)
+		{
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
+		}
+		else
+		{
+			$this->logSetup=false;
+		}
+		$this->logging->log('Loggin started', INFO);
+        
+		//*************** Get options from ini files
+		if (! is_file($this->trap_module_config))
+		{
+			throw new Exception("Ini file ".$this->trap_module_config." does not exists");
+		}
+		$trapConfig=parse_ini_file($this->trap_module_config,true);
+		if ($trapConfig == false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+			throw new Exception("Error reading ini file : ".$this->trap_module_config);
+		}
+		$this->getMainOptions($trapConfig); // Get main options from ini file
+        
+		//*************** Setup database class & get options
+		$this->setupDatabase($trapConfig);
+        
+		$this->getDatabaseOptions(); // Get options in database
+        
+		//*************** Setup API
+		if ($this->api_use === true) $this->getAPI(); // Setup API
+        
+		//*************** Setup MIB
+		$this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        
+		//*************** Setup Rule
+		$this->ruleClass = new Rule($this->logging); //< Create Rule class
+        
+		$this->trap_data=array(  // TODO : put this in a reset function (DAEMON_MODE)
+			'source_ip'	=> 'unknown',
+			'source_port'	=> 'unknown',
+			'destination_ip'	=> 'unknown',
+			'destination_port'	=> 'unknown',
+			'trap_oid'	=> 'unknown'
+		);
+        
+		//*************** Setup Plugins
+		//Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
+		$this->pluginClass = new Plugins($this);
             
             
-    }
-    
-    /**
-     * Get option from array of ini file, send message if empty
-     * @param string $option_array Array of ini file
-     * @param string $option_category category in ini file
-     * @param string $option_name name of option in category
-     * @param mixed $option_var variable to fill if found, left untouched if not found
-     * @param integer $log_level default 2 (warning)
-     * @param string $message warning message if not found
-     * @return boolean true if found, or false
-     */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
-    {
-        if (!isset($option_array[$option_category][$option_name]))
-        {
-            if ($message === null)
-            {
-                $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
-            }
-            $this->logging->log($message,$log_level);
-            return false;
-        }
-        else
-        {
-            $option_var=$option_array[$option_category][$option_name];
-            return true;
-        }
-    }
-    
-    /**
-     * Get options from ini file
-     * @param array $trap_config : ini file array
-     */
-    protected function getMainOptions($trapConfig)
-    {
-        
-        // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
-        
-        // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
-        
-        // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
-        
-        // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->db_prefix);
-        
-        // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
-        {
-            $this->api_use=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
-        }
-    }
-    
-    /**
-     * Create and setup database class for trap & ido (if no api) db
-     * @param array $trap_config : ini file array
-     */
-    protected function setupDatabase($trapConfig)
-    {
-        // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
-        
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
-            return;
-        }
-        if (!array_key_exists($dbTrapName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
-        
-        if ($this->api_use === true) return; // In case of API use, no IDO is necessary
-        
-        // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-        {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
-        }
-        $dbIdoName=$trapConfig['config']['IDOdatabase'];
-        
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
-    }
-    
-    /**
-     * Get options in database
-     */
-    protected function getDatabaseOptions()
-    {
-        // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
-        {
-            $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
-        }
-    }
-    
-    /** Set $variable to value if $element found in database config table
-     * @param string $element
-     * @param string $variable
-     */
-    protected function getDBConfigIfSet($element,&$variable)
-    {
-        $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
-    }
-    
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    protected function getDBConfig($element)  // TODO : put this in DB class
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
-    
-    /** OBSOLETE Send log. Throws exception on critical error
-     *	@param	string $message Message to log
-     *	@param	int $level 1=critical 2=warning 3=trace 4=debug
-     *	@param  string $destination file/syslog/display
-     *	@return void
-     **/
-    public function trapLog( $message, $level, $destination ='') // OBSOLETE
-    {
-        // TODO : replace ref with $this->logging->log
-        $this->logging->log($message, $level, $destination);
-    }
-    
-    public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
-    {
-        $this->logging->setLogging($debugLvl, $outputType,$outputOption);
-    }
-    
-    /**
-     * Returns or create new IcingaAPI object
-     * @return \Icinga\Module\Trapdirector\Icinga2API
-     */
-    protected function getAPI()
-    {
-        if ($this->icinga2api == null)
-        {
-            $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
-        }
-        return $this->icinga2api;
-    }
-    
-    
-    /**
-     * read data from stream
-     *	@param $stream string input stream, defaults to "php://stdin"
-     *	@return mixed array trap data or exception with error
-     */
-    public function read_trap($stream='php://stdin')
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($stream, 'r');
-        
-        if ($input_stream === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-            $this->logging->log("Error reading stdin !",ERROR,'');
-            return null; // note : exception thrown by logging
-        }
-        
-        // line 1 : host
-        $this->receivingHost=chop(fgets($input_stream));
-        if ($this->receivingHost === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-            $this->logging->log("Error reading Host !",ERROR,'');
-        }
-        // line 2 IP:port=>IP:port
-        $IP=chop(fgets($input_stream));
-        if ($IP === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-            $this->logging->log("Error reading IP !",ERROR,'');
-        }
-        $matches=array();
-        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-        if ($ret_code===0 || $ret_code===false)
-        {
-            $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-            $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
-        {
-            $this->trap_data['source_ip']=$matches[1];
-            $this->trap_data['destination_ip']=$matches[3];
-            $this->trap_data['source_port']=$matches[2];
-            $this->trap_data['destination_port']=$matches[4];
-        }
-        
-        while (($vars=fgets($input_stream)) !==false)
-        {
-            $vars=chop($vars);
-            $ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-            if ($ret_code===0 || $ret_code===false)
-            {
-                $this->logging->log('No match on trap data : '.$vars,WARN,'');
-            }
-            else
-            {
-                if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
-                {
-                    $this->trap_data['trap_oid']=$matches[2];
-                }
-                else
-                {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trap_data_ext,$object);
-                }
-            }
-        }
-        
-        if ($this->trap_data['trap_oid']=='unknown')
-        {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
-        }
-        
-        // Translate oids.
-        
-        $retArray=$this->translateOID($this->trap_data['trap_oid']);
-        if ($retArray != null)
-        {
-            $this->trap_data['trap_name']=$retArray['trap_name'];
-            $this->trap_data['trap_name_mib']=$retArray['trap_name_mib'];
-        }
-        foreach ($this->trap_data_ext as $key => $val)
-        {
-            $retArray=$this->translateOID($val->oid);
-            if ($retArray != null)
-            {
-                $this->trap_data_ext[$key]->oid_name=$retArray['trap_name'];
-                $this->trap_data_ext[$key]->oid_name_mib=$retArray['trap_name_mib'];
-            }
-        }
-        
-        
-        $this->trap_data['status']= 'waiting';
-        
-        return $this->trap_data;
-    }
-    
-    /**
-     * Translate oid into array(MIB,Name)
-     * @param $oid string oid to translate
-     * @return mixed : null if not found or array(MIB,Name)
-     */
-    public function translateOID($oid)
-    {
-        // try from database
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $name=$ret_code->fetch();
-        if ($name['name'] != null)
-        {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
-        }
-        
-        // Also check if it is an instance of OID
-        $oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
-        
-        $sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $name=$ret_code->fetch();
-        if ($name['name'] != null)
-        {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
-        }
-        
-        // Try to get oid name from snmptranslate
-        $translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-            ' '.$oid);
-        $matches=array();
-        $ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-        if ($ret_code===0 || $ret_code === false) {
-            return NULL;
-        } else {
-            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-            return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
-        }
-    }
-    
-    /**
-     * Erase old trap records
-     *	@param integer $days : erase traps when more than $days old
-     *	@return integer : number of lines deleted
-     **/
-    public function eraseOldTraps($days=0)
-    {
-        if ($days==0)
-        {
-            if (($days=$this->getDBConfig('db_remove_days')) == null)
-            {
-                $this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
-                return;
-            }
-        }
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $daysago = strtotime("-".$days." day");
-        $sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error erasing traps : '.$sql,ERROR,'');
-        }
-        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
-    }
-    
-    /** Write error to received trap database
-     */
-    public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
-    {
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        // add date time
-        $insert_col ='date_received,status';
-        $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
-        
-        if ($sourceIP !=null)
-        {
-            $insert_col .=',source_ip';
-            $insert_val .=",'". $sourceIP ."'";
-        }
-        if ($trapoid !=null)
-        {
-            $insert_col .=',trap_oid';
-            $insert_val .=",'". $trapoid ."'";
-        }
-        $insert_col .=',status_detail';
-        $insert_val .=",'". $message ."'";
-        
-        $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
-        
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO);
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+	}
+    
+	/**
+	 * Get option from array of ini file, send message if empty
+	 * @param string $option_array Array of ini file
+	 * @param string $option_category category in ini file
+	 * @param string $option_name name of option in category
+	 * @param mixed $option_var variable to fill if found, left untouched if not found
+	 * @param integer $log_level default 2 (warning)
+	 * @param string $message warning message if not found
+	 * @return boolean true if found, or false
+	 */
+	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+	{
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+			}
+			$this->logging->log($message,$log_level);
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
+	}
+    
+	/**
+	 * Get options from ini file
+	 * @param array $trap_config : ini file array
+	 */
+	protected function getMainOptions($trapConfig)
+	{
+        
+		// Snmptranslate binary path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        
+		// mibs path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        
+		// icinga2cmd path
+		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        
+		// table prefix
+		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->db_prefix);
+        
+		// API options
+		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
+		{
+			$this->api_use=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+		}
+	}
+    
+	/**
+	 * Create and setup database class for trap & ido (if no api) db
+	 * @param array $trap_config : ini file array
+	 */
+	protected function setupDatabase($trapConfig)
+	{
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        
+		if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+        
+		if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+        
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];
+        
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+	}
+    
+	/**
+	 * Get options in database
+	 */
+	protected function getDatabaseOptions()
+	{
+		// Database options
+		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		{
+			$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+		}
+	}
+    
+	/** Set $variable to value if $element found in database config table
+	 * @param string $element
+	 * @param string $variable
+	 */
+	protected function getDBConfigIfSet($element,&$variable)
+	{
+		$value=$this->getDBConfig($element);
+		if ($value != null) $variable=$value;
+	}
+    
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	protected function getDBConfig($element)  // TODO : put this in DB class
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
+    
+	/** OBSOLETE Send log. Throws exception on critical error
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 **/
+	public function trapLog( $message, $level, $destination ='') // OBSOLETE
+	{
+		// TODO : replace ref with $this->logging->log
+		$this->logging->log($message, $level, $destination);
+	}
+    
+	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	{
+		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+	}
+    
+	/**
+	 * Returns or create new IcingaAPI object
+	 * @return \Icinga\Module\Trapdirector\Icinga2API
+	 */
+	protected function getAPI()
+	{
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+		}
+		return $this->icinga2api;
+	}
+    
+    
+	/**
+	 * read data from stream
+	 *	@param $stream string input stream, defaults to "php://stdin"
+	 *	@return mixed array trap data or exception with error
+	 */
+	public function read_trap($stream='php://stdin')
+	{
+		//Read data from snmptrapd from stdin
+		$input_stream=fopen($stream, 'r');
+        
+		if ($input_stream === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->logging->log("Error reading stdin !",ERROR,'');
+			return null; // note : exception thrown by logging
+		}
+        
+		// line 1 : host
+		$this->receivingHost=chop(fgets($input_stream));
+		if ($this->receivingHost === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$this->logging->log("Error reading Host !",ERROR,'');
+		}
+		// line 2 IP:port=>IP:port
+		$IP=chop(fgets($input_stream));
+		if ($IP === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
+			$this->logging->log("Error reading IP !",ERROR,'');
+		}
+		$matches=array();
+		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
+		if ($ret_code===0 || $ret_code===false)
+		{
+			$this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
+			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+		}
+		else
+		{
+			$this->trap_data['source_ip']=$matches[1];
+			$this->trap_data['destination_ip']=$matches[3];
+			$this->trap_data['source_port']=$matches[2];
+			$this->trap_data['destination_port']=$matches[4];
+		}
+        
+		while (($vars=fgets($input_stream)) !==false)
+		{
+			$vars=chop($vars);
+			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
+			if ($ret_code===0 || $ret_code===false)
+			{
+				$this->logging->log('No match on trap data : '.$vars,WARN,'');
+			}
+			else
+			{
+				if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+				{
+					$this->trap_data['trap_oid']=$matches[2];
+				}
+				else
+				{
+					$object= new stdClass;
+					$object->oid =$matches[1];
+					$object->value = $matches[2];
+					array_push($this->trap_data_ext,$object);
+				}
+			}
+		}
+        
+		if ($this->trap_data['trap_oid']=='unknown')
+		{
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
+			$this->logging->log('no trap oid found',ERROR,'');
+		}
+        
+		// Translate oids.
+        
+		$retArray=$this->translateOID($this->trap_data['trap_oid']);
+		if ($retArray != null)
+		{
+			$this->trap_data['trap_name']=$retArray['trap_name'];
+			$this->trap_data['trap_name_mib']=$retArray['trap_name_mib'];
+		}
+		foreach ($this->trap_data_ext as $key => $val)
+		{
+			$retArray=$this->translateOID($val->oid);
+			if ($retArray != null)
+			{
+				$this->trap_data_ext[$key]->oid_name=$retArray['trap_name'];
+				$this->trap_data_ext[$key]->oid_name_mib=$retArray['trap_name_mib'];
+			}
+		}
+        
+        
+		$this->trap_data['status']= 'waiting';
+        
+		return $this->trap_data;
+	}
+    
+	/**
+	 * Translate oid into array(MIB,Name)
+	 * @param $oid string oid to translate
+	 * @return mixed : null if not found or array(MIB,Name)
+	 */
+	public function translateOID($oid)
+	{
+		// try from database
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$name=$ret_code->fetch();
+		if ($name['name'] != null)
+		{
+			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+		}
+        
+		// Also check if it is an instance of OID
+		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+        
+		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$name=$ret_code->fetch();
+		if ($name['name'] != null)
+		{
+			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+		}
+        
+		// Try to get oid name from snmptranslate
+		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+			' '.$oid);
+		$matches=array();
+		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
+		if ($ret_code===0 || $ret_code === false) {
+			return NULL;
+		} else {
+			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
+			return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+		}
+	}
+    
+	/**
+	 * Erase old trap records
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
+	public function eraseOldTraps($days=0)
+	{
+		if ($days==0)
+		{
+			if (($days=$this->getDBConfig('db_remove_days')) == null)
+			{
+				$this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+				return;
+			}
+		}
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$daysago = strtotime("-".$days." day");
+		$sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+		}
+		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+	}
+    
+	/** Write error to received trap database
+	 */
+	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+	{
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		// add date time
+		$insert_col ='date_received,status';
+		$insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+        
+		if ($sourceIP !=null)
+		{
+			$insert_col .=',source_ip';
+			$insert_val .=",'". $sourceIP ."'";
+		}
+		if ($trapoid !=null)
+		{
+			$insert_col .=',trap_oid';
+			$insert_val .=",'". $trapoid ."'";
+		}
+		$insert_col .=',status_detail';
+		$insert_val .=",'". $message ."'";
+        
+		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO);
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',1,'');
-                }
-                $this->trap_id=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',1,'');
-                }
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',1,'');
+				}
+				$this->trap_id=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
                 
-                $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->trap_id=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-        }
-        
-        $this->logging->log('id found: '. $this->trap_id,INFO );
-    }
-    
-    /** Write trap data to trap database
-     */
-    public function writeTrapToDB()
-    {
-        
-        // If action is ignore -> don't send t DB
-        if ($this->trap_to_db === false) return;
-        
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $insert_col='';
-        $insert_val='';
-        // add date time
-        $this->trap_data['date_received'] = date("Y-m-d H:i:s");
-        
-        $firstcol=1;
-        foreach ($this->trap_data as $col => $val)
-        {
-            if ($firstcol==0)
-            {
-                $insert_col .=',';
-                $insert_val .=',';
-            }
-            $insert_col .= $col ;
-            $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-            $firstcol=0;
-        }
-        
-        $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO );
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+				$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->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
+        
+		$this->logging->log('id found: '. $this->trap_id,INFO );
+	}
+    
+	/** Write trap data to trap database
+	 */
+	public function writeTrapToDB()
+	{
+        
+		// If action is ignore -> don't send t DB
+		if ($this->trap_to_db === false) return;
+        
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$insert_col='';
+		$insert_val='';
+		// add date time
+		$this->trap_data['date_received'] = date("Y-m-d H:i:s");
+        
+		$firstcol=1;
+		foreach ($this->trap_data as $col => $val)
+		{
+			if ($firstcol==0)
+			{
+				$insert_col .=',';
+				$insert_val .=',';
+			}
+			$insert_col .= $col ;
+			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$firstcol=0;
+		}
+        
+		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO );
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',ERROR,'');
-                }
-                $this->trap_id=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
-                }
+					$this->logging->log('Erreur recuperation id',ERROR,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',ERROR,'');
+				}
+				$this->trap_id=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',ERROR,'');
+				}
                 
-                $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->trap_id=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
-        }
-        $this->logging->log('id found: '.$this->trap_id,INFO );
-        
-        // Fill trap extended data table
-        foreach ($this->trap_data_ext as $value) {
-            // TODO : detect if trap value is encoded and decode it to UTF-8 for database
-            $firstcol=1;
-            $value->trap_id = $this->trap_id;
-            $insert_col='';
-            $insert_val='';
-            foreach ($value as $col => $val)
-            {
-                if ($firstcol==0)
-                {
-                    $insert_col .=',';
-                    $insert_val .=',';
-                }
-                $insert_col .= $col;
-                $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-                $firstcol=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->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+		}
+		$this->logging->log('id found: '.$this->trap_id,INFO );
+        
+		// Fill trap extended data table
+		foreach ($this->trap_data_ext as $value) {
+			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
+			$firstcol=1;
+			$value->trap_id = $this->trap_id;
+			$insert_col='';
+			$insert_val='';
+			foreach ($value as $col => $val)
+			{
+				if ($firstcol==0)
+				{
+					$insert_col .=',';
+					$insert_val .=',';
+				}
+				$insert_col .= $col;
+				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$firstcol=0;
+			}
             
-            $sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+			$sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
             
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
-            }
-        }
-    }
-    
-    /** Get rules from rule database with ip and oid
-     *	@param $ip string ipv4 or ipv6
-     *	@param $oid string oid in numeric
-     *	@return mixed|boolean : PDO object or false
-     */
-    protected function getRules($ip,$oid)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        // fetch rules based on IP in rule and OID
-        $sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return false;
-        }
-        $rules_all=$ret_code->fetchAll();
-        //echo "rule all :\n";print_r($rules_all);echo "\n";
-        $rules_ret=array();
-        $rule_ret_key=0;
-        foreach ($rules_all as $key => $rule)
-        {
-            if ($rule['ip4']==$ip || $rule['ip6']==$ip)
-            {
-                $rules_ret[$rule_ret_key]=$rules_all[$key];
-                //TODO : get host name by API (and check if correct in rule).
-                $rule_ret_key++;
-                continue;
-            }
-            // TODO : get hosts IP by API
-            if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
-            { // get ips of group members by oid
-                $db_conn2=$this->trapsDB->db_connect_ido();
-                $sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+			}
+		}
+	}
+    
+	/** Get rules from rule database with ip and oid
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed|boolean : PDO object or false
+	 */
+	protected function getRules($ip,$oid)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		// fetch rules based on IP in rule and OID
+		$sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return false;
+		}
+		$rules_all=$ret_code->fetchAll();
+		//echo "rule all :\n";print_r($rules_all);echo "\n";
+		$rules_ret=array();
+		$rule_ret_key=0;
+		foreach ($rules_all as $key => $rule)
+		{
+			if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+			{
+				$rules_ret[$rule_ret_key]=$rules_all[$key];
+				//TODO : get host name by API (and check if correct in rule).
+				$rule_ret_key++;
+				continue;
+			}
+			// TODO : get hosts IP by API
+			if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+			{ // get ips of group members by oid
+				$db_conn2=$this->trapsDB->db_connect_ido();
+				$sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
 						FROM icinga_objects as o
 						LEFT JOIN icinga_hostgroups as h ON o.object_id=h.hostgroup_object_id
 						LEFT JOIN icinga_hostgroup_members as m ON h.hostgroup_id=m.hostgroup_id
 						LEFT JOIN icinga_hosts as a ON a.host_object_id = m.host_object_id
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
-                if (($ret_code2=$db_conn2->query($sql)) === false) {
-                    $this->logging->log('No result in query : ' . $sql,WARN,'');
-                    continue;
-                }
-                $grouphosts=$ret_code2->fetchAll();
-                //echo "rule grp :\n";print_r($grouphosts);echo "\n";
-                foreach ( $grouphosts as $host)
-                {
-                    //echo $host['ip4']."\n";
-                    if ($host['ip4']==$ip || $host['ip6']==$ip)
-                    {
-                        //echo "Rule added \n";
-                        $rules_ret[$rule_ret_key]=$rules_all[$key];
-                        $rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
-                        $rule_ret_key++;
-                    }
-                }
-            }
-        }
-        //echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
-        return $rules_ret;
-    }
-    
-    /** Add rule match to rule
-     *	@param id int : rule id
-     *   @param set int : value to set
-     */
-    protected function add_rule_match($id, $set)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
-    
-    /** Send SERVICE_CHECK_RESULT with icinga2cmd or API
-     *
-     * @param string $host
-     * @param string $service
-     * @param integer $state numerical staus
-     * @param string $display
-     * @returnn bool true is service check was sent without error
-     */
-    public function serviceCheckResult($host,$service,$state,$display)
-    {
-        if ($this->api_use === false)
-        {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+				if (($ret_code2=$db_conn2->query($sql)) === false) {
+					$this->logging->log('No result in query : ' . $sql,WARN,'');
+					continue;
+				}
+				$grouphosts=$ret_code2->fetchAll();
+				//echo "rule grp :\n";print_r($grouphosts);echo "\n";
+				foreach ( $grouphosts as $host)
+				{
+					//echo $host['ip4']."\n";
+					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					{
+						//echo "Rule added \n";
+						$rules_ret[$rule_ret_key]=$rules_all[$key];
+						$rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
+						$rule_ret_key++;
+					}
+				}
+			}
+		}
+		//echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
+		return $rules_ret;
+	}
+    
+	/** Add rule match to rule
+	 *	@param id int : rule id
+	 *   @param set int : value to set
+	 */
+	protected function add_rule_match($id, $set)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
+    
+	/** Send SERVICE_CHECK_RESULT with icinga2cmd or API
+	 *
+	 * @param string $host
+	 * @param string $service
+	 * @param integer $state numerical staus
+	 * @param string $display
+	 * @returnn bool true is service check was sent without error
+	 */
+	public function serviceCheckResult($host,$service,$state,$display)
+	{
+		if ($this->api_use === false)
+		{
+			$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
+				$host.';' .$service .';' . $state . ';'.$display;
+				$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
                 
-                // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-                exec('echo "'.$send.'" > ' .$this->icinga2cmd);
-                return true;
-        }
-        else
-        {
-            // Get perfdata if found
-            $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
-            {
-                $display=$matches[1];
-                $perfdata=$matches[2];
-            }
-            else
-            {
-                $perfdata='';
-            }
+				// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
+				exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+				return true;
+		}
+		else
+		{
+			// Get perfdata if found
+			$matches=array();
+			if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+			{
+				$display=$matches[1];
+				$perfdata=$matches[2];
+			}
+			else
+			{
+				$perfdata='';
+			}
             
-            $api = $this->getAPI();
-            $api->setCredentials($this->api_username, $this->api_password);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
-            if ($retcode == false)
-            {
-                $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-                return false;
-            }
-            else
-            {
-                $this->logging->log( "Sent result : " .$retmessage,INFO );
-                return true;
-            }
-        }
-    }
-    
-    public function getHostByIP($ip)
-    {
-        $api = $this->getAPI();
-        $api->setCredentials($this->api_username, $this->api_password);
-        return $api->getHostByIP($ip);
-    }
-    
-    /** Resolve display.
-     *	Changes _OID(<oid>) to value if found or text "<not in trap>"
-     *	@param $display string
-     *	@return string display
-     */
-    protected function applyDisplay($display)
-    {
-        $matches=array();
-        while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
-        {
-            $oid=$matches[1];
-            $found=0;
-            foreach($this->trap_data_ext as $val)
-            {
-                if ($oid == $val->oid)
-                {
-                    $val->value=preg_replace('/"/','',$val->value);
-                    $rep=0;
-                    $display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-                    if ($rep==0)
-                    {
-                        $this->logging->log("Error in display",WARN,'');
-                        return $display;
-                    }
-                    $found=1;
-                    break;
-                }
-            }
-            if ($found==0)
-            {
-                $display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-                if ($rep==0)
-                {
-                    $this->logging->log("Error in display",WARN,'');
-                    return $display;
-                }
-            }
-        }
-        return $display;
-    }
-    
-    /** Match rules for current trap and do action
-     */
-    public function applyRules()
-    {
-        $rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
-        
-        if ($rules===false || count($rules)==0)
-        {
-            $this->logging->log('No rules found for this trap',INFO );
-            $this->trap_data['status']='unknown';
-            $this->trap_to_db=true;
-            return;
-        }
-        //print_r($rules);
-        // Evaluate all rules in sequence
-        $this->trap_action=null;
-        foreach ($rules as $rule)
-        {
+			$api = $this->getAPI();
+			$api->setCredentials($this->api_username, $this->api_password);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+			if ($retcode == false)
+			{
+				$this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+				return false;
+			}
+			else
+			{
+				$this->logging->log( "Sent result : " .$retmessage,INFO );
+				return true;
+			}
+		}
+	}
+    
+	public function getHostByIP($ip)
+	{
+		$api = $this->getAPI();
+		$api->setCredentials($this->api_username, $this->api_password);
+		return $api->getHostByIP($ip);
+	}
+    
+	/** Resolve display.
+	 *	Changes _OID(<oid>) to value if found or text "<not in trap>"
+	 *	@param $display string
+	 *	@return string display
+	 */
+	protected function applyDisplay($display)
+	{
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+		{
+			$oid=$matches[1];
+			$found=0;
+			foreach($this->trap_data_ext as $val)
+			{
+				if ($oid == $val->oid)
+				{
+					$val->value=preg_replace('/"/','',$val->value);
+					$rep=0;
+					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
+					if ($rep==0)
+					{
+						$this->logging->log("Error in display",WARN,'');
+						return $display;
+					}
+					$found=1;
+					break;
+				}
+			}
+			if ($found==0)
+			{
+				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
+				if ($rep==0)
+				{
+					$this->logging->log("Error in display",WARN,'');
+					return $display;
+				}
+			}
+		}
+		return $display;
+	}
+    
+	/** Match rules for current trap and do action
+	 */
+	public function applyRules()
+	{
+		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+        
+		if ($rules===false || count($rules)==0)
+		{
+			$this->logging->log('No rules found for this trap',INFO );
+			$this->trap_data['status']='unknown';
+			$this->trap_to_db=true;
+			return;
+		}
+		//print_r($rules);
+		// Evaluate all rules in sequence
+		$this->trap_action=null;
+		foreach ($rules as $rule)
+		{
             
-            $host_name=$rule['host_name'];
-            $service_name=$rule['service_name'];
+			$host_name=$rule['host_name'];
+			$service_name=$rule['service_name'];
             
-            $display=$this->applyDisplay($rule['display']);
-            $this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
-            try
-            {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext) ;
-                //->eval_rule($rule['rule']);
+			$display=$this->applyDisplay($rule['display']);
+			$this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+			try
+			{
+				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext) ;
+				//->eval_rule($rule['rule']);
                 
-                if ($evalr == true)
-                {
-                    //$this->logging->log('rules OOK: '.print_r($rule),INFO );
-                    $action=$rule['action_match'];
-                    $this->logging->log('action OK : '.$action,INFO );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
-                        {
-                            $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trap_to_db=($action==-2)?false:true;
-                }
-                else
-                {
-                    //$this->logging->log('rules KOO : '.print_r($rule),INFO );
+				if ($evalr == true)
+				{
+					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
+					$action=$rule['action_match'];
+					$this->logging->log('action OK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trap_to_db=($action==-2)?false:true;
+				}
+				else
+				{
+					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
-                    $action=$rule['action_nomatch'];
-                    $this->logging->log('action NOK : '.$action,INFO );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-                        {
-                            $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trap_to_db=($action==-2)?false:true;
-                }
-                // Put name in source_name
-                if (!isset($this->trap_data['source_name']))
-                {
-                    $this->trap_data['source_name']=$rule['host_name'];
-                }
-                else
-                {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
-                    { // only add if not present
-                        $this->trap_data['source_name'].=','.$rule['host_name'];
-                    }
-                }
-            }
-            catch (Exception $e)
-            {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-                $this->trap_action.=' ERR : '.$e->getMessage();
-                $this->trap_data['status']='error';
-            }
+					$action=$rule['action_nomatch'];
+					$this->logging->log('action NOK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trap_to_db=($action==-2)?false:true;
+				}
+				// Put name in source_name
+				if (!isset($this->trap_data['source_name']))
+				{
+					$this->trap_data['source_name']=$rule['host_name'];
+				}
+				else
+				{
+					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+					{ // only add if not present
+						$this->trap_data['source_name'].=','.$rule['host_name'];
+					}
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trap_action.=' ERR : '.$e->getMessage();
+				$this->trap_data['status']='error';
+			}
             
-        }
-        if ($this->trap_data['status']=='error')
-        {
-            $this->trap_to_db=true; // Always put errors in DB for the use can see
-        }
-        else
-        {
-            $this->trap_data['status']='done';
-        }
-    }
-    
-    /** Add Time a action to rule
-     *	@param string $time : time to process to insert in SQL
-     */
-    public function add_rule_final($time)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trap_action==null)
-        {
-            $this->trap_action='No action';
-        }
-        $sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
-    
-    /*********** UTILITIES *********************/
-    
-    /** reset service to OK after time defined in rule
-     *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better
-     *	@return integer : not in use
-     **/
-    public function reset_services()
-    {
-        // Get all services not in 'ok' state
-        $sql_query="SELECT s.service_object_id,
+		}
+		if ($this->trap_data['status']=='error')
+		{
+			$this->trap_to_db=true; // Always put errors in DB for the use can see
+		}
+		else
+		{
+			$this->trap_data['status']='done';
+		}
+	}
+    
+	/** Add Time a action to rule
+	 *	@param string $time : time to process to insert in SQL
+	 */
+	public function add_rule_final($time)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		if ($this->trap_action==null)
+		{
+			$this->trap_action='No action';
+		}
+		$sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
+    
+	/*********** UTILITIES *********************/
+    
+	/** reset service to OK after time defined in rule
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better
+	 *	@return integer : not in use
+	 **/
+	public function reset_services()
+	{
+		// Get all services not in 'ok' state
+		$sql_query="SELECT s.service_object_id,
 	 UNIX_TIMESTAMP(s.last_check) AS last_check,
 	s.current_state as state,
 	v.name1 as host_name,
@@ -951,43 +951,43 @@ 
 	FROM icinga_servicestatus AS s
     LEFT JOIN icinga_objects as v ON s.service_object_id=v.object_id
     WHERE s.current_state != 0;";
-        $db_conn=$this->trapsDB->db_connect_ido();
-        if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
-            return 0;
-        }
-        $services=$services_db->fetchAll();
-        
-        // Get all rules
-        $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
-        $db_conn2=$this->trapsDB->db_connect_trap();
-        if (($rules_db=$db_conn2->query($sql_query)) === false) {
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
-            return 0;
-        }
-        $rules=$rules_db->fetchAll();
-        
-        $now=date('U');
-        
-        $numreset=0;
-        foreach ($rules as $rule)
-        {
-            foreach ($services as $service)
-            {
-                if ($service['service_name'] == $rule['service_name'] &&
-                    $service['host_name'] == $rule['host_name'] &&
-                    ($service['last_check'] + $rule['revert_ok']) < $now)
-                {
-                    $this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
-                    $numreset++;
-                }
-            }
-        }
-        echo "\n";
-        echo $numreset . " service(s) reset to OK\n";
-        return 0;
-        
-    }
+		$db_conn=$this->trapsDB->db_connect_ido();
+		if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
+			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			return 0;
+		}
+		$services=$services_db->fetchAll();
+        
+		// Get all rules
+		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
+		$db_conn2=$this->trapsDB->db_connect_trap();
+		if (($rules_db=$db_conn2->query($sql_query)) === false) {
+			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			return 0;
+		}
+		$rules=$rules_db->fetchAll();
+        
+		$now=date('U');
+        
+		$numreset=0;
+		foreach ($rules as $rule)
+		{
+			foreach ($services as $service)
+			{
+				if ($service['service_name'] == $rule['service_name'] &&
+					$service['host_name'] == $rule['host_name'] &&
+					($service['last_check'] + $rule['revert_ok']) < $now)
+				{
+					$this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+					$numreset++;
+				}
+			}
+		}
+		echo "\n";
+		echo $numreset . " service(s) reset to OK\n";
+		return 0;
+        
+	}
     
     
 }
\ No newline at end of file

Spacing +197 added lines, -197 removed lines

@@ -30,13 +30,13 @@ 
     
     // Logs
     /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
+    public $logging; //< Logging class.
     /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
+    protected $logSetup; //< bool true if log was setup in constructor
     
     // Databases
     /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
+    public $trapsDB=null;
     
     // Trap received data
     protected $receivingHost;
@@ -48,15 +48,15 @@ 
     protected $trap_to_db=true; //< log trap to DB
     
     /** @var Mib mib class */
-    public $mibClass = null;
+    public $mibClass=null;
     
     /** @var Rule rule class */
-    public $ruleClass = null;
+    public $ruleClass=null;
     
     /** @var Plugins plugins manager **/
-    public $pluginClass = null;
+    public $pluginClass=null;
     
-    function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+    function __construct($etc_dir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
     {
         // Paths of ini files
         $this->icingaweb2_etc=$etc_dir;
@@ -64,10 +64,10 @@ 
         $this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
         
         //************* Setup logging
-        $this->logging = new Logging();
+        $this->logging=new Logging();
         if ($baseLogLevel != null)
         {
-            $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+            $this->logging->setLogging($baseLogLevel, $baseLogMode, $baseLogFile);
             $this->logSetup=true;
         }
         else
@@ -77,14 +77,14 @@ 
         $this->logging->log('Loggin started', INFO);
         
         //*************** Get options from ini files
-        if (! is_file($this->trap_module_config))
+        if (!is_file($this->trap_module_config))
         {
             throw new Exception("Ini file ".$this->trap_module_config." does not exists");
         }
-        $trapConfig=parse_ini_file($this->trap_module_config,true);
+        $trapConfig=parse_ini_file($this->trap_module_config, true);
         if ($trapConfig == false)
         {
-            $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+            $this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog');
             throw new Exception("Error reading ini file : ".$this->trap_module_config);
         }
         $this->getMainOptions($trapConfig); // Get main options from ini file
@@ -98,10 +98,10 @@ 
         if ($this->api_use === true) $this->getAPI(); // Setup API
         
         //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        $this->mibClass=new Mib($this->logging, $this->trapsDB, $this->snmptranslate, $this->snmptranslate_dirs); // Create Mib class
         
         //*************** Setup Rule
-        $this->ruleClass = new Rule($this->logging); //< Create Rule class
+        $this->ruleClass=new Rule($this->logging); //< Create Rule class
         
         $this->trap_data=array(  // TODO : put this in a reset function (DAEMON_MODE)
             'source_ip'	=> 'unknown',
@@ -113,7 +113,7 @@ 
         
         //*************** Setup Plugins
         //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+        $this->pluginClass=new Plugins($this);
             
             
     }
@@ -128,15 +128,15 @@ 
      * @param string $message warning message if not found
      * @return boolean true if found, or false
      */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+    protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=2, $message=null)
     {
         if (!isset($option_array[$option_category][$option_name]))
         {
             if ($message === null)
             {
-                $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+                $message='No '.$option_name.' in config file: '.$this->trap_module_config;
             }
-            $this->logging->log($message,$log_level);
+            $this->logging->log($message, $log_level);
             return false;
         }
         else
@@ -154,24 +154,24 @@ 
     {
         
         // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
         
         // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
         
         // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        $this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
         
         // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->db_prefix);
+        $this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->db_prefix);
         
         // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
+        if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->api_hostname))
         {
             $this->api_use=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->api_port);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->api_username);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->api_password);
         }
     }
     
@@ -182,40 +182,40 @@ 
     protected function setupDatabase($trapConfig)
     {
         // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
+        if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trap_module_config, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
+        if (($dbConfig=parse_ini_file($this->icingaweb2_ressources, true)) === false)
         {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+            $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources, ERROR, '');
             return;
         }
-        if (!array_key_exists($dbTrapName,$dbConfig))
+        if (!array_key_exists($dbTrapName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
             return;
         }
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->db_prefix);
         
         if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
         // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+        if (!array_key_exists('IDOdatabase', $trapConfig['config']))
         {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+            $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config, ERROR, '');
         }
         $dbIdoName=$trapConfig['config']['IDOdatabase'];
         
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+        $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
             return;
         }
         
@@ -230,9 +230,9 @@ 
         // Database options
         if ($this->logSetup === false) // Only if logging was no setup in constructor
         {
-            $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+            $this->getDBConfigIfSet('log_level', $this->logging->debugLevel);
+            $this->getDBConfigIfSet('log_destination', $this->logging->outputMode);
+            $this->getDBConfigIfSet('log_file', $this->logging->outputFile);
         }
     }
     
@@ -240,7 +240,7 @@ 
      * @param string $element
      * @param string $variable
      */
-    protected function getDBConfigIfSet($element,&$variable)
+    protected function getDBConfigIfSet($element, &$variable)
     {
         $value=$this->getDBConfig($element);
         if ($value != null) $variable=$value;
@@ -256,7 +256,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -273,15 +273,15 @@ 
      *	@param  string $destination file/syslog/display
      *	@return void
      **/
-    public function trapLog( $message, $level, $destination ='') // OBSOLETE
+    public function trapLog($message, $level, $destination='') // OBSOLETE
     {
         // TODO : replace ref with $this->logging->log
         $this->logging->log($message, $level, $destination);
     }
     
-    public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+    public function setLogging($debugLvl, $outputType, $outputOption=null)  // OBSOLETE
     {
-        $this->logging->setLogging($debugLvl, $outputType,$outputOption);
+        $this->logging->setLogging($debugLvl, $outputType, $outputOption);
     }
     
     /**
@@ -292,7 +292,7 @@ 
     {
         if ($this->icinga2api == null)
         {
-            $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+            $this->icinga2api=new Icinga2API($this->api_hostname, $this->api_port);
         }
         return $this->icinga2api;
     }
@@ -311,7 +311,7 @@ 
         if ($input_stream === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-            $this->logging->log("Error reading stdin !",ERROR,'');
+            $this->logging->log("Error reading stdin !", ERROR, '');
             return null; // note : exception thrown by logging
         }
         
@@ -320,21 +320,21 @@ 
         if ($this->receivingHost === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-            $this->logging->log("Error reading Host !",ERROR,'');
+            $this->logging->log("Error reading Host !", ERROR, '');
         }
         // line 2 IP:port=>IP:port
         $IP=chop(fgets($input_stream));
         if ($IP === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-            $this->logging->log("Error reading IP !",ERROR,'');
+            $this->logging->log("Error reading IP !", ERROR, '');
         }
         $matches=array();
-        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-        if ($ret_code===0 || $ret_code===false)
+        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/', $IP, $matches);
+        if ($ret_code === 0 || $ret_code === false)
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-            $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+            $this->logging->log('Error parsing IP : '.$IP, ERROR, '');
         }
         else
         {
@@ -344,34 +344,34 @@ 
             $this->trap_data['destination_port']=$matches[4];
         }
         
-        while (($vars=fgets($input_stream)) !==false)
+        while (($vars=fgets($input_stream)) !== false)
         {
             $vars=chop($vars);
-            $ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-            if ($ret_code===0 || $ret_code===false)
+            $ret_code=preg_match('/^([^ ]+) (.*)$/', $vars, $matches);
+            if ($ret_code === 0 || $ret_code === false)
             {
-                $this->logging->log('No match on trap data : '.$vars,WARN,'');
+                $this->logging->log('No match on trap data : '.$vars, WARN, '');
             }
             else
             {
-                if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+                if (($matches[1] == '.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1] == '.1.3.6.1.6.3.1.1.4.1'))
                 {
                     $this->trap_data['trap_oid']=$matches[2];
                 }
                 else
                 {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trap_data_ext,$object);
+                    $object=new stdClass;
+                    $object->oid=$matches[1];
+                    $object->value=$matches[2];
+                    array_push($this->trap_data_ext, $object);
                 }
             }
         }
         
-        if ($this->trap_data['trap_oid']=='unknown')
+        if ($this->trap_data['trap_oid'] == 'unknown')
         {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
+            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trap_data['source_ip']);
+            $this->logging->log('no trap oid found', ERROR, '');
         }
         
         // Translate oids.
@@ -393,7 +393,7 @@ 
         }
         
         
-        $this->trap_data['status']= 'waiting';
+        $this->trap_data['status']='waiting';
         
         return $this->trap_data;
     }
@@ -409,40 +409,40 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
-        $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, '');
         }
         $name=$ret_code->fetch();
         if ($name['name'] != null)
         {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
         }
         
         // Also check if it is an instance of OID
-        $oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+        $oid_instance=preg_replace('/\.[0-9]+$/', '', $oid);
         
         $sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-        $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, '');
         }
         $name=$ret_code->fetch();
         if ($name['name'] != null)
         {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
         }
         
         // Try to get oid name from snmptranslate
-        $translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+        $translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
             ' '.$oid);
         $matches=array();
-        $ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-        if ($ret_code===0 || $ret_code === false) {
+        $ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+        if ($ret_code === 0 || $ret_code === false) {
             return NULL;
         } else {
-            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-            return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid, INFO);
+            return array('trap_name_mib'=>$matches[1], 'trap_name'=>$matches[2]);
         }
     }
     
@@ -453,90 +453,90 @@ 
      **/
     public function eraseOldTraps($days=0)
     {
-        if ($days==0)
+        if ($days == 0)
         {
             if (($days=$this->getDBConfig('db_remove_days')) == null)
             {
-                $this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+                $this->logging->log('No days specified & no db value : no tap erase', WARN, '');
                 return;
             }
         }
         $db_conn=$this->trapsDB->db_connect_trap();
-        $daysago = strtotime("-".$days." day");
-        $sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+        $daysago=strtotime("-".$days." day");
+        $sql='delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s", $daysago).'\';';
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+            $this->logging->log('Error erasing traps : '.$sql, ERROR, '');
         }
-        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql, INFO);
     }
     
     /** Write error to received trap database
      */
-    public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+    public function writeTrapErrorToDB($message, $sourceIP=null, $trapoid=null)
     {
         
         $db_conn=$this->trapsDB->db_connect_trap();
         
         // add date time
-        $insert_col ='date_received,status';
-        $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+        $insert_col='date_received,status';
+        $insert_val="'".date("Y-m-d H:i:s")."','error'";
         
-        if ($sourceIP !=null)
+        if ($sourceIP != null)
         {
-            $insert_col .=',source_ip';
-            $insert_val .=",'". $sourceIP ."'";
+            $insert_col.=',source_ip';
+            $insert_val.=",'".$sourceIP."'";
         }
-        if ($trapoid !=null)
+        if ($trapoid != null)
         {
-            $insert_col .=',trap_oid';
-            $insert_val .=",'". $trapoid ."'";
+            $insert_col.=',trap_oid';
+            $insert_val.=",'".$trapoid."'";
         }
-        $insert_col .=',status_detail';
-        $insert_val .=",'". $message ."'";
+        $insert_col.=',status_detail';
+        $insert_val.=",'".$message."'";
         
-        $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
         
         switch ($this->trapsDB->trapDBType)
         {
             case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO);
+                $sql.=' RETURNING id;';
+                $this->logging->log('sql : '.$sql, INFO);
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
+                    $this->logging->log('Error SQL insert : '.$sql, 1, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',1,'');
+                    $this->logging->log('Erreur recuperation id', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',1,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id', 1, '');
                 }
                 $this->trap_id=$inserted_id_ret['id'];
                 break;
             case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=';';
+                $this->logging->log('sql : '.$sql, INFO);
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
+                    $this->logging->log('Error SQL insert : '.$sql, 1, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',1,'');
+                    $this->logging->log('Erreur recuperation id', 1, '');
                 }
                 
                 $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->trap_id=$inserted_id;
                 break;
             default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType, 1, '');
         }
         
-        $this->logging->log('id found: '. $this->trap_id,INFO );
+        $this->logging->log('id found: '.$this->trap_id, INFO);
     }
     
     /** Write trap data to trap database
@@ -553,86 +553,86 @@ 
         $insert_col='';
         $insert_val='';
         // add date time
-        $this->trap_data['date_received'] = date("Y-m-d H:i:s");
+        $this->trap_data['date_received']=date("Y-m-d H:i:s");
         
         $firstcol=1;
         foreach ($this->trap_data as $col => $val)
         {
-            if ($firstcol==0)
+            if ($firstcol == 0)
             {
-                $insert_col .=',';
-                $insert_val .=',';
+                $insert_col.=',';
+                $insert_val.=',';
             }
-            $insert_col .= $col ;
-            $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+            $insert_col.=$col;
+            $insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
             $firstcol=0;
         }
         
-        $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
         switch ($this->trapsDB->trapDBType)
         {
             case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=' RETURNING id;';
+                $this->logging->log('sql : '.$sql, INFO);
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+                    $this->logging->log('Error SQL insert : '.$sql, ERROR, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
+                    $this->logging->log('Erreur recuperation id', ERROR, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',ERROR,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id', ERROR, '');
                 }
                 $this->trap_id=$inserted_id_ret['id'];
                 break;
             case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=';';
+                $this->logging->log('sql : '.$sql, INFO);
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+                    $this->logging->log('Error SQL insert : '.$sql, ERROR, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
+                    $this->logging->log('Erreur recuperation id', ERROR, '');
                 }
                 
                 $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->trap_id=$inserted_id;
                 break;
             default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType, ERROR, '');
         }
-        $this->logging->log('id found: '.$this->trap_id,INFO );
+        $this->logging->log('id found: '.$this->trap_id, INFO);
         
         // Fill trap extended data table
         foreach ($this->trap_data_ext as $value) {
             // TODO : detect if trap value is encoded and decode it to UTF-8 for database
             $firstcol=1;
-            $value->trap_id = $this->trap_id;
+            $value->trap_id=$this->trap_id;
             $insert_col='';
             $insert_val='';
             foreach ($value as $col => $val)
             {
-                if ($firstcol==0)
+                if ($firstcol == 0)
                 {
-                    $insert_col .=',';
-                    $insert_val .=',';
+                    $insert_col.=',';
+                    $insert_val.=',';
                 }
-                $insert_col .= $col;
-                $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+                $insert_col.=$col;
+                $insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
                 $firstcol=0;
             }
             
-            $sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+            $sql='INSERT INTO '.$this->db_prefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';
             
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+                $this->logging->log('Erreur insertion data : '.$sql, WARN, '');
             }
         }
     }
@@ -642,14 +642,14 @@ 
      *	@param $oid string oid in numeric
      *	@return mixed|boolean : PDO object or false
      */
-    protected function getRules($ip,$oid)
+    protected function getRules($ip, $oid)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
         // fetch rules based on IP in rule and OID
         $sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-        $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,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return false;
         }
         $rules_all=$ret_code->fetchAll();
@@ -658,7 +658,7 @@ 
         $rule_ret_key=0;
         foreach ($rules_all as $key => $rule)
         {
-            if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+            if ($rule['ip4'] == $ip || $rule['ip6'] == $ip)
             {
                 $rules_ret[$rule_ret_key]=$rules_all[$key];
                 //TODO : get host name by API (and check if correct in rule).
@@ -666,7 +666,7 @@ 
                 continue;
             }
             // TODO : get hosts IP by API
-            if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+            if (isset($rule['host_group_name']) && $rule['host_group_name'] != null)
             { // get ips of group members by oid
                 $db_conn2=$this->trapsDB->db_connect_ido();
                 $sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
@@ -677,15 +677,15 @@ 
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
                 if (($ret_code2=$db_conn2->query($sql)) === false) {
-                    $this->logging->log('No result in query : ' . $sql,WARN,'');
+                    $this->logging->log('No result in query : '.$sql, WARN, '');
                     continue;
                 }
                 $grouphosts=$ret_code2->fetchAll();
                 //echo "rule grp :\n";print_r($grouphosts);echo "\n";
-                foreach ( $grouphosts as $host)
+                foreach ($grouphosts as $host)
                 {
                     //echo $host['ip4']."\n";
-                    if ($host['ip4']==$ip || $host['ip6']==$ip)
+                    if ($host['ip4'] == $ip || $host['ip6'] == $ip)
                     {
                         //echo "Rule added \n";
                         $rules_ret[$rule_ret_key]=$rules_all[$key];
@@ -708,7 +708,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -720,23 +720,23 @@ 
      * @param string $display
      * @returnn bool true is service check was sent without error
      */
-    public function serviceCheckResult($host,$service,$state,$display)
+    public function serviceCheckResult($host, $service, $state, $display)
     {
         if ($this->api_use === false)
         {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+            $send='['.date('U').'] PROCESS_SERVICE_CHECK_RESULT;'.
+                $host.';'.$service.';'.$state.';'.$display;
+                $this->logging->log($send." : to : ".$this->icinga2cmd, INFO);
                 
                 // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-                exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+                exec('echo "'.$send.'" > '.$this->icinga2cmd);
                 return true;
         }
         else
         {
             // Get perfdata if found
             $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+            if (preg_match('/(.*)\|(.*)/', $display, $matches) == 1)
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
@@ -746,17 +746,17 @@ 
                 $perfdata='';
             }
             
-            $api = $this->getAPI();
+            $api=$this->getAPI();
             $api->setCredentials($this->api_username, $this->api_password);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+            list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display, $perfdata);
             if ($retcode == false)
             {
-                $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+                $this->logging->log("Error sending result : ".$retmessage, WARN, '');
                 return false;
             }
             else
             {
-                $this->logging->log( "Sent result : " .$retmessage,INFO );
+                $this->logging->log("Sent result : ".$retmessage, INFO);
                 return true;
             }
         }
@@ -764,7 +764,7 @@ 
     
     public function getHostByIP($ip)
     {
-        $api = $this->getAPI();
+        $api=$this->getAPI();
         $api->setCredentials($this->api_username, $this->api_password);
         return $api->getHostByIP($ip);
     }
@@ -777,32 +777,32 @@ 
     protected function applyDisplay($display)
     {
         $matches=array();
-        while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+        while (preg_match('/_OID\(([0-9\.]+)\)/', $display, $matches) == 1)
         {
             $oid=$matches[1];
             $found=0;
-            foreach($this->trap_data_ext as $val)
+            foreach ($this->trap_data_ext as $val)
             {
                 if ($oid == $val->oid)
                 {
-                    $val->value=preg_replace('/"/','',$val->value);
+                    $val->value=preg_replace('/"/', '', $val->value);
                     $rep=0;
-                    $display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-                    if ($rep==0)
+                    $display=preg_replace('/_OID\('.$oid.'\)/', $val->value, $display, -1, $rep);
+                    if ($rep == 0)
                     {
-                        $this->logging->log("Error in display",WARN,'');
+                        $this->logging->log("Error in display", WARN, '');
                         return $display;
                     }
                     $found=1;
                     break;
                 }
             }
-            if ($found==0)
+            if ($found == 0)
             {
-                $display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-                if ($rep==0)
+                $display=preg_replace('/_OID\('.$oid.'\)/', '<not in trap>', $display, -1, $rep);
+                if ($rep == 0)
                 {
-                    $this->logging->log("Error in display",WARN,'');
+                    $this->logging->log("Error in display", WARN, '');
                     return $display;
                 }
             }
@@ -814,11 +814,11 @@ 
      */
     public function applyRules()
     {
-        $rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+        $rules=$this->getRules($this->trap_data['source_ip'], $this->trap_data['trap_oid']);
         
-        if ($rules===false || count($rules)==0)
+        if ($rules === false || count($rules) == 0)
         {
-            $this->logging->log('No rules found for this trap',INFO );
+            $this->logging->log('No rules found for this trap', INFO);
             $this->trap_data['status']='unknown';
             $this->trap_to_db=true;
             return;
@@ -833,59 +833,59 @@ 
             $service_name=$rule['service_name'];
             
             $display=$this->applyDisplay($rule['display']);
-            $this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+            $this->trap_action=($this->trap_action == null) ? '' : $this->trap_action.', ';
             try
             {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext) ;
+                $this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext);
                 //->eval_rule($rule['rule']);
                 
                 if ($evalr == true)
                 {
                     //$this->logging->log('rules OOK: '.print_r($rule),INFO );
                     $action=$rule['action_match'];
-                    $this->logging->log('action OK : '.$action,INFO );
+                    $this->logging->log('action OK : '.$action, INFO);
                     if ($action >= 0)
                     {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+                        if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
                         }
                         else
                         {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                            $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
                     }
                     else
                     {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                        $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                     }
-                    $this->trap_to_db=($action==-2)?false:true;
+                    $this->trap_to_db=($action == -2) ?false:true;
                 }
                 else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
                     $action=$rule['action_nomatch'];
-                    $this->logging->log('action NOK : '.$action,INFO );
+                    $this->logging->log('action NOK : '.$action, INFO);
                     if ($action >= 0)
                     {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+                        if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
                         }
                         else
                         {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                            $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
                     }
                     else
                     {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                        $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                     }
-                    $this->trap_to_db=($action==-2)?false:true;
+                    $this->trap_to_db=($action == -2) ?false:true;
                 }
                 // Put name in source_name
                 if (!isset($this->trap_data['source_name']))
@@ -894,7 +894,7 @@ 
                 }
                 else
                 {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+                    if (!preg_match('/'.$rule['host_name'].'/', $this->trap_data['source_name']))
                     { // only add if not present
                         $this->trap_data['source_name'].=','.$rule['host_name'];
                     }
@@ -902,13 +902,13 @@ 
             }
             catch (Exception $e)
             {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+                $this->logging->log('Error in rule eval : '.$e->getMessage(), WARN, '');
                 $this->trap_action.=' ERR : '.$e->getMessage();
                 $this->trap_data['status']='error';
             }
             
         }
-        if ($this->trap_data['status']=='error')
+        if ($this->trap_data['status'] == 'error')
         {
             $this->trap_to_db=true; // Always put errors in DB for the use can see
         }
@@ -924,13 +924,13 @@ 
     public function add_rule_final($time)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trap_action==null)
+        if ($this->trap_action == null)
         {
             $this->trap_action='No action';
         }
         $sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -953,7 +953,7 @@ 
     WHERE s.current_state != 0;";
         $db_conn=$this->trapsDB->db_connect_ido();
         if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+            $this->logging->log('No result in query : '.$sql_query, ERROR, '');
             return 0;
         }
         $services=$services_db->fetchAll();
@@ -962,7 +962,7 @@ 
         $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
         $db_conn2=$this->trapsDB->db_connect_trap();
         if (($rules_db=$db_conn2->query($sql_query)) === false) {
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+            $this->logging->log('No result in query : '.$sql_query, ERROR, '');
             return 0;
         }
         $rules=$rules_db->fetchAll();
@@ -978,13 +978,13 @@ 
                     $service['host_name'] == $rule['host_name'] &&
                     ($service['last_check'] + $rule['revert_ok']) < $now)
                 {
-                    $this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+                    $this->serviceCheckResult($service['host_name'], $service['service_name'], 0, 'Reset service to OK after '.$rule['revert_ok'].' seconds');
                     $numreset++;
                 }
             }
         }
         echo "\n";
-        echo $numreset . " service(s) reset to OK\n";
+        echo $numreset." service(s) reset to OK\n";
         return 0;
         
     }

Braces +39 added lines, -39 removed lines

@@ -69,8 +69,7 @@ 
         {
             $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
             $this->logSetup=true;
-        }
-        else
+        } else
         {
             $this->logSetup=false;
         }
@@ -95,7 +94,10 @@ 
         $this->getDatabaseOptions(); // Get options in database
         
         //*************** Setup API
-        if ($this->api_use === true) $this->getAPI(); // Setup API
+        if ($this->api_use === true) {
+        	$this->getAPI();
+        }
+        // Setup API
         
         //*************** Setup MIB
         $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
@@ -138,8 +140,7 @@ 
             }
             $this->logging->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -203,7 +204,10 @@ 
         
         $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
         
-        if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+        if ($this->api_use === true) {
+        	return;
+        }
+        // In case of API use, no IDO is necessary
         
         // IDO Database
         if (!array_key_exists('IDOdatabase',$trapConfig['config']))
@@ -228,9 +232,11 @@ 
     protected function getDatabaseOptions()
     {
         // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
+        if ($this->logSetup === false) {
+        	// Only if logging was no setup in constructor
         {
             $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
             $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
         }
@@ -243,7 +249,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
+        if ($value != null) {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -335,8 +343,7 @@ 
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
             $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
+        } else
         {
             $this->trap_data['source_ip']=$matches[1];
             $this->trap_data['destination_ip']=$matches[3];
@@ -351,14 +358,12 @@ 
             if ($ret_code===0 || $ret_code===false)
             {
                 $this->logging->log('No match on trap data : '.$vars,WARN,'');
-            }
-            else
+            } else
             {
                 if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
                 {
                     $this->trap_data['trap_oid']=$matches[2];
-                }
-                else
+                } else
                 {
                     $object= new stdClass;
                     $object->oid =$matches[1];
@@ -529,7 +534,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->trap_id=$inserted_id;
                 break;
             default:
@@ -545,7 +552,9 @@ 
     {
         
         // If action is ignore -> don't send t DB
-        if ($this->trap_to_db === false) return;
+        if ($this->trap_to_db === false) {
+        	return;
+        }
         
         
         $db_conn=$this->trapsDB->db_connect_trap();
@@ -602,7 +611,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->trap_id=$inserted_id;
                 break;
             default:
@@ -731,8 +742,7 @@ 
                 // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
                 exec('echo "'.$send.'" > ' .$this->icinga2cmd);
                 return true;
-        }
-        else
+        } else
         {
             // Get perfdata if found
             $matches=array();
@@ -740,8 +750,7 @@ 
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
-            }
-            else
+            } else
             {
                 $perfdata='';
             }
@@ -753,8 +762,7 @@ 
             {
                 $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
                 return false;
-            }
-            else
+            } else
             {
                 $this->logging->log( "Sent result : " .$retmessage,INFO );
                 return true;
@@ -850,20 +858,17 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
                     $this->trap_to_db=($action==-2)?false:true;
-                }
-                else
+                } else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
@@ -874,14 +879,12 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
@@ -891,16 +894,14 @@ 
                 if (!isset($this->trap_data['source_name']))
                 {
                     $this->trap_data['source_name']=$rule['host_name'];
-                }
-                else
+                } else
                 {
                     if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
                     { // only add if not present
                         $this->trap_data['source_name'].=','.$rule['host_name'];
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
                 $this->trap_action.=' ERR : '.$e->getMessage();
@@ -911,8 +912,7 @@ 
         if ($this->trap_data['status']=='error')
         {
             $this->trap_to_db=true; // Always put errors in DB for the use can see
-        }
-        else
+        } else
         {
             $this->trap_data['status']='done';
         }

library/Trapdirector/TrapsProcess/Plugins.php

Indentation +457 added lines, -457 removed lines

@@ -17,519 +17,519 @@
  */
 class Plugins
 {
-    /** Array of plugin objects. Keys ar plugin name
-     * @var PluginTemplate[string] $pluginsList Plugins array with name as index
-     * $pluginsList[plugin name]['object']  : plugin object (NULL of not loaded)
-     * $pluginsList[plugin name]['allOID']  : bool true if plugin catches all oid
-     * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
-     * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
-     **/
-    protected $pluginsList = array();
+	/** Array of plugin objects. Keys ar plugin name
+	 * @var PluginTemplate[string] $pluginsList Plugins array with name as index
+	 * $pluginsList[plugin name]['object']  : plugin object (NULL of not loaded)
+	 * $pluginsList[plugin name]['allOID']  : bool true if plugin catches all oid
+	 * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
+	 * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
+	 **/
+	protected $pluginsList = array();
 
-    /** Array of functions names
-     * @var array $functionList 
-     * $functionList[name]['plugin'] : Plugin name
-     * $functionList[name]['function'] : Plugin function to call (null if plugin not loaded)
-    */
-    protected $functionList=array();
+	/** Array of functions names
+	 * @var array $functionList 
+	 * $functionList[name]['plugin'] : Plugin name
+	 * $functionList[name]['function'] : Plugin function to call (null if plugin not loaded)
+	 */
+	protected $functionList=array();
     
-    /** @var string[] $enabledPlugins list of enabled plugins */
-    //public $enabledPlugins = array();
+	/** @var string[] $enabledPlugins list of enabled plugins */
+	//public $enabledPlugins = array();
 
     
-    /** @var Logging $logClass */
-    protected $logClass;
+	/** @var Logging $logClass */
+	protected $logClass;
 
-    /** @var Trap $trapClass */
-    protected $trapClass;
+	/** @var Trap $trapClass */
+	protected $trapClass;
     
-    /** @var string $pluginDir */
-    protected $pluginDir;
+	/** @var string $pluginDir */
+	protected $pluginDir;
     
-    /** Setup class
-     * @param Trap $logClass  the top trap class
-     * @param string $plugin_dir optional plugin directory
-     * @throws \Exception
-     */
-    function __construct(Trap $trapClass,string $pluginDir='')
-    {
-        if ($pluginDir == '')
-        {
-            $this->pluginDir=dirname(__DIR__).'/Plugins';
-        }
-        else 
-        {
-            $this->pluginDir=$pluginDir;
-        }
-        // Set and check Logging class
-        $this->trapClass=$trapClass;
-        if ($this->trapClass === null)
-        {
-            throw new Exception('Log class not loaded into trap class');
-        }
-        $this->logClass=$trapClass->logging;
-        if ($this->logClass === null)
-        {
-            throw new Exception('Log class not loaded into trap class');
-        }
-        // check DB class and get plugins list.
-        if ($this->trapClass->trapsDB === null)
-        {
-            throw new Exception('Database class not loaded into trap class');
-        }
-        $this->loadEnabledPlugins();
-    }
+	/** Setup class
+	 * @param Trap $logClass  the top trap class
+	 * @param string $plugin_dir optional plugin directory
+	 * @throws \Exception
+	 */
+	function __construct(Trap $trapClass,string $pluginDir='')
+	{
+		if ($pluginDir == '')
+		{
+			$this->pluginDir=dirname(__DIR__).'/Plugins';
+		}
+		else 
+		{
+			$this->pluginDir=$pluginDir;
+		}
+		// Set and check Logging class
+		$this->trapClass=$trapClass;
+		if ($this->trapClass === null)
+		{
+			throw new Exception('Log class not loaded into trap class');
+		}
+		$this->logClass=$trapClass->logging;
+		if ($this->logClass === null)
+		{
+			throw new Exception('Log class not loaded into trap class');
+		}
+		// check DB class and get plugins list.
+		if ($this->trapClass->trapsDB === null)
+		{
+			throw new Exception('Database class not loaded into trap class');
+		}
+		$this->loadEnabledPlugins();
+	}
     
     
-    /**
-     * Load enabled plugins from database config table.
-     * Fills enabledPlugins and functionList properties
-     * @throws \Exception
-     */
-    private function loadEnabledPlugins()
-    {
-        $PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
+	/**
+	 * Load enabled plugins from database config table.
+	 * Fills enabledPlugins and functionList properties
+	 * @throws \Exception
+	 */
+	private function loadEnabledPlugins()
+	{
+		$PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
                
-        if ($PluginList === null || $PluginList == '')
-        {
-            $this->logClass->log('No enabled plugins',DEBUG);
-            return;
-        }
-        else
-        {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
-            $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
+		if ($PluginList === null || $PluginList == '')
+		{
+			$this->logClass->log('No enabled plugins',DEBUG);
+			return;
+		}
+		else
+		{   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
+			$this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
             
-            $pluginArray = explode(',', $PluginList);
-            foreach ($pluginArray as $pluginElmt)
-            {
-                $pluginElmt = explode(';',$pluginElmt);
-                if ($pluginElmt === false || count($pluginElmt) != 4)
-                {
-                    throw new \Exception('Invalid plugin configuration : '. $PluginList );
-                }
-                $pluginName=$pluginElmt[0];
+			$pluginArray = explode(',', $PluginList);
+			foreach ($pluginArray as $pluginElmt)
+			{
+				$pluginElmt = explode(';',$pluginElmt);
+				if ($pluginElmt === false || count($pluginElmt) != 4)
+				{
+					throw new \Exception('Invalid plugin configuration : '. $PluginList );
+				}
+				$pluginName=$pluginElmt[0];
                 
-                $pluginListElmt = array();
-                $pluginListElmt['object'] = null; // class not loaded
-                $pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
-                $pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
-                $pluginListElmt['enabled'] = true;
+				$pluginListElmt = array();
+				$pluginListElmt['object'] = null; // class not loaded
+				$pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
+				$pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
+				$pluginListElmt['enabled'] = true;
                 
-                $this->pluginsList[$pluginName] = $pluginListElmt;
+				$this->pluginsList[$pluginName] = $pluginListElmt;
                 
-                // deal with plugin functions
-                $pluginFunctions = explode('|',$pluginElmt[3]);
-                if ($pluginFunctions !== false)
-                {
-                    foreach ($pluginFunctions as $function)
-                    {
-                        $this->functionList[$function] = array(
-                            'plugin'    =>   $pluginName,
-                            'function'  =>  null
-                        );
-                    }
-                }
-            }
+				// deal with plugin functions
+				$pluginFunctions = explode('|',$pluginElmt[3]);
+				if ($pluginFunctions !== false)
+				{
+					foreach ($pluginFunctions as $function)
+					{
+						$this->functionList[$function] = array(
+							'plugin'    =>   $pluginName,
+							'function'  =>  null
+						);
+					}
+				}
+			}
 
-        }
+		}
         
-    }
+	}
 
-    /**
-     * Save enabled plugin array in DB config
-     * @return bool true if OK, or false (error logged by DB Class)
-     */
-    private function saveEnabledPlugins()
-    {
-        $saveString='';
-        foreach ($this->pluginsList as $name => $value)
-        {
-            if ($value['enabled'] == false)
-            {
-                continue;
-            }
-            $functionString='';
-            foreach ($this->functionList as $fName => $fvalue)
-            {
-                if ($fvalue['plugin'] != $name)
-                {
-                    continue;
-                }
-                $functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
-                $functionString .= $fName;
-            }
-            $saveString .= ($saveString == '')?'':',' ;
+	/**
+	 * Save enabled plugin array in DB config
+	 * @return bool true if OK, or false (error logged by DB Class)
+	 */
+	private function saveEnabledPlugins()
+	{
+		$saveString='';
+		foreach ($this->pluginsList as $name => $value)
+		{
+			if ($value['enabled'] == false)
+			{
+				continue;
+			}
+			$functionString='';
+			foreach ($this->functionList as $fName => $fvalue)
+			{
+				if ($fvalue['plugin'] != $name)
+				{
+					continue;
+				}
+				$functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
+				$functionString .= $fName;
+			}
+			$saveString .= ($saveString == '')?'':',' ;
             
-            $allOID = ($value['allOID'] === true) ? 1 : 0;
-            $target = ($value['target'] === true) ? 1 : 0;
-            $saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
-        }
-        $this->logClass->log('Saving : ' . $saveString,DEBUG);
-        return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
-    }
+			$allOID = ($value['allOID'] === true) ? 1 : 0;
+			$target = ($value['target'] === true) ? 1 : 0;
+			$saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
+		}
+		$this->logClass->log('Saving : ' . $saveString,DEBUG);
+		return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
+	}
     
-    /** Get enabled plugin list by name
-     * @return array[string]
-     */
-    public function getEnabledPlugins() : array
-    {
-        $retArray=array();
-        foreach ($this->pluginsList as $name => $value)
-        {
-            if ($value['enabled'] == true)
-            {
-                array_push($retArray,$name);
-            }
-        }
-        return $retArray;
-    }
+	/** Get enabled plugin list by name
+	 * @return array[string]
+	 */
+	public function getEnabledPlugins() : array
+	{
+		$retArray=array();
+		foreach ($this->pluginsList as $name => $value)
+		{
+			if ($value['enabled'] == true)
+			{
+				array_push($retArray,$name);
+			}
+		}
+		return $retArray;
+	}
 
-    /** Enable plugin (enabling an enabled plugin is OK, same for disabled).
-     *  and save in DB config
-     * @param string $pluginName
-     * @param bool $enabled true to enable, false to disable
-     * @return bool true if OK, or false (error logged)
-     */
-    public function enablePlugin(string $pluginName,bool $enabled)
-    {
-        if ($enabled == false)
-        {
-            // If plugin is defined set to disable
-            if ( isset($this->pluginsList[$pluginName]))
-            {
-                $this->pluginsList[$pluginName]['enabled'] = false;
-            }            
-            return $this->saveEnabledPlugins();
-        }
-        // Check if plugin is loaded / exists
-        if ( ! isset($this->pluginsList[$pluginName]) || 
-                $this->pluginsList[$pluginName]['object'] === null)
-        {
-            try {
-                $this->registerPlugin($pluginName);
-            } catch (Exception $e) {
-                $this->logClass->log('Cannot enable plugin : ' . $e->getMessage());
-                return false;
-            }
-        }
-        $this->pluginsList[$pluginName]['enabled'] = true;
-        // save in DB and return 
-        return $this->saveEnabledPlugins();
-    }
+	/** Enable plugin (enabling an enabled plugin is OK, same for disabled).
+	 *  and save in DB config
+	 * @param string $pluginName
+	 * @param bool $enabled true to enable, false to disable
+	 * @return bool true if OK, or false (error logged)
+	 */
+	public function enablePlugin(string $pluginName,bool $enabled)
+	{
+		if ($enabled == false)
+		{
+			// If plugin is defined set to disable
+			if ( isset($this->pluginsList[$pluginName]))
+			{
+				$this->pluginsList[$pluginName]['enabled'] = false;
+			}            
+			return $this->saveEnabledPlugins();
+		}
+		// Check if plugin is loaded / exists
+		if ( ! isset($this->pluginsList[$pluginName]) || 
+				$this->pluginsList[$pluginName]['object'] === null)
+		{
+			try {
+				$this->registerPlugin($pluginName);
+			} catch (Exception $e) {
+				$this->logClass->log('Cannot enable plugin : ' . $e->getMessage());
+				return false;
+			}
+		}
+		$this->pluginsList[$pluginName]['enabled'] = true;
+		// save in DB and return 
+		return $this->saveEnabledPlugins();
+	}
    
-    /**
-     * Destroy plugin objects and reload them with new enabled list.
-     * TODO : Code this function (ref DAEMON_MODE)
-     */
-    public function reloadAllPlugins()
-    {
-        return;
-    }
+	/**
+	 * Destroy plugin objects and reload them with new enabled list.
+	 * TODO : Code this function (ref DAEMON_MODE)
+	 */
+	public function reloadAllPlugins()
+	{
+		return;
+	}
  
-    /** Load plugin by name. Create entry if not in $pluginsList
-     * @param string $pluginName Plugin name to load
-     * @return bool true if created, false if already loaded
-     * @throws Exception on error loading plugin
-     */
-    public function registerPlugin(string $pluginName)
-    {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
-        {
-            $pluginListElmt = array();
-            $pluginListElmt['object'] = null; // class not loaded
-            $pluginListElmt['enabled'] = false;
-            $this->pluginsList[$pluginName] = $pluginListElmt;
-        }
+	/** Load plugin by name. Create entry if not in $pluginsList
+	 * @param string $pluginName Plugin name to load
+	 * @return bool true if created, false if already loaded
+	 * @throws Exception on error loading plugin
+	 */
+	public function registerPlugin(string $pluginName)
+	{
+		if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+		{
+			$pluginListElmt = array();
+			$pluginListElmt['object'] = null; // class not loaded
+			$pluginListElmt['enabled'] = false;
+			$this->pluginsList[$pluginName] = $pluginListElmt;
+		}
         
-        if ($this->pluginsList[$pluginName]['object'] !== null)
-        {
-            return false;
-        }
-        try {
-            // Include plugin file
-            include_once($this->pluginDir.'/' . $pluginName . '.php');
+		if ($this->pluginsList[$pluginName]['object'] !== null)
+		{
+			return false;
+		}
+		try {
+			// Include plugin file
+			include_once($this->pluginDir.'/' . $pluginName . '.php');
             
-            // Create full class name with namespace
-            $pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
+			// Create full class name with namespace
+			$pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
             
-            // Create class
-            $newClass = new $pluginClassName();
+			// Create class
+			$newClass = new $pluginClassName();
             
-            // Set logging
-            $newClass->setLoggingClass($this->logClass);
+			// Set logging
+			$newClass->setLoggingClass($this->logClass);
             
-            // Add in plugin array
-            $this->pluginsList[$pluginName]['object']=$newClass;
-            $this->pluginsList[$pluginName]['allOID']=$newClass->catchAllTraps;
-            $this->pluginsList[$pluginName]['target']=$newClass->processTraps;
+			// Add in plugin array
+			$this->pluginsList[$pluginName]['object']=$newClass;
+			$this->pluginsList[$pluginName]['allOID']=$newClass->catchAllTraps;
+			$this->pluginsList[$pluginName]['target']=$newClass->processTraps;
             
-            // Delete old functions
-            foreach ($this->functionList as $fname => $fvalue)
-            {
-                if ($fvalue['plugin'] == $pluginName)
-                {
-                    unset($this->functionList[$fname]);
-                }
-            }
-            // Add functions
-            foreach ($newClass->functions as $fname => $function)
-            {
-                if (isset($this->functionList[$fname]))
-                {
-                    if ($this->functionList[$fname]['plugin'] != $pluginName )
-                    {
-                        throw new Exception('Duplicate function name '.$fname . ' in ' 
-                            . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
-                    }
+			// Delete old functions
+			foreach ($this->functionList as $fname => $fvalue)
+			{
+				if ($fvalue['plugin'] == $pluginName)
+				{
+					unset($this->functionList[$fname]);
+				}
+			}
+			// Add functions
+			foreach ($newClass->functions as $fname => $function)
+			{
+				if (isset($this->functionList[$fname]))
+				{
+					if ($this->functionList[$fname]['plugin'] != $pluginName )
+					{
+						throw new Exception('Duplicate function name '.$fname . ' in ' 
+							. $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
+					}
                     
-                }
-                else
-                {
-                    $this->functionList[$fname]=array();
-                    $this->functionList[$fname]['plugin'] = $pluginName;
-                }
-                $this->functionList[$fname]['function']=$function['function'];
-            }
-            $this->logClass->log('Registered plugin '.$pluginName,DEBUG);
+				}
+				else
+				{
+					$this->functionList[$fname]=array();
+					$this->functionList[$fname]['plugin'] = $pluginName;
+				}
+				$this->functionList[$fname]['function']=$function['function'];
+			}
+			$this->logClass->log('Registered plugin '.$pluginName,DEBUG);
             
-        } catch (Exception $e) {
-            unset($this->pluginsList[$pluginName]);
-            $errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
-            $this->logClass->log($errorMessage,WARN);
-            // Disable the plugin
-            $this->enablePlugin($pluginName, false);
-            throw new \Exception($errorMessage);
-        } catch (Throwable $t) {
-            unset($this->pluginsList[$pluginName]);
-            $errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
-            $this->logClass->log($errorMessage,WARN);
-            // Disable the plugin
-            $this->enablePlugin($pluginName, false);
-            throw new \Exception($errorMessage);
-        }
-        return true;
-    }
+		} catch (Exception $e) {
+			unset($this->pluginsList[$pluginName]);
+			$errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
+			$this->logClass->log($errorMessage,WARN);
+			// Disable the plugin
+			$this->enablePlugin($pluginName, false);
+			throw new \Exception($errorMessage);
+		} catch (Throwable $t) {
+			unset($this->pluginsList[$pluginName]);
+			$errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
+			$this->logClass->log($errorMessage,WARN);
+			// Disable the plugin
+			$this->enablePlugin($pluginName, false);
+			throw new \Exception($errorMessage);
+		}
+		return true;
+	}
     
-    /** Registers all plugins (check=false) or only those with name present in array (check=true)
-     * @param bool $checkEnabled Check if plugin is enabled before loading it
-     * @return string Errors encountered while registering plugins
-     */
-    public function registerAllPlugins(bool $checkEnabled=true)
-    {
-        $retDisplay='';
-        // First load enabled plugins
-        foreach (array_keys($this->pluginsList) as $pluginName)
-        {
-            try {
-                $this->registerPlugin($pluginName);
-            } catch (Exception $e) {
-                $retDisplay .= $e->getMessage() . ' / ';
-            }
-        }
-        if ($checkEnabled === false) // Load all php files in plugin dir
-        {
-            foreach (glob($this->pluginDir."/*.php") as $filename)
-            {             
-                $pluginName=basename($filename,'.php');
-                if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
-                {
-                    $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
-                    $retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
-                    break;
-                }
-                try { // Already registerd plugin will simply return false
-                    $this->registerPlugin($pluginName);               
-                } catch (Exception $e) {
-                    $retDisplay .= $e->getMessage() . ' / ';
-                }
-            }
-        }
+	/** Registers all plugins (check=false) or only those with name present in array (check=true)
+	 * @param bool $checkEnabled Check if plugin is enabled before loading it
+	 * @return string Errors encountered while registering plugins
+	 */
+	public function registerAllPlugins(bool $checkEnabled=true)
+	{
+		$retDisplay='';
+		// First load enabled plugins
+		foreach (array_keys($this->pluginsList) as $pluginName)
+		{
+			try {
+				$this->registerPlugin($pluginName);
+			} catch (Exception $e) {
+				$retDisplay .= $e->getMessage() . ' / ';
+			}
+		}
+		if ($checkEnabled === false) // Load all php files in plugin dir
+		{
+			foreach (glob($this->pluginDir."/*.php") as $filename)
+			{             
+				$pluginName=basename($filename,'.php');
+				if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
+				{
+					$this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
+					$retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
+					break;
+				}
+				try { // Already registerd plugin will simply return false
+					$this->registerPlugin($pluginName);               
+				} catch (Exception $e) {
+					$retDisplay .= $e->getMessage() . ' / ';
+				}
+			}
+		}
         
-        if ($retDisplay == '')
-        {
-            return 'All plugins loaded OK';
-        }
-        else
-        {
-            return $retDisplay;
-        }
-    }
+		if ($retDisplay == '')
+		{
+			return 'All plugins loaded OK';
+		}
+		else
+		{
+			return $retDisplay;
+		}
+	}
     
-    /**
-     * Returns array of name of loaded plugins
-     * @return array
-     */
-    public function pluginList() : array
-    {
-        return array_keys($this->pluginsList);    
-    }
+	/**
+	 * Returns array of name of loaded plugins
+	 * @return array
+	 */
+	public function pluginList() : array
+	{
+		return array_keys($this->pluginsList);    
+	}
 
-    /**
-     * Get plugin details
-     * @param string $name name of plugins
-     * @return boolean|stdClass result as stdClass or false if plugin not found.
-     * @throws \Exception if registering is not possible
-     */
-    public function pluginDetails(string $name)
-    {
-        if (!array_key_exists($name, $this->pluginsList))
-        {
-            return false;
-        }
-        if ($this->pluginsList[$name]['object'] === null)
-        {
-            $this->registerPlugin($name); // can throw exception handled by caller
-        }
-        $retObj = new stdClass();
-        $retObj->name           = $name;
-        $retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
-        $retObj->processTraps   = $this->pluginsList[$name]['target'];
-        $retObj->description    = $this->pluginsList[$name]['object']->description;
-        $functions=array();
-        foreach ($this->functionList as $fName => $func)
-        {
-            if ($func['plugin'] == $name)
-            {
-                array_push($functions,$fName);
-            }
-        }
-        $retObj->funcArray=$functions;
-        return $retObj;
-    }
+	/**
+	 * Get plugin details
+	 * @param string $name name of plugins
+	 * @return boolean|stdClass result as stdClass or false if plugin not found.
+	 * @throws \Exception if registering is not possible
+	 */
+	public function pluginDetails(string $name)
+	{
+		if (!array_key_exists($name, $this->pluginsList))
+		{
+			return false;
+		}
+		if ($this->pluginsList[$name]['object'] === null)
+		{
+			$this->registerPlugin($name); // can throw exception handled by caller
+		}
+		$retObj = new stdClass();
+		$retObj->name           = $name;
+		$retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
+		$retObj->processTraps   = $this->pluginsList[$name]['target'];
+		$retObj->description    = $this->pluginsList[$name]['object']->description;
+		$functions=array();
+		foreach ($this->functionList as $fName => $func)
+		{
+			if ($func['plugin'] == $name)
+			{
+				array_push($functions,$fName);
+			}
+		}
+		$retObj->funcArray=$functions;
+		return $retObj;
+	}
        
-    /**
-     * Get plugin name from function name
-     * @param string $funcName
-     * @param string $pluginName
-     * @return boolean returns plugin object of false;
-     */
-    public function getFunction($funcName,&$pluginName)
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            return false;
-        }
-        $pluginName = $this->functionList[$funcName]['plugin'];
-        return true;
-    }
+	/**
+	 * Get plugin name from function name
+	 * @param string $funcName
+	 * @param string $pluginName
+	 * @return boolean returns plugin object of false;
+	 */
+	public function getFunction($funcName,&$pluginName)
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			return false;
+		}
+		$pluginName = $this->functionList[$funcName]['plugin'];
+		return true;
+	}
     
-    /**
-     * Get functions params and description
-     * @param string $funcName
-     * @return boolean|stdClass false if not found or object (name,params,description)
-     * @throws \Exception if registering is not possible
-     */
-    public function getFunctionDetails($funcName)
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            return false;
-        }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
-        if ($plugin === null)
-        {
-            $this->registerPlugin($pluginName); // can throw exception handled by caller
-        }
-        $retObj = new stdClass();
-        $retObj->name           = $funcName;
-        $retObj->plugin         = $pluginName;
-        $retObj->params         = $plugin->functions[$funcName]['params'];
-        $retObj->description    = $plugin->functions[$funcName]['description'];
-        return $retObj;
-    }
+	/**
+	 * Get functions params and description
+	 * @param string $funcName
+	 * @return boolean|stdClass false if not found or object (name,params,description)
+	 * @throws \Exception if registering is not possible
+	 */
+	public function getFunctionDetails($funcName)
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			return false;
+		}
+		$pluginName = $this->functionList[$funcName]['plugin']; // plugin name
+		$plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+		if ($plugin === null)
+		{
+			$this->registerPlugin($pluginName); // can throw exception handled by caller
+		}
+		$retObj = new stdClass();
+		$retObj->name           = $funcName;
+		$retObj->plugin         = $pluginName;
+		$retObj->params         = $plugin->functions[$funcName]['params'];
+		$retObj->description    = $plugin->functions[$funcName]['description'];
+		return $retObj;
+	}
     
-    /**
-     * Evaluate function with parameters
-     * @param string $funcName
-     * @param mixed $params
-     * @throws Exception
-     * @return bool
-     */
-    public function getFunctionEval(string $funcName,$params) : bool
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            throw new Exception($funcName . ' not found.');
-        }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+	/**
+	 * Evaluate function with parameters
+	 * @param string $funcName
+	 * @param mixed $params
+	 * @throws Exception
+	 * @return bool
+	 */
+	public function getFunctionEval(string $funcName,$params) : bool
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			throw new Exception($funcName . ' not found.');
+		}
+		$pluginName = $this->functionList[$funcName]['plugin']; // plugin name
+		$plugin = $this->pluginsList[$pluginName]['object']; // plugin object
 
-        if ($plugin === null)
-        {
-            $this->registerPlugin($pluginName); // can throw exception handled by caller
-            $plugin = $this->pluginsList[$pluginName]['object'];
-        }
+		if ($plugin === null)
+		{
+			$this->registerPlugin($pluginName); // can throw exception handled by caller
+			$plugin = $this->pluginsList[$pluginName]['object'];
+		}
         
-        $propertyName = $this->functionList[$funcName]['function'];
-        $this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
+		$propertyName = $this->functionList[$funcName]['function'];
+		$this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
         
-        return $plugin->{$propertyName}($params);        
-    }
+		return $plugin->{$propertyName}($params);        
+	}
     
-    public function evaluateFunctionString(string $functionString) : bool
-    {
-        $matches=array();
-        // Cleanup spaces
-        $functionString = $this->trapClass->ruleClass->eval_cleanup($functionString);
-        $this->logClass->log('eval cleanup : '.$functionString,DEBUG);
+	public function evaluateFunctionString(string $functionString) : bool
+	{
+		$matches=array();
+		// Cleanup spaces
+		$functionString = $this->trapClass->ruleClass->eval_cleanup($functionString);
+		$this->logClass->log('eval cleanup : '.$functionString,DEBUG);
         
-        // Match function call
-        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
-        if ($num !=1)
-        {
-            throw new \ErrorException('Function syntax error : ' . $functionString );
-        }
-        $this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
-        $funcName=$matches[1];
+		// Match function call
+		$num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
+		if ($num !=1)
+		{
+			throw new \ErrorException('Function syntax error : ' . $functionString );
+		}
+		$this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
+		$funcName=$matches[1];
         
-        // Get parameters comma separated
-        $funcParams=str_getcsv($matches[2],',','"',"\\");
-        $this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
+		// Get parameters comma separated
+		$funcParams=str_getcsv($matches[2],',','"',"\\");
+		$this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
         
-        // return evaluation
-        return $this->getFunctionEval($funcName, $funcParams);        
+		// return evaluation
+		return $this->getFunctionEval($funcName, $funcParams);        
         
-    }
+	}
     
 }
 
 abstract class PluginTemplate
 {
     
-    /** @var Logging $loggingClass */
-    private $loggingClass;
+	/** @var Logging $loggingClass */
+	private $loggingClass;
     
-    /** @var string $name Name of plugin */
-    public $name;
+	/** @var string $name Name of plugin */
+	public $name;
     
-    /** @var string $description Description of plugin */
-    public $description='Default plugin description';
+	/** @var string $description Description of plugin */
+	public $description='Default plugin description';
     
-    /** @var array[string] $functions Functions of this plugin for rule eval*/
-    public $functions=array();
+	/** @var array[string] $functions Functions of this plugin for rule eval*/
+	public $functions=array();
     
-    /** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin */
-    public $catchAllTraps=false;
+	/** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin */
+	public $catchAllTraps=false;
     
-    /** @var boolean $processTraps Set to true if plugins can handle traps */
-    public $processTraps=false;
+	/** @var boolean $processTraps Set to true if plugins can handle traps */
+	public $processTraps=false;
     
-    /**
-     * @param \Trapdirector\Logging $loggingClass
-     */
-    public function setLoggingClass($loggingClass)
-    {
-        $this->loggingClass = $loggingClass;
-    }
+	/**
+	 * @param \Trapdirector\Logging $loggingClass
+	 */
+	public function setLoggingClass($loggingClass)
+	{
+		$this->loggingClass = $loggingClass;
+	}
     
-    /**
-     * 
-     * @param string $message
-     * @param int $level DEBUG/INFO/WARN/CRIT
-     */
-    public function log($message,$level)
-    {
-        $this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
-    }
+	/**
+	 * 
+	 * @param string $message
+	 * @param int $level DEBUG/INFO/WARN/CRIT
+	 */
+	public function log($message,$level)
+	{
+		$this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
+	}
 }
\ No newline at end of file

Spacing +88 added lines, -88 removed lines

@@ -24,7 +24,7 @@ 
      * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
      * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
      **/
-    protected $pluginsList = array();
+    protected $pluginsList=array();
 
     /** Array of functions names
      * @var array $functionList 
@@ -51,7 +51,7 @@ 
      * @param string $plugin_dir optional plugin directory
      * @throws \Exception
      */
-    function __construct(Trap $trapClass,string $pluginDir='')
+    function __construct(Trap $trapClass, string $pluginDir='')
     {
         if ($pluginDir == '')
         {
@@ -88,42 +88,42 @@ 
      */
     private function loadEnabledPlugins()
     {
-        $PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
+        $PluginList=$this->trapClass->trapsDB->getDBConfig('enabled_plugins');
                
         if ($PluginList === null || $PluginList == '')
         {
-            $this->logClass->log('No enabled plugins',DEBUG);
+            $this->logClass->log('No enabled plugins', DEBUG);
             return;
         }
         else
         {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
-            $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
+            $this->logClass->log('Enabled plugins = '.$PluginList, DEBUG);
             
-            $pluginArray = explode(',', $PluginList);
+            $pluginArray=explode(',', $PluginList);
             foreach ($pluginArray as $pluginElmt)
             {
-                $pluginElmt = explode(';',$pluginElmt);
+                $pluginElmt=explode(';', $pluginElmt);
                 if ($pluginElmt === false || count($pluginElmt) != 4)
                 {
-                    throw new \Exception('Invalid plugin configuration : '. $PluginList );
+                    throw new \Exception('Invalid plugin configuration : '.$PluginList);
                 }
                 $pluginName=$pluginElmt[0];
                 
-                $pluginListElmt = array();
-                $pluginListElmt['object'] = null; // class not loaded
-                $pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
-                $pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
-                $pluginListElmt['enabled'] = true;
+                $pluginListElmt=array();
+                $pluginListElmt['object']=null; // class not loaded
+                $pluginListElmt['allOID']=($pluginElmt[1] == '1') ? true : false;
+                $pluginListElmt['target']=($pluginElmt[2] == '1') ? true : false;
+                $pluginListElmt['enabled']=true;
                 
-                $this->pluginsList[$pluginName] = $pluginListElmt;
+                $this->pluginsList[$pluginName]=$pluginListElmt;
                 
                 // deal with plugin functions
-                $pluginFunctions = explode('|',$pluginElmt[3]);
+                $pluginFunctions=explode('|', $pluginElmt[3]);
                 if ($pluginFunctions !== false)
                 {
                     foreach ($pluginFunctions as $function)
                     {
-                        $this->functionList[$function] = array(
+                        $this->functionList[$function]=array(
                             'plugin'    =>   $pluginName,
                             'function'  =>  null
                         );
@@ -155,16 +155,16 @@ 
                 {
                     continue;
                 }
-                $functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
-                $functionString .= $fName;
+                $functionString.=($functionString == '') ? '' : '|'; // add separator if not empty
+                $functionString.=$fName;
             }
-            $saveString .= ($saveString == '')?'':',' ;
+            $saveString.=($saveString == '') ? '' : ',';
             
-            $allOID = ($value['allOID'] === true) ? 1 : 0;
-            $target = ($value['target'] === true) ? 1 : 0;
-            $saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
+            $allOID=($value['allOID'] === true) ? 1 : 0;
+            $target=($value['target'] === true) ? 1 : 0;
+            $saveString.=$name.';'.$allOID.';'.$target.';'.$functionString;
         }
-        $this->logClass->log('Saving : ' . $saveString,DEBUG);
+        $this->logClass->log('Saving : '.$saveString, DEBUG);
         return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
     }
     
@@ -178,7 +178,7 @@ 
         {
             if ($value['enabled'] == true)
             {
-                array_push($retArray,$name);
+                array_push($retArray, $name);
             }
         }
         return $retArray;
@@ -190,29 +190,29 @@ 
      * @param bool $enabled true to enable, false to disable
      * @return bool true if OK, or false (error logged)
      */
-    public function enablePlugin(string $pluginName,bool $enabled)
+    public function enablePlugin(string $pluginName, bool $enabled)
     {
         if ($enabled == false)
         {
             // If plugin is defined set to disable
-            if ( isset($this->pluginsList[$pluginName]))
+            if (isset($this->pluginsList[$pluginName]))
             {
-                $this->pluginsList[$pluginName]['enabled'] = false;
+                $this->pluginsList[$pluginName]['enabled']=false;
             }            
             return $this->saveEnabledPlugins();
         }
         // Check if plugin is loaded / exists
-        if ( ! isset($this->pluginsList[$pluginName]) || 
+        if (!isset($this->pluginsList[$pluginName]) || 
                 $this->pluginsList[$pluginName]['object'] === null)
         {
             try {
                 $this->registerPlugin($pluginName);
             } catch (Exception $e) {
-                $this->logClass->log('Cannot enable plugin : ' . $e->getMessage());
+                $this->logClass->log('Cannot enable plugin : '.$e->getMessage());
                 return false;
             }
         }
-        $this->pluginsList[$pluginName]['enabled'] = true;
+        $this->pluginsList[$pluginName]['enabled']=true;
         // save in DB and return 
         return $this->saveEnabledPlugins();
     }
@@ -233,12 +233,12 @@ 
      */
     public function registerPlugin(string $pluginName)
     {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+        if (!isset($this->pluginsList[$pluginName])) // Plugin isn't enable, create entry
         {
-            $pluginListElmt = array();
-            $pluginListElmt['object'] = null; // class not loaded
-            $pluginListElmt['enabled'] = false;
-            $this->pluginsList[$pluginName] = $pluginListElmt;
+            $pluginListElmt=array();
+            $pluginListElmt['object']=null; // class not loaded
+            $pluginListElmt['enabled']=false;
+            $this->pluginsList[$pluginName]=$pluginListElmt;
         }
         
         if ($this->pluginsList[$pluginName]['object'] !== null)
@@ -247,13 +247,13 @@ 
         }
         try {
             // Include plugin file
-            include_once($this->pluginDir.'/' . $pluginName . '.php');
+            include_once($this->pluginDir.'/'.$pluginName.'.php');
             
             // Create full class name with namespace
-            $pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
+            $pluginClassName=__NAMESPACE__.'\\Plugins\\'.$pluginName;
             
             // Create class
-            $newClass = new $pluginClassName();
+            $newClass=new $pluginClassName();
             
             // Set logging
             $newClass->setLoggingClass($this->logClass);
@@ -276,33 +276,33 @@ 
             {
                 if (isset($this->functionList[$fname]))
                 {
-                    if ($this->functionList[$fname]['plugin'] != $pluginName )
+                    if ($this->functionList[$fname]['plugin'] != $pluginName)
                     {
-                        throw new Exception('Duplicate function name '.$fname . ' in ' 
-                            . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
+                        throw new Exception('Duplicate function name '.$fname.' in ' 
+                            . $pluginName.' and '.$this->functionList[$fname]['plugin']);
                     }
                     
                 }
                 else
                 {
                     $this->functionList[$fname]=array();
-                    $this->functionList[$fname]['plugin'] = $pluginName;
+                    $this->functionList[$fname]['plugin']=$pluginName;
                 }
                 $this->functionList[$fname]['function']=$function['function'];
             }
-            $this->logClass->log('Registered plugin '.$pluginName,DEBUG);
+            $this->logClass->log('Registered plugin '.$pluginName, DEBUG);
             
         } catch (Exception $e) {
             unset($this->pluginsList[$pluginName]);
-            $errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
-            $this->logClass->log($errorMessage,WARN);
+            $errorMessage="Error registering plugin $pluginName : ".$e->getMessage();
+            $this->logClass->log($errorMessage, WARN);
             // Disable the plugin
             $this->enablePlugin($pluginName, false);
             throw new \Exception($errorMessage);
         } catch (Throwable $t) {
             unset($this->pluginsList[$pluginName]);
-            $errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
-            $this->logClass->log($errorMessage,WARN);
+            $errorMessage=$t->getMessage().' in file '.$t->getFile().' line '.$t->getLine();
+            $this->logClass->log($errorMessage, WARN);
             // Disable the plugin
             $this->enablePlugin($pluginName, false);
             throw new \Exception($errorMessage);
@@ -323,24 +323,24 @@ 
             try {
                 $this->registerPlugin($pluginName);
             } catch (Exception $e) {
-                $retDisplay .= $e->getMessage() . ' / ';
+                $retDisplay.=$e->getMessage().' / ';
             }
         }
         if ($checkEnabled === false) // Load all php files in plugin dir
         {
             foreach (glob($this->pluginDir."/*.php") as $filename)
             {             
-                $pluginName=basename($filename,'.php');
-                if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
+                $pluginName=basename($filename, '.php');
+                if (!preg_match('/^[a-zA-Z0-9]+$/', $pluginName))
                 {
                     $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
-                    $retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
+                    $retDisplay.="Invalid plugin name : ".$pluginName." / ";
                     break;
                 }
                 try { // Already registerd plugin will simply return false
                     $this->registerPlugin($pluginName);               
                 } catch (Exception $e) {
-                    $retDisplay .= $e->getMessage() . ' / ';
+                    $retDisplay.=$e->getMessage().' / ';
                 }
             }
         }
@@ -380,17 +380,17 @@ 
         {
             $this->registerPlugin($name); // can throw exception handled by caller
         }
-        $retObj = new stdClass();
-        $retObj->name           = $name;
-        $retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
-        $retObj->processTraps   = $this->pluginsList[$name]['target'];
-        $retObj->description    = $this->pluginsList[$name]['object']->description;
+        $retObj=new stdClass();
+        $retObj->name=$name;
+        $retObj->catchAllTraps=$this->pluginsList[$name]['allOID'];
+        $retObj->processTraps=$this->pluginsList[$name]['target'];
+        $retObj->description=$this->pluginsList[$name]['object']->description;
         $functions=array();
         foreach ($this->functionList as $fName => $func)
         {
             if ($func['plugin'] == $name)
             {
-                array_push($functions,$fName);
+                array_push($functions, $fName);
             }
         }
         $retObj->funcArray=$functions;
@@ -403,13 +403,13 @@ 
      * @param string $pluginName
      * @return boolean returns plugin object of false;
      */
-    public function getFunction($funcName,&$pluginName)
+    public function getFunction($funcName, &$pluginName)
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
             return false;
         }
-        $pluginName = $this->functionList[$funcName]['plugin'];
+        $pluginName=$this->functionList[$funcName]['plugin'];
         return true;
     }
     
@@ -421,21 +421,21 @@ 
      */
     public function getFunctionDetails($funcName)
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
             return false;
         }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+        $pluginName=$this->functionList[$funcName]['plugin']; // plugin name
+        $plugin=$this->pluginsList[$pluginName]['object']; // plugin object
         if ($plugin === null)
         {
             $this->registerPlugin($pluginName); // can throw exception handled by caller
         }
-        $retObj = new stdClass();
-        $retObj->name           = $funcName;
-        $retObj->plugin         = $pluginName;
-        $retObj->params         = $plugin->functions[$funcName]['params'];
-        $retObj->description    = $plugin->functions[$funcName]['description'];
+        $retObj=new stdClass();
+        $retObj->name=$funcName;
+        $retObj->plugin=$pluginName;
+        $retObj->params=$plugin->functions[$funcName]['params'];
+        $retObj->description=$plugin->functions[$funcName]['description'];
         return $retObj;
     }
     
@@ -446,23 +446,23 @@ 
      * @throws Exception
      * @return bool
      */
-    public function getFunctionEval(string $funcName,$params) : bool
+    public function getFunctionEval(string $funcName, $params) : bool
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
-            throw new Exception($funcName . ' not found.');
+            throw new Exception($funcName.' not found.');
         }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+        $pluginName=$this->functionList[$funcName]['plugin']; // plugin name
+        $plugin=$this->pluginsList[$pluginName]['object']; // plugin object
 
         if ($plugin === null)
         {
             $this->registerPlugin($pluginName); // can throw exception handled by caller
-            $plugin = $this->pluginsList[$pluginName]['object'];
+            $plugin=$this->pluginsList[$pluginName]['object'];
         }
         
-        $propertyName = $this->functionList[$funcName]['function'];
-        $this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
+        $propertyName=$this->functionList[$funcName]['function'];
+        $this->logClass->log('Using property '.$propertyName.' of class : '.$pluginName, DEBUG);
         
         return $plugin->{$propertyName}($params);        
     }
@@ -471,21 +471,21 @@ 
     {
         $matches=array();
         // Cleanup spaces
-        $functionString = $this->trapClass->ruleClass->eval_cleanup($functionString);
-        $this->logClass->log('eval cleanup : '.$functionString,DEBUG);
+        $functionString=$this->trapClass->ruleClass->eval_cleanup($functionString);
+        $this->logClass->log('eval cleanup : '.$functionString, DEBUG);
         
         // Match function call
-        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
-        if ($num !=1)
+        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString, $matches);
+        if ($num != 1)
         {
-            throw new \ErrorException('Function syntax error : ' . $functionString );
+            throw new \ErrorException('Function syntax error : '.$functionString);
         }
-        $this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
+        $this->logClass->log('Got function : '.$matches[1].', params : '.$matches[2], DEBUG);
         $funcName=$matches[1];
         
         // Get parameters comma separated
-        $funcParams=str_getcsv($matches[2],',','"',"\\");
-        $this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
+        $funcParams=str_getcsv($matches[2], ',', '"', "\\");
+        $this->logClass->log('Function params : '.print_r($funcParams, true), DEBUG);
         
         // return evaluation
         return $this->getFunctionEval($funcName, $funcParams);        
@@ -520,7 +520,7 @@ 
      */
     public function setLoggingClass($loggingClass)
     {
-        $this->loggingClass = $loggingClass;
+        $this->loggingClass=$loggingClass;
     }
     
     /**
@@ -528,8 +528,8 @@ 
      * @param string $message
      * @param int $level DEBUG/INFO/WARN/CRIT
      */
-    public function log($message,$level)
+    public function log($message, $level)
     {
-        $this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
+        $this->loggingClass->log('[ '.get_class($this).'] '.$message, $level);
     }
 }
\ No newline at end of file

Braces +10 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
         if ($pluginDir == '')
         {
             $this->pluginDir=dirname(__DIR__).'/Plugins';
-        }
-        else 
+        } else 
         {
             $this->pluginDir=$pluginDir;
         }
@@ -94,8 +93,7 @@ 
         {
             $this->logClass->log('No enabled plugins',DEBUG);
             return;
-        }
-        else
+        } else
         {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
             $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
             
@@ -233,9 +231,11 @@ 
      */
     public function registerPlugin(string $pluginName)
     {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+        if ( ! isset($this->pluginsList[$pluginName]) ) {
+        	// Plugin isn't enable, create entry
         {
             $pluginListElmt = array();
+        }
             $pluginListElmt['object'] = null; // class not loaded
             $pluginListElmt['enabled'] = false;
             $this->pluginsList[$pluginName] = $pluginListElmt;
@@ -282,8 +282,7 @@ 
                             . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
                     }
                     
-                }
-                else
+                } else
                 {
                     $this->functionList[$fname]=array();
                     $this->functionList[$fname]['plugin'] = $pluginName;
@@ -326,11 +325,13 @@ 
                 $retDisplay .= $e->getMessage() . ' / ';
             }
         }
-        if ($checkEnabled === false) // Load all php files in plugin dir
+        if ($checkEnabled === false) {
+        	// Load all php files in plugin dir
         {
             foreach (glob($this->pluginDir."/*.php") as $filename)
             {             
                 $pluginName=basename($filename,'.php');
+        }
                 if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
                 {
                     $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
@@ -348,8 +349,7 @@ 
         if ($retDisplay == '')
         {
             return 'All plugins loaded OK';
-        }
-        else
+        } else
         {
             return $retDisplay;
         }

library/Trapdirector/TrapsProcess/Database.php

Indentation +347 added lines, -347 removed lines

@@ -9,383 +9,383 @@
 class Database
 {
 
-    // Databases
-    /** @var \PDO $trapDB trap database */
-    protected $trapDB=null; 
-    protected $idoDB=null; //< ido database
-    public $trapDBType; //< Type of database for traps (mysql, pgsql)
-    public $idoDBType; //< Type of database for ido (mysql, pgsql)
+	// Databases
+	/** @var \PDO $trapDB trap database */
+	protected $trapDB=null; 
+	protected $idoDB=null; //< ido database
+	public $trapDBType; //< Type of database for traps (mysql, pgsql)
+	public $idoDBType; //< Type of database for ido (mysql, pgsql)
     
-    protected $trapDSN; //< trap database connection params
-    protected $trapUsername; //< trap database connection params
-    protected $trapPass; //< trap database connection params
-    public $dbPrefix; //< database tables prefix
+	protected $trapDSN; //< trap database connection params
+	protected $trapUsername; //< trap database connection params
+	protected $trapPass; //< trap database connection params
+	public $dbPrefix; //< database tables prefix
     
-    protected $idoSet; //< bool true is ido database set
-    protected $idoDSN; //< trap database connection params
-    protected $idoUsername; //< trap database connection params
-    protected $idoPass; //< trap database connection params
+	protected $idoSet; //< bool true is ido database set
+	protected $idoDSN; //< trap database connection params
+	protected $idoUsername; //< trap database connection params
+	protected $idoPass; //< trap database connection params
     
-    // Logging function
+	// Logging function
     
-    protected $logging; //< logging class
+	protected $logging; //< logging class
     
-    /**
-     * @param Logging $logClass : where to log
-     * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
-     */
-    function __construct($logClass,$dbParam,$dbPrefix)
-    {
-        $this->logging=$logClass;
-        $this->dbPrefix=$dbPrefix;
+	/**
+	 * @param Logging $logClass : where to log
+	 * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
+	 */
+	function __construct($logClass,$dbParam,$dbPrefix)
+	{
+		$this->logging=$logClass;
+		$this->dbPrefix=$dbPrefix;
         
-        $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
-        $this->db_connect_trap();
+		$this->trapDSN=$this->setupDSN($dbParam);
+		$this->trapUsername = $dbParam['username'];
+		$this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->trapDBType=$dbParam['db'];
+		$this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+		$this->db_connect_trap();
         
-    }
+	}
     
-    /**
-     * Setup and connect to IDO database
-     * @param array $dbParam : array of named params
-     */
-    public function setupIDO($dbParam)
-    {
-        $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
-        $this->idoDBType=$dbParam['db'];
-        $this->db_connect_ido();
-    }
+	/**
+	 * Setup and connect to IDO database
+	 * @param array $dbParam : array of named params
+	 */
+	public function setupIDO($dbParam)
+	{
+		$this->idoDSN=$this->setupDSN($dbParam);
+		$this->idoUsername = $dbParam['username'];
+		$this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+		$this->idoDBType=$dbParam['db'];
+		$this->db_connect_ido();
+	}
     
-    /**
-     * Connect to IDO database
-     * @return \PDO
-     */
-    public function db_connect_ido()
-    {
-        if ($this->idoDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->idoDB->query('select 1')->fetchColumn();
-                return $this->idoDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
-            }
-        }
-        try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->idoDB;
-    }
+	/**
+	 * Connect to IDO database
+	 * @return \PDO
+	 */
+	public function db_connect_ido()
+	{
+		if ($this->idoDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->idoDB->query('select 1')->fetchColumn();
+				return $this->idoDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database IDO connection lost, reconnecting',WARN);
+			}
+		}
+		try {
+			$this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->idoDB;
+	}
     
-    /**
-     * Connect to Trap database
-     * @return \PDO
-     */
-    public function db_connect_trap()
-    {
-        if ($this->trapDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->trapDB->query('select 1')->fetchColumn();
-                return $this->trapDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
-            }           
-        }       
-        try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->trapDB;
-    }
+	/**
+	 * Connect to Trap database
+	 * @return \PDO
+	 */
+	public function db_connect_trap()
+	{
+		if ($this->trapDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->trapDB->query('select 1')->fetchColumn();
+				return $this->trapDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database connection lost, reconnecting',WARN);
+			}           
+		}       
+		try {
+			$this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->trapDB;
+	}
     
-    /**
-     * Setup dsn and check parameters
-     * @param array $configElmt
-     * @return string
-     */
-    protected function setupDSN($configElmt)  
-    {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
-        {
-            $this->logging->log('Missing DB params',ERROR);
-            return ''; 
-        }
+	/**
+	 * Setup dsn and check parameters
+	 * @param array $configElmt
+	 * @return string
+	 */
+	protected function setupDSN($configElmt)  
+	{
+		if (!array_key_exists('db',$configElmt) ||
+			!array_key_exists('host',$configElmt) ||
+			!array_key_exists('dbname',$configElmt) ||
+			!array_key_exists('username',$configElmt))
+		{
+			$this->logging->log('Missing DB params',ERROR);
+			return ''; 
+		}
         
-        //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+		//	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
+		$dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
-        if (array_key_exists('port', $configElmt))
-        {
-            $dsn .= ';port='.$configElmt['port'];
-        }
-        return $dsn;
-    }
+		if (array_key_exists('port', $configElmt))
+		{
+			$dsn .= ';port='.$configElmt['port'];
+		}
+		return $dsn;
+	}
 
-    /** Set name=element in database config table
-     * @param string $name
-     * @param string $element
-     * @return boolean true on success, else false (error logged)
-     */
-    public function setDBConfig($name,$element)
-    {
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');           
-            return false;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['id']))
-        {   // Entry exists -> update
-            $sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
-        }
-        else
-        {   // Entry does no exists -> create
-            $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
-        }
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');
-            return false;
-        }
-        $this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
-        return true;
-    }
+	/** Set name=element in database config table
+	 * @param string $name
+	 * @param string $element
+	 * @return boolean true on success, else false (error logged)
+	 */
+	public function setDBConfig($name,$element)
+	{
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Error setting config element : ' . $sql,WARN,'');           
+			return false;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['id']))
+		{   // Entry exists -> update
+			$sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
+		}
+		else
+		{   // Entry does no exists -> create
+			$sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
+		}
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Error setting config element : ' . $sql,WARN,'');
+			return false;
+		}
+		$this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
+		return true;
+	}
 
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    public function getDBConfig($element)
-    {
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	public function getDBConfig($element)
+	{
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
     
     
-    //*********    Schema Management *********************/
+	//*********    Schema Management *********************/
 
-    /** Create database schema
-     *	@param $schema_file	string File to read schema from
-     *	@param $table_prefix string to replace #PREFIX# in schema file by this
-     */
-    public function create_schema($schema_file,$table_prefix)
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($schema_file, 'r');
+	/** Create database schema
+	 *	@param $schema_file	string File to read schema from
+	 *	@param $table_prefix string to replace #PREFIX# in schema file by this
+	 */
+	public function create_schema($schema_file,$table_prefix)
+	{
+		//Read data from snmptrapd from stdin
+		$input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
-        {
-            $this->logging->log("Error reading schema !",ERROR,'');
-            return;
-        }
-        $newline='';
-        $cur_table='';
-        $cur_table_array=array();
-        $db_conn=$this->db_connect_trap();
+		if ($input_stream=== false)
+		{
+			$this->logging->log("Error reading schema !",ERROR,'');
+			return;
+		}
+		$newline='';
+		$cur_table='';
+		$cur_table_array=array();
+		$db_conn=$this->db_connect_trap();
         
-        while (($line=fgets($input_stream)) !== false)
-        {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-            if (preg_match('/; *$/', $newline))
-            {
-                $sql= $newline;
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                    return;
-                }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
-                {
-                    $cur_table='table '.$cur_table_array[1];
-                }
-                else
-                {
-                    $cur_table='secret SQL stuff :-)';
-                }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
-                $newline='';
-            }
-        }
+		while (($line=fgets($input_stream)) !== false)
+		{
+			$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+			if (preg_match('/; *$/', $newline))
+			{
+				$sql= $newline;
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error create schema : '.$sql,ERROR,'');
+					return;
+				}
+				if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+				{
+					$cur_table='table '.$cur_table_array[1];
+				}
+				else
+				{
+					$cur_table='secret SQL stuff :-)';
+				}
+				$this->logging->log('Creating : ' . $cur_table,INFO );
+				$newline='';
+			}
+		}
         
-        $sql= $newline;
-        if ($sql != '' )
-        {
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                return;
-            }
-        }
-        $this->logging->log('Schema created',INFO);
-    }
+		$sql= $newline;
+		if ($sql != '' )
+		{
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Error create schema : '.$sql,ERROR,'');
+				return;
+			}
+		}
+		$this->logging->log('Schema created',INFO);
+	}
     
-    /**
-     * Update database schema from current (as set in db) to $target_version
-     *     @param $prefix string file prefix of sql update File
-     *     @param $target_version int target db version number
-     *     @param $table_prefix string to replace #PREFIX# in schema file by this
-     *     @param bool $getmsg : only get messages from version upgrades
-     *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
-     */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
-    {
-        // Get current db number
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
-            return 'ERROR';
-        }
-        $version=$ret_code->fetchAll();
-        $cur_version=$version[0]['value'];
+	/**
+	 * Update database schema from current (as set in db) to $target_version
+	 *     @param $prefix string file prefix of sql update File
+	 *     @param $target_version int target db version number
+	 *     @param $table_prefix string to replace #PREFIX# in schema file by this
+	 *     @param bool $getmsg : only get messages from version upgrades
+	 *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
+	 */
+	public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+	{
+		// Get current db number
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+			return 'ERROR';
+		}
+		$version=$ret_code->fetchAll();
+		$cur_version=$version[0]['value'];
         
-        if ($this->trapDBType == 'pgsql')
-        {
-            $prefix .= 'update_pgsql/schema_';
-        }
-        else
-        {
-            $prefix .= 'update_sql/schema_';
-        }
-        //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
-        if ($getmsg === true)
-        {
-            return $this->update_schema_message($prefix, $cur_version, $target_version);
-        }
+		if ($this->trapDBType == 'pgsql')
+		{
+			$prefix .= 'update_pgsql/schema_';
+		}
+		else
+		{
+			$prefix .= 'update_sql/schema_';
+		}
+		//echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
+		if ($getmsg === true)
+		{
+			return $this->update_schema_message($prefix, $cur_version, $target_version);
+		}
         
-        if ($this->update_schema_do($prefix, $cur_version, $target_version, $table_prefix) === true)
-        {
-            return 'ERROR';
-        }
-        return '';
+		if ($this->update_schema_do($prefix, $cur_version, $target_version, $table_prefix) === true)
+		{
+			return 'ERROR';
+		}
+		return '';
 
-    }
+	}
 
-    /**
-     * Update database schema from current (as set in db) to $target_version
-     *     @param string $prefix  file prefix of sql update File
-     *     @param int $cur_version  current db version number
-     *     @param int $target_version  target db version number
-     *     @param string $table_prefix   to replace #PREFIX# in schema file by this
-     *     @return bool : true on error
-     */
-    public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
-    {
-        while($cur_version<$target_version)
-        { // TODO : execute pre & post scripts
-            $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-            $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
-            {
-                $this->logging->log("Error reading update file ". $updateFile,ERROR);
-                return true;
-            }
-            $newline='';
-            $db_conn=$this->db_connect_trap();
-            $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            while (($line=fgets($input_stream)) !== false)
-            {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-                if (preg_match('/; *$/', $newline))
-                {
-                    $sql_req=$db_conn->prepare($newline);
-                    if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,ERROR);
-                        return true;
-                    }
-                    $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
-                    {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
-                    {
-                        $cur_table='secret SQL stuff :-)';
-                        //$cur_table=$newline;
-                    }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+	/**
+	 * Update database schema from current (as set in db) to $target_version
+	 *     @param string $prefix  file prefix of sql update File
+	 *     @param int $cur_version  current db version number
+	 *     @param int $target_version  target db version number
+	 *     @param string $table_prefix   to replace #PREFIX# in schema file by this
+	 *     @return bool : true on error
+	 */
+	public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
+	{
+		while($cur_version<$target_version)
+		{ // TODO : execute pre & post scripts
+			$cur_version++;
+			$this->logging->log('Updating to version : ' .$cur_version ,INFO );
+			$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+			$input_stream=fopen($updateFile, 'r');
+			if ($input_stream=== false)
+			{
+				$this->logging->log("Error reading update file ". $updateFile,ERROR);
+				return true;
+			}
+			$newline='';
+			$db_conn=$this->db_connect_trap();
+			$db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			while (($line=fgets($input_stream)) !== false)
+			{
+				if (preg_match('/^#/', $line)) continue; // ignore comment lines
+				$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+				if (preg_match('/; *$/', $newline))
+				{
+					$sql_req=$db_conn->prepare($newline);
+					if ($sql_req->execute() === false) {
+						$this->logging->log('Error create schema : '.$newline,ERROR);
+						return true;
+					}
+					$cur_table_array=array();
+					if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+					{
+						$cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+					}
+					else
+					{
+						$cur_table='secret SQL stuff :-)';
+						//$cur_table=$newline;
+					}
+					$this->logging->log('Doing : ' . $cur_table,INFO );
                     
-                    $newline='';
-                }
-            }
-            fclose($input_stream);
+					$newline='';
+				}
+			}
+			fclose($input_stream);
             
-            $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
-                return true;
-            }
+			$sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
+			$this->logging->log('SQL query : '.$sql,DEBUG );
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
+				return true;
+			}
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
-        }
-        return false;
-    }
+			$this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+		}
+		return false;
+	}
     
-    /**
-     * Get database message for update to $target_version
-     *     @param string $prefix  file prefix of sql update File
-     *     @param int $cur_version  current db version number
-     *     @param int $target_version  target db version number
-     *     @return string : return messages or 'ERROR'.
-     */
-    private function update_schema_message($prefix,$cur_version,$target_version)
-    {
+	/**
+	 * Get database message for update to $target_version
+	 *     @param string $prefix  file prefix of sql update File
+	 *     @param int $cur_version  current db version number
+	 *     @param int $target_version  target db version number
+	 *     @return string : return messages or 'ERROR'.
+	 */
+	private function update_schema_message($prefix,$cur_version,$target_version)
+	{
  
-        $message='';
-        $this->logging->log('getting message for upgrade',DEBUG );
-        while($cur_version<$target_version)
-        {
-            $cur_version++;
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-            $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
-            {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
-                return 'ERROR';
-            }
-            do 
-            { 
-                $line=fgets($input_stream); 
-            }
-            while ($line !== false && !preg_match('/#MESSAGE/',$line));
-            fclose($input_stream);
-            if ($line === false)
-            {
-                $this->logging->log("No message in file ". $updateFile,2,'');
-                return '';
-            }
-            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
-        }
-        return $message;
-    }
+		$message='';
+		$this->logging->log('getting message for upgrade',DEBUG );
+		while($cur_version<$target_version)
+		{
+			$cur_version++;
+			$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+			$input_stream=fopen($updateFile, 'r');
+			if ($input_stream=== false)
+			{
+				$this->logging->log("Error reading update file ". $updateFile,2,'');
+				return 'ERROR';
+			}
+			do 
+			{ 
+				$line=fgets($input_stream); 
+			}
+			while ($line !== false && !preg_match('/#MESSAGE/',$line));
+			fclose($input_stream);
+			if ($line === false)
+			{
+				$this->logging->log("No message in file ". $updateFile,2,'');
+				return '';
+			}
+			$message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+		}
+		return $message;
+	}
     
 }
\ No newline at end of file

Spacing +65 added lines, -65 removed lines

@@ -34,16 +34,16 @@ 
      * @param Logging $logClass : where to log
      * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
      */
-    function __construct($logClass,$dbParam,$dbPrefix)
+    function __construct($logClass, $dbParam, $dbPrefix)
     {
         $this->logging=$logClass;
         $this->dbPrefix=$dbPrefix;
         
         $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+        $this->trapUsername=$dbParam['username'];
+        $this->trapPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
         $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+        $this->logging->log('DSN : '.$this->trapDSN.';user '.$this->trapUsername.' / prefix : '.$this->dbPrefix, INFO);
         $this->db_connect_trap();
         
     }
@@ -55,9 +55,9 @@ 
     public function setupIDO($dbParam)
     {
         $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+        $this->idoUsername=$dbParam['username'];
+        $this->idoPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
+        $this->logging->log('DSN : '.$this->idoDSN.';user '.$this->idoUsername, INFO);
         $this->idoDBType=$dbParam['db'];
         $this->db_connect_ido();
     }
@@ -75,13 +75,13 @@ 
                 return $this->idoDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
+                $this->logging->log('Database IDO connection lost, reconnecting', WARN);
             }
         }
         try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+            $this->idoDB=new PDO($this->idoDSN, $this->idoUsername, $this->idoPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed to IDO : '.$e->getMessage(), ERROR, '');
         }
         return $this->idoDB;
     }
@@ -99,13 +99,13 @@ 
                 return $this->trapDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
+                $this->logging->log('Database connection lost, reconnecting', WARN);
             }           
         }       
         try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+            $this->trapDB=new PDO($this->trapDSN, $this->trapUsername, $this->trapPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed : '.$e->getMessage(), ERROR, '');
         }
         return $this->trapDB;
     }
@@ -117,21 +117,21 @@ 
      */
     protected function setupDSN($configElmt)  
     {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
+        if (!array_key_exists('db', $configElmt) ||
+            !array_key_exists('host', $configElmt) ||
+            !array_key_exists('dbname', $configElmt) ||
+            !array_key_exists('username', $configElmt))
         {
-            $this->logging->log('Missing DB params',ERROR);
+            $this->logging->log('Missing DB params', ERROR);
             return ''; 
         }
         
         //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+        $dsn=$configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
         if (array_key_exists('port', $configElmt))
         {
-            $dsn .= ';port='.$configElmt['port'];
+            $dsn.=';port='.$configElmt['port'];
         }
         return $dsn;
     }
@@ -141,12 +141,12 @@ 
      * @param string $element
      * @return boolean true on success, else false (error logged)
      */
-    public function setDBConfig($name,$element)
+    public function setDBConfig($name, $element)
     {
         $db_conn=$this->db_connect_trap();
         $sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');           
+            $this->logging->log('Error setting config element : '.$sql, WARN, '');           
             return false;
         }
         $value=$ret_code->fetch();
@@ -159,10 +159,10 @@ 
             $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
         }
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');
+            $this->logging->log('Error setting config element : '.$sql, WARN, '');
             return false;
         }
-        $this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
+        $this->logging->log('Setting config '.$name.' = '.$element.' in database', INFO);
         return true;
     }
 
@@ -176,7 +176,7 @@ 
         $db_conn=$this->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -194,14 +194,14 @@ 
      *	@param $schema_file	string File to read schema from
      *	@param $table_prefix string to replace #PREFIX# in schema file by this
      */
-    public function create_schema($schema_file,$table_prefix)
+    public function create_schema($schema_file, $table_prefix)
     {
         //Read data from snmptrapd from stdin
         $input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
+        if ($input_stream === false)
         {
-            $this->logging->log("Error reading schema !",ERROR,'');
+            $this->logging->log("Error reading schema !", ERROR, '');
             return;
         }
         $newline='';
@@ -211,15 +211,15 @@ 
         
         while (($line=fgets($input_stream)) !== false)
         {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+            $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
             if (preg_match('/; *$/', $newline))
             {
-                $sql= $newline;
+                $sql=$newline;
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                    $this->logging->log('Error create schema : '.$sql, ERROR, '');
                     return;
                 }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+                if (preg_match('/^ *CREATE TABLE ([^ ]+)/', $newline, $cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
                 }
@@ -227,20 +227,20 @@ 
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
+                $this->logging->log('Creating : '.$cur_table, INFO);
                 $newline='';
             }
         }
         
-        $sql= $newline;
-        if ($sql != '' )
+        $sql=$newline;
+        if ($sql != '')
         {
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                $this->logging->log('Error create schema : '.$sql, ERROR, '');
                 return;
             }
         }
-        $this->logging->log('Schema created',INFO);
+        $this->logging->log('Schema created', INFO);
     }
     
     /**
@@ -251,14 +251,14 @@ 
      *     @param bool $getmsg : only get messages from version upgrades
      *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
      */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+    public function update_schema($prefix, $target_version, $table_prefix, $getmsg=false)
     {
         // Get current db number
         $db_conn=$this->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $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('Cannot get db version. Query : ' . $sql,2,'');
+            $this->logging->log('Cannot get db version. Query : '.$sql, 2, '');
             return 'ERROR';
         }
         $version=$ret_code->fetchAll();
@@ -266,11 +266,11 @@ 
         
         if ($this->trapDBType == 'pgsql')
         {
-            $prefix .= 'update_pgsql/schema_';
+            $prefix.='update_pgsql/schema_';
         }
         else
         {
-            $prefix .= 'update_sql/schema_';
+            $prefix.='update_sql/schema_';
         }
         //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
         if ($getmsg === true)
@@ -294,17 +294,17 @@ 
      *     @param string $table_prefix   to replace #PREFIX# in schema file by this
      *     @return bool : true on error
      */
-    public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
+    public function update_schema_do($prefix, $cur_version, $target_version, $table_prefix)
     {
-        while($cur_version<$target_version)
+        while ($cur_version < $target_version)
         { // TODO : execute pre & post scripts
             $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+            $this->logging->log('Updating to version : '.$cur_version, INFO);
+            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
             $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
+            if ($input_stream === false)
             {
-                $this->logging->log("Error reading update file ". $updateFile,ERROR);
+                $this->logging->log("Error reading update file ".$updateFile, ERROR);
                 return true;
             }
             $newline='';
@@ -313,25 +313,25 @@ 
             while (($line=fgets($input_stream)) !== false)
             {
                 if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+                $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
                 if (preg_match('/; *$/', $newline))
                 {
                     $sql_req=$db_conn->prepare($newline);
                     if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,ERROR);
+                        $this->logging->log('Error create schema : '.$newline, ERROR);
                         return true;
                     }
                     $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/', $newline, $cur_table_array))
                     {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+                        $cur_table=$cur_table_array[1].' SQL table '.$cur_table_array[2];
                     }
                     else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;
                     }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+                    $this->logging->log('Doing : '.$cur_table, INFO);
                     
                     $newline='';
                 }
@@ -339,13 +339,13 @@ 
             fclose($input_stream);
             
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
+            $this->logging->log('SQL query : '.$sql, DEBUG);
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
+                $this->logging->log('Cannot update db version. Query : '.$sql, WARN);
                 return true;
             }
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+            $this->logging->log('Schema updated to version : '.$cur_version, INFO);
         }
         return false;
     }
@@ -357,33 +357,33 @@ 
      *     @param int $target_version  target db version number
      *     @return string : return messages or 'ERROR'.
      */
-    private function update_schema_message($prefix,$cur_version,$target_version)
+    private function update_schema_message($prefix, $cur_version, $target_version)
     {
  
         $message='';
-        $this->logging->log('getting message for upgrade',DEBUG );
-        while($cur_version<$target_version)
+        $this->logging->log('getting message for upgrade', DEBUG);
+        while ($cur_version < $target_version)
         {
             $cur_version++;
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
             $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
+            if ($input_stream === false)
             {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
+                $this->logging->log("Error reading update file ".$updateFile, 2, '');
                 return 'ERROR';
             }
             do 
             { 
                 $line=fgets($input_stream); 
             }
-            while ($line !== false && !preg_match('/#MESSAGE/',$line));
+            while ($line !== false && !preg_match('/#MESSAGE/', $line));
             fclose($input_stream);
             if ($line === false)
             {
-                $this->logging->log("No message in file ". $updateFile,2,'');
+                $this->logging->log("No message in file ".$updateFile, 2, '');
                 return '';
             }
-            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+            $message.=($cur_version - 1).'->'.$cur_version.' : '.preg_replace('/#MESSAGE : /', '', $line)."\n";
         }
         return $message;
     }

Braces +8 added lines, -9 removed lines

@@ -153,8 +153,7 @@ 
         if ($value != null && isset($value['id']))
         {   // Entry exists -> update
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
-        }
-        else
+        } else
         {   // Entry does no exists -> create
             $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
         }
@@ -222,8 +221,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -267,8 +265,7 @@ 
         if ($this->trapDBType == 'pgsql')
         {
             $prefix .= 'update_pgsql/schema_';
-        }
-        else
+        } else
         {
             $prefix .= 'update_sql/schema_';
         }
@@ -312,7 +309,10 @@ 
             $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             while (($line=fgets($input_stream)) !== false)
             {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
+                if (preg_match('/^#/', $line)) {
+                	continue;
+                }
+                // ignore comment lines
                 $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
                 if (preg_match('/; *$/', $newline))
                 {
@@ -325,8 +325,7 @@ 
                     if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
                     {
                         $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
+                    } else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;

library/Trapdirector/Plugins/NetworkRule.php

Indentation +63 added lines, -63 removed lines

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

Spacing +18 added lines, -18 removed lines

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