patrickpr / trapdirector

library/Trapdirector/TrapsActions/UIDatabase.php

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()->getDbAdapter();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getDbConn()
+	{
+		if ($this->getDb() == null) return null;
+		return $this->getDb()->getDbAdapter();
+	}
     
-    /**
-     * 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

Braces +18 added lines, -16 removed lines

@@ -126,8 +126,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -152,8 +151,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -167,8 +165,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -195,7 +192,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');
@@ -223,7 +222,9 @@ 
      */
     public function getDbConn()
     {
-        if ($this->getDb() == null) return null;
+        if ($this->getDb() == null) {
+        	return null;
+        }
         return $this->getDb()->getDbAdapter();
     }
     
@@ -253,7 +254,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');;
         
@@ -266,8 +269,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -284,7 +286,9 @@ 
      */
     public function getIdoDbConn()
     {
-        if ($this->getIdoDb() == null) return null;
+        if ($this->getIdoDb() == null) {
+        	return null;
+        }
         return $this->getIdoDb()->getConnection();
     }
     
@@ -306,8 +310,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -321,8 +324,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()));
         }

application/controllers/HandlerController.php

Indentation +295 added lines, -296 removed lines

@@ -12,13 +12,12 @@ 
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -28,13 +27,13 @@ 
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		$handlerTable = new HandlerTable(
-		      $this->moduleConfig->getTrapRuleName(),
-		      $this->moduleConfig->getHandlerListTitles(),
-		      $this->moduleConfig->getHandlerListDisplayColumns(),
-		      $this->moduleConfig->getHandlerColumns(),
-		      $dbConn->getDbAdapter(),
-		      $this->view,
-		      $this->moduleConfig->urlPath());
+			  $this->moduleConfig->getTrapRuleName(),
+			  $this->moduleConfig->getHandlerListTitles(),
+			  $this->moduleConfig->getHandlerListDisplayColumns(),
+			  $this->moduleConfig->getHandlerColumns(),
+			  $dbConn->getDbAdapter(),
+			  $this->view,
+			  $this->moduleConfig->urlPath());
 		
 		$handlerTable->setMaxPerPage($this->itemListDisplay());
 		
@@ -56,7 +55,7 @@ 
 		
 		// TODO : Obsolete remove after new table validation.
 		
-	    /**
+		/**
 		$this->getHandlerListTable()->setConnection($dbConn);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
 		// Apply pagination limits 
@@ -73,22 +72,22 @@ 
 	 */
 	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='';
+		}
 	}
 	
 	/**
@@ -96,31 +95,31 @@ 
 	 */
 	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;
 	}
 	
 	/**
@@ -129,102 +128,102 @@ 
 	 */
 	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->getIdoConn()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getIdoConn()->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;
 	}
 
 	/**
@@ -233,29 +232,29 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getIdoConn()->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getIdoConn()->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->getIdoConn()->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->getIdoConn()->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;
+			}
+		}
 	}
 
 	/**
@@ -264,33 +263,33 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getIdoConn()->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->getIdoConn()->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->getIdoConn()->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->getIdoConn()->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';
+			}
+		}
 	}
 	
 	/**
@@ -302,52 +301,52 @@ 
 	 */
 	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();
@@ -370,8 +369,8 @@ 
 		//$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;
 		}
 		
@@ -399,14 +398,14 @@ 
 			$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;
@@ -434,9 +433,9 @@ 
 	}
 	
 	/** 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();
@@ -451,8 +450,8 @@ 
 			'host_group_name'=>	array('post' => null,            'val' => null,  'db'=>true),
 			'serviceid'		=>	array('post' => 'serviceid',                     'db'=>false),
 			'service_name'	=>	array('post' => 'serviceName',                    'db'=>true),
-		    'comment'       =>  array('post' => 'comment',       'val' => '',    'db'=>true),
-		    'rule_type'     =>  array('post' => 'category',       'val' => 0,    'db'=>true),
+			'comment'       =>  array('post' => 'comment',       'val' => '',    'db'=>true),
+			'rule_type'     =>  array('post' => 'category',       'val' => 0,    'db'=>true),
 			'trap_oid'		=>	array('post' => 'oid',                            'db'=>true),
 			'revert_ok'		=>	array('post' => 'revertOK',      'val' => 0,      'db'=>true),
 			'display'		=>	array('post' => 'display',        'val' => '',     'db'=>true),
@@ -461,7 +460,7 @@ 
 			'action_nomatch'=>	array('post' => 'ruleNoMatch',    'val' => -1,    'db'=>true),					
 			'ip4'			=>	array('post' => null,             'val' => null,  'db'=>true),
 			'ip6'			=>	array('post' => null,             'val' => null,  'db'=>true),
-		    'action_form'	=>	array('post' => 'action_form',    'val' => null, 'db'=>false)
+			'action_form'	=>	array('post' => 'action_form',    'val' => null, 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
@@ -469,7 +468,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
+				$this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
 			}
 			catch (Exception $e)
 			{
@@ -479,7 +478,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -506,8 +505,8 @@ 
 			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
 			if (! $isHostGroup ) 
 			{  // checks if selection by host 
-			    $hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
-			    if ($hostAddr === NULL) throw new \Exception("No object found");
+				$hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
+				if ($hostAddr === NULL) throw new \Exception("No object found");
 				$params['ip4']['val']=$hostAddr->ip4;
 				$params['ip6']['val']=$hostAddr->ip6;
 				$checkHostName=$hostAddr->name;
@@ -518,49 +517,49 @@ 
 				}
 				if ($this->apiMode == TRUE)
 				{
-				    $serviceName=$this->getIdoConn()->getServiceById($params['serviceid']['val']);
-				    if (count($serviceName) == 0 )
-				    {
-				        $this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
-				        return;
-				    }
+					$serviceName=$this->getIdoConn()->getServiceById($params['serviceid']['val']);
+					if (count($serviceName) == 0 )
+					{
+						$this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
+						return;
+					}
 				}
 				else
 				{
-    				if (!is_numeric($params['serviceid']['val']))
-    				{
-    				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
-    				    return;
-    				}
+					if (!is_numeric($params['serviceid']['val']))
+					{
+						$this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+						return;
+					}
     				
-    				$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
-    				if ($params['service_name']['val'] != $serviceName->name2)
-    				{
-    					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
-    					return;
-    				}
+					$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
+					if ($params['service_name']['val'] != $serviceName->name2)
+					{
+						$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
+						return;
+					}
 				}
 			}
 			else
 			{
-			    if ($this->apiMode == TRUE)
-			    {
-			        $object=$this->getIdoConn()->getHostGroupById($params['hostid']['val']);
-			        if (count($object) == 0 || $params['host_name']['val'] != $object->__name)
-			        {
-			            $this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
-			            return;
-			        }
-			    }
-			    else 
-			    {
-    			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
-    				if ($params['host_name']['val'] != $object->name1)
-    				{
-    					$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
-    					return;					
-    				}
-			    }
+				if ($this->apiMode == TRUE)
+				{
+					$object=$this->getIdoConn()->getHostGroupById($params['hostid']['val']);
+					if (count($object) == 0 || $params['host_name']['val'] != $object->__name)
+					{
+						$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
+						return;
+					}
+				}
+				else 
+				{
+					$object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
+					if ($params['host_name']['val'] != $object->name1)
+					{
+						$this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
+						return;					
+					}
+				}
 				// Put param in correct column (group_name)
 				$params['host_group_name']['val'] = $params['host_name']['val'];
 				$params['host_name']['val']=null;
@@ -577,17 +576,17 @@ 
 			
 			if ($params['db_rule']['val'] == -1 || $params['action_form']['val'] == 'clone') 
 			{  // If no rule number or action is clone, add the handler
-			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
+				$ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
 			}
 			else
 			{
-			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
 		catch (Exception $e)
 		{
-		    $this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
+			$this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK', 'id' => $ruleID));
@@ -595,9 +594,9 @@ 
 	}
 
 	/** 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');  }
@@ -613,14 +612,14 @@ 
 		}
 		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)
@@ -634,9 +633,9 @@ 
 	}
 
 	/** 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');  }
@@ -652,7 +651,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -668,10 +667,10 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object|array : column objects in db 
-	*
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object|array : column objects in db 
+	 *
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -682,7 +681,7 @@ 
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -699,7 +698,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(