patrickpr / trapdirector

application/controllers/HelperController.php

Indentation +84 added lines, -84 removed lines

@@ -12,8 +12,8 @@ 
 {
 	
 	/** Get host list with filter (IP or name) : host=<filter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -40,8 +40,8 @@ 
 
 	
 	/** Get hostgroup list with filter (name) : hostgroup=<hostFilter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostgroupsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -68,11 +68,11 @@ 
 
 	
 	/** Get service list by host name ( host=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		hostid = host object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		hostid = host object id or -1 if not found.
+	 */
 	public function getservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -112,11 +112,11 @@ 
 	}
 	
 	/** Get service list by host group ( name=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		groupid = group object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		groupid = group object id or -1 if not found.
+	 */
 	public function gethostgroupservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -153,10 +153,10 @@ 
 	}
 
 	/** Get traps from mib  : entry : mib=<mib>
-	*	returns in JSON : 
-	*		status=>OK/No mib/Error getting mibs
-	*		traps=>array of array( oid -> name)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No mib/Error getting mibs
+	 *		traps=>array of array( oid -> name)
+	 */
 	public function gettrapsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -182,10 +182,10 @@ 
 	}	
 
 	/** Get trap objects from mib  : entry : trap=<oid>
-	*	returns in JSON : 
-	*		status=>OK/no trap/not found
-	*		objects=>array of array( oid -> name, oid->mib)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/no trap/not found
+	 *		objects=>array of array( oid -> name, oid->mib)
+	 */
 	public function gettrapobjectsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -211,8 +211,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -227,10 +227,10 @@ 
 	}
 	
 	/** Get MIB::Name from OID : entry : oid
-	*		status=>OK/No oid/not found
-	*		mib=>string
-	*		name=>string
-	*/	
+	 *		status=>OK/No oid/not found
+	 *		mib=>string
+	 *		name=>string
+	 */	
 	public function translateoidAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -258,7 +258,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -267,10 +267,10 @@ 
 
 	
 	/** Save or execute database purge of <n> days
-	*	days=>int 
-	*	action=>save/execute
-	*	return : status=>OK/Message error
-	*/
+	 *	days=>int 
+	 *	action=>save/execute
+	 *	return : status=>OK/Message error
+	 */
 	public function dbmaintenanceAction()
 	{
 		
@@ -339,11 +339,11 @@ 
 	}	
 
 	/** Save log output to db
-	*	destination=>log destination 
-	*	file=>file name
-	*	level => int 
-	*	return : status=>OK/Message error
-	*/
+	 *	destination=>log destination 
+	 *	file=>file name
+	 *	level => int 
+	 *	return : status=>OK/Message error
+	 */
 	public function logdestinationAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -367,8 +367,8 @@ 
 			$fileHandler=@fopen($file,'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
-			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
-			    return;
+				$this->_helper->json(array('status'=>'File not writable :  '.$file));
+				return;
 			}
 		}
 		else
@@ -418,50 +418,50 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
-	    if (isset($postData['rule']))
-	    {
-	        $rule=$postData['rule'];
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No Rule'));
-	    }
-	    if (isset($postData['action']))
-	    {
-	        $action=$postData['action'];
-	        if ($action != 'evaluate')
-	        {
-	            $this->_helper->json(array('status'=>'unknown action '.$action));
-	            return;
-	        }
-	    }
-	    else
-	    {
-	        $this->_helper->json(array('status'=>'No action'));
-	        return;
-	    }
-	    if ($action == 'evaluate')
-	    {
-	        try
-	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $Trap = new Trap($icingaweb2_etc);
-	            // Cleanup spaces before eval
-	            $rule=$Trap->eval_cleanup($rule);
-	            // Eval
-	            $item=0;
-	            $rule=$Trap->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
-	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
-	            return;
-	        }
-	        $return=($rule==true)?'true':'false';
-	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
-	    }
+		$postData=$this->getRequest()->getPost();
+		if (isset($postData['rule']))
+		{
+			$rule=$postData['rule'];
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No Rule'));
+		}
+		if (isset($postData['action']))
+		{
+			$action=$postData['action'];
+			if ($action != 'evaluate')
+			{
+				$this->_helper->json(array('status'=>'unknown action '.$action));
+				return;
+			}
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'No action'));
+			return;
+		}
+		if ($action == 'evaluate')
+		{
+			try
+			{
+				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+				$Trap = new Trap($icingaweb2_etc);
+				// Cleanup spaces before eval
+				$rule=$Trap->eval_cleanup($rule);
+				// Eval
+				$item=0;
+				$rule=$Trap->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));
+		}
 	    
 	}	
 	

Spacing +35 added lines, -35 removed lines

@@ -27,12 +27,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostByIP($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -55,12 +55,12 @@ 
 			return;
 		}
 
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -82,31 +82,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -126,28 +126,28 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -172,7 +172,7 @@ 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -201,7 +201,7 @@ 
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -278,7 +278,7 @@ 
 		if (isset($postData['days']))
 		{
 			$days=$postData['days'];
-			if (!preg_match('/^[0-9]+$/',$days))
+			if (!preg_match('/^[0-9]+$/', $days))
 			{
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
@@ -292,7 +292,7 @@ 
 		if (isset($postData['action']))
 		{
 			$action=$postData['action'];
-			if ($action != 'save' && $action !='execute')
+			if ($action != 'save' && $action != 'execute')
 			{
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
@@ -307,11 +307,11 @@ 
 		{
 			try
 			{
-				$this->setDBConfigValue('db_remove_days',$days);
+				$this->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -321,16 +321,16 @@ 
 		{
 			try
 			{
-				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 				$debug_level=4;
-				$Trap = new Trap($icingaweb2_etc);
-				$Trap->setLogging($debug_level,'syslog');
+				$Trap=new Trap($icingaweb2_etc);
+				$Trap->setLogging($debug_level, 'syslog');
 				$Trap->eraseOldTraps($days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage()));
 				return;
 			}			
 			$this->_helper->json(array('status'=>'OK'));
@@ -364,7 +364,7 @@ 
 		if (isset($postData['file']))
 		{ 
 			$file=$postData['file'];
-			$fileHandler=@fopen($file,'w');
+			$fileHandler=@fopen($file, 'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
@@ -396,13 +396,13 @@ 
 		
 		try
 		{
-			$this->setDBConfigValue('log_destination',$destination);
-			$this->setDBConfigValue('log_file',$file);
-			$this->setDBConfigValue('log_level',$level);
+			$this->setDBConfigValue('log_destination', $destination);
+			$this->setDBConfigValue('log_file', $file);
+			$this->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -445,21 +445,21 @@ 
 	    {
 	        try
 	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $Trap = new Trap($icingaweb2_etc);
+	            $Trap=new Trap($icingaweb2_etc);
 	            // Cleanup spaces before eval
 	            $rule=$Trap->eval_cleanup($rule);
 	            // Eval
 	            $item=0;
-	            $rule=$Trap->evaluation($rule,$item);
+	            $rule=$Trap->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));
 	    }
 	    

Braces +25 added lines, -50 removed lines

@@ -20,8 +20,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'KO'));
 			return;
@@ -48,8 +47,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Error : no filter'));
 			return;
@@ -79,8 +77,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -91,8 +88,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -123,8 +119,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -135,8 +130,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -163,8 +157,7 @@ 
 		if (isset($postData['mib']))
 		{
 			$mib=$postData['mib'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No mib'));
 			return;
@@ -173,8 +166,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -192,8 +184,7 @@ 
 		if (isset($postData['trap']))
 		{
 			$trap=$postData['trap'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No trap'));
 			return;
@@ -202,8 +193,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -218,8 +208,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -237,8 +226,7 @@ 
 		if (isset($postData['oid']))
 		{
 			$oid=$postData['oid'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No oid'));
 			return;
@@ -249,8 +237,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -283,8 +270,7 @@ 
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No days'));
 			return;
@@ -297,8 +283,7 @@ 
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No action'));
 			return;
@@ -308,8 +293,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -327,8 +311,7 @@ 
 				$Trap = new Trap($icingaweb2_etc);
 				$Trap->setLogging($debug_level,'syslog');
 				$Trap->eraseOldTraps($days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
 				return;
@@ -356,8 +339,7 @@ 
 				$this->_helper->json(array('status'=>'invalid destination : '.$destination));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No destination'));
 		}
@@ -370,14 +352,12 @@ 
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			    return;
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 				return;
@@ -387,8 +367,7 @@ 
 		if (isset($postData['level']))
 		{ 
 			$level=$postData['level'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No level'));
 			return;
@@ -399,8 +378,7 @@ 
 			$this->setDBConfigValue('log_destination',$destination);
 			$this->setDBConfigValue('log_file',$file);
 			$this->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -422,8 +400,7 @@ 
 	    if (isset($postData['rule']))
 	    {
 	        $rule=$postData['rule'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No Rule'));
 	    }
@@ -435,8 +412,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -453,8 +429,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$Trap->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;

application/controllers/StatusController.php

Indentation +28 added lines, -28 removed lines

@@ -65,10 +65,10 @@ 
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -87,22 +87,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -110,7 +110,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -259,20 +259,20 @@ 
 // 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 +45 added lines, -45 removed lines

@@ -22,18 +22,18 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-			$db = $this->getDb()->getConnection();
-			$query = $db->select()->from(
+			$db=$this->getDb()->getConnection();
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,7 +59,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -85,7 +85,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -94,34 +94,34 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
 				$name=$_FILES['mibfile']['name'];
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
-				$destination = array_shift($DirConf) .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
+				$destination=array_shift($DirConf).'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				if (move_uploaded_file($_FILES['mibfile']['tmp_name'], $destination) === false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
 				}
@@ -134,13 +134,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';
@@ -158,46 +158,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');
 		
 		
@@ -221,18 +221,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
@@ -245,13 +245,13 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 		);
 	} 
 }
@@ -259,7 +259,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -268,11 +268,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 +8 added lines, -16 removed lines

@@ -41,8 +41,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +55,7 @@ 
 			$this->view->currentLogFile=$this->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}		
@@ -107,8 +105,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -124,8 +121,7 @@ 
 				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)===false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
-				}
-				else
+				} else
 				{
 					$this->view->uploadStatus="File $name uploaded";
 				}
@@ -144,13 +140,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';
 		}
@@ -171,15 +165,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');
 			}