Inspection of "Error in redirect" - patrickpr/trapdirector - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 4f33ba...3d7e39 )

by Patrick

created 2020-02-13 15:18 UTC

Status

Indentation +243 added lines, -244 removed lines patch added patch discarded remove patch

@@ -11,13 +11,12 @@  discard block
 block discarded – undo
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -41,22 +40,22 @@  discard block
 block discarded – undo
 	 */
 	public function testruleAction()
 	{
-	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
-	        'active'	=> true,
-	        'label'		=> $this->translate('Test Rule'),
-	        'url'		=> Url::fromRequest()
-	    ));
+		$this->checkReadPermission();
+		$this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Test Rule'),
+			'url'		=> Url::fromRequest()
+		));
 	    
 
-	    if ($this->params->get('rule') !== null) 
-	    {
-	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
-	    {
-	        $this->view->rule='';
-	    }
+		if ($this->params->get('rule') !== null) 
+		{
+			$this->view->rule= $this->params->get('rule');
+		}
+		else
+		{
+			$this->view->rule='';
+		}
 	}
 	
 	/**
@@ -64,31 +63,31 @@  discard block
 block discarded – undo
 	 */
 	private function add_setup_vars()
 	{
-	    // variables to send to view
-	    $this->view->hostlist=array(); // host list to input datalist
-	    $this->view->hostname=''; // Host name in input text
-	    $this->view->serviceGet=false; // Set to true to get list of service if only one host set
-	    $this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
-	    $this->view->mainoid=''; // Trap OID
-	    $this->view->mib=''; // Trap mib
-	    $this->view->name=''; // Trap name
-	    $this->view->trapListForMIB=array(); // Trap list if mib exists for trap
-	    $this->view->objectList=array(); // objects sent with trap
-	    $this->view->display=''; // Initial display
-	    $this->view->rule=''; // rule display
-	    $this->view->revertOK=''; // revert OK in seconds
-	    $this->view->hostid=-1; // normally set by javascript serviceGet()
-	    $this->view->ruleid=-1; // Rule id in DB for update & delete
-	    $this->view->setToUpdate=false; // set form as update form
-	    $this->view->setRuleMatch=-1; // set action on rule match (default nothing)
-	    $this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
+		// variables to send to view
+		$this->view->hostlist=array(); // host list to input datalist
+		$this->view->hostname=''; // Host name in input text
+		$this->view->serviceGet=false; // Set to true to get list of service if only one host set
+		$this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
+		$this->view->mainoid=''; // Trap OID
+		$this->view->mib=''; // Trap mib
+		$this->view->name=''; // Trap name
+		$this->view->trapListForMIB=array(); // Trap list if mib exists for trap
+		$this->view->objectList=array(); // objects sent with trap
+		$this->view->display=''; // Initial display
+		$this->view->rule=''; // rule display
+		$this->view->revertOK=''; // revert OK in seconds
+		$this->view->hostid=-1; // normally set by javascript serviceGet()
+		$this->view->ruleid=-1; // Rule id in DB for update & delete
+		$this->view->setToUpdate=false; // set form as update form
+		$this->view->setRuleMatch=-1; // set action on rule match (default nothing)
+		$this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
 	    
-	    $this->view->selectGroup=false; // Select by group if true
-	    $this->view->hostgroupid=-1; // host group id
-	    $this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
+		$this->view->selectGroup=false; // Select by group if true
+		$this->view->hostgroupid=-1; // host group id
+		$this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
 	    
-	    $this->view->modifier=null;
-	    $this->view->modified=null;
+		$this->view->modifier=null;
+		$this->view->modified=null;
 	}
 	
 	/**
@@ -97,102 +96,102 @@  discard block
 block discarded – undo
 	 */
 	private function add_from_existing($trapid)
 	{
-	    /********** Setup from existing trap ***************/
-	    // Get the full trap info
-	    $trapDetail=$this->getTrapDetail($trapid);
+		/********** Setup from existing trap ***************/
+		// Get the full trap info
+		$trapDetail=$this->getTrapDetail($trapid);
 	    
-	    $hostfilter=$trapDetail->source_ip;
+		$hostfilter=$trapDetail->source_ip;
 	    
-	    // Get host
-	    try
-	    {
-	        $hosts=$this->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getHostByIP($hostfilter);
+		}
+		catch (Exception $e)
+		{
+			$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+		}
 	    
 	    
-	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
-	        $this->view->hostname=$hosts[0]->name;
-	        //$hostid=$hosts[0]->id;
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
+		// if one unique host found -> put id text input
+		if (count($hosts)==1) {
+			$this->view->hostname=$hosts[0]->name;
+			//$hostid=$hosts[0]->id;
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
 	        
-	    }
-	    else
-	    {
-	        foreach($hosts as $key=>$val)
-	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
-	        }
-	    }
+		}
+		else
+		{
+			foreach($hosts as $key=>$val)
+			{
+				array_push($this->view->hostlist,$hosts[$key]->name);
+			}
+		}
 	    
-	    // set up trap oid and objects received by the trap
+		// set up trap oid and objects received by the trap
 	    
-	    $this->view->mainoid=$trapDetail->trap_oid;
-	    if ($trapDetail->trap_name_mib != null)
-	    {
-	        $this->view->mib=$trapDetail->trap_name_mib;
-	        $this->view->name=$trapDetail->trap_name;
-	        $this->view->trapListForMIB=$this->getMIB()
-	        ->getTrapList($trapDetail->trap_name_mib);
-	    }
+		$this->view->mainoid=$trapDetail->trap_oid;
+		if ($trapDetail->trap_name_mib != null)
+		{
+			$this->view->mib=$trapDetail->trap_name_mib;
+			$this->view->name=$trapDetail->trap_name;
+			$this->view->trapListForMIB=$this->getMIB()
+			->getTrapList($trapDetail->trap_name_mib);
+		}
 	    
-	    // Get all objects that can be in trap from MIB
-	    $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
-	    // Get all objects in current Trap
-	    $currentTrapObjects=$this->getTrapobjects($trapid);
-	    $oid_index=1;
-	    foreach ($currentTrapObjects as $key => $val)
-	    {
-	        $currentObjectType='Unknown';
-	        $currentObjectTypeEnum='Unknown';
-	        if (isset($allObjects[$val->oid]['type']))
-	        {
-	            $currentObjectType=$allObjects[$val->oid]['type'];
-	            $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
-	        }
-	        $currentObject=array(
-	            $oid_index,
-	            $val->oid,
-	            $val->oid_name_mib,
-	            $val->oid_name,
-	            $val->value,
-	            $currentObjectType,
-	            $currentObjectTypeEnum
-	        );
-	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
-	        // set currrent object to null in allObjects
-	        if (isset($allObjects[$val->oid]))
-	        {
-	            $allObjects[$val->oid]=null;
-	        }
-	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
-	    {
-	        foreach ($allObjects as $key => $val)
-	        {
-	            if ($val==null) { continue; }
-	            array_push($this->view->objectList, array(
-	                $oid_index,
-	                $key,
-	                $allObjects[$key]['mib'],
-	                $allObjects[$key]['name'],
-	                '',
-	                $allObjects[$key]['type'],
-	                $allObjects[$key]['type_enum']
-	            ));
-	            $oid_index++;
-	        }
-	    }
+		// Get all objects that can be in trap from MIB
+		$allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
+		// Get all objects in current Trap
+		$currentTrapObjects=$this->getTrapobjects($trapid);
+		$oid_index=1;
+		foreach ($currentTrapObjects as $key => $val)
+		{
+			$currentObjectType='Unknown';
+			$currentObjectTypeEnum='Unknown';
+			if (isset($allObjects[$val->oid]['type']))
+			{
+				$currentObjectType=$allObjects[$val->oid]['type'];
+				$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
+			}
+			$currentObject=array(
+				$oid_index,
+				$val->oid,
+				$val->oid_name_mib,
+				$val->oid_name,
+				$val->value,
+				$currentObjectType,
+				$currentObjectTypeEnum
+			);
+			$oid_index++;
+			array_push($this->view->objectList,$currentObject);
+			// set currrent object to null in allObjects
+			if (isset($allObjects[$val->oid]))
+			{
+				$allObjects[$val->oid]=null;
+			}
+		}
+		if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+		{
+			foreach ($allObjects as $key => $val)
+			{
+				if ($val==null) { continue; }
+				array_push($this->view->objectList, array(
+					$oid_index,
+					$key,
+					$allObjects[$key]['mib'],
+					$allObjects[$key]['name'],
+					'',
+					$allObjects[$key]['type'],
+					$allObjects[$key]['type_enum']
+				));
+				$oid_index++;
+			}
+		}
 	    
-	    // Add a simple display
-	    $this->view->display='Trap '.$trapDetail->trap_name.' received';
-	    $this->view->create_basic_rule=true;
+		// Add a simple display
+		$this->view->display='Trap '.$trapDetail->trap_name.' received';
+		$this->view->create_basic_rule=true;
 	}
 
 	/**
@@ -201,29 +200,29 @@  discard block
 block discarded – undo
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
-	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
-	        $this->view->serviceGet=false;
-	    }
-	    else
-	    {
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
-	        // get service id for form to set :
-	        $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
-	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
-	        {
-	            $this->view->serviceSet=$serviceID[0]->id;
-	        }
-	    }
+		if (count($host_get)==0)
+		{
+			$this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+			$this->view->serviceGet=false;
+		}
+		else
+		{
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
+			// get service id for form to set :
+			$serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
+			if (count($serviceID) ==0)
+			{
+				$this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+			else
+			{
+				$this->view->serviceSet=$serviceID[0]->id;
+			}
+		}
 	}
 
 	/**
@@ -232,33 +231,33 @@  discard block
 block discarded – undo
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
-	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
-	        $this->view->serviceGroupGet=false;
-	    }
-	    else
-	    {
-	        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
-	        $foundGrpService=0;
-	        foreach ($grpServices as $grpService)
-	        {
-	            if ($grpService[0] == $ruleDetail->service_name)
-	            {
-	                $foundGrpService=1;
-	                $this->view->serviceSet=$ruleDetail->service_name;
-	            }
-	        }
+		// Check if groupe exists
+		$group_get=$this->getHostGroupByName($this->view->hostgroupname);
+		if (count($group_get)==0)
+		{
+			$this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+			$this->view->serviceGroupGet=false;
+		}
+		else
+		{
+			$grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
+			$foundGrpService=0;
+			foreach ($grpServices as $grpService)
+			{
+				if ($grpService[0] == $ruleDetail->service_name)
+				{
+					$foundGrpService=1;
+					$this->view->serviceSet=$ruleDetail->service_name;
+				}
+			}
 	        
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
-	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	    }
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGroupGet=true;
+			if ($foundGrpService==0)
+			{
+				$this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+		}
 	}
 	
 	/**
@@ -270,52 +269,52 @@  discard block
 block discarded – undo
 	 */
 	private function add_create_trap_object_list(&$display, &$rule)
 	{
-	    $curObjectList=array();
-	    $index=1;
-	    // check in display & rule for : OID(<oid>)
-	    $matches=array();
-	    while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) ||
-	        preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
-	    {
-	        $curOid=$matches[1];
+		$curObjectList=array();
+		$index=1;
+		// check in display & rule for : OID(<oid>)
+		$matches=array();
+		while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) ||
+			preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
+		{
+			$curOid=$matches[1];
 	        
-	        if ( (preg_match('/\*/',$curOid) == 0 ) 
-	            && ($object=$this->getMIB()->translateOID($curOid)) != null)
-	        {
-	            array_push($curObjectList, array(
-	                $index,
-	                $curOid,
-	                $object['mib'],
-	                $object['name'],
-	                '',
-	                $object['type'],
-	                $object['type_enum']
-	            ));
-	        }
-	        else
-	        {
-	            array_push($curObjectList, array(
-	                $index,
-	                $curOid,
-	                'not found',
-	                'not found',
-	                '',
-	                'not found',
-	                'not found'
-	            ));
-	        }
-	        $curOid = preg_replace('/\*/','\*',$curOid);
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
-	        $index++;
-	    }
-	    return $curObjectList;
+			if ( (preg_match('/\*/',$curOid) == 0 ) 
+				&& ($object=$this->getMIB()->translateOID($curOid)) != null)
+			{
+				array_push($curObjectList, array(
+					$index,
+					$curOid,
+					$object['mib'],
+					$object['name'],
+					'',
+					$object['type'],
+					$object['type_enum']
+				));
+			}
+			else
+			{
+				array_push($curObjectList, array(
+					$index,
+					$curOid,
+					'not found',
+					'not found',
+					'',
+					'not found',
+					'not found'
+				));
+			}
+			$curOid = preg_replace('/\*/','\*',$curOid);
+			$display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
+			$rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+			$index++;
+		}
+		return $curObjectList;
 	}
 	
 	/** Add a handler  
-	*	Get params fromid : setup from existing trap (id of trap table)
-	*	Get param ruleid : edit from existing handler (id of rule table)
-	*/
+	 *	Get params fromid : setup from existing trap (id of trap table)
+	 *	Get param ruleid : edit from existing handler (id of rule table)
+	 */
 	public function addAction()
 	{
 		$this->checkConfigPermission();
@@ -334,8 +333,8 @@  discard block
 block discarded – undo
 		//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
 		
 		if (($trapid = $this->params->get('fromid')) !== null) {
-		    /********** Setup from existing trap ***************/
-            $this->add_from_existing($trapid);
+			/********** Setup from existing trap ***************/
+			$this->add_from_existing($trapid);
 			return;
 		}
 		
@@ -360,14 +359,14 @@  discard block
 block discarded – undo
 			$this->view->warning_message='';
 			if ($this->view->hostname != null)
 			{
-			    $this->view->selectGroup=false;
-			    // Check if hostname still exists
-			    $this->add_check_host_exists($ruleDetail);
+				$this->view->selectGroup=false;
+				// Check if hostname still exists
+				$this->add_check_host_exists($ruleDetail);
 			}
 			else
 			{
-			    $this->view->selectGroup=true;
-			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
+				$this->view->selectGroup=true;
+				$this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
 			}
 			
 			$this->view->mainoid=$ruleDetail->trap_oid;
@@ -395,9 +394,9 @@  discard block
 block discarded – undo
 	}
 	
 	/** Validate form and output message to user  
-	*	@param in postdata 
-	* 	@return string status : OK / <Message>
-	**/
+	 *	@param in postdata 
+	 * 	@return string status : OK / <Message>
+	 **/
 	protected function handlerformAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -438,7 +437,7 @@  discard block
 block discarded – undo
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -522,9 +521,9 @@  discard block
 block discarded – undo
 	}
 
 	/** Get trap detail by trapid. 
-	*	@param integer $trapid : id of trap in received table
-	*	@return array (objects)
-	*/
+	 *	@param integer $trapid : id of trap in received table
+	 *	@return array (objects)
+	 */
 	protected function getTrapDetail($trapid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -540,14 +539,14 @@  discard block
 block discarded – undo
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
 			if ( $trapDetail == null ) 
 			{
-			    $trapDetail = 'NULL';
-			    throw new Exception('No traps was found with id = '.$trapid);
+				$trapDetail = 'NULL';
+				throw new Exception('No traps was found with id = '.$trapid);
 			}
 		}
 		catch (Exception $e)
@@ -561,9 +560,9 @@  discard block
 block discarded – undo
 	}
 
 	/** Get trap objects
-	*	@param integer $trapid : trap id
-	* 	@return array : full column in db of trap id
-	*/
+	 *	@param integer $trapid : trap id
+	 * 	@return array : full column in db of trap id
+	 */
 	protected function getTrapobjects($trapid)
 	{	
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -579,7 +578,7 @@  discard block
 block discarded – undo
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -595,10 +594,10 @@  discard block
 block discarded – undo
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object : column objects in db 
-	*
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object : column objects in db 
+	 *
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -609,7 +608,7 @@  discard block
 block discarded – undo
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -626,7 +625,7 @@  discard block
 block discarded – undo
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Please login to merge, or discard this patch.

library/Trapdirector/TrapsActions/UIDatabase.php 1 patch

Indentation +251 added lines, -251 removed lines patch added patch discarded remove patch

@@ -19,30 +19,30 @@  discard block
 block discarded – undo
  */
 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;
+	}
 }
 
 /**
@@ -57,267 +57,267 @@  discard block
 block discarded – undo
 class UIDatabase
 {
     
-    /** @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;
+	}
     
-    /**
-     * 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

Please login to merge, or discard this patch.

		@@ -11,13 +11,12 @@ discard block
		block discarded – undo
11	11
12	12	//use Icinga\Web\Form as Form;
13	13	/** Rules management
14		-
15		-*/
	14	+ */
16	15	class HandlerController extends TrapsController
17	16	{
18	17
19	18	/** index : list existing rules
20		- */
	19	+ */
21	20	public function indexAction()
22	21	{
23	22	$this->checkReadPermission();
		@@ -41,22 +40,22 @@ discard block
		block discarded – undo
41	40	*/
42	41	public function testruleAction()
43	42	{
44		- $this->checkReadPermission();
45		- $this->getTabs()->add('get',array(
46		- 'active' => true,
47		- 'label' => $this->translate('Test Rule'),
48		- 'url' => Url::fromRequest()
49		- ));
	43	+ $this->checkReadPermission();
	44	+ $this->getTabs()->add('get',array(
	45	+ 'active' => true,
	46	+ 'label' => $this->translate('Test Rule'),
	47	+ 'url' => Url::fromRequest()
	48	+ ));
50	49
51	50
52		- if ($this->params->get('rule') !== null)
53		- {
54		- $this->view->rule= $this->params->get('rule');
55		- }
56		- else
57		- {
58		- $this->view->rule='';
59		- }
	51	+ if ($this->params->get('rule') !== null)
	52	+ {
	53	+ $this->view->rule= $this->params->get('rule');
	54	+ }
	55	+ else
	56	+ {
	57	+ $this->view->rule='';
	58	+ }
60	59	}
61	60
62	61	/**
		@@ -64,31 +63,31 @@ discard block
		block discarded – undo
64	63	*/
65	64	private function add_setup_vars()
66	65	{
67		- // variables to send to view
68		- $this->view->hostlist=array(); // host list to input datalist
69		- $this->view->hostname=''; // Host name in input text
70		- $this->view->serviceGet=false; // Set to true to get list of service if only one host set
71		- $this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
72		- $this->view->mainoid=''; // Trap OID
73		- $this->view->mib=''; // Trap mib
74		- $this->view->name=''; // Trap name
75		- $this->view->trapListForMIB=array(); // Trap list if mib exists for trap
76		- $this->view->objectList=array(); // objects sent with trap
77		- $this->view->display=''; // Initial display
78		- $this->view->rule=''; // rule display
79		- $this->view->revertOK=''; // revert OK in seconds
80		- $this->view->hostid=-1; // normally set by javascript serviceGet()
81		- $this->view->ruleid=-1; // Rule id in DB for update & delete
82		- $this->view->setToUpdate=false; // set form as update form
83		- $this->view->setRuleMatch=-1; // set action on rule match (default nothing)
84		- $this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
	66	+ // variables to send to view
	67	+ $this->view->hostlist=array(); // host list to input datalist
	68	+ $this->view->hostname=''; // Host name in input text
	69	+ $this->view->serviceGet=false; // Set to true to get list of service if only one host set
	70	+ $this->view->serviceSet=null; // Select service in services select (must have serviceGet=true).
	71	+ $this->view->mainoid=''; // Trap OID
	72	+ $this->view->mib=''; // Trap mib
	73	+ $this->view->name=''; // Trap name
	74	+ $this->view->trapListForMIB=array(); // Trap list if mib exists for trap
	75	+ $this->view->objectList=array(); // objects sent with trap
	76	+ $this->view->display=''; // Initial display
	77	+ $this->view->rule=''; // rule display
	78	+ $this->view->revertOK=''; // revert OK in seconds
	79	+ $this->view->hostid=-1; // normally set by javascript serviceGet()
	80	+ $this->view->ruleid=-1; // Rule id in DB for update & delete
	81	+ $this->view->setToUpdate=false; // set form as update form
	82	+ $this->view->setRuleMatch=-1; // set action on rule match (default nothing)
	83	+ $this->view->setRuleNoMatch=-1; // set action on rule no match (default nothing)
85	84
86		- $this->view->selectGroup=false; // Select by group if true
87		- $this->view->hostgroupid=-1; // host group id
88		- $this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
	85	+ $this->view->selectGroup=false; // Select by group if true
	86	+ $this->view->hostgroupid=-1; // host group id
	87	+ $this->view->serviceGroupGet=false; // Get list of service for group (set serviceSet to select one)
89	88
90		- $this->view->modifier=null;
91		- $this->view->modified=null;
	89	+ $this->view->modifier=null;
	90	+ $this->view->modified=null;
92	91	}
93	92
94	93	/**
		@@ -97,102 +96,102 @@ discard block
		block discarded – undo
97	96	*/
98	97	private function add_from_existing($trapid)
99	98	{
100		- /******** Setup from existing trap *************/
101		- // Get the full trap info
102		- $trapDetail=$this->getTrapDetail($trapid);
	99	+ /******** Setup from existing trap *************/
	100	+ // Get the full trap info
	101	+ $trapDetail=$this->getTrapDetail($trapid);
103	102
104		- $hostfilter=$trapDetail->source_ip;
	103	+ $hostfilter=$trapDetail->source_ip;
105	104
106		- // Get host
107		- try
108		- {
109		- $hosts=$this->getHostByIP($hostfilter);
110		- }
111		- catch (Exception $e)
112		- {
113		- $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
114		- }
	105	+ // Get host
	106	+ try
	107	+ {
	108	+ $hosts=$this->getHostByIP($hostfilter);
	109	+ }
	110	+ catch (Exception $e)
	111	+ {
	112	+ $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
	113	+ }
115	114
116	115
117		- // if one unique host found -> put id text input
118		- if (count($hosts)==1) {
119		- $this->view->hostname=$hosts[0]->name;
120		- //$hostid=$hosts[0]->id;
121		- // Tell JS to get services when page is loaded
122		- $this->view->serviceGet=true;
	116	+ // if one unique host found -> put id text input
	117	+ if (count($hosts)==1) {
	118	+ $this->view->hostname=$hosts[0]->name;
	119	+ //$hostid=$hosts[0]->id;
	120	+ // Tell JS to get services when page is loaded
	121	+ $this->view->serviceGet=true;
123	122
124		- }
125		- else
126		- {
127		- foreach($hosts as $key=>$val)
128		- {
129		- array_push($this->view->hostlist,$hosts[$key]->name);
130		- }
131		- }
	123	+ }
	124	+ else
	125	+ {
	126	+ foreach($hosts as $key=>$val)
	127	+ {
	128	+ array_push($this->view->hostlist,$hosts[$key]->name);
	129	+ }
	130	+ }
132	131
133		- // set up trap oid and objects received by the trap
	132	+ // set up trap oid and objects received by the trap
134	133
135		- $this->view->mainoid=$trapDetail->trap_oid;
136		- if ($trapDetail->trap_name_mib != null)
137		- {
138		- $this->view->mib=$trapDetail->trap_name_mib;
139		- $this->view->name=$trapDetail->trap_name;
140		- $this->view->trapListForMIB=$this->getMIB()
141		- ->getTrapList($trapDetail->trap_name_mib);
142		- }
	134	+ $this->view->mainoid=$trapDetail->trap_oid;
	135	+ if ($trapDetail->trap_name_mib != null)
	136	+ {
	137	+ $this->view->mib=$trapDetail->trap_name_mib;
	138	+ $this->view->name=$trapDetail->trap_name;
	139	+ $this->view->trapListForMIB=$this->getMIB()
	140	+ ->getTrapList($trapDetail->trap_name_mib);
	141	+ }
143	142
144		- // Get all objects that can be in trap from MIB
145		- $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
146		- // Get all objects in current Trap
147		- $currentTrapObjects=$this->getTrapobjects($trapid);
148		- $oid_index=1;
149		- foreach ($currentTrapObjects as $key => $val)
150		- {
151		- $currentObjectType='Unknown';
152		- $currentObjectTypeEnum='Unknown';
153		- if (isset($allObjects[$val->oid]['type']))
154		- {
155		- $currentObjectType=$allObjects[$val->oid]['type'];
156		- $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
157		- }
158		- $currentObject=array(
159		- $oid_index,
160		- $val->oid,
161		- $val->oid_name_mib,
162		- $val->oid_name,
163		- $val->value,
164		- $currentObjectType,
165		- $currentObjectTypeEnum
166		- );
167		- $oid_index++;
168		- array_push($this->view->objectList,$currentObject);
169		- // set currrent object to null in allObjects
170		- if (isset($allObjects[$val->oid]))
171		- {
172		- $allObjects[$val->oid]=null;
173		- }
174		- }
175		- if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
176		- {
177		- foreach ($allObjects as $key => $val)
178		- {
179		- if ($val==null) { continue; }
180		- array_push($this->view->objectList, array(
181		- $oid_index,
182		- $key,
183		- $allObjects[$key]['mib'],
184		- $allObjects[$key]['name'],
185		- '',
186		- $allObjects[$key]['type'],
187		- $allObjects[$key]['type_enum']
188		- ));
189		- $oid_index++;
190		- }
191		- }
	143	+ // Get all objects that can be in trap from MIB
	144	+ $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
	145	+ // Get all objects in current Trap
	146	+ $currentTrapObjects=$this->getTrapobjects($trapid);
	147	+ $oid_index=1;
	148	+ foreach ($currentTrapObjects as $key => $val)
	149	+ {
	150	+ $currentObjectType='Unknown';
	151	+ $currentObjectTypeEnum='Unknown';
	152	+ if (isset($allObjects[$val->oid]['type']))
	153	+ {
	154	+ $currentObjectType=$allObjects[$val->oid]['type'];
	155	+ $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
	156	+ }
	157	+ $currentObject=array(
	158	+ $oid_index,
	159	+ $val->oid,
	160	+ $val->oid_name_mib,
	161	+ $val->oid_name,
	162	+ $val->value,
	163	+ $currentObjectType,
	164	+ $currentObjectTypeEnum
	165	+ );
	166	+ $oid_index++;
	167	+ array_push($this->view->objectList,$currentObject);
	168	+ // set currrent object to null in allObjects
	169	+ if (isset($allObjects[$val->oid]))
	170	+ {
	171	+ $allObjects[$val->oid]=null;
	172	+ }
	173	+ }
	174	+ if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
	175	+ {
	176	+ foreach ($allObjects as $key => $val)
	177	+ {
	178	+ if ($val==null) { continue; }
	179	+ array_push($this->view->objectList, array(
	180	+ $oid_index,
	181	+ $key,
	182	+ $allObjects[$key]['mib'],
	183	+ $allObjects[$key]['name'],
	184	+ '',
	185	+ $allObjects[$key]['type'],
	186	+ $allObjects[$key]['type_enum']
	187	+ ));
	188	+ $oid_index++;
	189	+ }
	190	+ }
192	191
193		- // Add a simple display
194		- $this->view->display='Trap '.$trapDetail->trap_name.' received';
195		- $this->view->create_basic_rule=true;
	192	+ // Add a simple display
	193	+ $this->view->display='Trap '.$trapDetail->trap_name.' received';
	194	+ $this->view->create_basic_rule=true;
196	195	}
197	196
198	197	/**
		@@ -201,29 +200,29 @@ discard block
		block discarded – undo
201	200	*/
202	201	private function add_check_host_exists($ruleDetail)
203	202	{
204		- // Check if hostname still exists
205		- $host_get=$this->getHostByName($this->view->hostname);
	203	+ // Check if hostname still exists
	204	+ $host_get=$this->getHostByName($this->view->hostname);
206	205
207		- if (count($host_get)==0)
208		- {
209		- $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
210		- $this->view->serviceGet=false;
211		- }
212		- else
213		- {
214		- // Tell JS to get services when page is loaded
215		- $this->view->serviceGet=true;
216		- // get service id for form to set :
217		- $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
218		- if (count($serviceID) ==0)
219		- {
220		- $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
221		- }
222		- else
223		- {
224		- $this->view->serviceSet=$serviceID[0]->id;
225		- }
226		- }
	206	+ if (count($host_get)==0)
	207	+ {
	208	+ $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
	209	+ $this->view->serviceGet=false;
	210	+ }
	211	+ else
	212	+ {
	213	+ // Tell JS to get services when page is loaded
	214	+ $this->view->serviceGet=true;
	215	+ // get service id for form to set :
	216	+ $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
	217	+ if (count($serviceID) ==0)
	218	+ {
	219	+ $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
	220	+ }
	221	+ else
	222	+ {
	223	+ $this->view->serviceSet=$serviceID[0]->id;
	224	+ }
	225	+ }
227	226	}
228	227
229	228	/**
		@@ -232,33 +231,33 @@ discard block
		block discarded – undo
232	231	*/
233	232	private function add_check_hostgroup_exists($ruleDetail)
234	233	{
235		- // Check if groupe exists
236		- $group_get=$this->getHostGroupByName($this->view->hostgroupname);
237		- if (count($group_get)==0)
238		- {
239		- $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
240		- $this->view->serviceGroupGet=false;
241		- }
242		- else
243		- {
244		- $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
245		- $foundGrpService=0;
246		- foreach ($grpServices as $grpService)
247		- {
248		- if ($grpService[0] == $ruleDetail->service_name)
249		- {
250		- $foundGrpService=1;
251		- $this->view->serviceSet=$ruleDetail->service_name;
252		- }
253		- }
	234	+ // Check if groupe exists
	235	+ $group_get=$this->getHostGroupByName($this->view->hostgroupname);
	236	+ if (count($group_get)==0)
	237	+ {
	238	+ $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
	239	+ $this->view->serviceGroupGet=false;
	240	+ }
	241	+ else
	242	+ {
	243	+ $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
	244	+ $foundGrpService=0;
	245	+ foreach ($grpServices as $grpService)
	246	+ {
	247	+ if ($grpService[0] == $ruleDetail->service_name)
	248	+ {
	249	+ $foundGrpService=1;
	250	+ $this->view->serviceSet=$ruleDetail->service_name;
	251	+ }
	252	+ }
254	253
255		- // Tell JS to get services when page is loaded
256		- $this->view->serviceGroupGet=true;
257		- if ($foundGrpService==0)
258		- {
259		- $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
260		- }
261		- }
	254	+ // Tell JS to get services when page is loaded
	255	+ $this->view->serviceGroupGet=true;
	256	+ if ($foundGrpService==0)
	257	+ {
	258	+ $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
	259	+ }
	260	+ }
262	261	}
263	262
264	263	/**
		@@ -270,52 +269,52 @@ discard block
		block discarded – undo
270	269	*/
271	270	private function add_create_trap_object_list(&$display, &$rule)
272	271	{
273		- $curObjectList=array();
274		- $index=1;
275		- // check in display & rule for : OID(<oid>)
276		- $matches=array();
277		- while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) \|\|
278		- preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
279		- {
280		- $curOid=$matches[1];
	272	+ $curObjectList=array();
	273	+ $index=1;
	274	+ // check in display & rule for : OID(<oid>)
	275	+ $matches=array();
	276	+ while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) \|\|
	277	+ preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
	278	+ {
	279	+ $curOid=$matches[1];
281	280
282		- if ( (preg_match('/\*/',$curOid) == 0 )
283		- && ($object=$this->getMIB()->translateOID($curOid)) != null)
284		- {
285		- array_push($curObjectList, array(
286		- $index,
287		- $curOid,
288		- $object['mib'],
289		- $object['name'],
290		- '',
291		- $object['type'],
292		- $object['type_enum']
293		- ));
294		- }
295		- else
296		- {
297		- array_push($curObjectList, array(
298		- $index,
299		- $curOid,
300		- 'not found',
301		- 'not found',
302		- '',
303		- 'not found',
304		- 'not found'
305		- ));
306		- }
307		- $curOid = preg_replace('/\/','\',$curOid);
308		- $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
309		- $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
310		- $index++;
311		- }
312		- return $curObjectList;
	281	+ if ( (preg_match('/\*/',$curOid) == 0 )
	282	+ && ($object=$this->getMIB()->translateOID($curOid)) != null)
	283	+ {
	284	+ array_push($curObjectList, array(
	285	+ $index,
	286	+ $curOid,
	287	+ $object['mib'],
	288	+ $object['name'],
	289	+ '',
	290	+ $object['type'],
	291	+ $object['type_enum']
	292	+ ));
	293	+ }
	294	+ else
	295	+ {
	296	+ array_push($curObjectList, array(
	297	+ $index,
	298	+ $curOid,
	299	+ 'not found',
	300	+ 'not found',
	301	+ '',
	302	+ 'not found',
	303	+ 'not found'
	304	+ ));
	305	+ }
	306	+ $curOid = preg_replace('/\/','\',$curOid);
	307	+ $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
	308	+ $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
	309	+ $index++;
	310	+ }
	311	+ return $curObjectList;
313	312	}
314	313
315	314	/** Add a handler
316		- * Get params fromid : setup from existing trap (id of trap table)
317		- * Get param ruleid : edit from existing handler (id of rule table)
318		- */
	315	+ * Get params fromid : setup from existing trap (id of trap table)
	316	+ * Get param ruleid : edit from existing handler (id of rule table)
	317	+ */
319	318	public function addAction()
320	319	{
321	320	$this->checkConfigPermission();
		@@ -334,8 +333,8 @@ discard block
		block discarded – undo
334	333	//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
335	334
336	335	if (($trapid = $this->params->get('fromid')) !== null) {
337		- /******** Setup from existing trap *************/
338		- $this->add_from_existing($trapid);
	336	+ /******** Setup from existing trap *************/
	337	+ $this->add_from_existing($trapid);
339	338	return;
340	339	}
341	340
		@@ -360,14 +359,14 @@ discard block
		block discarded – undo
360	359	$this->view->warning_message='';
361	360	if ($this->view->hostname != null)
362	361	{
363		- $this->view->selectGroup=false;
364		- // Check if hostname still exists
365		- $this->add_check_host_exists($ruleDetail);
	362	+ $this->view->selectGroup=false;
	363	+ // Check if hostname still exists
	364	+ $this->add_check_host_exists($ruleDetail);
366	365	}
367	366	else
368	367	{
369		- $this->view->selectGroup=true;
370		- $this->add_check_hostgroup_exists($ruleDetail); // Check if groupe exists
	368	+ $this->view->selectGroup=true;
	369	+ $this->add_check_hostgroup_exists($ruleDetail); // Check if groupe exists
371	370	}
372	371
373	372	$this->view->mainoid=$ruleDetail->trap_oid;
		@@ -395,9 +394,9 @@ discard block
		block discarded – undo
395	394	}
396	395
397	396	/** Validate form and output message to user
398		- * @param in postdata
399		- * @return string status : OK / <Message>
400		- **/
	397	+ * @param in postdata
	398	+ * @return string status : OK / <Message>
	399	+ **/
401	400	protected function handlerformAction()
402	401	{
403	402	$postData=$this->getRequest()->getPost();
		@@ -438,7 +437,7 @@ discard block
		block discarded – undo
438	437	//$this->Module()->
439	438	$this->_helper->json(array(
440	439	'status'=>'OK',
441		- 'redirect'=>'trapdirector/handler'
	440	+ 'redirect'=>'trapdirector/handler'
442	441
443	442	));
444	443	}
		@@ -522,9 +521,9 @@ discard block
		block discarded – undo
522	521	}
523	522
524	523	/** Get trap detail by trapid.
525		- * @param integer $trapid : id of trap in received table
526		- * @return array (objects)
527		- */
	524	+ * @param integer $trapid : id of trap in received table
	525	+ * @return array (objects)
	526	+ */
528	527	protected function getTrapDetail($trapid)
529	528	{
530	529	if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id'); }
		@@ -540,14 +539,14 @@ discard block
		block discarded – undo
540	539	}
541	540	try
542	541	{
543		- $query = $dbConn->select()
	542	+ $query = $dbConn->select()
544	543	->from($this->getModuleConfig()->getTrapTableName(),$elmts)
545	544	->where('id=?',$trapid);
546	545	$trapDetail=$dbConn->fetchRow($query);
547	546	if ( $trapDetail == null )
548	547	{
549		- $trapDetail = 'NULL';
550		- throw new Exception('No traps was found with id = '.$trapid);
	548	+ $trapDetail = 'NULL';
	549	+ throw new Exception('No traps was found with id = '.$trapid);
551	550	}
552	551	}
553	552	catch (Exception $e)
		@@ -561,9 +560,9 @@ discard block
		block discarded – undo
561	560	}
562	561
563	562	/** Get trap objects
564		- * @param integer $trapid : trap id
565		- * @return array : full column in db of trap id
566		- */
	563	+ * @param integer $trapid : trap id
	564	+ * @return array : full column in db of trap id
	565	+ */
567	566	protected function getTrapobjects($trapid)
568	567	{
569	568	if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id'); }
		@@ -579,7 +578,7 @@ discard block
		block discarded – undo
579	578	}
580	579	try
581	580	{
582		- $query = $dbConn->select()
	581	+ $query = $dbConn->select()
583	582	->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
584	583	->where('trap_id=?',$trapid);
585	584	$trapDetail=$dbConn->fetchAll($query);
		@@ -595,10 +594,10 @@ discard block
		block discarded – undo
595	594	}
596	595
597	596	/** Get rule detail by ruleid.
598		- * @param integer $ruleid int id of rule in rule table
599		- * @return object : column objects in db
600		- *
601		- */
	597	+ * @param integer $ruleid int id of rule in rule table
	598	+ * @return object : column objects in db
	599	+ *
	600	+ */
602	601	protected function getRuleDetail($ruleid)
603	602	{
604	603	if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id'); }
		@@ -609,7 +608,7 @@ discard block
		block discarded – undo
609	608	// *************** Get main data
610	609	try
611	610	{
612		- $query = $dbConn->select()
	611	+ $query = $dbConn->select()
613	612	->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
614	613	->where('id=?',$ruleid);
615	614	$ruleDetail=$dbConn->fetchRow($query);
		@@ -626,7 +625,7 @@ discard block
		block discarded – undo
626	625	}
627	626
628	627	/** Setup tabs for rules
629		- */
	628	+ */
630	629	protected function prepareTabs()
631	630	{
632	631	return $this->getTabs()->add('status', array(

		@@ -19,30 +19,30 @@ discard block
		block discarded – undo
19	19	*/
20	20	class DBException extends Exception
21	21	{
22		- /** @var array $returnArray */
23		- private $returnArray;
	22	+ /** @var array $returnArray */
	23	+ private $returnArray;
24	24
25		- /**
26		- * Buil DBException
27		- * @param array $retarray
28		- * @param string $message
29		- * @param int $code
30		- * @param Exception $previous
31		- */
32		- public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
33		- {
34		- parent::__construct($message,$code,$previous);
35		- $this->returnArray = $retarray;
36		- }
	25	+ /**
	26	+ * Buil DBException
	27	+ * @param array $retarray
	28	+ * @param string $message
	29	+ * @param int $code
	30	+ * @param Exception $previous
	31	+ */
	32	+ public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
	33	+ {
	34	+ parent::__construct($message,$code,$previous);
	35	+ $this->returnArray = $retarray;
	36	+ }
37	37
38		- /**
39		- * Get exception array
40		- * @return array
41		- */
42		- public function getArray()
43		- {
44		- return $this->returnArray;
45		- }
	38	+ /**
	39	+ * Get exception array
	40	+ * @return array
	41	+ */
	42	+ public function getArray()
	43	+ {
	44	+ return $this->returnArray;
	45	+ }
46	46	}
47	47
48	48	/**
		@@ -57,267 +57,267 @@ discard block
		block discarded – undo
57	57	class UIDatabase
58	58	{
59	59
60		- /** @var TrapsController $trapController TrapController 'parent' class */
61		- protected $trapController=null;
	60	+ /** @var TrapsController $trapController TrapController 'parent' class */
	61	+ protected $trapController=null;
62	62
63		- /** @var Selectable $trapDB Trap Database*/
64		- protected $trapDB=null;
	63	+ /** @var Selectable $trapDB Trap Database*/
	64	+ protected $trapDB=null;
65	65
66		- /** @var Selectable $trapDB Icinga IDO database*/
67		- protected $idoDB=null;
	66	+ /** @var Selectable $trapDB Icinga IDO database*/
	67	+ protected $idoDB=null;
68	68
69		- /** @var array $testResult */
70		- protected $testResult;
	69	+ /** @var array $testResult */
	70	+ protected $testResult;
71	71
72		- /**
73		- *
74		- * @param TrapsController $trapCtrl
75		- */
76		- function __construct(TrapsController $trapCtrl)
77		- {
78		- $this->trapController=$trapCtrl;
79		- }
	72	+ /**
	73	+ *
	74	+ * @param TrapsController $trapCtrl
	75	+ */
	76	+ function __construct(TrapsController $trapCtrl)
	77	+ {
	78	+ $this->trapController=$trapCtrl;
	79	+ }
80	80
81		- /**
82		- * Test if database version >= min database version
83		- *
84		- * @param \Zend_Db_Adapter_Abstract $dbConn
85		- * @param int $min Minimum version
86		- * @param bool $test Test mode
87		- * @param string $DBname Name of DB
88		- * @return bool true if OK, false if version < min version
89		- * @throws Exception if error and test = true
90		- */
91		- protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
92		- {
93		- try
94		- {
95		- $query = $dbAdapter->select()
96		- ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
97		- ->where('name=\'db_version\'');
98		- $version=$dbAdapter->fetchRow($query);
99		- if ( ($version == null) \|\| ! property_exists($version,'value') )
100		- {
101		- if ($test === true)
102		- {
103		- $this->testResult = array(4,$DBname);
104		- return false;
105		- }
106		- $this->trapController->redirectNow('trapdirector/settings?dberror=4');
107		- return false;
108		- }
109		- if ($version->value < $min)
110		- {
111		- if ($test === true)
112		- {
113		- $this->testResult = array(5,$version->value,$min);
114		- return false;
115		- }
116		- $this->trapController->redirectNow('trapdirector/settings?dberror=5');
117		- return false;
118		- }
119		- }
120		- catch (Exception $e)
121		- {
122		- if ($test === true)
123		- {
124		- $this->testResult = array(3,$DBname,$e->getMessage());
125		- return false;
126		- }
127		- $this->trapController->redirectNow('trapdirector/settings?dberror=4');
128		- return false;
129		- }
130		- return true;
131		- }
	81	+ /**
	82	+ * Test if database version >= min database version
	83	+ *
	84	+ * @param \Zend_Db_Adapter_Abstract $dbConn
	85	+ * @param int $min Minimum version
	86	+ * @param bool $test Test mode
	87	+ * @param string $DBname Name of DB
	88	+ * @return bool true if OK, false if version < min version
	89	+ * @throws Exception if error and test = true
	90	+ */
	91	+ protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
	92	+ {
	93	+ try
	94	+ {
	95	+ $query = $dbAdapter->select()
	96	+ ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
	97	+ ->where('name=\'db_version\'');
	98	+ $version=$dbAdapter->fetchRow($query);
	99	+ if ( ($version == null) \|\| ! property_exists($version,'value') )
	100	+ {
	101	+ if ($test === true)
	102	+ {
	103	+ $this->testResult = array(4,$DBname);
	104	+ return false;
	105	+ }
	106	+ $this->trapController->redirectNow('trapdirector/settings?dberror=4');
	107	+ return false;
	108	+ }
	109	+ if ($version->value < $min)
	110	+ {
	111	+ if ($test === true)
	112	+ {
	113	+ $this->testResult = array(5,$version->value,$min);
	114	+ return false;
	115	+ }
	116	+ $this->trapController->redirectNow('trapdirector/settings?dberror=5');
	117	+ return false;
	118	+ }
	119	+ }
	120	+ catch (Exception $e)
	121	+ {
	122	+ if ($test === true)
	123	+ {
	124	+ $this->testResult = array(3,$DBname,$e->getMessage());
	125	+ return false;
	126	+ }
	127	+ $this->trapController->redirectNow('trapdirector/settings?dberror=4');
	128	+ return false;
	129	+ }
	130	+ return true;
	131	+ }
132	132
133		- /** Get Database connexion
134		- * @param $DBname string DB name in resource.ini_ge
135		- * @param $test bool if set to true, returns error code and not database
136		- * @param $test_version bool if set to flase, does not test database version of trapDB
137		- * @throws DBException if test = true and error
138		- * @return Selectable\|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
139		- */
140		- protected function getDbByName($DBname , $test = false , $test_version = true)
141		- {
142		- try
143		- {
144		- $dbconn = IcingaDbConnection::fromResourceName($DBname);
145		- }
146		- catch (Exception $e)
147		- {
148		- if ($test === true)
149		- {
150		- throw new DBException(array(2,$DBname));
151		- }
152		- $this->trapController->redirectNow('trapdirector/settings?dberror=2');
153		- return null;
154		- }
	133	+ /** Get Database connexion
	134	+ * @param $DBname string DB name in resource.ini_ge
	135	+ * @param $test bool if set to true, returns error code and not database
	136	+ * @param $test_version bool if set to flase, does not test database version of trapDB
	137	+ * @throws DBException if test = true and error
	138	+ * @return Selectable\|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
	139	+ */
	140	+ protected function getDbByName($DBname , $test = false , $test_version = true)
	141	+ {
	142	+ try
	143	+ {
	144	+ $dbconn = IcingaDbConnection::fromResourceName($DBname);
	145	+ }
	146	+ catch (Exception $e)
	147	+ {
	148	+ if ($test === true)
	149	+ {
	150	+ throw new DBException(array(2,$DBname));
	151	+ }
	152	+ $this->trapController->redirectNow('trapdirector/settings?dberror=2');
	153	+ return null;
	154	+ }
155	155
156		- try
157		- {
158		- $dbAdapter=$dbconn->getDbAdapter();
	156	+ try
	157	+ {
	158	+ $dbAdapter=$dbconn->getDbAdapter();
159	159
160		- }
161		- catch (Exception $e)
162		- {
163		- if ($test === true)
164		- {
165		- throw new DBException(array(3,$DBname,$e->getMessage()));
166		- }
167		- $this->trapController->redirectNow('trapdirector/settings?dberror=3');
168		- return null;
169		- }
	160	+ }
	161	+ catch (Exception $e)
	162	+ {
	163	+ if ($test === true)
	164	+ {
	165	+ throw new DBException(array(3,$DBname,$e->getMessage()));
	166	+ }
	167	+ $this->trapController->redirectNow('trapdirector/settings?dberror=3');
	168	+ return null;
	169	+ }
170	170
171		- if ($test_version == true) {
172		- $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
173		- if ($testRet !== true)
174		- {
175		- throw new DBException($this->testResult);
176		- }
177		- }
	171	+ if ($test_version == true) {
	172	+ $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
	173	+ if ($testRet !== true)
	174	+ {
	175	+ throw new DBException($this->testResult);
	176	+ }
	177	+ }
178	178
179		- return $dbconn;
180		- }
	179	+ return $dbconn;
	180	+ }
181	181
182		- /**
183		- * Get Trap database
184		- * @return Selectable\|null : returns DB connexion or null on error.
185		- */
186		- public function getDb()
187		- {
188		- if ( $this->trapDB != null ) return $this->trapDB;
	182	+ /**
	183	+ * Get Trap database
	184	+ * @return Selectable\|null : returns DB connexion or null on error.
	185	+ */
	186	+ public function getDb()
	187	+ {
	188	+ if ( $this->trapDB != null ) return $this->trapDB;
189	189
190	190
191		- $dbresource=$this->trapController->Config()->get('config', 'database');
	191	+ $dbresource=$this->trapController->Config()->get('config', 'database');
192	192
193		- if ( ! $dbresource )
194		- {
195		- $this->trapController->redirectNow('trapdirector/settings?dberror=1');
196		- return null;
197		- }
	193	+ if ( ! $dbresource )
	194	+ {
	195	+ $this->trapController->redirectNow('trapdirector/settings?dberror=1');
	196	+ return null;
	197	+ }
198	198
199		- try {
200		- $this->trapDB = $this->getDbByName($dbresource,false,true);
201		- } catch (DBException $e) {
202		- return null; // Should not happen as test = false
203		- }
	199	+ try {
	200	+ $this->trapDB = $this->getDbByName($dbresource,false,true);
	201	+ } catch (DBException $e) {
	202	+ return null; // Should not happen as test = false
	203	+ }
204	204
205		- //$this->trapDB->getConnection();
	205	+ //$this->trapDB->getConnection();
206	206
207		- return $this->trapDB;
208		- }
	207	+ return $this->trapDB;
	208	+ }
209	209
210		- /**
211		- * Get Zend adapter of DB.
212		- * @return \Zend_Db_Adapter_Abstract\|null
213		- */
214		- public function getDbConn()
215		- {
216		- if ($this->getDb() == null) return null;
217		- return $this->getDb()->getConnection();
218		- }
	210	+ /**
	211	+ * Get Zend adapter of DB.
	212	+ * @return \Zend_Db_Adapter_Abstract\|null
	213	+ */
	214	+ public function getDbConn()
	215	+ {
	216	+ if ($this->getDb() == null) return null;
	217	+ return $this->getDb()->getConnection();
	218	+ }
219	219
220		- /**
221		- * Test Trap database
222		- * @param boolean $test
223		- * @throws DBException on error.
224		- * @return \Zend_Db_Adapter_Abstract\|array\|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
225		- */
226		- public function testGetDb()
227		- {
228		- $dbresource=$this->trapController->Config()->get('config', 'database');
	220	+ /**
	221	+ * Test Trap database
	222	+ * @param boolean $test
	223	+ * @throws DBException on error.
	224	+ * @return \Zend_Db_Adapter_Abstract\|array\|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
	225	+ */
	226	+ public function testGetDb()
	227	+ {
	228	+ $dbresource=$this->trapController->Config()->get('config', 'database');
229	229
230		- if ( ! $dbresource )
231		- {
232		- throw new DBException(array(1,''));
233		- }
	230	+ if ( ! $dbresource )
	231	+ {
	232	+ throw new DBException(array(1,''));
	233	+ }
234	234
235		- $this->trapDB = $this->getDbByName($dbresource,true,true);
236		- return;
237		- }
	235	+ $this->trapDB = $this->getDbByName($dbresource,true,true);
	236	+ return;
	237	+ }
238	238
239	239
240		- /**
241		- * Get IDO Database
242		- * @return \Zend_Db_Adapter_Abstract\|NULL returns DB connexion or null on error.
243		- */
244		- public function getIdoDb()
245		- {
246		- if ( $this->idoDB != null ) return $this->idoDB;
247		- // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
248		- $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
	240	+ /**
	241	+ * Get IDO Database
	242	+ * @return \Zend_Db_Adapter_Abstract\|NULL returns DB connexion or null on error.
	243	+ */
	244	+ public function getIdoDb()
	245	+ {
	246	+ if ( $this->idoDB != null ) return $this->idoDB;
	247	+ // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
	248	+ $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
249	249
250		- if ( ! $dbresource )
251		- {
252		- $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
253		- return null;
254		- }
	250	+ if ( ! $dbresource )
	251	+ {
	252	+ $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
	253	+ return null;
	254	+ }
255	255
256		- try
257		- {
258		- $dbconn = IcingaDbConnection::fromResourceName($dbresource);
259		- }
260		- catch (Exception $e)
261		- {
262		- $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
263		- return null;
264		- }
	256	+ try
	257	+ {
	258	+ $dbconn = IcingaDbConnection::fromResourceName($dbresource);
	259	+ }
	260	+ catch (Exception $e)
	261	+ {
	262	+ $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
	263	+ return null;
	264	+ }
265	265
266		- $this->idoDB = $dbconn;
267		- return $this->idoDB;
268		- }
	266	+ $this->idoDB = $dbconn;
	267	+ return $this->idoDB;
	268	+ }
269	269
270	270
271		- /**
272		- * Get Zend adapter of DB.
273		- * @return \Zend_Db_Adapter_Abstract\|null
274		- */
275		- public function getIdoDbConn()
276		- {
277		- if ($this->getIdoDb() == null) return null;
278		- return $this->getIdoDb()->getConnection();
279		- }
	271	+ /**
	272	+ * Get Zend adapter of DB.
	273	+ * @return \Zend_Db_Adapter_Abstract\|null
	274	+ */
	275	+ public function getIdoDbConn()
	276	+ {
	277	+ if ($this->getIdoDb() == null) return null;
	278	+ return $this->getIdoDb()->getConnection();
	279	+ }
280	280
281		- /**
282		- * Get IDO Database
283		- * @param boolean $test
284		- * @throws DBException on error
285		- */
286		- public function testGetIdoDb()
287		- {
288		- // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
289		- $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
	281	+ /**
	282	+ * Get IDO Database
	283	+ * @param boolean $test
	284	+ * @throws DBException on error
	285	+ */
	286	+ public function testGetIdoDb()
	287	+ {
	288	+ // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
	289	+ $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
290	290
291		- if ( ! $dbresource )
292		- {
293		- throw new DBException(array(1,'No database in config.ini'));
294		- }
	291	+ if ( ! $dbresource )
	292	+ {
	293	+ throw new DBException(array(1,'No database in config.ini'));
	294	+ }
295	295
296		- try
297		- {
298		- $dbconn = IcingaDbConnection::fromResourceName($dbresource);
299		- }
300		- catch (Exception $e)
301		- {
302		- throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
303		- }
	296	+ try
	297	+ {
	298	+ $dbconn = IcingaDbConnection::fromResourceName($dbresource);
	299	+ }
	300	+ catch (Exception $e)
	301	+ {
	302	+ throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
	303	+ }
304	304
305		- try
306		- {
307		- $query = $dbconn->select()
308		- ->from('icinga_dbversion',array('version'));
309		- $version=$dbconn->fetchRow($query);
310		- if ( ($version == null) \|\| ! property_exists($version,'version') )
311		- {
312		- throw new DBException( array(4,"$dbresource does not look like an IDO database"));
313		- }
314		- }
315		- catch (Exception $e)
316		- {
317		- throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
318		- }
	305	+ try
	306	+ {
	307	+ $query = $dbconn->select()
	308	+ ->from('icinga_dbversion',array('version'));
	309	+ $version=$dbconn->fetchRow($query);
	310	+ if ( ($version == null) \|\| ! property_exists($version,'version') )
	311	+ {
	312	+ throw new DBException( array(4,"$dbresource does not look like an IDO database"));
	313	+ }
	314	+ }
	315	+ catch (Exception $e)
	316	+ {
	317	+ throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
	318	+ }
319	319
320		- return;
321		- }
	320	+ return;
	321	+ }
322	322
323	323	}
324	324	\ No newline at end of file

patrickpr / trapdirector

Push — master ( 4f33ba...3d7e39 )

Status

Category

Indentation +243 added lines, -244 removed lines patch added patch discarded remove patch

Indentation +251 added lines, -251 removed lines patch added patch discarded remove patch