patrickpr / trapdirector

application/controllers/HelperController.php

Indentation +143 added lines, -143 removed lines

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

Spacing +65 added lines, -65 removed lines

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

Braces +17 added lines, -34 removed lines

@@ -65,8 +65,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -77,8 +76,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -114,8 +112,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -146,8 +143,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -169,8 +165,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -185,8 +180,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -209,8 +203,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -245,8 +238,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -264,8 +256,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;
@@ -292,8 +283,7 @@ 
 	    {
 	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
 	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 	        return;
@@ -330,14 +320,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;
@@ -351,8 +339,7 @@ 
 		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
 		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
 		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -388,8 +375,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;
@@ -422,8 +408,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;
@@ -431,8 +416,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -463,8 +447,7 @@ 
 	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
 	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
 	        return;

library/Trapdirector/TrapsProcess/Trap.php

Indentation +823 added lines, -823 removed lines

@@ -17,846 +17,846 @@ 
  */
 class Trap
 {
-    use TrapConfig;
+	use TrapConfig;
     
-    // Configuration files and dirs
-    /** @var string Icinga etc path */
-    protected $icingaweb2Etc;
-    /** @var string $trapModuleConfig config.ini of module */
-    protected $trapModuleConfig;
-    /** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
-    protected $icingaweb2Ressources;
-    // Options from config.ini (default values)
-    /** @var string $snmptranslate */
-    protected $snmptranslate='/usr/bin/snmptranslate';
-    /** @var string $snmptranslate_dirs */
-    protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
-    /** @var string $icinga2cmd */
-    protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
-    /** @var string $dbPrefix */
-    protected $dbPrefix='traps_';
+	// Configuration files and dirs
+	/** @var string Icinga etc path */
+	protected $icingaweb2Etc;
+	/** @var string $trapModuleConfig config.ini of module */
+	protected $trapModuleConfig;
+	/** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
+	protected $icingaweb2Ressources;
+	// Options from config.ini (default values)
+	/** @var string $snmptranslate */
+	protected $snmptranslate='/usr/bin/snmptranslate';
+	/** @var string $snmptranslate_dirs */
+	protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
+	/** @var string $icinga2cmd */
+	protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
+	/** @var string $dbPrefix */
+	protected $dbPrefix='traps_';
     
-    // API
-    /** @var boolean $apiUse */
-    protected $apiUse=false;
-    /** @var Icinga2API $icinga2api */
-    protected $icinga2api=null;
-    /** @var string $apiHostname */
-    protected $apiHostname='';
-    /** @var integer $apiPort */
-    protected $apiPort=0;
-    /** @var string $apiUsername */
-    protected $apiUsername='';
-    /** @var string $apiPassword */
-    protected $apiPassword='';
+	// API
+	/** @var boolean $apiUse */
+	protected $apiUse=false;
+	/** @var Icinga2API $icinga2api */
+	protected $icinga2api=null;
+	/** @var string $apiHostname */
+	protected $apiHostname='';
+	/** @var integer $apiPort */
+	protected $apiPort=0;
+	/** @var string $apiUsername */
+	protected $apiUsername='';
+	/** @var string $apiPassword */
+	protected $apiPassword='';
     
-    // 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
+	// 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;
+	// Databases
+	/** @var Database $trapsDB  Database class*/
+	public $trapsDB = null;
     
-    // Trap received data
-    protected $receivingHost;
-    /** @var array	Main trap data (oid, source...) */
-    public $trapData=array();
-    /** @var array $trapDataExt Additional trap data objects (oid/value).*/
-    public $trapDataExt=array(); 
-    /** @var int $trapId trap_id after sql insert*/
-    public $trapId=null;
-    /** @var string $trapAction trap action for final write*/
-    public $trapAction=null;
-    /** @var boolean $trapToDb log trap to DB */
-    protected $trapToDb=true;
+	// Trap received data
+	protected $receivingHost;
+	/** @var array	Main trap data (oid, source...) */
+	public $trapData=array();
+	/** @var array $trapDataExt Additional trap data objects (oid/value).*/
+	public $trapDataExt=array(); 
+	/** @var int $trapId trap_id after sql insert*/
+	public $trapId=null;
+	/** @var string $trapAction trap action for final write*/
+	public $trapAction=null;
+	/** @var boolean $trapToDb log trap to DB */
+	protected $trapToDb=true;
     
-    /** @var Mib mib class */
-    public $mibClass = null;
+	/** @var Mib mib class */
+	public $mibClass = null;
     
-    /** @var Rule rule class */
-    public $ruleClass = null;
+	/** @var Rule rule class */
+	public $ruleClass = null;
     
-    /** @var Plugins plugins manager **/
-    public $pluginClass = null;
+	/** @var Plugins plugins manager **/
+	public $pluginClass = null;
     
-    /** @var TrapApi $trapApiClass */
-    public $trapApiClass = null;
+	/** @var TrapApi $trapApiClass */
+	public $trapApiClass = null;
     
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
-    {
-        // Paths of ini files
-        $this->icingaweb2Etc=$etcDir;
-        $this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
-        $this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
+	function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	{
+		// Paths of ini files
+		$this->icingaweb2Etc=$etcDir;
+		$this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
+		$this->icingaweb2Ressources=$this->icingaweb2Etc."/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);
-        
-        
-        // Create distributed API object
-        
-        $this->trapApiClass = new TrapApi($this->logging);
-        
-        //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
-        {
-            throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
-        }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
-        if ($trapConfig == false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
-            throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
-        }
-        $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->apiUse === 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); //< Create Rule class
-        
-        $this->trapData=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);
+		//************* 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);
+        
+        
+		// Create distributed API object
+        
+		$this->trapApiClass = new TrapApi($this->logging);
+        
+		//*************** Get options from ini files
+		if (! is_file($this->trapModuleConfig))
+		{
+			throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
+		}
+		$trapConfig=parse_ini_file($this->trapModuleConfig,true);
+		if ($trapConfig == false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+			throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
+		}
+		$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->apiUse === 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); //< Create Rule class
+        
+		$this->trapData=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);
             
             
-    }
+	}
 
-    /** @return \Trapdirector\Logging   */
-    public function getLogging()
-    {
-        return $this->logging;
-    }
+	/** @return \Trapdirector\Logging   */
+	public function getLogging()
+	{
+		return $this->logging;
+	}
 
-    /** @return \Trapdirector\TrapApi   */
-    public function getTrapApi()
-    {
-        return $this->trapApiClass;
-    }
+	/** @return \Trapdirector\TrapApi   */
+	public function getTrapApi()
+	{
+		return $this->trapApiClass;
+	}
     
-    /** @return \Trapdirector\Database */
-    public function getTrapsDB()
-    {
-        return $this->trapsDB;
-    }
+	/** @return \Trapdirector\Database */
+	public function getTrapsDB()
+	{
+		return $this->trapsDB;
+	}
     
-    /** 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);
-    }
+	/** 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);
-    }
+	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->apiHostname,$this->apiPort);
-        }
-        return $this->icinga2api;
-    }
+	/**
+	 * Returns or create new IcingaAPI object
+	 * @return \Icinga\Module\Trapdirector\Icinga2API
+	 */
+	protected function getAPI()
+	{
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+		}
+		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->trapData['source_ip']=$matches[1];
-            $this->trapData['destination_ip']=$matches[3];
-            $this->trapData['source_port']=$matches[2];
-            $this->trapData['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,'');
-                continue;
-            }
-            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->trapData['trap_oid']=$matches[2];
-                continue;
-            }
-            if ( $this->useSnmpTrapAddess === TRUE &&  preg_match('/'.$this->snmpTrapAddressOID.'/', $matches[1]) == 1)
-            {
-                $this->logging->log('Found relayed trap from ' . $matches[2] . ' relayed by ' .$this->trapData['source_ip'],DEBUG);
-                if (preg_match('/^[0-9\.]+$/',$matches[2]) == 0 && preg_match('/^[0-9a-fA-F:]+$/',$matches[2]) == 0)
-                {
-                    $this->logging->log('Value of SnmpTrapAddess ('.$this->snmpTrapAddressOID.') is not IP : ' .$matches[2],WARN,'');
-                    continue;
-                }
-                $this->trapData['source_ip'] = $matches[2];
-                continue;
-            }
-            $object= new stdClass;
-            $object->oid =$matches[1];
-            $object->value = $matches[2];
-            array_push($this->trapDataExt,$object);
-        }
-        
-        if ($this->trapData['trap_oid']=='unknown')
-        {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
-        }
-        
-        // Translate oids.
-        
-        $retArray=$this->translateOID($this->trapData['trap_oid']);
-        if ($retArray != null)
-        {
-            $this->trapData['trap_name']=$retArray['trap_name'];
-            $this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
-        }
-        foreach ($this->trapDataExt as $key => $val)
-        {
-            $retArray=$this->translateOID($val->oid);
-            if ($retArray != null)
-            {
-                $this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
-                $this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
-            }
-        }
-        
-        
-        $this->trapData['status']= 'waiting';
-        
-        return $this->trapData;
-    }
+	/**
+	 * 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->trapData['source_ip']=$matches[1];
+			$this->trapData['destination_ip']=$matches[3];
+			$this->trapData['source_port']=$matches[2];
+			$this->trapData['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,'');
+				continue;
+			}
+			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->trapData['trap_oid']=$matches[2];
+				continue;
+			}
+			if ( $this->useSnmpTrapAddess === TRUE &&  preg_match('/'.$this->snmpTrapAddressOID.'/', $matches[1]) == 1)
+			{
+				$this->logging->log('Found relayed trap from ' . $matches[2] . ' relayed by ' .$this->trapData['source_ip'],DEBUG);
+				if (preg_match('/^[0-9\.]+$/',$matches[2]) == 0 && preg_match('/^[0-9a-fA-F:]+$/',$matches[2]) == 0)
+				{
+					$this->logging->log('Value of SnmpTrapAddess ('.$this->snmpTrapAddressOID.') is not IP : ' .$matches[2],WARN,'');
+					continue;
+				}
+				$this->trapData['source_ip'] = $matches[2];
+				continue;
+			}
+			$object= new stdClass;
+			$object->oid =$matches[1];
+			$object->value = $matches[2];
+			array_push($this->trapDataExt,$object);
+		}
+        
+		if ($this->trapData['trap_oid']=='unknown')
+		{
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
+			$this->logging->log('no trap oid found',ERROR,'');
+		}
+        
+		// Translate oids.
+        
+		$retArray=$this->translateOID($this->trapData['trap_oid']);
+		if ($retArray != null)
+		{
+			$this->trapData['trap_name']=$retArray['trap_name'];
+			$this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
+		}
+		foreach ($this->trapDataExt as $key => $val)
+		{
+			$retArray=$this->translateOID($val->oid);
+			if ($retArray != null)
+			{
+				$this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
+				$this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
+			}
+		}
+        
+        
+		$this->trapData['status']= 'waiting';
+        
+		return $this->trapData;
+	}
     
-    /**
-     * 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->dbPrefix.'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->dbPrefix.'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]);
-        }
-    }
+	/**
+	 * 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->dbPrefix.'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->dbPrefix.'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->dbPrefix.'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);
-    }
+	/**
+	 * 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->dbPrefix.'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->dbPrefix.'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) {
+	/** 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->dbPrefix.'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->trapId=$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->trapId=$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->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-        }
-        
-        $this->logging->log('id found: '. $this->trapId,INFO );
-    }
+				$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->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
+        
+		$this->logging->log('id found: '. $this->trapId,INFO );
+	}
     
-    /** Write trap data to trap database
-     */
-    public function writeTrapToDB()
-    {
-        
-        // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
-        
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $insert_col='';
-        $insert_val='';
-        // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
-        
-        $firstcol=1;
-        foreach ($this->trapData 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->dbPrefix.'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) {
+	/** Write trap data to trap database
+	 */
+	public function writeTrapToDB()
+	{
+        
+		// If action is ignore -> don't send t DB
+		if ($this->trapToDb === false) return;
+        
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$insert_col='';
+		$insert_val='';
+		// add date time
+		$this->trapData['date_received'] = date("Y-m-d H:i:s");
+        
+		$firstcol=1;
+		foreach ($this->trapData 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->dbPrefix.'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->trapId=$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->trapId=$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->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
-        }
-        $this->logging->log('id found: '.$this->trapId,INFO );
-        
-        // Fill trap extended data table
-        foreach ($this->trapDataExt as $value) {
-            // TODO : detect if trap value is encoded and decode it to UTF-8 for database
-            $firstcol=1;
-            $value->trap_id = $this->trapId;
-            $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->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+		}
+		$this->logging->log('id found: '.$this->trapId,INFO );
+        
+		// Fill trap extended data table
+		foreach ($this->trapDataExt as $value) {
+			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
+			$firstcol=1;
+			$value->trap_id = $this->trapId;
+			$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->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+			$sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
             
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
-            }
-        }
-    }
+			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->dbPrefix.'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
+	/** 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->dbPrefix.'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;
-    }
+				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->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
+	/** 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->dbPrefix."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->apiUse === false)
-        {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+	/** 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->apiUse === 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->apiUsername, $this->apiPassword);
-            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;
-            }
-        }
-    }
+			$api = $this->getAPI();
+			$api->setCredentials($this->apiUsername, $this->apiPassword);
+			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->apiUsername, $this->apiPassword);
-        return $api->getHostByIP($ip);
-    }
+	public function getHostByIP($ip)
+	{
+		$api = $this->getAPI();
+		$api->setCredentials($this->apiUsername, $this->apiPassword);
+		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;
-            // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+	/** 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;
+			// Test and transform regexp
+			$oidR = $this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
-            {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
-                {
-                    $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;
-    }
+			foreach($this->trapDataExt as $val)
+			{
+				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				{
+					$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->trapData['source_ip'],$this->trapData['trap_oid']);
-        
-        if ($rules===false || count($rules)==0)
-        {
-            $this->logging->log('No rules found for this trap',INFO );
-            $this->trapData['status']='unknown';
-            $this->trapToDb=true;
-            return;
-        }
-        //print_r($rules);
-        // Evaluate all rules in sequence
-        $this->trapAction=null;
-        foreach ($rules as $rule)
-        {
+	/** Match rules for current trap and do action
+	 */
+	public function applyRules()
+	{
+		$rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        
+		if ($rules===false || count($rules)==0)
+		{
+			$this->logging->log('No rules found for this trap',INFO );
+			$this->trapData['status']='unknown';
+			$this->trapToDb=true;
+			return;
+		}
+		//print_r($rules);
+		// Evaluate all rules in sequence
+		$this->trapAction=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->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
-            try
-            {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
-                //->eval_rule($rule['rule']);
+			$display=$this->applyDisplay($rule['display']);
+			$this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+			try
+			{
+				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+				//->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->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($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->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($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->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($action==-2)?false:true;
-                }
-                // Put name in source_name
-                if (!isset($this->trapData['source_name']))
-                {
-                    $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
-                {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
-                    { // only add if not present
-                        $this->trapData['source_name'].=','.$rule['host_name'];
-                    }
-                }
-            }
-            catch (Exception $e)
-            {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-                $this->trapAction.=' ERR : '.$e->getMessage();
-                $this->trapData['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->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($action==-2)?false:true;
+				}
+				// Put name in source_name
+				if (!isset($this->trapData['source_name']))
+				{
+					$this->trapData['source_name']=$rule['host_name'];
+				}
+				else
+				{
+					if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+					{ // only add if not present
+						$this->trapData['source_name'].=','.$rule['host_name'];
+					}
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trapAction.=' ERR : '.$e->getMessage();
+				$this->trapData['status']='error';
+			}
             
-        }
-        if ($this->trapData['status']=='error')
-        {
-            $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
-        {
-            $this->trapData['status']='done';
-        }
-    }
+		}
+		if ($this->trapData['status']=='error')
+		{
+			$this->trapToDb=true; // Always put errors in DB for the use can see
+		}
+		else
+		{
+			$this->trapData['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->trapAction==null)
-        {
-            $this->trapAction='No action';
-        }
-        $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
+	/** 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->trapAction==null)
+		{
+			$this->trapAction='No action';
+		}
+		$sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
     
-    /*********** UTILITIES *********************/
+	/*********** 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,
+	/** 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,
@@ -864,43 +864,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->dbPrefix."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->dbPrefix."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 +177 added lines, -177 removed lines

@@ -52,13 +52,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;
@@ -74,18 +74,18 @@ 
     protected $trapToDb=true;
     
     /** @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;
     
     /** @var TrapApi $trapApiClass */
-    public $trapApiClass = null;
+    public $trapApiClass=null;
     
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+    function __construct($etcDir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
     {
         // Paths of ini files
         $this->icingaweb2Etc=$etcDir;
@@ -93,10 +93,10 @@ 
         $this->icingaweb2Ressources=$this->icingaweb2Etc."/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
@@ -108,17 +108,17 @@ 
         
         // Create distributed API object
         
-        $this->trapApiClass = new TrapApi($this->logging);
+        $this->trapApiClass=new TrapApi($this->logging);
         
         //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
+        if (!is_file($this->trapModuleConfig))
         {
             throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
         }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
+        $trapConfig=parse_ini_file($this->trapModuleConfig, true);
         if ($trapConfig == false)
         {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig, ERROR, 'syslog');
             throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
         }
         $this->getMainOptions($trapConfig); // Get main options from ini file
@@ -132,10 +132,10 @@ 
         if ($this->apiUse === 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); //< Create Rule class
+        $this->ruleClass=new Rule($this); //< Create Rule class
         
         $this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
             'source_ip'	=> 'unknown',
@@ -147,7 +147,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);
             
             
     }
@@ -176,15 +176,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);
     }
     
     /**
@@ -195,7 +195,7 @@ 
     {
         if ($this->icinga2api == null)
         {
-            $this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+            $this->icinga2api=new Icinga2API($this->apiHostname, $this->apiPort);
         }
         return $this->icinga2api;
     }
@@ -214,7 +214,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
         }
         
@@ -223,21 +223,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
         {
@@ -247,41 +247,41 @@ 
             $this->trapData['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, '');
                 continue;
             }
-            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->trapData['trap_oid']=$matches[2];
                 continue;
             }
-            if ( $this->useSnmpTrapAddess === TRUE &&  preg_match('/'.$this->snmpTrapAddressOID.'/', $matches[1]) == 1)
+            if ($this->useSnmpTrapAddess === TRUE && preg_match('/'.$this->snmpTrapAddressOID.'/', $matches[1]) == 1)
             {
-                $this->logging->log('Found relayed trap from ' . $matches[2] . ' relayed by ' .$this->trapData['source_ip'],DEBUG);
-                if (preg_match('/^[0-9\.]+$/',$matches[2]) == 0 && preg_match('/^[0-9a-fA-F:]+$/',$matches[2]) == 0)
+                $this->logging->log('Found relayed trap from '.$matches[2].' relayed by '.$this->trapData['source_ip'], DEBUG);
+                if (preg_match('/^[0-9\.]+$/', $matches[2]) == 0 && preg_match('/^[0-9a-fA-F:]+$/', $matches[2]) == 0)
                 {
-                    $this->logging->log('Value of SnmpTrapAddess ('.$this->snmpTrapAddressOID.') is not IP : ' .$matches[2],WARN,'');
+                    $this->logging->log('Value of SnmpTrapAddess ('.$this->snmpTrapAddressOID.') is not IP : '.$matches[2], WARN, '');
                     continue;
                 }
-                $this->trapData['source_ip'] = $matches[2];
+                $this->trapData['source_ip']=$matches[2];
                 continue;
             }
-            $object= new stdClass;
-            $object->oid =$matches[1];
-            $object->value = $matches[2];
-            array_push($this->trapDataExt,$object);
+            $object=new stdClass;
+            $object->oid=$matches[1];
+            $object->value=$matches[2];
+            array_push($this->trapDataExt, $object);
         }
         
-        if ($this->trapData['trap_oid']=='unknown')
+        if ($this->trapData['trap_oid'] == 'unknown')
         {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
+            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trapData['source_ip']);
+            $this->logging->log('no trap oid found', ERROR, '');
         }
         
         // Translate oids.
@@ -303,7 +303,7 @@ 
         }
         
         
-        $this->trapData['status']= 'waiting';
+        $this->trapData['status']='waiting';
         
         return $this->trapData;
     }
@@ -319,40 +319,40 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT mib,name from '.$this->dbPrefix.'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->dbPrefix.'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]);
         }
     }
     
@@ -363,90 +363,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->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+        $daysago=strtotime("-".$days." day");
+        $sql='delete from '.$this->dbPrefix.'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->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'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->trapId=$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->trapId=$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->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
     }
     
     /** Write trap data to trap database
@@ -463,86 +463,86 @@ 
         $insert_col='';
         $insert_val='';
         // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
+        $this->trapData['date_received']=date("Y-m-d H:i:s");
         
         $firstcol=1;
         foreach ($this->trapData 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->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'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->trapId=$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->trapId=$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->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
         
         // Fill trap extended data table
         foreach ($this->trapDataExt as $value) {
             // TODO : detect if trap value is encoded and decode it to UTF-8 for database
             $firstcol=1;
-            $value->trap_id = $this->trapId;
+            $value->trap_id=$this->trapId;
             $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->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+            $sql='INSERT INTO '.$this->dbPrefix.'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, '');
             }
         }
     }
@@ -552,14 +552,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->dbPrefix.'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();
@@ -568,7 +568,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).
@@ -576,7 +576,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
@@ -587,15 +587,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];
@@ -618,7 +618,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql="UPDATE ".$this->dbPrefix."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, '');
         }
     }
     
@@ -630,23 +630,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->apiUse === 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];
@@ -656,17 +656,17 @@ 
                 $perfdata='';
             }
             
-            $api = $this->getAPI();
+            $api=$this->getAPI();
             $api->setCredentials($this->apiUsername, $this->apiPassword);
-            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;
             }
         }
@@ -674,7 +674,7 @@ 
     
     public function getHostByIP($ip)
     {
-        $api = $this->getAPI();
+        $api=$this->getAPI();
         $api->setCredentials($this->apiUsername, $this->apiPassword);
         return $api->getHostByIP($ip);
     }
@@ -687,35 +687,35 @@ 
     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;
             // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+            $oidR=$this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
+            foreach ($this->trapDataExt as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    $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;
                 }
             }
@@ -727,11 +727,11 @@ 
      */
     public function applyRules()
     {
-        $rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        $rules=$this->getRules($this->trapData['source_ip'], $this->trapData['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->trapData['status']='unknown';
             $this->trapToDb=true;
             return;
@@ -746,59 +746,59 @@ 
             $service_name=$rule['service_name'];
             
             $display=$this->applyDisplay($rule['display']);
-            $this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+            $this->trapAction=($this->trapAction == null) ? '' : $this->trapAction.', ';
             try
             {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+                $this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt);
                 //->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->trapAction.='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->trapAction.='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->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($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->trapAction.='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->trapAction.='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->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($action == -2) ?false:true;
                 }
                 // Put name in source_name
                 if (!isset($this->trapData['source_name']))
@@ -807,7 +807,7 @@ 
                 }
                 else
                 {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+                    if (!preg_match('/'.$rule['host_name'].'/', $this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
@@ -815,13 +815,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->trapAction.=' ERR : '.$e->getMessage();
                 $this->trapData['status']='error';
             }
             
         }
-        if ($this->trapData['status']=='error')
+        if ($this->trapData['status'] == 'error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
         }
@@ -837,13 +837,13 @@ 
     public function add_rule_final($time)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trapAction==null)
+        if ($this->trapAction == null)
         {
             $this->trapAction='No action';
         }
         $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -866,7 +866,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();
@@ -875,7 +875,7 @@ 
         $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."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();
@@ -891,13 +891,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 +26 added lines, -30 removed lines

@@ -98,8 +98,7 @@ 
         {
             $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
             $this->logSetup=true;
-        }
-        else
+        } else
         {
             $this->logSetup=false;
         }
@@ -129,7 +128,10 @@ 
         $this->getDatabaseOptions(); // Get options in database
         
         //*************** Setup API
-        if ($this->apiUse === true) $this->getAPI(); // Setup API
+        if ($this->apiUse === true) {
+        	$this->getAPI();
+        }
+        // Setup API
         
         //*************** Setup MIB
         $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
@@ -238,8 +240,7 @@ 
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
             $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
+        } else
         {
             $this->trapData['source_ip']=$matches[1];
             $this->trapData['destination_ip']=$matches[3];
@@ -439,7 +440,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->trapId=$inserted_id;
                 break;
             default:
@@ -455,7 +458,9 @@ 
     {
         
         // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
+        if ($this->trapToDb === false) {
+        	return;
+        }
         
         
         $db_conn=$this->trapsDB->db_connect_trap();
@@ -512,7 +517,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->trapId=$inserted_id;
                 break;
             default:
@@ -641,8 +648,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();
@@ -650,8 +656,7 @@ 
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
-            }
-            else
+            } else
             {
                 $perfdata='';
             }
@@ -663,8 +668,7 @@ 
             {
                 $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
                 return false;
-            }
-            else
+            } else
             {
                 $this->logging->log( "Sent result : " .$retmessage,INFO );
                 return true;
@@ -763,20 +767,17 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
                     $this->trapToDb=($action==-2)?false:true;
-                }
-                else
+                } else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
@@ -787,14 +788,12 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
@@ -804,16 +803,14 @@ 
                 if (!isset($this->trapData['source_name']))
                 {
                     $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
+                } else
                 {
                     if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
                 $this->trapAction.=' ERR : '.$e->getMessage();
@@ -824,8 +821,7 @@ 
         if ($this->trapData['status']=='error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
+        } else
         {
             $this->trapData['status']='done';
         }

library/Trapdirector/TrapsProcess/TrapConfig.php

Indentation +186 added lines, -186 removed lines

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

Spacing +40 added lines, -40 removed lines

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

Braces +11 added lines, -7 removed lines

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

library/Trapdirector/Tables/HandlerTable.php

Indentation +120 added lines, -120 removed lines

@@ -7,137 +7,137 @@
 class HandlerTable extends TrapDirectorTable
 {
 
-    protected $status_display=array(
-        -2	=>'ignore',
-        -1 => '-',
-        0	=> 'OK',
-        1	=> 'warning',
-        2	=> 'critical',
-        3	=> 'unknown',);
+	protected $status_display=array(
+		-2	=>'ignore',
+		-1 => '-',
+		0	=> 'OK',
+		1	=> 'warning',
+		2	=> 'critical',
+		3	=> 'unknown',);
     
-    // translate
-    protected $doTranslate=false;
-    protected $MIB;
+	// translate
+	protected $doTranslate=false;
+	protected $MIB;
     
-    // categories
-    protected $categories = NULL;
+	// categories
+	protected $categories = NULL;
     
-    public function setCategoriesArray(array $categories)
-    {
-        $this->categories = $categories;
-    }
+	public function setCategoriesArray(array $categories)
+	{
+		$this->categories = $categories;
+	}
     
-    public function groupingPrintData( $value)
-    {
-        if ($this->groupingColumn == 'rule_type')
-        {
-            if ($this->categories == NULL || (! isset($this->categories[$value])))
-                return 'Unknown category ('.$value.')';
-            return 'Category : '. $this->categories[$value];
-        }
-        $html = "$value";
-        return $html;
-    }
+	public function groupingPrintData( $value)
+	{
+		if ($this->groupingColumn == 'rule_type')
+		{
+			if ($this->categories == NULL || (! isset($this->categories[$value])))
+				return 'Unknown category ('.$value.')';
+			return 'Category : '. $this->categories[$value];
+		}
+		$html = "$value";
+		return $html;
+	}
     
-    public function setMibloader($mibloader)
-    {
-        $this->MIB=$mibloader;
-        $this->doTranslate=true;
-    }
+	public function setMibloader($mibloader)
+	{
+		$this->MIB=$mibloader;
+		$this->doTranslate=true;
+	}
 
-    public function titleOrder($name)
-    {
-        switch ($name)
-        {
-            case 'host_name' : return $this->content[$name]; break;
-            case 'source_ip' : return 'ip4'; break;
-            default: return $this->content[$name];	
-        }
-        return NULL;
-    }
+	public function titleOrder($name)
+	{
+		switch ($name)
+		{
+			case 'host_name' : return $this->content[$name]; break;
+			case 'source_ip' : return 'ip4'; break;
+			default: return $this->content[$name];	
+		}
+		return NULL;
+	}
     
-    public function getCurrentURL()
-    {
-        return Url::fromPath($this->urlPath . '/handler');
-    }
+	public function getCurrentURL()
+	{
+		return Url::fromPath($this->urlPath . '/handler');
+	}
     
-    public function renderLine($row)
-      {
-          $html = '';
-          $firstCol = true;
+	public function renderLine($row)
+	  {
+		  $html = '';
+		  $firstCol = true;
                
-          $titleNames = array_keys($this->titles);
-          foreach ($titleNames as $rowkey )
-          {        
-              // Check missing value
-              if (property_exists($row, $rowkey))
-              {
-                  switch ($rowkey)
-                  {
-                      case 'action_match': // display text levels
-                      case 'action_nomatch':
-                          $val=$this->status_display[$row->$rowkey];
-                          break;
-                      case 'trap_oid': // try to traslate oids.
+		  $titleNames = array_keys($this->titles);
+		  foreach ($titleNames as $rowkey )
+		  {        
+			  // Check missing value
+			  if (property_exists($row, $rowkey))
+			  {
+				  switch ($rowkey)
+				  {
+					  case 'action_match': // display text levels
+					  case 'action_nomatch':
+						  $val=$this->status_display[$row->$rowkey];
+						  break;
+					  case 'trap_oid': // try to traslate oids.
                           
-                          if ($this->doTranslate === true)
-                          {
-                              $oidName = $this->MIB->translateOID($row->$rowkey);
-                              if (isset($oidName['name']))
-                              {
-                                  $val=$oidName['name'];
-                              }
-                              else
-                              {
-                                  $val = $row->$rowkey;
-                              }
-                          }
-                          else
-                          {
-                              $val = $row->$rowkey;
-                          }
-                          break;
-                      case 'host_name': // switch to hostgroup if name is null
-                          if ($row->$rowkey == null)
-                          {
-                              $val = $row->host_group_name;
-                          }
-                          else
-                          {
-                              $val = $row->$rowkey;
-                          }
-                          break;
-                      default:
-                          $val = $row->$rowkey;
-                  }
-                  if ($rowkey == 'trap_oid' && $this->doTranslate===true)
-                  {
+						  if ($this->doTranslate === true)
+						  {
+							  $oidName = $this->MIB->translateOID($row->$rowkey);
+							  if (isset($oidName['name']))
+							  {
+								  $val=$oidName['name'];
+							  }
+							  else
+							  {
+								  $val = $row->$rowkey;
+							  }
+						  }
+						  else
+						  {
+							  $val = $row->$rowkey;
+						  }
+						  break;
+					  case 'host_name': // switch to hostgroup if name is null
+						  if ($row->$rowkey == null)
+						  {
+							  $val = $row->host_group_name;
+						  }
+						  else
+						  {
+							  $val = $row->$rowkey;
+						  }
+						  break;
+					  default:
+						  $val = $row->$rowkey;
+				  }
+				  if ($rowkey == 'trap_oid' && $this->doTranslate===true)
+				  {
                       
-                  }
-              } else {
-                  $val = '-';
-              }
-              if ($firstCol === true) { // Put link in first column for trap detail.
-                  $html .= '<td class="traphover">'
-                      . $this->view->qlink(
-                          $this->view->escape($val),
-                          Url::fromPath(
-                              $this->urlPath . '/handler/add',
-                              array('ruleid' => $row->id)
-                              )
-                          );
-                  if ($row->comment != '')
-                  {
-                      $html.= '<span class="tohover">'. $row->comment .'</span></td>';
-                  }
-                  $html.= '</td>';
-              } else {
-                  $html .= '<td>' . $this->view->escape($val) . '</td>';
-              }
-              $firstCol=false;
+				  }
+			  } else {
+				  $val = '-';
+			  }
+			  if ($firstCol === true) { // Put link in first column for trap detail.
+				  $html .= '<td class="traphover">'
+					  . $this->view->qlink(
+						  $this->view->escape($val),
+						  Url::fromPath(
+							  $this->urlPath . '/handler/add',
+							  array('ruleid' => $row->id)
+							  )
+						  );
+				  if ($row->comment != '')
+				  {
+					  $html.= '<span class="tohover">'. $row->comment .'</span></td>';
+				  }
+				  $html.= '</td>';
+			  } else {
+				  $html .= '<td>' . $this->view->escape($val) . '</td>';
+			  }
+			  $firstCol=false;
               
-          }
-          return $html;
-      }
+		  }
+		  return $html;
+	  }
 
 }
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -20,22 +20,22 @@ 
     protected $MIB;
     
     // categories
-    protected $categories = NULL;
+    protected $categories=NULL;
     
     public function setCategoriesArray(array $categories)
     {
-        $this->categories = $categories;
+        $this->categories=$categories;
     }
     
-    public function groupingPrintData( $value)
+    public function groupingPrintData($value)
     {
         if ($this->groupingColumn == 'rule_type')
         {
-            if ($this->categories == NULL || (! isset($this->categories[$value])))
+            if ($this->categories == NULL || (!isset($this->categories[$value])))
                 return 'Unknown category ('.$value.')';
-            return 'Category : '. $this->categories[$value];
+            return 'Category : '.$this->categories[$value];
         }
-        $html = "$value";
+        $html="$value";
         return $html;
     }
     
@@ -58,16 +58,16 @@ 
     
     public function getCurrentURL()
     {
-        return Url::fromPath($this->urlPath . '/handler');
+        return Url::fromPath($this->urlPath.'/handler');
     }
     
     public function renderLine($row)
       {
-          $html = '';
-          $firstCol = true;
+          $html='';
+          $firstCol=true;
                
-          $titleNames = array_keys($this->titles);
-          foreach ($titleNames as $rowkey )
+          $titleNames=array_keys($this->titles);
+          foreach ($titleNames as $rowkey)
           {        
               // Check missing value
               if (property_exists($row, $rowkey))
@@ -82,57 +82,57 @@ 
                           
                           if ($this->doTranslate === true)
                           {
-                              $oidName = $this->MIB->translateOID($row->$rowkey);
+                              $oidName=$this->MIB->translateOID($row->$rowkey);
                               if (isset($oidName['name']))
                               {
                                   $val=$oidName['name'];
                               }
                               else
                               {
-                                  $val = $row->$rowkey;
+                                  $val=$row->$rowkey;
                               }
                           }
                           else
                           {
-                              $val = $row->$rowkey;
+                              $val=$row->$rowkey;
                           }
                           break;
                       case 'host_name': // switch to hostgroup if name is null
                           if ($row->$rowkey == null)
                           {
-                              $val = $row->host_group_name;
+                              $val=$row->host_group_name;
                           }
                           else
                           {
-                              $val = $row->$rowkey;
+                              $val=$row->$rowkey;
                           }
                           break;
                       default:
-                          $val = $row->$rowkey;
+                          $val=$row->$rowkey;
                   }
-                  if ($rowkey == 'trap_oid' && $this->doTranslate===true)
+                  if ($rowkey == 'trap_oid' && $this->doTranslate === true)
                   {
                       
                   }
               } else {
-                  $val = '-';
+                  $val='-';
               }
               if ($firstCol === true) { // Put link in first column for trap detail.
-                  $html .= '<td class="traphover">'
+                  $html.='<td class="traphover">'
                       . $this->view->qlink(
                           $this->view->escape($val),
                           Url::fromPath(
-                              $this->urlPath . '/handler/add',
+                              $this->urlPath.'/handler/add',
                               array('ruleid' => $row->id)
                               )
                           );
                   if ($row->comment != '')
                   {
-                      $html.= '<span class="tohover">'. $row->comment .'</span></td>';
+                      $html.='<span class="tohover">'.$row->comment.'</span></td>';
                   }
-                  $html.= '</td>';
+                  $html.='</td>';
               } else {
-                  $html .= '<td>' . $this->view->escape($val) . '</td>';
+                  $html.='<td>'.$this->view->escape($val).'</td>';
               }
               $firstCol=false;
               

Braces +6 added lines, -8 removed lines

@@ -31,8 +31,9 @@ 
     {
         if ($this->groupingColumn == 'rule_type')
         {
-            if ($this->categories == NULL || (! isset($this->categories[$value])))
-                return 'Unknown category ('.$value.')';
+            if ($this->categories == NULL || (! isset($this->categories[$value]))) {
+                            return 'Unknown category ('.$value.')';
+            }
             return 'Category : '. $this->categories[$value];
         }
         $html = "$value";
@@ -86,13 +87,11 @@ 
                               if (isset($oidName['name']))
                               {
                                   $val=$oidName['name'];
-                              }
-                              else
+                              } else
                               {
                                   $val = $row->$rowkey;
                               }
-                          }
-                          else
+                          } else
                           {
                               $val = $row->$rowkey;
                           }
@@ -101,8 +100,7 @@ 
                           if ($row->$rowkey == null)
                           {
                               $val = $row->host_group_name;
-                          }
-                          else
+                          } else
                           {
                               $val = $row->$rowkey;
                           }

library/Trapdirector/Tables/TrapDirectorTable.php

Indentation +391 added lines, -391 removed lines

@@ -5,299 +5,299 @@ 
 
 abstract class TrapDirectorTable
 {
-    /** @var array $titles table titles (name, display value) */
-    protected $titles = null;
+	/** @var array $titles table titles (name, display value) */
+	protected $titles = null;
 
-    /** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
-    protected $content = null;
+	/** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
+	protected $content = null;
     
-    /** @var array $columnNames names of columns for filtering */
-    protected $columnNames = array();
+	/** @var array $columnNames names of columns for filtering */
+	protected $columnNames = array();
     
-    /** @var mixed $dbConn connection to database  */
-    protected $dbConn = null;
+	/** @var mixed $dbConn connection to database  */
+	protected $dbConn = null;
     
-    /** Current view **/
-    protected $view;
+	/** Current view **/
+	protected $view;
     
-    protected $urlPath;
+	protected $urlPath;
     
-    // Database stuff
+	// Database stuff
    /** @var array $table (db ref, name) */
-    protected $table = array();
+	protected $table = array();
     
-    /** @var mixed  $query Query in database; */
-    protected $query = null;
+	/** @var mixed  $query Query in database; */
+	protected $query = null;
     
-    /** @var array $order : (db column, 'ASC' | 'DESC') */
-    protected $order = array();
-    protected $orderQuery = '';
+	/** @var array $order : (db column, 'ASC' | 'DESC') */
+	protected $order = array();
+	protected $orderQuery = '';
     
-    /********* Filter ********/
-    /** @var string $filterString : string filter for db columns */
-    protected $filterString = '';
+	/********* Filter ********/
+	/** @var string $filterString : string filter for db columns */
+	protected $filterString = '';
     
-    /** @var array $filterColumn : columns to apply filter to */
-    protected $filterColumn = array();
+	/** @var array $filterColumn : columns to apply filter to */
+	protected $filterColumn = array();
     
-    protected $filterQuery='';
+	protected $filterQuery='';
     
-    /*************** Paging *************/
-    protected $maxPerPage = 25;
+	/*************** Paging *************/
+	protected $maxPerPage = 25;
     
-    protected $currentPage = 0;
+	protected $currentPage = 0;
     
-    /*************** Grouping ************/
-    protected $grouppingActive=false;
+	/*************** Grouping ************/
+	protected $grouppingActive=false;
     
-    protected $groupingColumn='';
+	protected $groupingColumn='';
     
-    protected $groupingVal='';
+	protected $groupingVal='';
     
-    protected $groupingColSpan=1;
+	protected $groupingColSpan=1;
     
-    function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
-    {
-        $this->table = $table;
-        $this->titles = $titles;
-        $this->content = $columns;
-        $this->columnNames = $columnNames;
-        $this->dbConn = $dbConn;
+	function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
+	{
+		$this->table = $table;
+		$this->titles = $titles;
+		$this->content = $columns;
+		$this->columnNames = $columnNames;
+		$this->dbConn = $dbConn;
         
-        $this->view = $view;
-        $this->urlPath = $urlPath;
+		$this->view = $view;
+		$this->urlPath = $urlPath;
         
-        return $this;
-    }
+		return $this;
+	}
 
     
-    /************** GET variables and URLs *************/
-    public function getParams(array $getVars)
-    {
-        $this->getFilterQuery($getVars);
-        $this->getPagingQuery($getVars);
-        $this->getOrderQuery($getVars);
-    }
-    
-    public function getCurrentURL()
-    {
-        return '?';
-    }
-    
-    protected function getCurrentURLAndQS(string $caller)
-    {
-        $actionURL = $this->getCurrentURL() . '?' ;
-        $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+	/************** GET variables and URLs *************/
+	public function getParams(array $getVars)
+	{
+		$this->getFilterQuery($getVars);
+		$this->getPagingQuery($getVars);
+		$this->getOrderQuery($getVars);
+	}
+    
+	public function getCurrentURL()
+	{
+		return '?';
+	}
+    
+	protected function getCurrentURLAndQS(string $caller)
+	{
+		$actionURL = $this->getCurrentURL() . '?' ;
+		$QSList=array();
+		if ($caller != 'filter' && $this->curFilterQuery() != '')
+			array_push($QSList , $this->curFilterQuery());
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+		if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
+			array_push($QSList , $this->curPagingQuery());
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+		if ($caller != 'order' && $this->curOrderQuery() != '')
+			array_push($QSList , $this->curOrderQuery());
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+		if (count($QSList) != 0)
+			$actionURL .=  implode('&', $QSList) . '&';
         
-        return $actionURL;
-    }
-    
-    /************* DB queries ******************/
-    /**
-     * Get base query in $this->query
-     * @return  TrapDirectorTable
-     */
-    public function getBaseQuery()
-    {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query->from(
-            $this->table,
-            $this->content
-            );
+		return $actionURL;
+	}
+    
+	/************* DB queries ******************/
+	/**
+	 * Get base query in $this->query
+	 * @return  TrapDirectorTable
+	 */
+	public function getBaseQuery()
+	{
+		$this->query = $this->dbConn->select();
+		$this->query = $this->query->from(
+			$this->table,
+			$this->content
+			);
         
-        return $this;
-    }
-    
-    public function fullQuery()
-    {
-        $this->getBaseQuery()
-        ->applyFilter()
-        ->applyPaging()
-        ->applyOrder();
+		return $this;
+	}
+    
+	public function fullQuery()
+	{
+		$this->getBaseQuery()
+		->applyFilter()
+		->applyPaging()
+		->applyOrder();
         
-        return $this->dbConn->fetchAll($this->query);
-        //return $this->query->fetchAll();
-    }
-    
-    
-    /**************** Filtering ******************/
-    
-    public function applyFilter()
-    {
-        if ($this->filterString == '' || count($this->filterColumn) == 0)
-        {
-            return $this;
-        }
-        $filter='';
-        foreach ($this->filterColumn as $column)
-        {
-            if ($filter != "") $filter.=' OR ';
-            //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
-            $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
-        }
-        //echo $filter;
+		return $this->dbConn->fetchAll($this->query);
+		//return $this->query->fetchAll();
+	}
+    
+    
+	/**************** Filtering ******************/
+    
+	public function applyFilter()
+	{
+		if ($this->filterString == '' || count($this->filterColumn) == 0)
+		{
+			return $this;
+		}
+		$filter='';
+		foreach ($this->filterColumn as $column)
+		{
+			if ($filter != "") $filter.=' OR ';
+			//$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
+			$filter .= $column  . " LIKE '%" . $this->filterString. "%'";
+		}
+		//echo $filter;
         
-        $this->query=$this->query->where($filter);
+		$this->query=$this->query->where($filter);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function setFilter(string $filter, array $filterCol)
-    {
-        $this->filterString = $filter;
-        $this->filterColumn = $filterCol;
-        return $this;
-    }
+	public function setFilter(string $filter, array $filterCol)
+	{
+		$this->filterString = $filter;
+		$this->filterColumn = $filterCol;
+		return $this;
+	}
    
-    public function renderFilter()
-    {
+	public function renderFilter()
+	{
         
-        $html=' <form id="genfilter" name="mainFilterGen"
+		$html=' <form id="genfilter" name="mainFilterGen"
 			enctype="application/x-www-form-urlencoded"
 			action="'.$this->getCurrentURLAndQS('filter').'"
 			method="get">';
-        $html.='<input type="text" name="f" title="Search is simple! Try to combine multiple words"
+		$html.='<input type="text" name="f" title="Search is simple! Try to combine multiple words"
 	placeholder="Search..."  value="'.$this->filterQuery.'">';
 
-        $html.='</form>';
-        return $html;
-    }
+		$html.='</form>';
+		return $html;
+	}
  
-    public function getFilterQuery(array $getVars)
-    {
-        if (isset($getVars['f']))
-        {
-            $this->filterQuery = $getVars['f'];
-            $this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
-        }
-    }
-    
-    protected function curFilterQuery()
-    {
-        if ($this->filterQuery == '') return '';
-        return 'f='.$this->filterQuery;
-    }
-    
-    /***************** Ordering ********************/
-    
-    public function applyOrder()
-    {
-        if (count($this->order) == 0)
-        {
-            return $this;
-        }
-        $orderSQL='';
-        foreach ($this->order as $column => $direction)
-        {
-            if ($orderSQL != "") $orderSQL.=',';
+	public function getFilterQuery(array $getVars)
+	{
+		if (isset($getVars['f']))
+		{
+			$this->filterQuery = $getVars['f'];
+			$this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
+		}
+	}
+    
+	protected function curFilterQuery()
+	{
+		if ($this->filterQuery == '') return '';
+		return 'f='.$this->filterQuery;
+	}
+    
+	/***************** Ordering ********************/
+    
+	public function applyOrder()
+	{
+		if (count($this->order) == 0)
+		{
+			return $this;
+		}
+		$orderSQL='';
+		foreach ($this->order as $column => $direction)
+		{
+			if ($orderSQL != "") $orderSQL.=',';
             
-            $orderSQL .= $column . ' ' . $direction;
-        }
-        $this->query = $this->query->order($orderSQL);
+			$orderSQL .= $column . ' ' . $direction;
+		}
+		$this->query = $this->query->order($orderSQL);
         
-        return $this;
-    }
-    
-    public function setOrder(array $order)
-    {
-        $this->order = $order;
-        return $this;
-    }
+		return $this;
+	}
+    
+	public function setOrder(array $order)
+	{
+		$this->order = $order;
+		return $this;
+	}
 
-    public function isOrderSet()
-    {
-        if (count($this->order == 0)) return FALSE;
-        return TRUE;
-    }
-    
-    public function getOrderQuery(array $getVars)
-    {
-        if (isset($getVars['o']))
-        {
-            $this->orderQuery = $getVars['o'];
-            $match = array();
-            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
-            {
-                $orderArray=array($match[1] => $match[2]);
-                echo "$match[1] => $match[2]";
-                $this->setOrder($orderArray);
-            }
-        }
-    }
-    
-    protected function curOrderQuery()
-    {
-        if ($this->orderQuery == '') return '';
-        return 'o='.$this->orderQuery;
-    }
-    
-    /*****************  Paging and counting *********/
-    
-    public function countQuery()
-    {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query
-            ->from(
-                $this->table,
-                array('COUNT(*)')
-                );
-        $this->applyFilter();                   
-    }
-    
-    public function count()
-    {
-        $this->countQuery();
-        return $this->dbConn->fetchOne($this->query);
-    }
-    
-    public function setMaxPerPage(int $max)
-    {
-        $this->maxPerPage = $max;
-    }
-    
-    protected function getPagingQuery(array $getVars)
-    {
-        if (isset($getVars['page']))
-        {
-            $this->currentPage = $getVars['page'];
-        }
-    }
+	public function isOrderSet()
+	{
+		if (count($this->order == 0)) return FALSE;
+		return TRUE;
+	}
+    
+	public function getOrderQuery(array $getVars)
+	{
+		if (isset($getVars['o']))
+		{
+			$this->orderQuery = $getVars['o'];
+			$match = array();
+			if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
+			{
+				$orderArray=array($match[1] => $match[2]);
+				echo "$match[1] => $match[2]";
+				$this->setOrder($orderArray);
+			}
+		}
+	}
+    
+	protected function curOrderQuery()
+	{
+		if ($this->orderQuery == '') return '';
+		return 'o='.$this->orderQuery;
+	}
+    
+	/*****************  Paging and counting *********/
+    
+	public function countQuery()
+	{
+		$this->query = $this->dbConn->select();
+		$this->query = $this->query
+			->from(
+				$this->table,
+				array('COUNT(*)')
+				);
+		$this->applyFilter();                   
+	}
+    
+	public function count()
+	{
+		$this->countQuery();
+		return $this->dbConn->fetchOne($this->query);
+	}
+    
+	public function setMaxPerPage(int $max)
+	{
+		$this->maxPerPage = $max;
+	}
+    
+	protected function getPagingQuery(array $getVars)
+	{
+		if (isset($getVars['page']))
+		{
+			$this->currentPage = $getVars['page'];
+		}
+	}
 
-    protected function curPagingQuery()
-    {
-        if ($this->currentPage == '') return '';
-        return 'page='.$this->currentPage;
-    }
-    
-    public function renderPagingHeader()
-    {
-        $count = $this->count();
-        if ($count <= $this->maxPerPage )
-        {
-            return  'count : ' . $this->count() . '<br>';
-        }
+	protected function curPagingQuery()
+	{
+		if ($this->currentPage == '') return '';
+		return 'page='.$this->currentPage;
+	}
+    
+	public function renderPagingHeader()
+	{
+		$count = $this->count();
+		if ($count <= $this->maxPerPage )
+		{
+			return  'count : ' . $this->count() . '<br>';
+		}
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+		if ($this->currentPage == 0) $this->currentPage = 1;
         
-        $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+		$numPages = intdiv($count , $this->maxPerPage);
+		if ($count % $this->maxPerPage != 0 ) $numPages++;
         
-        $html = '<div class="pagination-control" role="navigation">';
-        $html .= '<ul class="nav tab-nav">';
-        if ($this->currentPage <=1)
-        {
-            $html .= '
+		$html = '<div class="pagination-control" role="navigation">';
+		$html .= '<ul class="nav tab-nav">';
+		if ($this->currentPage <=1)
+		{
+			$html .= '
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -305,35 +305,35 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
-        {
-            $html .= '
+		}
+		else 
+		{
+			$html .= '
                 <li class="nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage - 1 ).'" class="previous-page" >
                             <i aria-hidden="true" class="icon-angle-double-left"></i>            
                      </a>
                 </li>
             ';
-        }
+		}
         
-        for ($i=1; $i <= $numPages ; $i++)
-        {
-            $active = ($this->currentPage == $i) ? 'active' : '';
-            $first = ($i-1)*$this->maxPerPage+1;
-            $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
-            $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
-            $html .= '<li class="' . $active . ' nav-item">
+		for ($i=1; $i <= $numPages ; $i++)
+		{
+			$active = ($this->currentPage == $i) ? 'active' : '';
+			$first = ($i-1)*$this->maxPerPage+1;
+			$last = $i * $this->maxPerPage;
+			if ($last > $count) $last = $count;
+			$display = 'Show rows '. $first . ' to '. $last .' of '. $count;
+			$html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
                     '.$i.'                
                     </a>
                 </li>';
-        }
+		}
         
-        if ($this->currentPage == $numPages)
-        {
-            $html .= '
+		if ($this->currentPage == $numPages)
+		{
+			$html .= '
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -341,150 +341,150 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
-        {
-            $html .= '
+		}
+		else
+		{
+			$html .= '
                 <li class="nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage + 1 ).'" class="next-page">
                             <i aria-hidden="true" class="icon-angle-double-right"></i>
                      </a>
                 </li>
             ';
-        }
+		}
         
-        $html .= '</ul> </div>';
+		$html .= '</ul> </div>';
         
-        return $html;
-    }
-    
-    public function applyPaging()
-    {
-        $this->query->limitPage($this->currentPage,$this->maxPerPage);
-        return $this;
-    }
-    
-    /*****************  Grouping ****************/
-    
-    public function setGrouping($columnDBName)
-    {
-        $this->groupingColumn = $columnDBName;
-        $this->grouppingActive = TRUE;
-    }
-    
-    public function initGrouping()
-    {
-        $this->groupingVal = '';
-        $this->groupingColSpan = count($this->titles);
-    }
-    
-    public function groupingPrintData( $value)
-    {
-        $html = "$value";
-        return $html;
-    }
-    
-    public function groupingNextLine( $values)
-    {
-        if ($this->grouppingActive === FALSE) return '';
+		return $html;
+	}
+    
+	public function applyPaging()
+	{
+		$this->query->limitPage($this->currentPage,$this->maxPerPage);
+		return $this;
+	}
+    
+	/*****************  Grouping ****************/
+    
+	public function setGrouping($columnDBName)
+	{
+		$this->groupingColumn = $columnDBName;
+		$this->grouppingActive = TRUE;
+	}
+    
+	public function initGrouping()
+	{
+		$this->groupingVal = '';
+		$this->groupingColSpan = count($this->titles);
+	}
+    
+	public function groupingPrintData( $value)
+	{
+		$html = "$value";
+		return $html;
+	}
+    
+	public function groupingNextLine( $values)
+	{
+		if ($this->grouppingActive === FALSE) return '';
         
-        $dbcol = $this->groupingColumn;
-        if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol )
-        {
-            $this->groupingVal = $values->$dbcol;
-            $html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
-            return $html;
-        }
-        return '';
+		$dbcol = $this->groupingColumn;
+		if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol )
+		{
+			$this->groupingVal = $values->$dbcol;
+			$html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
+			return $html;
+		}
+		return '';
         
-    }
-    
-    /*************** Rendering *************************/
-    
-    public function titleOrder($name)
-    {
-        return $this->content[$name];
-    }
-    
-    public function renderTitles()
-    {
-        $html = "<thead>\n<tr>\n";
-        foreach ($this->titles as $name => $values)
-        {
-            $titleOrder = $this->titleOrder($name);
-            if ($titleOrder != NULL)
-            {
-                if (isset($this->order[$titleOrder]))
-                {
-                    if ($this->order[$titleOrder] == 'ASC')
-                    {
-                        $titleOrder.='DESC';
-                    }
-                    else
-                    {
-                        $titleOrder.='ASC';
-                    }
-                }
-                else 
-                {
-                    $titleOrder.='ASC';
-                }
-                $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
-                $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
-            }
-            else 
-            {
-                $html .= '<th>' . $values . '</th>';
-            }          
-        }
-        $html .= "</tr>\n</thead>\n";
-        return $html;
-    }
-    
-    public function renderLine( $value)
-    {
-        $html = '';
-        $titleNames = array_keys($this->titles);
-        foreach ($titleNames as $name )
-        {
-            $html .= '<td>';
-            $html .= $value->$name;
-            $html .= "</td>\n";
-        }
-        return $html;
-    }
-    
-    public function renderTable(array $values)
-    {
-       $html = '<tbody id="obj_table_body">';
-       foreach($values as $value)
-       {
-           $html .= $this->groupingNextLine($value);
+	}
+    
+	/*************** Rendering *************************/
+    
+	public function titleOrder($name)
+	{
+		return $this->content[$name];
+	}
+    
+	public function renderTitles()
+	{
+		$html = "<thead>\n<tr>\n";
+		foreach ($this->titles as $name => $values)
+		{
+			$titleOrder = $this->titleOrder($name);
+			if ($titleOrder != NULL)
+			{
+				if (isset($this->order[$titleOrder]))
+				{
+					if ($this->order[$titleOrder] == 'ASC')
+					{
+						$titleOrder.='DESC';
+					}
+					else
+					{
+						$titleOrder.='ASC';
+					}
+				}
+				else 
+				{
+					$titleOrder.='ASC';
+				}
+				$actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
+				$html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
+			}
+			else 
+			{
+				$html .= '<th>' . $values . '</th>';
+			}          
+		}
+		$html .= "</tr>\n</thead>\n";
+		return $html;
+	}
+    
+	public function renderLine( $value)
+	{
+		$html = '';
+		$titleNames = array_keys($this->titles);
+		foreach ($titleNames as $name )
+		{
+			$html .= '<td>';
+			$html .= $value->$name;
+			$html .= "</td>\n";
+		}
+		return $html;
+	}
+    
+	public function renderTable(array $values)
+	{
+	   $html = '<tbody id="obj_table_body">';
+	   foreach($values as $value)
+	   {
+		   $html .= $this->groupingNextLine($value);
            
-           $html .= "<tr>\n";
-           $html .= $this->renderLine($value);
-           $html .= "</tr>\n";
-       }
-       $html .= '</tbody>';
-       return $html;
-    }
-    
-    public function render()
-    {
-        $html = '';
+		   $html .= "<tr>\n";
+		   $html .= $this->renderLine($value);
+		   $html .= "</tr>\n";
+	   }
+	   $html .= '</tbody>';
+	   return $html;
+	}
+    
+	public function render()
+	{
+		$html = '';
         
         
-        $values = $this->fullQuery();
-        $this->initGrouping();
+		$values = $this->fullQuery();
+		$this->initGrouping();
         
-        $html.="<table class='simple common-table table-row-selectable'>\n";
+		$html.="<table class='simple common-table table-row-selectable'>\n";
         
-        $html .= $this->renderTitles();
-        $html .= $this->renderTable($values);
-        $html .= '</table>'; 
+		$html .= $this->renderTitles();
+		$html .= $this->renderTable($values);
+		$html .= '</table>'; 
         
 
-        return $html;
-    }
+		return $html;
+	}
     
 }
\ No newline at end of file

Spacing +102 added lines, -102 removed lines

@@ -6,16 +6,16 @@ 
 abstract class TrapDirectorTable
 {
     /** @var array $titles table titles (name, display value) */
-    protected $titles = null;
+    protected $titles=null;
 
     /** @var array $content table content  (name, sb column name). name index must be the same as $titles*/
-    protected $content = null;
+    protected $content=null;
     
     /** @var array $columnNames names of columns for filtering */
-    protected $columnNames = array();
+    protected $columnNames=array();
     
     /** @var mixed $dbConn connection to database  */
-    protected $dbConn = null;
+    protected $dbConn=null;
     
     /** Current view **/
     protected $view;
@@ -24,28 +24,28 @@ 
     
     // Database stuff
    /** @var array $table (db ref, name) */
-    protected $table = array();
+    protected $table=array();
     
     /** @var mixed  $query Query in database; */
-    protected $query = null;
+    protected $query=null;
     
     /** @var array $order : (db column, 'ASC' | 'DESC') */
-    protected $order = array();
-    protected $orderQuery = '';
+    protected $order=array();
+    protected $orderQuery='';
     
     /********* Filter ********/
     /** @var string $filterString : string filter for db columns */
-    protected $filterString = '';
+    protected $filterString='';
     
     /** @var array $filterColumn : columns to apply filter to */
-    protected $filterColumn = array();
+    protected $filterColumn=array();
     
     protected $filterQuery='';
     
     /*************** Paging *************/
-    protected $maxPerPage = 25;
+    protected $maxPerPage=25;
     
-    protected $currentPage = 0;
+    protected $currentPage=0;
     
     /*************** Grouping ************/
     protected $grouppingActive=false;
@@ -56,16 +56,16 @@ 
     
     protected $groupingColSpan=1;
     
-    function __construct(array $table,array $titles, array $columns, array $columnNames, $dbConn , $view, $urlPath)
+    function __construct(array $table, array $titles, array $columns, array $columnNames, $dbConn, $view, $urlPath)
     {
-        $this->table = $table;
-        $this->titles = $titles;
-        $this->content = $columns;
-        $this->columnNames = $columnNames;
-        $this->dbConn = $dbConn;
+        $this->table=$table;
+        $this->titles=$titles;
+        $this->content=$columns;
+        $this->columnNames=$columnNames;
+        $this->dbConn=$dbConn;
         
-        $this->view = $view;
-        $this->urlPath = $urlPath;
+        $this->view=$view;
+        $this->urlPath=$urlPath;
         
         return $this;
     }
@@ -86,19 +86,19 @@ 
     
     protected function getCurrentURLAndQS(string $caller)
     {
-        $actionURL = $this->getCurrentURL() . '?' ;
+        $actionURL=$this->getCurrentURL().'?';
         $QSList=array();
         if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+            array_push($QSList, $this->curFilterQuery());
         
         if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+            array_push($QSList, $this->curPagingQuery());
  
         if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+            array_push($QSList, $this->curOrderQuery());
         
         if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+            $actionURL.=implode('&', $QSList).'&';
         
         return $actionURL;
     }
@@ -110,8 +110,8 @@ 
      */
     public function getBaseQuery()
     {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query->from(
+        $this->query=$this->dbConn->select();
+        $this->query=$this->query->from(
             $this->table,
             $this->content
             );
@@ -144,7 +144,7 @@ 
         {
             if ($filter != "") $filter.=' OR ';
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
-            $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
+            $filter.=$column." LIKE '%".$this->filterString."%'";
         }
         //echo $filter;
         
@@ -155,8 +155,8 @@ 
 
     public function setFilter(string $filter, array $filterCol)
     {
-        $this->filterString = $filter;
-        $this->filterColumn = $filterCol;
+        $this->filterString=$filter;
+        $this->filterColumn=$filterCol;
         return $this;
     }
    
@@ -178,7 +178,7 @@ 
     {
         if (isset($getVars['f']))
         {
-            $this->filterQuery = $getVars['f'];
+            $this->filterQuery=$getVars['f'];
             $this->setFilter(html_entity_decode($getVars['f']), $this->columnNames);
         }
     }
@@ -202,16 +202,16 @@ 
         {
             if ($orderSQL != "") $orderSQL.=',';
             
-            $orderSQL .= $column . ' ' . $direction;
+            $orderSQL.=$column.' '.$direction;
         }
-        $this->query = $this->query->order($orderSQL);
+        $this->query=$this->query->order($orderSQL);
         
         return $this;
     }
     
     public function setOrder(array $order)
     {
-        $this->order = $order;
+        $this->order=$order;
         return $this;
     }
 
@@ -225,9 +225,9 @@ 
     {
         if (isset($getVars['o']))
         {
-            $this->orderQuery = $getVars['o'];
-            $match = array();
-            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery , $match))
+            $this->orderQuery=$getVars['o'];
+            $match=array();
+            if (preg_match('/(.*)(ASC|DESC)$/', $this->orderQuery, $match))
             {
                 $orderArray=array($match[1] => $match[2]);
                 echo "$match[1] => $match[2]";
@@ -246,8 +246,8 @@ 
     
     public function countQuery()
     {
-        $this->query = $this->dbConn->select();
-        $this->query = $this->query
+        $this->query=$this->dbConn->select();
+        $this->query=$this->query
             ->from(
                 $this->table,
                 array('COUNT(*)')
@@ -263,14 +263,14 @@ 
     
     public function setMaxPerPage(int $max)
     {
-        $this->maxPerPage = $max;
+        $this->maxPerPage=$max;
     }
     
     protected function getPagingQuery(array $getVars)
     {
         if (isset($getVars['page']))
         {
-            $this->currentPage = $getVars['page'];
+            $this->currentPage=$getVars['page'];
         }
     }
 
@@ -282,22 +282,22 @@ 
     
     public function renderPagingHeader()
     {
-        $count = $this->count();
-        if ($count <= $this->maxPerPage )
+        $count=$this->count();
+        if ($count <= $this->maxPerPage)
         {
-            return  'count : ' . $this->count() . '<br>';
+            return  'count : '.$this->count().'<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) $this->currentPage=1;
         
-        $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        $numPages=intdiv($count, $this->maxPerPage);
+        if ($count % $this->maxPerPage != 0) $numPages++;
         
-        $html = '<div class="pagination-control" role="navigation">';
-        $html .= '<ul class="nav tab-nav">';
-        if ($this->currentPage <=1)
+        $html='<div class="pagination-control" role="navigation">';
+        $html.='<ul class="nav tab-nav">';
+        if ($this->currentPage <= 1)
         {
-            $html .= '
+            $html.='
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -308,24 +308,24 @@ 
         }
         else 
         {
-            $html .= '
+            $html.='
                 <li class="nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage - 1 ).'" class="previous-page" >
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.($this->currentPage - 1).'" class="previous-page" >
                             <i aria-hidden="true" class="icon-angle-double-left"></i>            
                      </a>
                 </li>
             ';
         }
         
-        for ($i=1; $i <= $numPages ; $i++)
+        for ($i=1; $i <= $numPages; $i++)
         {
-            $active = ($this->currentPage == $i) ? 'active' : '';
-            $first = ($i-1)*$this->maxPerPage+1;
-            $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
-            $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
-            $html .= '<li class="' . $active . ' nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
+            $active=($this->currentPage == $i) ? 'active' : '';
+            $first=($i - 1) * $this->maxPerPage + 1;
+            $last=$i * $this->maxPerPage;
+            if ($last > $count) $last=$count;
+            $display='Show rows '.$first.' to '.$last.' of '.$count;
+            $html.='<li class="'.$active.' nav-item">
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.$i.'" title="'.$display.'" aria-label="'.$display.'">
                     '.$i.'                
                     </a>
                 </li>';
@@ -333,7 +333,7 @@ 
         
         if ($this->currentPage == $numPages)
         {
-            $html .= '
+            $html.='
                 <li class="nav-item disabled" aria-hidden="true">
                     <span class="previous-page">
                             <span class="sr-only">Previous page</span>
@@ -344,23 +344,23 @@ 
         }
         else
         {
-            $html .= '
+            $html.='
                 <li class="nav-item">
-                    <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. ($this->currentPage + 1 ).'" class="next-page">
+                    <a href="'. $this->getCurrentURLAndQS('paging').'&page='.($this->currentPage + 1).'" class="next-page">
                             <i aria-hidden="true" class="icon-angle-double-right"></i>
                      </a>
                 </li>
             ';
         }
         
-        $html .= '</ul> </div>';
+        $html.='</ul> </div>';
         
         return $html;
     }
     
     public function applyPaging()
     {
-        $this->query->limitPage($this->currentPage,$this->maxPerPage);
+        $this->query->limitPage($this->currentPage, $this->maxPerPage);
         return $this;
     }
     
@@ -368,31 +368,31 @@ 
     
     public function setGrouping($columnDBName)
     {
-        $this->groupingColumn = $columnDBName;
-        $this->grouppingActive = TRUE;
+        $this->groupingColumn=$columnDBName;
+        $this->grouppingActive=TRUE;
     }
     
     public function initGrouping()
     {
-        $this->groupingVal = '';
-        $this->groupingColSpan = count($this->titles);
+        $this->groupingVal='';
+        $this->groupingColSpan=count($this->titles);
     }
     
-    public function groupingPrintData( $value)
+    public function groupingPrintData($value)
     {
-        $html = "$value";
+        $html="$value";
         return $html;
     }
     
-    public function groupingNextLine( $values)
+    public function groupingNextLine($values)
     {
         if ($this->grouppingActive === FALSE) return '';
         
-        $dbcol = $this->groupingColumn;
-        if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol )
+        $dbcol=$this->groupingColumn;
+        if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol)
         {
-            $this->groupingVal = $values->$dbcol;
-            $html = '<tr><th colspan="'. $this->groupingColSpan .'">'. $this->groupingPrintData($this->groupingVal) .'</th></tr>';
+            $this->groupingVal=$values->$dbcol;
+            $html='<tr><th colspan="'.$this->groupingColSpan.'">'.$this->groupingPrintData($this->groupingVal).'</th></tr>';
             return $html;
         }
         return '';
@@ -408,10 +408,10 @@ 
     
     public function renderTitles()
     {
-        $html = "<thead>\n<tr>\n";
+        $html="<thead>\n<tr>\n";
         foreach ($this->titles as $name => $values)
         {
-            $titleOrder = $this->titleOrder($name);
+            $titleOrder=$this->titleOrder($name);
             if ($titleOrder != NULL)
             {
                 if (isset($this->order[$titleOrder]))
@@ -429,59 +429,59 @@ 
                 {
                     $titleOrder.='ASC';
                 }
-                $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
-                $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
+                $actionURL=$this->getCurrentURLAndQS('order').'o='.$titleOrder;
+                $html.='<th><a href="'.$actionURL.'">'.$values.'</a></th>';
             }
             else 
             {
-                $html .= '<th>' . $values . '</th>';
+                $html.='<th>'.$values.'</th>';
             }          
         }
-        $html .= "</tr>\n</thead>\n";
+        $html.="</tr>\n</thead>\n";
         return $html;
     }
     
-    public function renderLine( $value)
+    public function renderLine($value)
     {
-        $html = '';
-        $titleNames = array_keys($this->titles);
-        foreach ($titleNames as $name )
+        $html='';
+        $titleNames=array_keys($this->titles);
+        foreach ($titleNames as $name)
         {
-            $html .= '<td>';
-            $html .= $value->$name;
-            $html .= "</td>\n";
+            $html.='<td>';
+            $html.=$value->$name;
+            $html.="</td>\n";
         }
         return $html;
     }
     
     public function renderTable(array $values)
     {
-       $html = '<tbody id="obj_table_body">';
-       foreach($values as $value)
+       $html='<tbody id="obj_table_body">';
+       foreach ($values as $value)
        {
-           $html .= $this->groupingNextLine($value);
+           $html.=$this->groupingNextLine($value);
            
-           $html .= "<tr>\n";
-           $html .= $this->renderLine($value);
-           $html .= "</tr>\n";
+           $html.="<tr>\n";
+           $html.=$this->renderLine($value);
+           $html.="</tr>\n";
        }
-       $html .= '</tbody>';
+       $html.='</tbody>';
        return $html;
     }
     
     public function render()
     {
-        $html = '';
+        $html='';
         
         
-        $values = $this->fullQuery();
+        $values=$this->fullQuery();
         $this->initGrouping();
         
         $html.="<table class='simple common-table table-row-selectable'>\n";
         
-        $html .= $this->renderTitles();
-        $html .= $this->renderTable($values);
-        $html .= '</table>'; 
+        $html.=$this->renderTitles();
+        $html.=$this->renderTable($values);
+        $html.='</table>'; 
         
 
         return $html;

Braces +47 added lines, -28 removed lines

@@ -88,17 +88,21 @@ 
     {
         $actionURL = $this->getCurrentURL() . '?' ;
         $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+        if ($caller != 'filter' && $this->curFilterQuery() != '') {
+                    array_push($QSList , $this->curFilterQuery());
+        }
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '') {
+                    array_push($QSList , $this->curPagingQuery());
+        }
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+        if ($caller != 'order' && $this->curOrderQuery() != '') {
+                    array_push($QSList , $this->curOrderQuery());
+        }
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList) . '&';
+        if (count($QSList) != 0) {
+                    $actionURL .=  implode('&', $QSList) . '&';
+        }
         
         return $actionURL;
     }
@@ -142,7 +146,9 @@ 
         $filter='';
         foreach ($this->filterColumn as $column)
         {
-            if ($filter != "") $filter.=' OR ';
+            if ($filter != "") {
+            	$filter.=' OR ';
+            }
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
             $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
         }
@@ -185,7 +191,9 @@ 
     
     protected function curFilterQuery()
     {
-        if ($this->filterQuery == '') return '';
+        if ($this->filterQuery == '') {
+        	return '';
+        }
         return 'f='.$this->filterQuery;
     }
     
@@ -200,7 +208,9 @@ 
         $orderSQL='';
         foreach ($this->order as $column => $direction)
         {
-            if ($orderSQL != "") $orderSQL.=',';
+            if ($orderSQL != "") {
+            	$orderSQL.=',';
+            }
             
             $orderSQL .= $column . ' ' . $direction;
         }
@@ -217,7 +227,9 @@ 
 
     public function isOrderSet()
     {
-        if (count($this->order == 0)) return FALSE;
+        if (count($this->order == 0)) {
+        	return FALSE;
+        }
         return TRUE;
     }
     
@@ -238,7 +250,9 @@ 
     
     protected function curOrderQuery()
     {
-        if ($this->orderQuery == '') return '';
+        if ($this->orderQuery == '') {
+        	return '';
+        }
         return 'o='.$this->orderQuery;
     }
     
@@ -276,7 +290,9 @@ 
 
     protected function curPagingQuery()
     {
-        if ($this->currentPage == '') return '';
+        if ($this->currentPage == '') {
+        	return '';
+        }
         return 'page='.$this->currentPage;
     }
     
@@ -288,10 +304,14 @@ 
             return  'count : ' . $this->count() . '<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) {
+        	$this->currentPage = 1;
+        }
         
         $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        if ($count % $this->maxPerPage != 0 ) {
+        	$numPages++;
+        }
         
         $html = '<div class="pagination-control" role="navigation">';
         $html .= '<ul class="nav tab-nav">';
@@ -305,8 +325,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
+        } else 
         {
             $html .= '
                 <li class="nav-item">
@@ -322,7 +341,9 @@ 
             $active = ($this->currentPage == $i) ? 'active' : '';
             $first = ($i-1)*$this->maxPerPage+1;
             $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
+            if ($last > $count) {
+            	$last = $count;
+            }
             $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
             $html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
@@ -341,8 +362,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
+        } else
         {
             $html .= '
                 <li class="nav-item">
@@ -386,7 +406,9 @@ 
     
     public function groupingNextLine( $values)
     {
-        if ($this->grouppingActive === FALSE) return '';
+        if ($this->grouppingActive === FALSE) {
+        	return '';
+        }
         
         $dbcol = $this->groupingColumn;
         if ($this->groupingVal == '' || $this->groupingVal != $values->$dbcol )
@@ -419,20 +441,17 @@ 
                     if ($this->order[$titleOrder] == 'ASC')
                     {
                         $titleOrder.='DESC';
-                    }
-                    else
+                    } else
                     {
                         $titleOrder.='ASC';
                     }
-                }
-                else 
+                } else 
                 {
                     $titleOrder.='ASC';
                 }
                 $actionURL = $this->getCurrentURLAndQS('order').'o='.$titleOrder;
                 $html .= '<th><a href="'.$actionURL.'">' . $values . '</a></th>';
-            }
-            else 
+            } else 
             {
                 $html .= '<th>' . $values . '</th>';
             }          

library/Trapdirector/Config/TrapModuleConfig.php

Indentation +35 added lines, -35 removed lines

@@ -4,18 +4,18 @@ 
 
 class TrapModuleConfig
 {
-    /********** Database configuration ***********************/
+	/********** Database configuration ***********************/
 	// Database prefix for tables 
-    protected $table_prefix; //< Database prefix for tables 	
+	protected $table_prefix; //< Database prefix for tables 	
 	protected $DBConfigDefaults=array(
 		'db_remove_days' => 60, // number of days before removing traps
 		'log_destination' => 'syslog', // Log destination for trap handler
 		'log_file' => '/tmp/trapdirector.log', // Log file
 		'log_level' => 2, // log level
 		'use_SnmpTrapAddess' => 1, // use SnmpTrapAddress by default
-	    'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
-	    'max_rows_in_list' => 5, // Max rows displayed in table before paging
-	    'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
+		'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
+		'max_rows_in_list' => 5, // Max rows displayed in table before paging
+		'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
 	);
 	// get default values for dbconfig
 	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
@@ -122,27 +122,27 @@ 
 	// Note : must have 'source_ip' and 'last_sent'
 	public function getTrapHostListDisplayColumns()
 	{
-	    return array(
-	        'source_name'  =>  't.source_name',
-	        'source_ip'    =>  't.source_ip',
-	        'trap_oid'     =>  't.trap_oid',
-	        'count'        =>  'count(*)',
-	        'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
-	    );
+		return array(
+			'source_name'  =>  't.source_name',
+			'source_ip'    =>  't.source_ip',
+			'trap_oid'     =>  't.trap_oid',
+			'count'        =>  'count(*)',
+			'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
+		);
 	}
 
 	public function getTrapHostListSearchColumns()
 	{
-	    return array(); // No search needed on this table
+		return array(); // No search needed on this table
 	}
 	// Titles display in Trap List table
 	public function getTrapHostListTitles()
 	{
-	    return array(
-	        'trap_oid'		=> 'Trap OID',
-	        'count'		    => 'Number of traps received',
-	        'last_sent'     => 'Last trap received'
-	    );
+		return array(
+			'trap_oid'		=> 'Trap OID',
+			'count'		    => 'Number of traps received',
+			'last_sent'     => 'Last trap received'
+		);
 	}
 	
 	
@@ -157,13 +157,13 @@ 
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
 			'rule'			=> 'r.rule',
-		    'comment'	    => 'r.comment',
-		    'category'	    => 'r.rule_type',
+			'comment'	    => 'r.comment',
+			'category'	    => 'r.rule_type',
 			'action_match'	=> 'r.action_match',
 			'action_nomatch'=> 'r.action_nomatch',
 			'service_name'	=> 'r.service_name',
 			'num_match'		=> 'r.num_match',
-		    'rule_type'     => 'r.rule_type',
+			'rule_type'     => 'r.rule_type',
 			'id'           	=> 'r.id'
 		);
 	}
@@ -184,17 +184,17 @@ 
 	}
 	public function getHandlerColumns()
 	{
-	    return array(
-	        'r.host_name', 'r.host_group_name',
-	        'r.ip4', 'r.ip6',
-	        'r.trap_oid',
-	        'r.rule',
-	        'r.action_match',
-	        'r.action_nomatch',
-	        'r.service_name',
-	        'r.num_match',
-	        'r.id'
-	    );
+		return array(
+			'r.host_name', 'r.host_group_name',
+			'r.ip4', 'r.ip6',
+			'r.trap_oid',
+			'r.rule',
+			'r.action_match',
+			'r.action_nomatch',
+			'r.service_name',
+			'r.num_match',
+			'r.id'
+		);
 	}
 
 	// handler update (<key> => <sql select>)
@@ -214,9 +214,9 @@ 
 			'revert_ok'		=> 'r.revert_ok',
 			'display'		=> 'r.display',
 			'modified'		=> 'UNIX_TIMESTAMP(r.modified)',
-            'modifier'		=> 'r.modifier',
-		    'comment'       => 'r.comment',
-		    'category'      => 'r.rule_type'
+			'modifier'		=> 'r.modifier',
+			'comment'       => 'r.comment',
+			'category'      => 'r.rule_type'
 		);
 	}	
 		

Spacing +31 added lines, -31 removed lines

@@ -18,27 +18,27 @@ 
 	    'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> ....
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	/** Minimum DB version
 	 * @return number
 	 */
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	/** Current DB version
 	 * @return number
 	 */
-	static public function getDbCurVersion() { return 2;}
+	static public function getDbCurVersion() { return 2; }
 
 	/************ Module configuration **********************/
 	// Module base path
 	static public function urlPath() { return 'trapdirector'; }
-	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service" , "actions/process-check-result"); } //< api user permissions required
+	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service", "actions/process-check-result"); } //< api user permissions required
 	
 	
 	/*********** Log configuration *************************/
 	protected $logLevels=array(0=>'No output', 1=>'critical', 2=>'warning', 3=>'trace', 4=>'ALL');
-	public function getlogLevels() { return $this->logLevels;}
-	protected $logDestinations=array('syslog'=>'syslog','file'=>'file','display'=>'display');
-	public function getLogDestinations() { return $this->logDestinations;}
+	public function getlogLevels() { return $this->logLevels; }
+	protected $logDestinations=array('syslog'=>'syslog', 'file'=>'file', 'display'=>'display');
+	public function getLogDestinations() { return $this->logDestinations; }
 	
 	function __construct($prefix)
 	{
@@ -49,29 +49,29 @@ 
 	// DB table name of trap received list : prefix 't'
 	public function getTrapTableName() 
 	{ 
-		return array('t' => $this->table_prefix . 'received'); 
+		return array('t' => $this->table_prefix.'received'); 
 	}
 	// DB table name of trap data  list : prefix 'd'
 	public function getTrapDataTableName() 
 	{ 
-		return array('d' => $this->table_prefix . 'received_data'); 
+		return array('d' => $this->table_prefix.'received_data'); 
 	}	
 
 	// DB table name of rules : prefix 'r'
 	public function getTrapRuleName() 
 	{ 
-		return array('r' => $this->table_prefix . 'rules'); 
+		return array('r' => $this->table_prefix.'rules'); 
 	}		
 	
 	// DB table name of db config : prefix 'c'
 	public function getDbConfigTableName() 
 	{ 
-		return array('c' => $this->table_prefix . 'db_config');
+		return array('c' => $this->table_prefix.'db_config');
 	}
 	
 	// Mib cache tables
-	public function getMIBCacheTableName() { return $this->table_prefix . 'mib_cache'; }
-	public function getMIBCacheTableTrapObjName() { return $this->table_prefix . 'mib_cache_trap_object'; }
+	public function getMIBCacheTableName() { return $this->table_prefix.'mib_cache'; }
+	public function getMIBCacheTableTrapObjName() { return $this->table_prefix.'mib_cache_trap_object'; }
 	
 	
 	/****************** Database queries *******************/
@@ -152,7 +152,7 @@ 
 	public function getHandlerListDisplayColumns()
 	{
 		return array(
-			'host_name'		=> 'r.host_name',//'UNIX_TIMESTAMP(t.date_received)',
+			'host_name'		=> 'r.host_name', //'UNIX_TIMESTAMP(t.date_received)',
 			'host_group_name'=> 'r.host_group_name',
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
@@ -224,32 +224,32 @@ 
 	public function trapDetailQuery()
 	{
 		return array(
-			'timestamp'			=> array('Date','UNIX_TIMESTAMP(t.date_received)'),
-			'source_ip'			=> array('Source IP','t.source_ip'),
-			'source_name'		=> array('Source name','t.source_name'),
-			'source_port'		=> array('Source port','t.source_port'),
-			'destination_ip'	=> array('Destination IP','t.destination_ip'),
-			'destination_port'	=> array('Destination port','t.destination_port'),			
-			'trap_oid'			=> array('Numeric OID','t.trap_oid'),
-			'trap_name'			=> array('Trap name','t.trap_name'),
-			'trap_name_mib'		=> array('Trap MIB','t.trap_name_mib'),
-			'status'			=> array('Processing status','t.status'),
-			'status_detail'		=> array('Status details','t.status_detail'),
-			'process_time'		=> array('Trap processing time','t.process_time'),			
+			'timestamp'			=> array('Date', 'UNIX_TIMESTAMP(t.date_received)'),
+			'source_ip'			=> array('Source IP', 't.source_ip'),
+			'source_name'		=> array('Source name', 't.source_name'),
+			'source_port'		=> array('Source port', 't.source_port'),
+			'destination_ip'	=> array('Destination IP', 't.destination_ip'),
+			'destination_port'	=> array('Destination port', 't.destination_port'),			
+			'trap_oid'			=> array('Numeric OID', 't.trap_oid'),
+			'trap_name'			=> array('Trap name', 't.trap_name'),
+			'trap_name_mib'		=> array('Trap MIB', 't.trap_name_mib'),
+			'status'			=> array('Processing status', 't.status'),
+			'status_detail'		=> array('Status details', 't.status_detail'),
+			'process_time'		=> array('Trap processing time', 't.process_time'),			
 		);
 	}
 	// Trap detail : additional data (<key> => <title> <sql select>)
 	public function trapDataDetailQuery()
 	{
 		return array(
-			'oid'				=> array('Numeric OID','d.oid'),
-			'oid_name'			=> array('Text OID','d.oid_name'),
-			'oid_name_mib'		=> array('MIB','d.oid_name_mib'),
-			'value'				=> array('Value','d.value'),
+			'oid'				=> array('Numeric OID', 'd.oid'),
+			'oid_name'			=> array('Text OID', 'd.oid_name'),
+			'oid_name_mib'		=> array('MIB', 'd.oid_name_mib'),
+			'value'				=> array('Value', 'd.value'),
 		);
 	}
 	// foreign key of trap data table
-	public function trapDataFK() { return 'trap_id';}
+	public function trapDataFK() { return 'trap_id'; }
 	
 	// Max items in a list OBSOLETE TODO : remove after all tables moved to trapdirectorTable
 	public function itemListDisplay() { return 25; }

library/Trapdirector/TrapsController.php

Indentation +103 added lines, -103 removed lines

@@ -47,8 +47,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -80,12 +80,12 @@ 
 	 */
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	/**
@@ -106,12 +106,12 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 
 	/**
@@ -120,34 +120,34 @@ 
 	 */
 	public function getIdoConn()
 	{
-	    if ($this->icingaAPI === NULL)
-	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
-    	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test(NULL);
-    	    if ($ret === TRUE)
-    	    {
-    	        return $this->getUIDatabase();
-    	    }
+		if ($this->icingaAPI === NULL)
+		{
+			$host = $this->Config()->get('config', 'icingaAPI_host');
+			$port = $this->Config()->get('config', 'icingaAPI_port');
+			$user = $this->Config()->get('config', 'icingaAPI_user');
+			$pass = $this->Config()->get('config', 'icingaAPI_password');
+			$this->icingaAPI = new Icinga2API($host,$port);
+			$this->icingaAPI->setCredentials($user, $pass);
+			list($ret,$message) = $this->icingaAPI->test(NULL);
+			if ($ret === TRUE)
+			{
+				return $this->getUIDatabase();
+			}
     	    
-	    }
-	    return $this->icingaAPI;
+		}
+		return $this->icingaAPI;
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -156,33 +156,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -202,18 +202,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -223,13 +223,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{
@@ -242,72 +242,72 @@ 
 
 	/************************ UI elements **************************/
 	
-    /**
-     * get max rows to display before paging.
-     * @return number
-     */
+	/**
+	 * get max rows to display before paging.
+	 * @return number
+	 */
 	public function itemListDisplay()
 	{
-	    return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
+		return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
 	}
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+		return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
 	}
 	
-    /**
-     * get Handlers categories list (index => textvalue).
-     * @return array
-     */	
+	/**
+	 * get Handlers categories list (index => textvalue).
+	 * @return array
+	 */	
 	public function getHandlersCategory()
 	{
-	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
-	    $retArray=array();
-	    foreach ($catListArray as $category)
-	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
-	    }
-	    return $retArray; 
+		//<index>:<name>!<index>:<name>
+		$catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
+		$catListArray=explode('!',$catList);
+		$retArray=array();
+		foreach ($catListArray as $category)
+		{
+			$catArray=explode(':',$category);
+			$retArray[$catArray[0]] = $catArray[1];
+		}
+		return $retArray; 
 	}
 
 	public function setHandlerCategory(array $catArray)
 	{
-	    $catString='';
-	    foreach ($catArray as $index => $value)
-	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
-	    }
-	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
+		$catString='';
+		foreach ($catArray as $index => $value)
+		{
+			if ($catString != '' ) $catString .= '!';
+			$catString .= $index . ':' . $value;
+		}
+		$this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$i=1;
+		while (isset($catArray[$i]) && $i < 100) $i++;
+		if ($i == 100) throw new ProgrammingError('Category array error');
+		$catArray[$i] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    unset($catArray[$catIndex]);
-	    $this->setHandlerCategory($catArray);
-	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
+		$catArray = $this->getHandlersCategory();
+		unset($catArray[$catIndex]);
+		$this->setHandlerCategory($catArray);
+		$this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
 	}
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$catArray[$catIndex] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 }

Spacing +39 added lines, -39 removed lines

@@ -42,7 +42,7 @@ 
 	/** @var UIDatabase $UIDatabase */
 	protected $UIDatabase;
 	/** @var Icinga2Api $IcingaAPI */
-	protected $icingaAPI = NULL;
+	protected $icingaAPI=NULL;
 	
 	
 	
@@ -58,7 +58,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -69,7 +69,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -82,7 +82,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -95,7 +95,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -108,7 +108,7 @@ 
 	{
 	    if ($this->UIDatabase == Null)
 	    {
-	        $this->UIDatabase = new UIDatabase($this);
+	        $this->UIDatabase=new UIDatabase($this);
 	       
 	    }
 	    return $this->UIDatabase;
@@ -122,13 +122,13 @@ 
 	{
 	    if ($this->icingaAPI === NULL)
 	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
+    	    $host=$this->Config()->get('config', 'icingaAPI_host');
+    	    $port=$this->Config()->get('config', 'icingaAPI_port');
+    	    $user=$this->Config()->get('config', 'icingaAPI_user');
+    	    $pass=$this->Config()->get('config', 'icingaAPI_password');
+    	    $this->icingaAPI=new Icinga2API($host, $port);
     	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test(NULL);
+    	    list($ret, $message)=$this->icingaAPI->test(NULL);
     	    if ($ret === TRUE)
     	    {
     	        return $this->getUIDatabase();
@@ -139,32 +139,32 @@ 
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -175,10 +175,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -190,10 +190,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -208,7 +208,7 @@ 
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
@@ -228,10 +228,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}
@@ -253,7 +253,7 @@ 
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list', $maxRows);
 	}
 	
     /**
@@ -263,13 +263,13 @@ 
 	public function getHandlersCategory()
 	{
 	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
+	    $catList=$this->getUIDatabase()->getDBConfigValue('handler_categories');
+	    $catListArray=explode('!', $catList);
 	    $retArray=array();
 	    foreach ($catListArray as $category)
 	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
+	        $catArray=explode(':', $category);
+	        $retArray[$catArray[0]]=$catArray[1];
 	    }
 	    return $retArray; 
 	}
@@ -279,25 +279,25 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
+	        if ($catString != '') $catString.='!';
+	        $catString.=$index.':'.$value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    $i=1;
 	    while (isset($catArray[$i]) && $i < 100) $i++;
 	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
+	    $catArray[$i]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    unset($catArray[$catIndex]);
 	    $this->setHandlerCategory($catArray);
 	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
@@ -305,8 +305,8 @@ 
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
+	    $catArray=$this->getHandlersCategory();
+	    $catArray[$catIndex]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}
 	

Braces +12 added lines, -4 removed lines

@@ -209,7 +209,9 @@ 
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
@@ -279,7 +281,9 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
+	        if ($catString != '' ) {
+	        	$catString .= '!';
+	        }
 	        $catString .= $index . ':' . $value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
@@ -289,8 +293,12 @@ 
 	{
 	    $catArray = $this->getHandlersCategory();
 	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
+	    while (isset($catArray[$i]) && $i < 100) {
+	    	$i++;
+	    }
+	    if ($i == 100) {
+	    	throw new ProgrammingError('Category array error');
+	    }
 	    $catArray[$i] = $catName;
 	    $this->setHandlerCategory($catArray);
 	}

library/Trapdirector/TrapsActions/TrapDBQuery.php

Indentation +209 added lines, -209 removed lines

@@ -20,245 +20,245 @@
 trait TrapDBQuery
 {
     
-    /** @return TrapsController */
-    abstract protected function getTrapCtrl();
+	/** @return TrapsController */
+	abstract protected function getTrapCtrl();
 
-    /** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
-    abstract public function getDbConn();
+	/** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
+	abstract public function getDbConn();
     
-    /** Add handler rule in traps DB
-     *	@param array $params : array(<db item>=><value>)
-     *	@return int inserted id
-     */
-    public function addHandlerRule($params)
-    {
-        // TODO Check for rule consistency
+	/** Add handler rule in traps DB
+	 *	@param array $params : array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
+	public function addHandlerRule($params)
+	{
+		// TODO Check for rule consistency
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // Add last modified date = creation date and username
-        $params['created'] = new Zend_Db_Expr('NOW()');
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// Add last modified date = creation date and username
+		$params['created'] = new Zend_Db_Expr('NOW()');
+		$params['modified'] = new 	Zend_Db_Expr('NOW()');
+		$params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
-        $query=$dbConn->insert(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            $params
-            );
-        if($query==false)
-        {
-            return null;
-        }
-        return $dbConn->lastInsertId();
-    }
+		$query=$dbConn->insert(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			$params
+			);
+		if($query==false)
+		{
+			return null;
+		}
+		return $dbConn->lastInsertId();
+	}
     
-    /** Update handler rule in traps DB
-     *	@param array $params : (<db item>=><value>)
-     *   @param integer $ruleID : rule id in db
-     *	@return array affected rows
-     */
-    public function updateHandlerRule($params,$ruleID)
-    {
-        // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // Add last modified date = creation date and username
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+	/** Update handler rule in traps DB
+	 *	@param array $params : (<db item>=><value>)
+	 *   @param integer $ruleID : rule id in db
+	 *	@return array affected rows
+	 */
+	public function updateHandlerRule($params,$ruleID)
+	{
+		// TODO Check for rule consistency
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// Add last modified date = creation date and username
+		$params['modified'] = new 	Zend_Db_Expr('NOW()');
+		$params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
-        $numRows=$dbConn->update(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            $params,
-            'id='.$ruleID
-            );
-        return $numRows;
-    }
+		$numRows=$dbConn->update(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			$params,
+			'id='.$ruleID
+			);
+		return $numRows;
+	}
     
-    /**
-     * ON category removal, put back cat to 0 on handlers with this category.
-     * @param int $catIndex
-     * @throws \ErrorException
-     * @return number
-     */
-    public function updateHandlersOnCategoryDelete($catIndex)
-    {
-        // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/**
+	 * ON category removal, put back cat to 0 on handlers with this category.
+	 * @param int $catIndex
+	 * @throws \ErrorException
+	 * @return number
+	 */
+	public function updateHandlersOnCategoryDelete($catIndex)
+	{
+		// TODO Check for rule consistency
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $numRows=$dbConn->update(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            array('rule_type' => 0),
-            'rule_type='.$catIndex
-            );
-        return $numRows;
-    }
+		$numRows=$dbConn->update(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			array('rule_type' => 0),
+			'rule_type='.$catIndex
+			);
+		return $numRows;
+	}
     
-    /** Delete rule by id
-     *	@param int $ruleID rule id
-     */
-    public function deleteRule($ruleID)
-    {
-        if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
+	/** Delete rule by id
+	 *	@param int $ruleID rule id
+	 */
+	public function deleteRule($ruleID)
+	{
+		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->delete(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            'id='.$ruleID
-            );
-        return $query;
-    }
+		$query=$dbConn->delete(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			'id='.$ruleID
+			);
+		return $query;
+	}
 
-    /**
-     * Get last trap rule table modification
-     * @throws \ErrorException
-     * @return Zend_Db_Select
-     */
-    public function lastModification()
-    {
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/**
+	 * Get last trap rule table modification
+	 * @throws \ErrorException
+	 * @return Zend_Db_Select
+	 */
+	public function lastModification()
+	{
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query = $dbConn->select()
-        ->from(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
-        $returnRow=$dbConn->fetchRow($query);
-        return $returnRow->lastmodified;
-    }
+		$query = $dbConn->select()
+		->from(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
+		$returnRow=$dbConn->fetchRow($query);
+		return $returnRow->lastmodified;
+	}
     
-    /** Delete trap by ip & oid
-     *	@param $ipAddr string source IP (v4 or v6)
-     *	@param $oid string oid
-     */
-    public function deleteTrap($ipAddr,$oid)
-    {
+	/** Delete trap by ip & oid
+	 *	@param $ipAddr string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
+	public function deleteTrap($ipAddr,$oid)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $condition=null;
-        if ($ipAddr != null)
-        {
-            $condition="source_ip='$ipAddr'";
-        }
-        if ($oid != null)
-        {
-            $condition=($condition===null)?'':$condition.' AND ';
-            $condition.="trap_oid='$oid'";
-        }
-        if($condition === null) return null;
-        $query=$dbConn->delete(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
-            $condition
-            );
-        // TODO test ret code etc...
-        return $query;
-    }
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$condition=null;
+		if ($ipAddr != null)
+		{
+			$condition="source_ip='$ipAddr'";
+		}
+		if ($oid != null)
+		{
+			$condition=($condition===null)?'':$condition.' AND ';
+			$condition.="trap_oid='$oid'";
+		}
+		if($condition === null) return null;
+		$query=$dbConn->delete(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
+			$condition
+			);
+		// TODO test ret code etc...
+		return $query;
+	}
     
     
-    /** count trap by ip & oid
-     *	@param $ipAddr string source IP (v4 or v6)
-     *	@param $oid string oid
-     */
-    public function countTrap($ipAddr,$oid)
-    {
+	/** count trap by ip & oid
+	 *	@param $ipAddr string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
+	public function countTrap($ipAddr,$oid)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $condition=null;
-        if ($ipAddr != null)
-        {
-            $condition="source_ip='$ipAddr'";
-        }
-        if ($oid != null)
-        {
-            $condition=($condition===null)?'':$condition.' AND ';
-            $condition.="trap_oid='$oid'";
-        }
-        if($condition === null) return 0;
-        $query=$dbConn->select()
-            ->from(
-                $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
-                array('num'=>'count(*)'))
-            ->where($condition);
-        $returnRow=$dbConn->fetchRow($query);
-        return $returnRow->num;
-    }
+		$condition=null;
+		if ($ipAddr != null)
+		{
+			$condition="source_ip='$ipAddr'";
+		}
+		if ($oid != null)
+		{
+			$condition=($condition===null)?'':$condition.' AND ';
+			$condition.="trap_oid='$oid'";
+		}
+		if($condition === null) return 0;
+		$query=$dbConn->select()
+			->from(
+				$this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
+				array('num'=>'count(*)'))
+			->where($condition);
+		$returnRow=$dbConn->fetchRow($query);
+		return $returnRow->num;
+	}
     
-    /** get configuration value
-     *	@param string $element : configuration name in db
-     */
-    public function getDBConfigValue($element)
-    {
+	/** get configuration value
+	 *	@param string $element : configuration name in db
+	 */
+	public function getDBConfigValue($element)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->select()
-        ->from(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array('value'=>'value'))
-            ->where('name=?',$element);
-            $returnRow=$dbConn->fetchRow($query);
-            if ($returnRow==null)  // value does not exists
-            {
-                $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
+		$query=$dbConn->select()
+		->from(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array('value'=>'value'))
+			->where('name=?',$element);
+			$returnRow=$dbConn->fetchRow($query);
+			if ($returnRow==null)  // value does not exists
+			{
+				$default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
+				if ( ! isset($default[$element])) return null; // no default and not value
                 
-                $this->addDBConfigValue($element,$default[$element]);
-                return $default[$element];
-            }
-            if ($returnRow->value == null) // value id empty
-            {
-                $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
-                $this->setDBConfigValue($element,$default[$element]);
-                return $default[$element];
-            }
-            return $returnRow->value;
-    }
+				$this->addDBConfigValue($element,$default[$element]);
+				return $default[$element];
+			}
+			if ($returnRow->value == null) // value id empty
+			{
+				$default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
+				if ( ! isset($default[$element])) return null; // no default and not value
+				$this->setDBConfigValue($element,$default[$element]);
+				return $default[$element];
+			}
+			return $returnRow->value;
+	}
     
-    /** add configuration value
-     *	@param string $element : name of config element
-     *   @param string $value : value
-     */
+	/** add configuration value
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
     
-    public function addDBConfigValue($element,$value)
-    {
+	public function addDBConfigValue($element,$value)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->insert(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array(
-                'name' => $element,
-                'value'=>$value
-            )
-            );
-        return $query;
-    }
+		$query=$dbConn->insert(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array(
+				'name' => $element,
+				'value'=>$value
+			)
+			);
+		return $query;
+	}
     
-    /** set configuration value
-     *	@param string $element : name of config element
-     *   @param string $value : value
-     */
-    public function setDBConfigValue($element,$value)
-    {
+	/** set configuration value
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
+	public function setDBConfigValue($element,$value)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->update(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array('value'=>$value),
-            'name=\''.$element.'\''
-            );
-        return $query;
-    }
+		$query=$dbConn->update(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array('value'=>$value),
+			'name=\''.$element.'\''
+			);
+		return $query;
+	}
     
     
 }
\ No newline at end of file

Spacing +33 added lines, -33 removed lines

@@ -34,18 +34,18 @@ 
     {
         // TODO Check for rule consistency
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // Add last modified date = creation date and username
-        $params['created'] = new Zend_Db_Expr('NOW()');
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+        $params['created']=new Zend_Db_Expr('NOW()');
+        $params['modified']=new 	Zend_Db_Expr('NOW()');
+        $params['modifier']=$this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
         $query=$dbConn->insert(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
             $params
             );
-        if($query==false)
+        if ($query == false)
         {
             return null;
         }
@@ -57,14 +57,14 @@ 
      *   @param integer $ruleID : rule id in db
      *	@return array affected rows
      */
-    public function updateHandlerRule($params,$ruleID)
+    public function updateHandlerRule($params, $ruleID)
     {
         // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // Add last modified date = creation date and username
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+        $params['modified']=new 	Zend_Db_Expr('NOW()');
+        $params['modifier']=$this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
         $numRows=$dbConn->update(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
@@ -83,7 +83,7 @@ 
     public function updateHandlersOnCategoryDelete($catIndex)
     {
         // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $numRows=$dbConn->update(
@@ -99,9 +99,9 @@ 
      */
     public function deleteRule($ruleID)
     {
-        if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
+        if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->delete(
@@ -118,10 +118,10 @@ 
      */
     public function lastModification()
     {
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query = $dbConn->select()
+        $query=$dbConn->select()
         ->from(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
             array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
@@ -133,10 +133,10 @@ 
      *	@param $ipAddr string source IP (v4 or v6)
      *	@param $oid string oid
      */
-    public function deleteTrap($ipAddr,$oid)
+    public function deleteTrap($ipAddr, $oid)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $condition=null;
         if ($ipAddr != null)
@@ -145,10 +145,10 @@ 
         }
         if ($oid != null)
         {
-            $condition=($condition===null)?'':$condition.' AND ';
+            $condition=($condition === null) ? '' : $condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return null;
+        if ($condition === null) return null;
         $query=$dbConn->delete(
             $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
             $condition
@@ -162,10 +162,10 @@ 
      *	@param $ipAddr string source IP (v4 or v6)
      *	@param $oid string oid
      */
-    public function countTrap($ipAddr,$oid)
+    public function countTrap($ipAddr, $oid)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $condition=null;
@@ -175,10 +175,10 @@ 
         }
         if ($oid != null)
         {
-            $condition=($condition===null)?'':$condition.' AND ';
+            $condition=($condition === null) ? '' : $condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return 0;
+        if ($condition === null) return 0;
         $query=$dbConn->select()
             ->from(
                 $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
@@ -194,28 +194,28 @@ 
     public function getDBConfigValue($element)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->select()
         ->from(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
             array('value'=>'value'))
-            ->where('name=?',$element);
+            ->where('name=?', $element);
             $returnRow=$dbConn->fetchRow($query);
-            if ($returnRow==null)  // value does not exists
+            if ($returnRow == null)  // value does not exists
             {
                 $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
+                if (!isset($default[$element])) return null; // no default and not value
                 
-                $this->addDBConfigValue($element,$default[$element]);
+                $this->addDBConfigValue($element, $default[$element]);
                 return $default[$element];
             }
             if ($returnRow->value == null) // value id empty
             {
                 $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
-                $this->setDBConfigValue($element,$default[$element]);
+                if (!isset($default[$element])) return null; // no default and not value
+                $this->setDBConfigValue($element, $default[$element]);
                 return $default[$element];
             }
             return $returnRow->value;
@@ -226,10 +226,10 @@ 
      *   @param string $value : value
      */
     
-    public function addDBConfigValue($element,$value)
+    public function addDBConfigValue($element, $value)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->insert(
@@ -246,10 +246,10 @@ 
      *	@param string $element : name of config element
      *   @param string $value : value
      */
-    public function setDBConfigValue($element,$value)
+    public function setDBConfigValue($element, $value)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->update(

Braces +50 added lines, -16 removed lines

@@ -35,7 +35,9 @@ 
         // TODO Check for rule consistency
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         // Add last modified date = creation date and username
         $params['created'] = new Zend_Db_Expr('NOW()');
         $params['modified'] = new 	Zend_Db_Expr('NOW()');
@@ -61,7 +63,9 @@ 
     {
         // TODO Check for rule consistency
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         // Add last modified date = creation date and username
         $params['modified'] = new 	Zend_Db_Expr('NOW()');
         $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
@@ -84,7 +88,9 @@ 
     {
         // TODO Check for rule consistency
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $numRows=$dbConn->update(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
@@ -102,7 +108,9 @@ 
         if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->delete(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
@@ -119,7 +127,9 @@ 
     public function lastModification()
     {
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query = $dbConn->select()
         ->from(
@@ -137,7 +147,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $condition=null;
         if ($ipAddr != null)
         {
@@ -148,7 +160,9 @@ 
             $condition=($condition===null)?'':$condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return null;
+        if($condition === null) {
+        	return null;
+        }
         $query=$dbConn->delete(
             $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
             $condition
@@ -166,7 +180,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $condition=null;
         if ($ipAddr != null)
@@ -178,7 +194,9 @@ 
             $condition=($condition===null)?'':$condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return 0;
+        if($condition === null) {
+        	return 0;
+        }
         $query=$dbConn->select()
             ->from(
                 $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
@@ -195,7 +213,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->select()
         ->from(
@@ -203,18 +223,28 @@ 
             array('value'=>'value'))
             ->where('name=?',$element);
             $returnRow=$dbConn->fetchRow($query);
-            if ($returnRow==null)  // value does not exists
+            if ($returnRow==null) {
+            	// value does not exists
             {
                 $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
+            }
+                if ( ! isset($default[$element])) {
+                	return null;
+                }
+                // no default and not value
                 
                 $this->addDBConfigValue($element,$default[$element]);
                 return $default[$element];
             }
-            if ($returnRow->value == null) // value id empty
+            if ($returnRow->value == null) {
+            	// value id empty
             {
                 $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
+            }
+                if ( ! isset($default[$element])) {
+                	return null;
+                }
+                // no default and not value
                 $this->setDBConfigValue($element,$default[$element]);
                 return $default[$element];
             }
@@ -230,7 +260,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->insert(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
@@ -250,7 +282,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->update(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),

application/controllers/StatusController.php

Indentation +146 added lines, -146 removed lines

@@ -21,8 +21,8 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -51,7 +51,7 @@ 
 		
 		try
 		{		
-		    $this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
+			$this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
 			$this->view->logDestinations=$this->getModuleConfig()->getLogDestinations();
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
@@ -65,23 +65,23 @@ 
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
-		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+			$this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+			$this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
+			$this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status',$e->getMessage());
 		}		
 		
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -100,22 +100,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -123,7 +123,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -131,32 +131,32 @@ 
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
+				$name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
 				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
-				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
+					$this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
 				}
 				else
 				{
-				    if (!is_writable($destDir))
-				    {
-				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
-				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
-    				    {
-    				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
-    				    {
-    				        $this->view->uploadStatus="File $name uploaded in $destDir";
-    				    }
-				    }
+					if (!is_writable($destDir))
+					{
+						$this->view->uploadStatus="ERROR : $destDir directory is not writable";
+					}
+					else
+					{
+						$destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+						$sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
+						if (move_uploaded_file($sourceTmpNam,$destination)===false)
+						{
+							$this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
+						}
+						else
+						{
+							$this->view->uploadStatus="File $name uploaded in $destDir";
+						}
+					}
 				}
 
 			}
@@ -236,63 +236,63 @@ 
 	/** UI options */
 	public function uimgtAction()
 	{
-	    $this->prepareTabs()->activate('uimgt');
+		$this->prepareTabs()->activate('uimgt');
 	    
-	    $this->view->setError='';
-	    $this->view->setOKMsg='';
+		$this->view->setError='';
+		$this->view->setOKMsg='';
 	    
-	    //max_rows=25&row_update=update
-	    if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
-	    {
-	        $maxRows = $this->getRequest()->getParam('max_rows');
-	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
-	        {
-	            $this->view->setError='Max rows must be a number';
-	        }
-	        else
-	        {
-	            $this->setitemListDisplay($maxRows);
-	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
-	        }
-	    }
+		//max_rows=25&row_update=update
+		if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
+		{
+			$maxRows = $this->getRequest()->getParam('max_rows');
+			if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
+			{
+				$this->view->setError='Max rows must be a number';
+			}
+			else
+			{
+				$this->setitemListDisplay($maxRows);
+				$this->view->setOKMsg='Set max rows to ' . $maxRows;
+			}
+		}
 	    
-	    if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
-	    {
-	        $addCat = $this->getRequest()->getParam('add_category');
-            $this->addHandlersCategory($addCat);
-	    }
+		if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
+		{
+			$addCat = $this->getRequest()->getParam('add_category');
+			$this->addHandlersCategory($addCat);
+		}
 	    
-	    if ( $this->getRequest()->getPost('type',NULL) !== NULL )
-	    {
-	        $type = $this->getRequest()->getPost('type',NULL);
-	        $index = $this->getRequest()->getPost('index',NULL);
-	        $newname = $this->getRequest()->getPost('newname',NULL);
+		if ( $this->getRequest()->getPost('type',NULL) !== NULL )
+		{
+			$type = $this->getRequest()->getPost('type',NULL);
+			$index = $this->getRequest()->getPost('index',NULL);
+			$newname = $this->getRequest()->getPost('newname',NULL);
 
-	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
-	            $this->_helper->json(array('status'=>'Bad index'));
+			if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
+				$this->_helper->json(array('status'=>'Bad index'));
 	        
-	        switch ($type)
-	        {
-	            case 'delete':
-	                $this->delHandlersCategory($index);
-	                $this->_helper->json(array('status'=>'OK'));
-	                return;
-	                break;
-	            case 'rename':
-	                $this->renameHandlersCategory($index, $newname);
-	                $this->_helper->json(array('status'=>'OK'));
-	                return;
-	                break;
-	            default:
-	                $this->_helper->json(array('status'=>'Unknwon command'));
-	                return;
-	                break;
-	        }
-	    }
+			switch ($type)
+			{
+				case 'delete':
+					$this->delHandlersCategory($index);
+					$this->_helper->json(array('status'=>'OK'));
+					return;
+					break;
+				case 'rename':
+					$this->renameHandlersCategory($index, $newname);
+					$this->_helper->json(array('status'=>'OK'));
+					return;
+					break;
+				default:
+					$this->_helper->json(array('status'=>'Unknwon command'));
+					return;
+					break;
+			}
+		}
 	    
-	    $this->view->maxRows = $this->itemListDisplay();
+		$this->view->maxRows = $this->itemListDisplay();
 	    
-	    $this->view->categories = $this->getHandlersCategory();
+		$this->view->categories = $this->getHandlersCategory();
 	    
 	    
 	    
@@ -341,47 +341,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);
+		}
 
 	}
 	
@@ -393,36 +393,36 @@ 
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
-	    )->add('uimgt', array(
-	        'label' => $this->translate('UI Configuration'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
-        )->add('services', array(
+		)->add('uimgt', array(
+			'label' => $this->translate('UI Configuration'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
+		)->add('services', array(
 			'label' => $this->translate('Services management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
-	    )->add('plugins', array(
-	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
-	    );
+		)->add('plugins', array(
+			'label' => $this->translate('Plugins management'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+		);
 	} 
 }
 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }

Spacing +78 added lines, -78 removed lines

@@ -21,19 +21,19 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,20 +59,20 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+		    $this->view->useSnmpTrapAddess=($this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1) ? TRUE : FALSE;
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+		    $this->view->SnmpTrapAddressOIDDefault=($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid']) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+		    $this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -98,7 +98,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -107,32 +107,32 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+			    $name=filter_var($_FILES['mibfile']['name'], FILTER_SANITIZE_STRING);
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
@@ -146,9 +146,9 @@ 
 				    }
 				    else
 				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'], FILTER_SANITIZE_STRING);
+				        if (move_uploaded_file($sourceTmpNam, $destination) === false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
     				    }
@@ -164,13 +164,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';
@@ -188,46 +188,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');
 		
 		
@@ -242,9 +242,9 @@ 
 	    $this->view->setOKMsg='';
 	    
 	    //max_rows=25&row_update=update
-	    if ( $this->getRequest()->getParam('max_rows',NULL) !== NULL )
+	    if ($this->getRequest()->getParam('max_rows', NULL) !== NULL)
 	    {
-	        $maxRows = $this->getRequest()->getParam('max_rows');
+	        $maxRows=$this->getRequest()->getParam('max_rows');
 	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
 	        {
 	            $this->view->setError='Max rows must be a number';
@@ -252,21 +252,21 @@ 
 	        else
 	        {
 	            $this->setitemListDisplay($maxRows);
-	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
+	            $this->view->setOKMsg='Set max rows to '.$maxRows;
 	        }
 	    }
 	    
-	    if ( $this->getRequest()->getParam('add_category',NULL) !== NULL )
+	    if ($this->getRequest()->getParam('add_category', NULL) !== NULL)
 	    {
-	        $addCat = $this->getRequest()->getParam('add_category');
+	        $addCat=$this->getRequest()->getParam('add_category');
             $this->addHandlersCategory($addCat);
 	    }
 	    
-	    if ( $this->getRequest()->getPost('type',NULL) !== NULL )
+	    if ($this->getRequest()->getPost('type', NULL) !== NULL)
 	    {
-	        $type = $this->getRequest()->getPost('type',NULL);
-	        $index = $this->getRequest()->getPost('index',NULL);
-	        $newname = $this->getRequest()->getPost('newname',NULL);
+	        $type=$this->getRequest()->getPost('type', NULL);
+	        $index=$this->getRequest()->getPost('index', NULL);
+	        $newname=$this->getRequest()->getPost('newname', NULL);
 
 	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
 	            $this->_helper->json(array('status'=>'Bad index'));
@@ -290,9 +290,9 @@ 
 	        }
 	    }
 	    
-	    $this->view->maxRows = $this->itemListDisplay();
+	    $this->view->maxRows=$this->itemListDisplay();
 	    
-	    $this->view->categories = $this->getHandlersCategory();
+	    $this->view->categories=$this->getHandlersCategory();
 	    
 	    
 	    
@@ -316,18 +316,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
@@ -343,15 +343,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();
@@ -359,16 +359,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);
 	        }
 	    }
 	    
@@ -376,10 +376,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);
 	    }
 
@@ -389,19 +389,19 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 	    )->add('uimgt', array(
 	        'label' => $this->translate('UI Configuration'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/uimgt')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/uimgt')
         )->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 	    )->add('plugins', array(
 	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/plugins')
 	    );
 	} 
 }
@@ -409,7 +409,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -418,11 +418,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $file=new File('mib-file');
         $file->setLabel('Mib upload');
              //->setAttrib('multiple', null);
         $this->addElement($file);
-		$button = new Submit("upload",array('ignore'=>false));
-		$this->addElement($button);//->setIgnore(false);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }

Braces +18 added lines, -27 removed lines

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