patrickpr / trapdirector

library/Trapdirector/Config/MIBLoader.php

Spacing +28 added lines, -28 removed lines

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

Braces +12 added lines, -7 removed lines

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

Indentation +46 added lines, -46 removed lines

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

application/controllers/ReceivedController.php

Braces +16 added lines, -12 removed lines

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

Indentation +25 added lines, -25 removed lines

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

Spacing +33 added lines, -33 removed lines

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

application/controllers/StatusController.php

Spacing +63 added lines, -63 removed lines

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

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

Braces +13 added lines, -21 removed lines

@@ -22,7 +22,9 @@ 
 		try
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -41,8 +43,7 @@ 
  			
 			$this->view->trap_days_delete=$this->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());
 		}		
@@ -107,8 +107,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -124,22 +123,19 @@ 
 				if (!is_dir($destDir))
 				{
 				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
-				}
-				else
+				} else
 				{
 				    if (!is_writable($destDir))
 				    {
 				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
+				    } else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
+    				    } else
     				    {
     				        $this->view->uploadStatus="File $name uploaded in $destDir";
     				    }
@@ -161,13 +157,11 @@ 
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='can execute but no resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='cannot execute';
 		}
@@ -188,15 +182,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}

application/controllers/SettingsController.php

Indentation +188 added lines, -188 removed lines

@@ -25,16 +25,16 @@ 
    */
   private function get_param()
   {
-      $dberrorMsg=$this->params->get('dberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
-      $dberrorMsg=$this->params->get('idodberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
+	  $dberrorMsg=$this->params->get('dberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
+	  $dberrorMsg=$this->params->get('idodberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
   }
   
   /**
@@ -43,22 +43,22 @@ 
    */
   private function check_empty_config()
   {
-      $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
-      if ($this->Config()->isEmpty() == true)
-      {
-          $this->Config()->setSection('config'); // Set base config section.
-          try
-          {
-              $this->Config()->saveIni();
-              $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
-              //$emptyConfig=1;
-          }
-          catch (Exception $e)
-          {
-              $this->view->configErrorDetected=$e->getMessage();
-          }
+	  $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	  if ($this->Config()->isEmpty() == true)
+	  {
+		  $this->Config()->setSection('config'); // Set base config section.
+		  try
+		  {
+			  $this->Config()->saveIni();
+			  $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
+			  //$emptyConfig=1;
+		  }
+		  catch (Exception $e)
+		  {
+			  $this->view->configErrorDetected=$e->getMessage();
+		  }
           
-      }
+	  }
   }
   
   /**
@@ -71,56 +71,56 @@ 
    */
   private function check_db()
   {
-      $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
-              Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
-              Url::fromPath('trapdirector/settings/updateschema')),
-      );
+	  $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
+		  0	=>	array('Database configuration OK','',''),
+		  1	=>	array('Database set in config.ini','No database in config.ini',''),
+		  2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+			  Url::fromPath('config/resource')),
+		  3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  4	=>	array('Schema is set','Schema is not set for ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  5	=>	array('Schema is up to date','Schema is outdated :',
+			  Url::fromPath('trapdirector/settings/updateschema')),
+	  );
       
-      try {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->db_error=$dberror[0];
-      switch ($dberror[0])
-      {
-          case 2:
-          case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
-              break;
-          case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
-              break;
-          case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
-              break;
-          case 0:
-          case 1:
-              break;
-          default:
-              new ProgrammingError('Out of bond result from database test');
-      }
-      $this->view->message=$db_message;
+	  $this->view->db_error=$dberror[0];
+	  switch ($dberror[0])
+	  {
+		  case 2:
+		  case 4:
+			  $db_message[$dberror[0]][1] .= $dberror[1];
+			  break;
+		  case 3:
+			  $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+			  break;
+		  case 5:
+			  $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+			  break;
+		  case 0:
+		  case 1:
+			  break;
+		  default:
+			  new ProgrammingError('Out of bond result from database test');
+	  }
+	  $this->view->message=$db_message;
       
-      try {
-          $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+	  $this->view->ido_db_error=$dberror[0];
+	  $this->view->ido_message='IDO Database : ' . $dberror[1];
   }
   
   /**
@@ -130,23 +130,23 @@ 
    */
   private function check_api()
   {
-      if ($this->Config()->get('config', 'icingaAPI_host') != '')
-      {
-          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
-          $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
-          try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
-              //$this->view->apimessageError=false;
-          } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
-              $this->view->apimessageError=true;
-          }
-      }
-      else
-      {
-          $this->view->apimessage='API parameters not configured';
-          $this->view->apimessageError=true;
-      }
+	  if ($this->Config()->get('config', 'icingaAPI_host') != '')
+	  {
+		  $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+		  $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
+		  try {
+			  list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+			  //$this->view->apimessageError=false;
+		  } catch (RuntimeException $e) {
+			  $this->view->apimessage='API config : ' . $e->getMessage();
+			  $this->view->apimessageError=true;
+		  }
+	  }
+	  else
+	  {
+		  $this->view->apimessage='API parameters not configured';
+		  $this->view->apimessageError=true;
+	  }
   }
 
   /**
@@ -157,21 +157,21 @@ 
    */
   private function check_icingaweb_path()
   {
-      $this->view->icingaEtcWarn=0;
-      $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-      if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
-      {
-          $output=array();
+	  $this->view->icingaEtcWarn=0;
+	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+	  if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
+	  {
+		  $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+		  exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
-          {
-              $this->view->icingaEtcWarn=1;
-              $this->view->icingaweb2_etc=$icingaweb2_etc;
-          }
-      }
+		  if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		  {
+			  $this->view->icingaEtcWarn=1;
+			  $this->view->icingaweb2_etc=$icingaweb2_etc;
+		  }
+	  }
       
   }
   
@@ -182,15 +182,15 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
-      foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
-      {
-          if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
-          {
-              $resources[$name] = $name;
-          }
-      }
-      return $resources;
+	  $resources = array();
+	  foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
+	  {
+		  if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
+		  {
+			  $resources[$name] = $name;
+		  }
+	  }
+	  return $resources;
   }
   
   /**
@@ -209,7 +209,7 @@ 
   public function indexAction()
   {
       
-    // CHeck permissions : display tests in any case, but no configuration.
+	// CHeck permissions : display tests in any case, but no configuration.
 	$this->view->configPermission=$this->checkModuleConfigPermission(1);
 	// But check read permission
 	$this->checkReadPermission();
@@ -217,16 +217,16 @@ 
 	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
-    $this->get_param();
+	$this->get_param();
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	$this->check_empty_config();
 
 	// Test Database
-    $this->check_db();
+	$this->check_db();
 	
 	//********* Test API
-    $this->check_api();
+	$this->check_api();
 	
 	//*********** Test snmptrapd alive and options
 	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
@@ -241,11 +241,11 @@ 
 	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . PHP_BINARY
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -275,8 +275,8 @@ 
 	
 	try 
 	{
-	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-	    printf('Schema already exists');
+		$this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		printf('Schema already exists');
 	    
 	} 
 	catch (DBException $e) 
@@ -287,19 +287,19 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
-        $dbType=$dbResource->get('db');
-        switch ($dbType) {
-          case 'mysql':
-              $dbFileExt='sql';
-              break;
-          case 'pgsql':
-              $dbFileExt='pgsql';
-              break;
-          default:
-              printf("Database configuration error : Unsuported DB");
-              return;
-        } 
+		$dbResource = ResourceFactory::getResourceConfig($dbName);
+		$dbType=$dbResource->get('db');
+		switch ($dbType) {
+		  case 'mysql':
+			  $dbFileExt='sql';
+			  break;
+		  case 'pgsql':
+			  $dbFileExt='pgsql';
+			  break;
+		  default:
+			  printf("Database configuration error : Unsuported DB");
+			  return;
+		} 
 
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -323,32 +323,32 @@ 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
-    		'active'	=> true,
-    		'label'		=> $this->translate('Update Schema'),
-    		'url'		=> Url::fromRequest()
-    	));
+	  $this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Update Schema'),
+			'url'		=> Url::fromRequest()
+		));
 	  // check if needed
 	  $dberror=array();
-      try
-      {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          echo 'Schema already exists and is up to date<br>';
-          return;
-      }
-      catch (DBException $e)
-      {
-          $dberror=$e->getArray(); 
-      }
+	  try
+	  {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
+	  }
+	  catch (DBException $e)
+	  {
+		  $dberror=$e->getArray(); 
+	  }
 	  
 	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
-	      echo 'Database does not exists or is not setup correctly<br>';
-	      return;
+		  echo 'Database does not exists or is not setup correctly<br>';
+		  return;
 	  }
-      // setup
+	  // setup
 	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
@@ -361,20 +361,20 @@ 
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
-	      // Check for messages and display if any
-              echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
-	      if ($message != '')
-	      {
-	          echo 'Note :<br><pre>';
-	          echo $message;
-	          echo '</pre>';
-	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
-	          echo '<br>';
-	          return;
-	      }
+		  // Check for messages and display if any
+			  echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
+		  $Trap->setLogging(2,'syslog');
+		  $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+		  if ($message != '')
+		  {
+			  echo 'Note :<br><pre>';
+			  echo $message;
+			  echo '</pre>';
+			  echo '<br>';
+			  echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+			  echo '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -388,28 +388,28 @@ 
 
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
-      }
-      $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
-      }
-      // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+	  }
+	  $psOutput=array();
+	  exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+	  }
+	  // Assume there is only one line... TODO : see if there is a better way to do this
+	  $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
+	  if (!preg_match('/-n/',$line))
+		  return array(1,'snmptrapd has no -n option : '.$line);
+	  if (!preg_match('/-O[^ ]*n/',$line))
+		  return array(1,'snmptrapd has no -On option : '.$line);
+	  if (!preg_match('/-O[^ ]*e/',$line))
+		  return array(1,'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

Spacing +65 added lines, -65 removed lines

@@ -72,23 +72,23 @@ 
   private function check_db()
   {
       $db_message=array( // index => ( message OK, message NOK, optional link if NOK )
-          0	=>	array('Database configuration OK','',''),
-          1	=>	array('Database set in config.ini','No database in config.ini',''),
-          2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+          0	=>	array('Database configuration OK', '', ''),
+          1	=>	array('Database set in config.ini', 'No database in config.ini', ''),
+          2	=>	array('Database exists in Icingaweb2 config', 'Database does not exist in Icingaweb2 : ',
               Url::fromPath('config/resource')),
-          3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+          3	=>	array('Database credentials OK', 'Database does not exist/invalid credentials/no schema : ',
               Url::fromPath('trapdirector/settings/createschema')),
-          4	=>	array('Schema is set','Schema is not set for ',
+          4	=>	array('Schema is set', 'Schema is not set for ',
               Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
+          5	=>	array('Schema is up to date', 'Schema is outdated :',
               Url::fromPath('trapdirector/settings/updateschema')),
       );
       
       try {
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->db_error=$dberror[0];
@@ -96,13 +96,13 @@ 
       {
           case 2:
           case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
+              $db_message[$dberror[0]][1].=$dberror[1];
               break;
           case 3:
-              $db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+              $db_message[$dberror[0]][1].=$dberror[1].', Message : '.$dberror[2];
               break;
           case 5:
-              $db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+              $db_message[$dberror[0]][1].=' version '.$dberror[1].', version needed : '.$dberror[2];
               break;
           case 0:
           case 1:
@@ -114,13 +114,13 @@ 
       
       try {
           $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+      $this->view->ido_message='IDO Database : '.$dberror[1];
   }
   
   /**
@@ -132,13 +132,13 @@ 
   {
       if ($this->Config()->get('config', 'icingaAPI_host') != '')
       {
-          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+          $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'), $this->Config()->get('config', 'icingaAPI_port'));
           $apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
           try {
-              list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+              list($this->view->apimessageError, $this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
               //$this->view->apimessageError=false;
           } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
+              $this->view->apimessage='API config : '.$e->getMessage();
               $this->view->apimessageError=true;
           }
       }
@@ -163,10 +163,10 @@ 
       {
           $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+          exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2Etc=" ', $output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+          if (!isset($output[0]) || !preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
           {
               $this->view->icingaEtcWarn=1;
               $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -182,12 +182,12 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
+      $resources=array();
       foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
       {
           if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
           {
-              $resources[$name] = $name;
+              $resources[$name]=$name;
           }
       }
       return $resources;
@@ -214,7 +214,7 @@ 
 	// But check read permission
 	$this->checkReadPermission();
 	
-	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+	$this->view->tabs=$this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
     $this->get_param();
@@ -229,32 +229,32 @@ 
     $this->check_api();
 	
 	//*********** Test snmptrapd alive and options
-	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
+	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage)=$this->checkSnmpTrapd();
 
 	// List DB in $ressources
-	$resources = $this->get_db_list(array('mysql', 'pgsql')); 
+	$resources=$this->get_db_list(array('mysql', 'pgsql')); 
 
 	// Check standard Icingaweb2 path
 	$this->check_icingaweb_path();
 	
 	// Setup path for mini documentation
-	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=PHP_BINARY.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.PHP_BINARY
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -266,7 +266,7 @@ 
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -287,7 +287,7 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
+        $dbResource=ResourceFactory::getResourceConfig($dbName);
         $dbType=$dbResource->get('db');
         switch ($dbType) {
           case 'mysql':
@@ -302,28 +302,28 @@ 
         } 
 
 		printf('<pre>');
-		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
+		require_once $this->Module()->getBaseDir().'/bin/trap_class.php';
 		
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=4;
-		$Trap = new Trap($icingaweb2_etc);
-		$Trap->setLogging($debug_level,'display');
+		$Trap=new Trap($icingaweb2_etc);
+		$Trap->setLogging($debug_level, 'display');
 		
 		$prefix=$this->Config()->get('config', 'database_prefix');
 		// schema file : <path>/SQL/schema_v<verion>.<dbtype>
-		$schema=$this->Module()->getBaseDir() . 
-		'/SQL/schema_v'. $this->getModuleConfig()->getDbCurVersion() . '.' . $dbFileExt;
+		$schema=$this->Module()->getBaseDir(). 
+		'/SQL/schema_v'.$this->getModuleConfig()->getDbCurVersion().'.'.$dbFileExt;
 		
-		$Trap->trapsDB->create_schema($schema,$prefix);
+		$Trap->trapsDB->create_schema($schema, $prefix);
 		echo '</pre>';
 	}
-	echo '<br><br>Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a>';
+	echo '<br><br>Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a>';
   }
 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
+      $this->getTabs()->add('get', array(
     		'active'	=> true,
     		'label'		=> $this->translate('Update Schema'),
     		'url'		=> Url::fromRequest()
@@ -341,7 +341,7 @@ 
           $dberror=$e->getArray(); 
       }
 	  
-	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
+	  echo 'Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
@@ -349,40 +349,40 @@ 
 	      return;
 	  }
       // setup
-	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	  require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
-	  $Trap = new Trap($icingaweb2_etc);
+	  $Trap=new Trap($icingaweb2_etc);
 	  
 	  
 	  $prefix=$this->Config()->get('config', 'database_prefix');
-	  $updateSchema=$this->Module()->getBaseDir() . '/SQL/';
+	  $updateSchema=$this->Module()->getBaseDir().'/SQL/';
 	  
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
 	      // Check for messages and display if any
               echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix, true);
 	      if ($message != '')
 	      {
 	          echo 'Note :<br><pre>';
 	          echo $message;
 	          echo '</pre>';
 	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="'.Url::fromPath('trapdirector/settings/updateschema').'?msgok=1">Click here to update</a>';
 	          echo '<br>';
 	          return;
 	      }
 	  }
 	  
-	  $Trap->setLogging($debug_level,'display');
+	  $Trap->setLogging($debug_level, 'display');
 	  
-	  echo 'Updating schema to '. $target_version . ': <br>';
+	  echo 'Updating schema to '.$target_version.': <br>';
 	  echo '<pre>';
 	  	  
-	  $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -390,26 +390,26 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+      exec('netstat -an |grep -E "udp.*:162"', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+          return array(1, 'Port UDP/162 is not open : snmptrapd must not be started');
       }
       $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+      exec('ps fax |grep snmptrapd |grep -v grep', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+          return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+      if (!preg_match('/-n/', $line))
+          return array(1, 'snmptrapd has no -n option : '.$line);
+      if (!preg_match('/-O[^ ]*n/', $line))
+          return array(1, 'snmptrapd has no -On option : '.$line);
+      if (!preg_match('/-O[^ ]*e/', $line))
+          return array(1, 'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+      return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

Braces +13 added lines, -14 removed lines

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

library/Trapdirector/TrapsActions/UIDatabase.php

Braces +18 added lines, -16 removed lines

@@ -116,8 +116,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -142,8 +141,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -157,8 +155,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -185,7 +182,9 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ( $this->trapDB != null ) {
+        	return $this->trapDB;
+        }
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
@@ -213,7 +212,9 @@ 
      */
     public function getDbConn()
     {
-        if ($this->getDb() == null) return null;
+        if ($this->getDb() == null) {
+        	return null;
+        }
         return $this->getDb()->getConnection();
     }
     
@@ -243,7 +244,9 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ( $this->idoDB != null ) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
@@ -256,8 +259,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -274,7 +276,9 @@ 
      */
     public function getIdoDbConn()
     {
-        if ($this->getIdoDb() == null) return null;
+        if ($this->getIdoDb() == null) {
+        	return null;
+        }
         return $this->getIdoDb()->getConnection();
     }
     
@@ -296,8 +300,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -311,8 +314,7 @@ 
             {
                 throw new DBException( array(4,"$dbresource does not look like an IDO database"));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
         }

Spacing +36 added lines, -36 removed lines

@@ -29,10 +29,10 @@ 
      * @param int $code
      * @param Exception $previous
      */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+    public function __construct(array $retarray, string $message=null, int $code=0, Exception $previous=null)
     {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
+        parent::__construct($message, $code, $previous);
+        $this->returnArray=$retarray;
     }
     
     /**
@@ -56,7 +56,7 @@ 
  */
 class UIDatabase //extends TrapDBQuery
 {
-    use TrapDBQuery,IdoDBQuery;
+    use TrapDBQuery, IdoDBQuery;
     
     /** @var TrapsController $trapController TrapController 'parent' class */
     protected  $trapController=null;
@@ -94,19 +94,19 @@ 
      * @return bool true if OK, false if version < min version
      * @throws Exception if error and test = true
      */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+    protected function testDbVersion($dbAdapter, int $min, bool $test, string $DBname)
     {
         try
         {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+            $query=$dbAdapter->select()
+            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(), 'value')
             ->where('name=\'db_version\'');
             $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
+            if (($version == null) || !property_exists($version, 'value'))
             {
                 if ($test === true) 
                 {
-                    $this->testResult = array(4,$DBname);
+                    $this->testResult=array(4, $DBname);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -116,7 +116,7 @@ 
             {
                 if ($test === true) 
                 {
-                    $this->testResult = array(5,$version->value,$min);
+                    $this->testResult=array(5, $version->value, $min);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
@@ -127,7 +127,7 @@ 
         {
             if ($test === true) 
             {
-                $this->testResult = array(3,$DBname,$e->getMessage());
+                $this->testResult=array(3, $DBname, $e->getMessage());
                 return false;
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -143,17 +143,17 @@ 
      *  @throws DBException if test = true and error
      *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
      */
-    protected function getDbByName($DBname , $test = false , $test_version = true)
+    protected function getDbByName($DBname, $test=false, $test_version=true)
     {
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
+            $dbconn=IcingaDbConnection::fromResourceName($DBname);
         }
         catch (Exception $e)
         {
             if ($test === true) 
             {
-                throw new DBException(array(2,$DBname));
+                throw new DBException(array(2, $DBname));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
@@ -168,7 +168,7 @@ 
         {
             if ($test === true)
             {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
+                throw new DBException(array(3, $DBname, $e->getMessage()));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=3');
             return null;
@@ -191,19 +191,19 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ($this->trapDB != null) return $this->trapDB;
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
             $this->trapController->redirectNow('trapdirector/settings?dberror=1');
             return null;
         }
 
         try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
+            $this->trapDB=$this->getDbByName($dbresource, false, true);
         } catch (DBException $e) {
             return null; // Should not happen as test = false
         }
@@ -233,12 +233,12 @@ 
     {       
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-                throw new DBException(array(1,''));
+                throw new DBException(array(1, ''));
         }
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
+        $this->trapDB=$this->getDbByName($dbresource, true, true);       
         return;
     }
     
@@ -249,11 +249,11 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ($this->idoDB != null) return $this->idoDB;
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
             return null;
@@ -261,7 +261,7 @@ 
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
@@ -269,7 +269,7 @@ 
             return null;
         }
 
-        $this->idoDB = $dbconn;
+        $this->idoDB=$dbconn;
         return $this->idoDB;
     }
 
@@ -292,35 +292,35 @@ 
     public function testGetIdoDb()
     {
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-            throw new DBException(array(1,'No database in config.ini'));
+            throw new DBException(array(1, 'No database in config.ini'));
         }
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+            throw new DBException(array(2, "Database $dbresource does not exists in IcingaWeb2"));
         }
                
         try
         {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
+            $query=$dbconn->select()
+            ->from('icinga_dbversion', array('version'));
             $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
+            if (($version == null) || !property_exists($version, 'version'))
             {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+                throw new DBException(array(4, "$dbresource does not look like an IDO database"));
             }
         }
         catch (Exception $e)
         {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+            throw new DBException(array(3, "Error connecting to $dbresource : ".$e->getMessage()));
         }
         
         return;

Indentation +260 added lines, -260 removed lines

@@ -19,30 +19,30 @@ 
  */
 class DBException extends Exception
 {
-    /** @var array $returnArray */
-    private $returnArray;
+	/** @var array $returnArray */
+	private $returnArray;
     
-    /**
-     * Buil DBException
-     * @param array $retarray
-     * @param string $message
-     * @param int $code
-     * @param Exception $previous
-     */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
-    }
+	/**
+	 * Buil DBException
+	 * @param array $retarray
+	 * @param string $message
+	 * @param int $code
+	 * @param Exception $previous
+	 */
+	public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+	{
+		parent::__construct($message,$code,$previous);
+		$this->returnArray = $retarray;
+	}
     
-    /**
-     * Get exception array
-     * @return array
-     */
-    public function getArray()
-    {
-        return $this->returnArray;
-    }
+	/**
+	 * Get exception array
+	 * @return array
+	 */
+	public function getArray()
+	{
+		return $this->returnArray;
+	}
 }
 
 /**
@@ -56,278 +56,278 @@ 
  */
 class UIDatabase //extends TrapDBQuery
 {
-    use TrapDBQuery,IdoDBQuery;
+	use TrapDBQuery,IdoDBQuery;
     
-    /** @var TrapsController $trapController TrapController 'parent' class */
-    protected  $trapController=null;
+	/** @var TrapsController $trapController TrapController 'parent' class */
+	protected  $trapController=null;
     
-    /** @var Selectable $trapDB Trap Database*/
-    protected $trapDB=null;
+	/** @var Selectable $trapDB Trap Database*/
+	protected $trapDB=null;
  
-    /** @var Selectable $trapDB Icinga IDO database*/
-    protected $idoDB=null;
+	/** @var Selectable $trapDB Icinga IDO database*/
+	protected $idoDB=null;
     
-    /** @var array $testResult */
-    protected $testResult;
+	/** @var array $testResult */
+	protected $testResult;
     
-    /**
-     * 
-     * @param TrapsController $trapCtrl
-     */
-    function __construct(TrapsController $trapCtrl)
-    {
-        $this->trapController=$trapCtrl;
-    }
+	/**
+	 * 
+	 * @param TrapsController $trapCtrl
+	 */
+	function __construct(TrapsController $trapCtrl)
+	{
+		$this->trapController=$trapCtrl;
+	}
     
-    /**
-     * Get TrapsController instance
-     * @return TrapsController
-     */
-    protected function getTrapCtrl()
-    {
-        return $this->trapController;
-    }
+	/**
+	 * Get TrapsController instance
+	 * @return TrapsController
+	 */
+	protected function getTrapCtrl()
+	{
+		return $this->trapController;
+	}
     
-    /**
-     * Test if database version >= min database version
-     * 
-     * @param \Zend_Db_Adapter_Abstract $dbConn
-     * @param int $min Minimum version
-     * @param bool $test Test mode
-     * @param string $DBname Name of DB
-     * @return bool true if OK, false if version < min version
-     * @throws Exception if error and test = true
-     */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
-    {
-        try
-        {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
-            ->where('name=\'db_version\'');
-            $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
-            {
-                if ($test === true) 
-                {
-                    $this->testResult = array(4,$DBname);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-                return false;
-            }
-            if ($version->value < $min)
-            {
-                if ($test === true) 
-                {
-                    $this->testResult = array(5,$version->value,$min);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=5');
-                return false;
-            }
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                $this->testResult = array(3,$DBname,$e->getMessage());
-                return false;
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Test if database version >= min database version
+	 * 
+	 * @param \Zend_Db_Adapter_Abstract $dbConn
+	 * @param int $min Minimum version
+	 * @param bool $test Test mode
+	 * @param string $DBname Name of DB
+	 * @return bool true if OK, false if version < min version
+	 * @throws Exception if error and test = true
+	 */
+	protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+	{
+		try
+		{
+			$query = $dbAdapter->select()
+			->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+			->where('name=\'db_version\'');
+			$version=$dbAdapter->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'value') )
+			{
+				if ($test === true) 
+				{
+					$this->testResult = array(4,$DBname);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+				return false;
+			}
+			if ($version->value < $min)
+			{
+				if ($test === true) 
+				{
+					$this->testResult = array(5,$version->value,$min);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=5');
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				$this->testResult = array(3,$DBname,$e->getMessage());
+				return false;
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+			return false;
+		}
+		return true;
+	}
     
-    /**	Get Database connexion
-     *	@param $DBname string DB name in resource.ini_ge
-     *	@param $test bool if set to true, returns error code and not database
-     *	@param $test_version bool if set to flase, does not test database version of trapDB
-     *  @throws DBException if test = true and error
-     *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    protected function getDbByName($DBname , $test = false , $test_version = true)
-    {
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                throw new DBException(array(2,$DBname));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=2');
-            return null;
-        }
+	/**	Get Database connexion
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *  @throws DBException if test = true and error
+	 *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	protected function getDbByName($DBname , $test = false , $test_version = true)
+	{
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				throw new DBException(array(2,$DBname));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=2');
+			return null;
+		}
         
-        try
-        {
-            $dbAdapter=$dbconn->getDbAdapter();
+		try
+		{
+			$dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
-        {
-            if ($test === true)
-            {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=3');
-            return null;
-        }
+		}
+		catch (Exception $e)
+		{
+			if ($test === true)
+			{
+				throw new DBException(array(3,$DBname,$e->getMessage()));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=3');
+			return null;
+		}
         
-        if ($test_version == true) {
-            $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
-            if ($testRet !== true) 
-            {
-                throw new DBException($this->testResult);
-            }
-        }
+		if ($test_version == true) {
+			$testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
+			if ($testRet !== true) 
+			{
+				throw new DBException($this->testResult);
+			}
+		}
         
-        return $dbconn;
-    }
+		return $dbconn;
+	}
 
-    /**
-     * Get Trap database
-     * @return Selectable|null : returns DB connexion or null on error.
-     */
-    public function getDb()
-    {
-        if ( $this->trapDB != null ) return $this->trapDB;
+	/**
+	 * Get Trap database
+	 * @return Selectable|null : returns DB connexion or null on error.
+	 */
+	public function getDb()
+	{
+		if ( $this->trapDB != null ) return $this->trapDB;
         
         
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-            $this->trapController->redirectNow('trapdirector/settings?dberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?dberror=1');
+			return null;
+		}
 
-        try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
-        } catch (DBException $e) {
-            return null; // Should not happen as test = false
-        }
+		try {
+			$this->trapDB = $this->getDbByName($dbresource,false,true);
+		} catch (DBException $e) {
+			return null; // Should not happen as test = false
+		}
         
-        //$this->trapDB->getConnection();
+		//$this->trapDB->getConnection();
         
-        return $this->trapDB;
-    }
+		return $this->trapDB;
+	}
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getDbConn()
-    {
-        if ($this->getDb() == null) return null;
-        return $this->getDb()->getConnection();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getDbConn()
+	{
+		if ($this->getDb() == null) return null;
+		return $this->getDb()->getConnection();
+	}
     
-    /**
-     * Test Trap database
-     * @param boolean $test
-     * @throws DBException on error.
-     * @return \Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function testGetDb()
-    {       
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+	/**
+	 * Test Trap database
+	 * @param boolean $test
+	 * @throws DBException on error.
+	 * @return \Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function testGetDb()
+	{       
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-                throw new DBException(array(1,''));
-        }
+		if ( ! $dbresource )
+		{
+				throw new DBException(array(1,''));
+		}
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
-        return;
-    }
+		$this->trapDB = $this->getDbByName($dbresource,true,true);       
+		return;
+	}
     
 
-    /**
-     * Get IDO Database
-     * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
-     */
-    public function getIdoDb()
-    {
-        if ( $this->idoDB != null ) return $this->idoDB;
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database
+	 * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
+	 */
+	public function getIdoDb()
+	{
+		if ( $this->idoDB != null ) return $this->idoDB;
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
-            return null;
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
+		}
 
-        $this->idoDB = $dbconn;
-        return $this->idoDB;
-    }
+		$this->idoDB = $dbconn;
+		return $this->idoDB;
+	}
 
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getIdoDbConn()
-    {
-        if ($this->getIdoDb() == null) return null;
-        return $this->getIdoDb()->getConnection();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getIdoDbConn()
+	{
+		if ($this->getIdoDb() == null) return null;
+		return $this->getIdoDb()->getConnection();
+	}
     
-    /**
-     * Get IDO Database
-     * @param boolean $test
-     * @throws DBException on error
-     */
-    public function testGetIdoDb()
-    {
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database
+	 * @param boolean $test
+	 * @throws DBException on error
+	 */
+	public function testGetIdoDb()
+	{
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            throw new DBException(array(1,'No database in config.ini'));
-        }
+		if ( ! $dbresource )
+		{
+			throw new DBException(array(1,'No database in config.ini'));
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+		}
                
-        try
-        {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
-            $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
-            {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
-            }
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
-        }
+		try
+		{
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+			}
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+		}
         
-        return;
-    }
+		return;
+	}
     
 }
\ No newline at end of file

application/controllers/HelperController.php

Indentation +128 added lines, -128 removed lines

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

Braces +16 added lines, -32 removed lines

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

Spacing +60 added lines, -60 removed lines

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

library/Trapdirector/TrapsActions/TrapDBQuery.php

Braces +44 added lines, -14 removed lines

@@ -26,7 +26,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()');
@@ -52,7 +54,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();
@@ -73,7 +77,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(),
@@ -90,7 +96,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)
         {
@@ -101,7 +109,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
@@ -119,7 +129,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)
@@ -131,7 +143,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(),
@@ -148,7 +162,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(
@@ -156,18 +172,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];
             }
@@ -183,7 +209,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(),
@@ -203,7 +231,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(),

Indentation +175 added lines, -175 removed lines

@@ -19,207 +19,207 @@
 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;
+	}
     
-    /** 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;
+	}
     
-    /** 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 +30 added lines, -30 removed lines

@@ -33,18 +33,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;
         }
@@ -56,14 +56,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(),
@@ -78,9 +78,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(
@@ -94,10 +94,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)
@@ -106,10 +106,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
@@ -123,10 +123,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;
@@ -136,10 +136,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(),
@@ -155,28 +155,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;
@@ -187,10 +187,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(
@@ -207,10 +207,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(

library/Trapdirector/TrapsController.php

Indentation +48 added lines, -48 removed lines

@@ -43,8 +43,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -76,12 +76,12 @@ 
 	 */
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	/**
@@ -102,23 +102,23 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -127,33 +127,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -173,18 +173,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -194,13 +194,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +20 added lines, -20 removed lines

@@ -54,7 +54,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -65,7 +65,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -78,7 +78,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -91,7 +91,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -104,38 +104,38 @@ 
 	{
 	    if ($this->UIDatabase == Null)
 	    {
-	        $this->UIDatabase = new UIDatabase($this);
+	        $this->UIDatabase=new UIDatabase($this);
 	       
 	    }
 	    return $this->UIDatabase;
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -146,10 +146,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -161,10 +161,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -179,7 +179,7 @@ 
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
@@ -199,10 +199,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

Braces +3 added lines, -1 removed lines

@@ -180,7 +180,9 @@
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),

library/Trapdirector/TrapsActions/IdoDBQuery.php

Spacing +28 added lines, -28 removed lines

@@ -23,14 +23,14 @@ 
     public function getHostByIP($ip)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hosts'),
                 'b.host_object_id=a.object_id',
@@ -46,14 +46,14 @@ 
     public function getHostByName($name)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hosts'),
                 'b.host_object_id=a.object_id',
@@ -69,13 +69,13 @@ 
     public function getHostGroupByName($ip)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hostgroups'),
                 'b.hostgroup_object_id=a.object_id',
@@ -91,8 +91,8 @@ 
      */
     public function getHostInfoByID($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -113,18 +113,18 @@ 
      */
     public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'a.object_id'))
+            array('name' => 'a.name1', 'id' => 'a.object_id'))
             ->join(
                 array('b' => 'icinga_hosts'),
                 'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-                ->where('a.object_id = ?',$id);
+                array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+                ->where('a.object_id = ?', $id);
                 return $dbConn->fetchRow($query);
     }
     
@@ -136,17 +136,17 @@ 
     public function getServicesByHostid($id)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
+            array('name' => 's.display_name', 'id' => 's.service_object_id'))
             ->join(
                 array('a' => 'icinga_objects'),
                 's.service_object_id=a.object_id',
-                array('is_active'=>'a.is_active','name2'=>'a.name2'))
+                array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
                 ->where('s.host_object_id='.$id.' AND a.is_active = 1');
                 return $dbConn->fetchAll($query);
     }
@@ -159,8 +159,8 @@ 
      */
     public function getServicesByHostGroupid($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -177,11 +177,11 @@ 
                 foreach ($hosts as $key => $host)
                 { // For each host, get all services and add in common_services if not found or add counter
                     $host_services=$this->getServicesByHostid($host->host_object_id);
-                    foreach($host_services as $service)
+                    foreach ($host_services as $service)
                     {
                         if (isset($common_services[$service->name2]['num']))
                         {
-                            $common_services[$service->name2]['num'] +=1;
+                            $common_services[$service->name2]['num']+=1;
                         }
                         else
                         {
@@ -197,7 +197,7 @@ 
                 {
                     if ($common_services[$key]['num'] == $num_hosts)
                     {
-                        array_push($result,array($key,$common_services[$key]['name']));
+                        array_push($result, array($key, $common_services[$key]['name']));
                     }
                 }
                 
@@ -210,9 +210,9 @@ 
      *	@param $name string service name
      *	@return array  service id
      */
-    public function getServiceIDByName($hostname,$name)
+    public function getServiceIDByName($hostname, $name)
     {
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         if ($name == null)
@@ -223,7 +223,7 @@ 
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
+            array('name' => 's.display_name', 'id' => 's.service_object_id'))
             ->join(
                 array('a' => 'icinga_objects'),
                 's.service_object_id=a.object_id',
@@ -241,14 +241,14 @@ 
     public function getObjectNameByid($id)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name1' => 'a.name1','name2' => 'a.name2'))
+            array('name1' => 'a.name1', 'name2' => 'a.name2'))
             ->where('a.object_id='.$id.' AND a.is_active = 1');
             
             return $dbConn->fetchRow($query);

Braces +28 added lines, -11 removed lines

@@ -24,7 +24,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
@@ -47,7 +49,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
@@ -70,7 +74,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
@@ -93,7 +99,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
@@ -115,7 +123,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
@@ -138,7 +148,9 @@ 
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_services'),
@@ -161,7 +173,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_hostgroup_members'),
@@ -182,8 +196,7 @@ 
                         if (isset($common_services[$service->name2]['num']))
                         {
                             $common_services[$service->name2]['num'] +=1;
-                        }
-                        else
+                        } else
                         {
                             $common_services[$service->name2]['num']=1;
                             $common_services[$service->name2]['name']=$service->name;
@@ -213,7 +226,9 @@ 
     public function getServiceIDByName($hostname,$name)
     {
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         if ($name == null)
         {
@@ -243,7 +258,9 @@ 
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->select()
         ->from(

Indentation +222 added lines, -222 removed lines

@@ -18,247 +18,247 @@
 trait IdoDBQuery
 {
 
-    /** @return TrapsController */
-    abstract protected function getTrapCtrl();
+	/** @return TrapsController */
+	abstract protected function getTrapCtrl();
     
-    /** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
-    abstract public function getIdoDbConn();
+	/** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
+	abstract public function getIdoDbConn();
     
-    /** Get host(s) by IP (v4 or v6) or by name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostByIP($ip)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get host(s) by IP (v4 or v6) or by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostByIP($ip)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host(s) by name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostByName($name)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get host(s) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostByName($name)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("a.name1 = '$name'");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("a.name1 = '$name'");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host groups by  name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostGroupByName($ip)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hostgroups'),
-                'b.hostgroup_object_id=a.object_id',
-                array('display_name' => 'b.alias'))
-                ->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+	/** Get host groups by  name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostGroupByName($ip)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hostgroups'),
+				'b.hostgroup_object_id=a.object_id',
+				array('display_name' => 'b.alias'))
+				->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
  
-    /** Get host IP (v4 and v6) by name in IDO database
-     *	does not catch exceptions
-     *	@return array ( name, display_name, ip4, ip6)
-     */
-    public function getHostInfoByID($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
-                ->where("a.object_id = '".$id."'");
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host IP (v4 and v6) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
+	public function getHostInfoByID($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
+				->where("a.object_id = '".$id."'");
+				return $dbConn->fetchRow($query);
+	}
         
-    /** Get host by objectid  in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( id, name, display_name, ip, ip6,  )
-     */
-    public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'a.object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-                ->where('a.object_id = ?',$id);
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host by objectid  in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
+	public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'a.object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?',$id);
+				return $dbConn->fetchRow($query);
+	}
     
-    /** Get services from object ( host_object_id) in IDO database
-     *	does not catch exceptions
-     *	@param $id	int object_id
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostid($id)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                array('is_active'=>'a.is_active','name2'=>'a.name2'))
-                ->where('s.host_object_id='.$id.' AND a.is_active = 1');
-                return $dbConn->fetchAll($query);
-    }
+	/** Get services from object ( host_object_id) in IDO database
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostid($id)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_services'),
+			array('name' => 's.display_name','id' => 's.service_object_id'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				array('is_active'=>'a.is_active','name2'=>'a.name2'))
+				->where('s.host_object_id='.$id.' AND a.is_active = 1');
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
-     * 	gets all hosts in hostgroup and return common services
-     *	does not catch exceptions
-     *	@param $id	int object_id
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostGroupid($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_hostgroup_members'),
-            array('host_object_id' => 's.host_object_id'))
-            ->join(
-                array('a' => 'icinga_hostgroups'),
-                's.hostgroup_id=a.hostgroup_id',
-                'hostgroup_object_id')
-                ->where('a.hostgroup_object_id='.$id);
-                $hosts=$dbConn->fetchAll($query);
-                $common_services=array();
-                $num_hosts=count($hosts);
-                foreach ($hosts as $key => $host)
-                { // For each host, get all services and add in common_services if not found or add counter
-                    $host_services=$this->getServicesByHostid($host->host_object_id);
-                    foreach($host_services as $service)
-                    {
-                        if (isset($common_services[$service->name2]['num']))
-                        {
-                            $common_services[$service->name2]['num'] +=1;
-                        }
-                        else
-                        {
-                            $common_services[$service->name2]['num']=1;
-                            $common_services[$service->name2]['name']=$service->name;
-                        }
-                    }
-                }
-                $result=array();
+	/** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
+	 * 	gets all hosts in hostgroup and return common services
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostGroupid($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_hostgroup_members'),
+			array('host_object_id' => 's.host_object_id'))
+			->join(
+				array('a' => 'icinga_hostgroups'),
+				's.hostgroup_id=a.hostgroup_id',
+				'hostgroup_object_id')
+				->where('a.hostgroup_object_id='.$id);
+				$hosts=$dbConn->fetchAll($query);
+				$common_services=array();
+				$num_hosts=count($hosts);
+				foreach ($hosts as $key => $host)
+				{ // For each host, get all services and add in common_services if not found or add counter
+					$host_services=$this->getServicesByHostid($host->host_object_id);
+					foreach($host_services as $service)
+					{
+						if (isset($common_services[$service->name2]['num']))
+						{
+							$common_services[$service->name2]['num'] +=1;
+						}
+						else
+						{
+							$common_services[$service->name2]['num']=1;
+							$common_services[$service->name2]['name']=$service->name;
+						}
+					}
+				}
+				$result=array();
                 
-                //print_r($common_services);
-                foreach (array_keys($common_services) as $key)
-                {
-                    if ($common_services[$key]['num'] == $num_hosts)
-                    {
-                        array_push($result,array($key,$common_services[$key]['name']));
-                    }
-                }
+				//print_r($common_services);
+				foreach (array_keys($common_services) as $key)
+				{
+					if ($common_services[$key]['num'] == $num_hosts)
+					{
+						array_push($result,array($key,$common_services[$key]['name']));
+					}
+				}
                 
-                return $result;
-    }
+				return $result;
+	}
     
-    /** Get services object id by host name / service name in IDO database
-     *	does not catch exceptions
-     *	@param $hostname string host name
-     *	@param $name string service name
-     *	@return array  service id
-     */
-    public function getServiceIDByName($hostname,$name)
-    {
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get services object id by host name / service name in IDO database
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return array  service id
+	 */
+	public function getServiceIDByName($hostname,$name)
+	{
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        if ($name == null)
-        {
-            return array();
-        }
+		if ($name == null)
+		{
+			return array();
+		}
         
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                'is_active')
-                ->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_services'),
+			array('name' => 's.display_name','id' => 's.service_object_id'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				'is_active')
+				->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
                 
-                return $dbConn->fetchAll($query);
-    }
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get object name from object_id  in IDO database
-     *	does not catch exceptions
-     *	@param int $id object_id (default to null, used first if not null)
-     *	@return array name1 (host) name2 (service)
-     */
-    public function getObjectNameByid($id)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get object name from object_id  in IDO database
+	 *	does not catch exceptions
+	 *	@param int $id object_id (default to null, used first if not null)
+	 *	@return array name1 (host) name2 (service)
+	 */
+	public function getObjectNameByid($id)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name1' => 'a.name1','name2' => 'a.name2'))
-            ->where('a.object_id='.$id.' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name1' => 'a.name1','name2' => 'a.name2'))
+			->where('a.object_id='.$id.' AND a.is_active = 1');
             
-            return $dbConn->fetchRow($query);
-    }
+			return $dbConn->fetchRow($query);
+	}
     
     
 }
\ No newline at end of file