patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Mib.php

Indentation +455 added lines, -455 removed lines

@@ -14,57 +14,57 @@ 
  */
 class Mib
 {
-    use \MibDatabase;
+	use \MibDatabase;
     
-    /** @var Logging $logging logging class */
-    protected $logging;
-    /** @var Database $trapsDB Database class */
-    protected $trapsDB;
+	/** @var Logging $logging logging class */
+	protected $logging;
+	/** @var Database $trapsDB Database class */
+	protected $trapsDB;
     
-    /** @var string $snmptranslate */
-    public $snmptranslate;
-    /** @var string $snmptranslateDirs */
-    public $snmptranslateDirs;
+	/** @var string $snmptranslate */
+	public $snmptranslate;
+	/** @var string $snmptranslateDirs */
+	public $snmptranslateDirs;
     
-    private $dbOidAll; //< All oid in database;
-    private $dbOidIndex; //< Index of oid in dbOidAll
-    private $objectsAll; //< output lines of snmptranslate list
-    private $trapObjectsIndex; //< array of traps objects (as OID)
+	private $dbOidAll; //< All oid in database;
+	private $dbOidIndex; //< Index of oid in dbOidAll
+	private $objectsAll; //< output lines of snmptranslate list
+	private $trapObjectsIndex; //< array of traps objects (as OID)
     
-    private $oidDesc=array(); //< $oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL
+	private $oidDesc=array(); //< $oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL
 
-    // Timing vars for update
-    private $timing=array();
+	// Timing vars for update
+	private $timing=array();
     
-    /**
-     * Setup Mib Class
-     * @param Logging $logClass : where to log
-     * @param Database $dbClass : Database
-     */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
-    {
-        $this->logging=$logClass;
-        $this->trapsDB=$dbClass;
-        $this->snmptranslate=$snmptrans;
-        $this->snmptranslateDirs=$snmptransdir;
+	/**
+	 * Setup Mib Class
+	 * @param Logging $logClass : where to log
+	 * @param Database $dbClass : Database
+	 */
+	function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+	{
+		$this->logging=$logClass;
+		$this->trapsDB=$dbClass;
+		$this->snmptranslate=$snmptrans;
+		$this->snmptranslateDirs=$snmptransdir;
 
-    }
+	}
     
-    /**
-     * @return \Trapdirector\Logging
-     */
-    public function getLogging()
-    {
-        return $this->logging;
-    }
+	/**
+	 * @return \Trapdirector\Logging
+	 */
+	public function getLogging()
+	{
+		return $this->logging;
+	}
 
-    /**
-     * @return \Trapdirector\Database
-     */
-    public function getTrapsDB()
-    {
-        return $this->trapsDB;
-    }
+	/**
+	 * @return \Trapdirector\Database
+	 */
+	public function getTrapsDB()
+	{
+		return $this->trapsDB;
+	}
 
 /**
  * Get object details & mib , returns snmptranslate output
@@ -72,478 +72,478 @@ 
  * @param string $trapmib : mib of trap
  * @return NULL|array : null if not found, or output of snmptranslate
  */
-    private function get_object_details($object,$trapmib)
-    {
-        $match=$snmptrans=array();
-        $retVal=0;
-        $this->oidDesc['mib']=$trapmib;
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-        if ($retVal!=0)
-        {
-            // Maybe not trap mib, search with IR
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-            { // Not found -> continue with warning
-                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-                return null;
-            }
-            $this->oidDesc['mib']=$match[1];
+	private function get_object_details($object,$trapmib)
+	{
+		$match=$snmptrans=array();
+		$retVal=0;
+		$this->oidDesc['mib']=$trapmib;
+		exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+			' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+		if ($retVal!=0)
+		{
+			// Maybe not trap mib, search with IR
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+			{ // Not found -> continue with warning
+				$this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+				return null;
+			}
+			$this->oidDesc['mib']=$match[1];
             
-            // Do the snmptranslate again.
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
-            if ($retVal!=0) {
-                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
-                return null;
-            }
+			// Do the snmptranslate again.
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
+			if ($retVal!=0) {
+				$this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
+				return null;
+			}
             
-        }
-        return $snmptrans;
-    }
+		}
+		return $snmptrans;
+	}
 
 /**
  * Parse snmptranslate output and set  $this->oidDesc with elements 
  * @param array $snmptrans : multi line output of snmptrans
  */
-    private function parse_object($snmptrans)
-    {
-        $tmpdesc=''; // For multiline description
-        $indesc=false; // true if currently inside multiline description
-        $match=array();
+	private function parse_object($snmptrans)
+	{
+		$tmpdesc=''; // For multiline description
+		$indesc=false; // true if currently inside multiline description
+		$match=array();
         
-        foreach ($snmptrans as $line)
-        {
-            if ($indesc===true)
-            {
-                $line=preg_replace('/[\t ]+/',' ',$line);
-                if (preg_match('/(.*)"$/', $line,$match))
-                {
-                    $this->oidDesc['description'] = $tmpdesc . $match[1];
-                    $indesc=false;
-                }
-                $tmpdesc.=$line;
-                continue;
-            }
-            if (preg_match('/^\.[0-9\.]+$/', $line))
-            {
-                $this->oidDesc['oid']=$line;
-                continue;
-            }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-            {
-                $this->oidDesc['syntax']=$match[1];
-                $this->oidDesc['type_enum']=$match[2];
-                continue;
-            }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-            {
-                $this->oidDesc['syntax']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-            {
-                $this->oidDesc['dispHint']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-            {
-                $this->oidDesc['description']=$match[1];
-                continue;
-            }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-            {
-                $tmpdesc=$match[1];
-                $indesc=true;
-                continue;
-            }
-            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-            {
-                $this->oidDesc['textconv']=$match[1];
-                continue;
-            }
-        }
-    }
+		foreach ($snmptrans as $line)
+		{
+			if ($indesc===true)
+			{
+				$line=preg_replace('/[\t ]+/',' ',$line);
+				if (preg_match('/(.*)"$/', $line,$match))
+				{
+					$this->oidDesc['description'] = $tmpdesc . $match[1];
+					$indesc=false;
+				}
+				$tmpdesc.=$line;
+				continue;
+			}
+			if (preg_match('/^\.[0-9\.]+$/', $line))
+			{
+				$this->oidDesc['oid']=$line;
+				continue;
+			}
+			if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+			{
+				$this->oidDesc['syntax']=$match[1];
+				$this->oidDesc['type_enum']=$match[2];
+				continue;
+			}
+			if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+			{
+				$this->oidDesc['syntax']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+			{
+				$this->oidDesc['dispHint']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+			{
+				$this->oidDesc['description']=$match[1];
+				continue;
+			}
+			if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+			{
+				$tmpdesc=$match[1];
+				$indesc=true;
+				continue;
+			}
+			if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+			{
+				$this->oidDesc['textconv']=$match[1];
+				continue;
+			}
+		}
+	}
 
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
-    {              
-        $trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
+	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	{              
+		$trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
         
-        if ($check_existing === true)
-        {
-            $dbObjects=$this->cache_db_objects($trapId);
-        }
+		if ($check_existing === true)
+		{
+			$dbObjects=$this->cache_db_objects($trapId);
+		}
         
-        foreach ($objects as $object)
-        {
+		foreach ($objects as $object)
+		{
             
-            $this->reset_oidDesc();
+			$this->reset_oidDesc();
             
-            $snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
-            if ($snmptrans === null) continue; // object not found
+			$snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
+			if ($snmptrans === null) continue; // object not found
             
-            $this->parse_object($snmptrans);
+			$this->parse_object($snmptrans);
 
-            $this->oidDesc['name'] = $object;
+			$this->oidDesc['name'] = $object;
             
-            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
+			$this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
 
-            // Update
-            $this->update_oid();
+			// Update
+			$this->update_oid();
             
-            if (isset($dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]))
-            {   // if link exists, continue
-                $dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]=2;
-                continue;
-            }
-            if ($check_existing === true)
-            {
-                // TODO : check link trap - objects exists, mark them.
-            }
-            // Associate in object table
-            $db_conn=$this->trapsDB->db_connect_trap();
-            $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
-                'values (:trap_id, :object_id)';
-            $sqlQuery=$db_conn->prepare($sql);
-            $sqlParam=array(
-                ':trap_id' => $trapId,
-                ':object_id' => $this->dbOidIndex[$this->oidDesc['oid']]['id'],
-            );
+			if (isset($dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$this->oidDesc['oid']]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true)
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$db_conn=$this->trapsDB->db_connect_trap();
+			$sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
+				'values (:trap_id, :object_id)';
+			$sqlQuery=$db_conn->prepare($sql);
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$this->oidDesc['oid']]['id'],
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
-            }
-        }
-        if ($check_existing === true)
-        {
-            // TODO : remove link trap - objects that wasn't marked.
-        }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
         
-    }
+	}
 
-    private function reset_oidDesc()
-    {
-        $this->oidDesc['oid']=null;
-        $this->oidDesc['name']=null;
-        $this->oidDesc['type']=null;
-        $this->oidDesc['mib']=null;
-        $this->oidDesc['textconv']=null;
-        $this->oidDesc['dispHint'] =null;
-        $this->oidDesc['syntax']=null;
-        $this->oidDesc['type_enum']=null;
-        $this->oidDesc['description']=null;
-    }
+	private function reset_oidDesc()
+	{
+		$this->oidDesc['oid']=null;
+		$this->oidDesc['name']=null;
+		$this->oidDesc['type']=null;
+		$this->oidDesc['mib']=null;
+		$this->oidDesc['textconv']=null;
+		$this->oidDesc['dispHint'] =null;
+		$this->oidDesc['syntax']=null;
+		$this->oidDesc['type_enum']=null;
+		$this->oidDesc['description']=null;
+	}
     
-    /**
-     * Fills $this->objectsAll with all mibs from snmptranslate
-     * @return integer : number of elements 
-     */
-    private function load_mibs_snmptranslate()
-    {
-        $retVal=0;
-        // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
-        unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
-        }
-        // Count elements to show progress
-        $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
-        return $numElements;
-    }
+	/**
+	 * Fills $this->objectsAll with all mibs from snmptranslate
+	 * @return integer : number of elements 
+	 */
+	private function load_mibs_snmptranslate()
+	{
+		$retVal=0;
+		// Get all mib objects from all mibs
+		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		unset($this->objectsAll);
+		exec($snmpCommand,$this->objectsAll,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR,'');
+		}
+		// Count elements to show progress
+		$numElements=count($this->objectsAll);
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		return $numElements;
+	}
 
-    /**
-     * load all mib objects db in dbOidAll (raw) and index in dbOidIndex
-     */
-    private function load_mibs_from_db()
-    {
-        // Get all mibs from databse to have a memory index
+	/**
+	 * load all mib objects db in dbOidAll (raw) and index in dbOidIndex
+	 */
+	private function load_mibs_from_db()
+	{
+		// Get all mibs from databse to have a memory index
         
-        $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $this->dbOidAll=$ret_code->fetchAll();
-        $this->dbOidIndex=array();
-        // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
-        {
-            $this->dbOidIndex[$val['oid']]['key']=$key;
-            $this->dbOidIndex[$val['oid']]['id']=$val['id'];
-        }
-    }
+		$sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$this->dbOidAll=$ret_code->fetchAll();
+		$this->dbOidIndex=array();
+		// Create the index for db;
+		foreach($this->dbOidAll as $key=>$val)
+		{
+			$this->dbOidIndex[$val['oid']]['key']=$key;
+			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
+		}
+	}
 
-    /**
-     * Reset all update timers & count to zero
-     */
-    private function reset_update_timers()
-    {
-        $this->timing['base_parse_time']=0;
-        $this->timing['base_check_time']=0;
-        $this->timing['type0_check_time']=0;
-        $this->timing['nottrap_time']=0;
-        $this->timing['update_time']=0;
-        $this->timing['objects_time']=0;
-        $this->timing['base_parse_num']=0;
-        $this->timing['base_check_num']=0;
-        $this->timing['type0_check_num']=0;
-        $this->timing['nottrap_num']=0;
-        $this->timing['update_num']=0;
-        $this->timing['objects_num']=0;
-        $this->timing['num_traps']=0;
-    }
+	/**
+	 * Reset all update timers & count to zero
+	 */
+	private function reset_update_timers()
+	{
+		$this->timing['base_parse_time']=0;
+		$this->timing['base_check_time']=0;
+		$this->timing['type0_check_time']=0;
+		$this->timing['nottrap_time']=0;
+		$this->timing['update_time']=0;
+		$this->timing['objects_time']=0;
+		$this->timing['base_parse_num']=0;
+		$this->timing['base_check_num']=0;
+		$this->timing['type0_check_num']=0;
+		$this->timing['nottrap_num']=0;
+		$this->timing['update_num']=0;
+		$this->timing['objects_num']=0;
+		$this->timing['num_traps']=0;
+	}
 
-    /**
-     * Detect if $this->objectsAll[$curElement] is a trap 
-     * @param integer $curElement
-     * @param bool $onlyTraps : set to false to get all and not only traps.
-     * @return boolean : false if it's a trap , true if not
-     */
-    private function detect_trap($curElement,$onlyTraps)
-    {
-        // Get oid or pass if not found
-        if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
-        {
-            $this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_parse_num'] ++;
-            return true;
-        }
-        $this->oidDesc['oid']=$this->objectsAll[$curElement];
+	/**
+	 * Detect if $this->objectsAll[$curElement] is a trap 
+	 * @param integer $curElement
+	 * @param bool $onlyTraps : set to false to get all and not only traps.
+	 * @return boolean : false if it's a trap , true if not
+	 */
+	private function detect_trap($curElement,$onlyTraps)
+	{
+		// Get oid or pass if not found
+		if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+		{
+			$this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['base_parse_num'] ++;
+			return true;
+		}
+		$this->oidDesc['oid']=$this->objectsAll[$curElement];
         
-        // get next line
-        $curElement++;
-        $match=$snmptrans=array();
-        if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-            $this->objectsAll[$curElement],$match))
-        {
-            $this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_check_num']++;
-            return true;
-        }
+		// get next line
+		$curElement++;
+		$match=$snmptrans=array();
+		if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
+			$this->objectsAll[$curElement],$match))
+		{
+			$this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['base_check_num']++;
+			return true;
+		}
         
-        $this->oidDesc['name']=$match[1]; // Name
-        $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
+		$this->oidDesc['name']=$match[1]; // Name
+		$this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
-        {
-            // Check if next is suboid -> in that case is cannot be a trap
-            if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
-            {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
-                $this->timing['type0_check_num']++;
-                return true;
-            }
-            unset($snmptrans);
-            $retVal=0;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
-                $this->timing['type0_check_num']++;
-                return true;
-            }
-            //echo "\n v1 trap found : $this->oidDesc['oid'] \n";
-            // Force as trap.
-            $this->oidDesc['type']=21;
-        }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
-        {
-            $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['nottrap_num']++;
-            return true;
-        }
-        return false;
-    }
+		if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+		{
+			// Check if next is suboid -> in that case is cannot be a trap
+			if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
+			{
+				$this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+				$this->timing['type0_check_num']++;
+				return true;
+			}
+			unset($snmptrans);
+			$retVal=0;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+				' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				$this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+				$this->timing['type0_check_num']++;
+				return true;
+			}
+			//echo "\n v1 trap found : $this->oidDesc['oid'] \n";
+			// Force as trap.
+			$this->oidDesc['type']=21;
+		}
+		if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+		{
+			$this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['nottrap_num']++;
+			return true;
+		}
+		return false;
+	}
    
-    /**
-     * get_trap_mib_description
-     * @return array|null : array of snmptranslate output or null on error
-    **/
-    private function get_trap_mib_description()
-    {
-        $retVal=0;
-        $match=$snmptrans=array();
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR);
-            return $snmptrans;
-        }
+	/**
+	 * get_trap_mib_description
+	 * @return array|null : array of snmptranslate output or null on error
+	 **/
+	private function get_trap_mib_description()
+	{
+		$retVal=0;
+		$match=$snmptrans=array();
+		exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
+			' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR);
+			return $snmptrans;
+		}
         
-        if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
-        {
-            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
-            return $snmptrans;
-        }
-        $this->oidDesc['mib']=$match[1];
+		if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+		{
+			$this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
+			return $snmptrans;
+		}
+		$this->oidDesc['mib']=$match[1];
         
-        $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
-        if (isset($snmptrans[$numLine]))
-        {
-            $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+		$numLine=1;
+		while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+		if (isset($snmptrans[$numLine]))
+		{
+			$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
             
-            while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-            {
-                $this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-                $numLine++;
-            }
-            if (isset($snmptrans[$numLine])) {
-                $this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
-                $this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
-            }
+			while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+			{
+				$this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+				$numLine++;
+			}
+			if (isset($snmptrans[$numLine])) {
+				$this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
+				$this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
+			}
             
-        }
-        return $snmptrans;
-    }
+		}
+		return $snmptrans;
+	}
 
-    /**
-     * Get trap objects
-     * @param array $snmptrans : output of snmptranslate for TrapModuleConfig
-     * @return array|null : array of objects or null if not found
-    **/
-    private function get_trap_objects($snmptrans)
-    {
-        $objectName=null;
-        $match=array();
-        foreach ($snmptrans as $line)
-        {
-            if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-            {
-                $objectName=$match[1];
-            }
-        }
-        if ($objectName == null)
-        {
-            $this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-            return null;
-        }
+	/**
+	 * Get trap objects
+	 * @param array $snmptrans : output of snmptranslate for TrapModuleConfig
+	 * @return array|null : array of objects or null if not found
+	 **/
+	private function get_trap_objects($snmptrans)
+	{
+		$objectName=null;
+		$match=array();
+		foreach ($snmptrans as $line)
+		{
+			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+			{
+				$objectName=$match[1];
+			}
+		}
+		if ($objectName == null)
+		{
+			$this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
+			$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+			return null;
+		}
         
-        $trapObjects=array();
-        while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
-        {
-            array_push($trapObjects,$match[1]);
-            $objectName=preg_replace('/'.$match[0].'/','',$objectName);
-        }
-        return $trapObjects;
-    }
+		$trapObjects=array();
+		while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
+		{
+			array_push($trapObjects,$match[1]);
+			$objectName=preg_replace('/'.$match[0].'/','',$objectName);
+		}
+		return $trapObjects;
+	}
     
-    /**
-     * Cache mib in database
-     * @param boolean $display_progress : Display progress on standard output
-     * @param boolean $check_change : Force check of trap params & objects
-     * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
-     * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-     */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
-    {
-        // Global Timing
-        $timeTaken = microtime(true);
+	/**
+	 * Cache mib in database
+	 * @param boolean $display_progress : Display progress on standard output
+	 * @param boolean $check_change : Force check of trap params & objects
+	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
+	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
+	 */
+	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	{
+		// Global Timing
+		$timeTaken = microtime(true);
         
-        $numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
+		$numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
         
-        $this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
+		$this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
         
-        $step=$basestep=$numElements/10; // output display of % done
-        $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$step=$basestep=$numElements/10; // output display of % done
+		$num_step=0;
+		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
         
-        // Create index for trap objects
-        $this->trapObjectsIndex=array();
+		// Create index for trap objects
+		$this->trapObjectsIndex=array();
         
-        // detailed timing (time_* vars)
-        $this->reset_update_timers();
+		// detailed timing (time_* vars)
+		$this->reset_update_timers();
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
-        {
-            $this->timing['base_time']= microtime(true);
-            if ($display_progress)
-            {
-                if ((microtime(true)-$timeFiveSec) > 2)
-                { // echo a . every 2 sec
-                    echo '.';
-                    $timeFiveSec = microtime(true);
-                }
-                if ($curElement>$step)
-                { // display progress
-                    $num_step++;
-                    $step+=$basestep;   
-                    echo "\n" . ($num_step*10). '% : ';
-                }
-            }
+		for ($curElement=0;$curElement < $numElements;$curElement++)
+		{
+			$this->timing['base_time']= microtime(true);
+			if ($display_progress)
+			{
+				if ((microtime(true)-$timeFiveSec) > 2)
+				{ // echo a . every 2 sec
+					echo '.';
+					$timeFiveSec = microtime(true);
+				}
+				if ($curElement>$step)
+				{ // display progress
+					$num_step++;
+					$step+=$basestep;   
+					echo "\n" . ($num_step*10). '% : ';
+				}
+			}
             
-            $this->reset_oidDesc();
-            if ($this->detect_trap($curElement,$onlyTraps)===true)
-            {
-                continue;
-            }
+			$this->reset_oidDesc();
+			if ($this->detect_trap($curElement,$onlyTraps)===true)
+			{
+				continue;
+			}
             
-            $this->timing['num_traps']++;
+			$this->timing['num_traps']++;
             
-            $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+			$this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
+			if ($display_progress) echo '#'; // echo a # when trap found
 
-            // get trap objects & source MIB
+			// get trap objects & source MIB
             
-            $snmptrans=$this->get_trap_mib_description(); // get MIB & description
+			$snmptrans=$this->get_trap_mib_description(); // get MIB & description
 
 
-            $update=$this->update_oid(); // Do update of trap.
+			$update=$this->update_oid(); // Do update of trap.
             
-            $this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['update_num']++;
+			$this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['update_num']++;
             
-            $this->timing['base_time']= microtime(true); // Reset to check object time
+			$this->timing['base_time']= microtime(true); // Reset to check object time
             
-            if (($update==0) && ($check_change===false))
-            { // Trapd didn't change & force check disabled
-                $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-                if ($display_progress) echo "C";
-                continue;
-            }
+			if (($update==0) && ($check_change===false))
+			{ // Trapd didn't change & force check disabled
+				$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+				if ($display_progress) echo "C";
+				continue;
+			}
             
-            $trapObjects=$this->get_trap_objects($snmptrans); // Get trap objects from snmptranslate output            
-            if ($trapObjects == null)
-            {
-                continue;
-            }
+			$trapObjects=$this->get_trap_objects($snmptrans); // Get trap objects from snmptranslate output            
+			if ($trapObjects == null)
+			{
+				continue;
+			}
            
-            $this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
+			$this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
             
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['objects_num']++;
-        }
+			$this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+			$this->timing['objects_num']++;
+		}
         
-        if ($display_progress)
-        {
-            echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
-            echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
-            echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
-            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
-            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
+		if ($display_progress)
+		{
+			echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
+			echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
+			echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
+			echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
+			echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
             
-            $timeTaken=microtime(true) - $timeTaken;
-            echo "Global time : ".round($timeTaken)." seconds\n";
-        }
-    }
+			$timeTaken=microtime(true) - $timeTaken;
+			echo "Global time : ".round($timeTaken)." seconds\n";
+		}
+	}
     
     
 }
\ No newline at end of file

Spacing +93 added lines, -93 removed lines

@@ -41,7 +41,7 @@ 
      * @param Logging $logClass : where to log
      * @param Database $dbClass : Database
      */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+    function __construct($logClass, $dbClass, $snmptrans, $snmptransdir)
     {
         $this->logging=$logClass;
         $this->trapsDB=$dbClass;
@@ -72,30 +72,30 @@ 
  * @param string $trapmib : mib of trap
  * @return NULL|array : null if not found, or output of snmptranslate
  */
-    private function get_object_details($object,$trapmib)
+    private function get_object_details($object, $trapmib)
     {
         $match=$snmptrans=array();
         $retVal=0;
         $this->oidDesc['mib']=$trapmib;
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -On -Td '.$this->oidDesc['mib'].'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+        if ($retVal != 0)
         {
             // Maybe not trap mib, search with IR
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+            if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
             { // Not found -> continue with warning
-                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
                 return null;
             }
             $this->oidDesc['mib']=$match[1];
             
             // Do the snmptranslate again.
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
-            if ($retVal!=0) {
-                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -On -Td '.$this->oidDesc['mib'].'::'.$object, $snmptrans, $retVal);
+            if ($retVal != 0) {
+                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object, 2, '');
                 return null;
             }
             
@@ -115,12 +115,12 @@ 
         
         foreach ($snmptrans as $line)
         {
-            if ($indesc===true)
+            if ($indesc === true)
             {
-                $line=preg_replace('/[\t ]+/',' ',$line);
-                if (preg_match('/(.*)"$/', $line,$match))
+                $line=preg_replace('/[\t ]+/', ' ', $line);
+                if (preg_match('/(.*)"$/', $line, $match))
                 {
-                    $this->oidDesc['description'] = $tmpdesc . $match[1];
+                    $this->oidDesc['description']=$tmpdesc.$match[1];
                     $indesc=false;
                 }
                 $tmpdesc.=$line;
@@ -131,34 +131,34 @@ 
                 $this->oidDesc['oid']=$line;
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 $this->oidDesc['type_enum']=$match[2];
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['dispHint']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['description']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
             {
                 $tmpdesc=$match[1];
                 $indesc=true;
                 continue;
             }
-            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['textconv']=$match[1];
                 continue;
@@ -173,9 +173,9 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+    public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
     {              
-        $trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
+        $trapId=$this->dbOidIndex[$trapOID]['id']; // Get id of trap
         
         if ($check_existing === true)
         {
@@ -192,9 +192,9 @@ 
             
             $this->parse_object($snmptrans);
 
-            $this->oidDesc['name'] = $object;
+            $this->oidDesc['name']=$object;
             
-            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
+            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'], DEBUG);
 
             // Update
             $this->update_oid();
@@ -219,7 +219,7 @@ 
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
+                $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$this->oidDesc['oid']]['id'], 1, '');
             }
         }
         if ($check_existing === true)
@@ -236,7 +236,7 @@ 
         $this->oidDesc['type']=null;
         $this->oidDesc['mib']=null;
         $this->oidDesc['textconv']=null;
-        $this->oidDesc['dispHint'] =null;
+        $this->oidDesc['dispHint']=null;
         $this->oidDesc['syntax']=null;
         $this->oidDesc['type_enum']=null;
         $this->oidDesc['description']=null;
@@ -250,17 +250,17 @@ 
     {
         $retVal=0;
         // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+        $snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
+        $this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
         unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
+        exec($snmpCommand, $this->objectsAll, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
+            $this->logging->log('error executing snmptranslate', ERROR, '');
         }
         // Count elements to show progress
         $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
         return $numElements;
     }
 
@@ -274,14 +274,14 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
+        $this->logging->log('SQL query : '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
+            $this->logging->log('No result in query : '.$sql, ERROR, '');
         }
         $this->dbOidAll=$ret_code->fetchAll();
         $this->dbOidIndex=array();
         // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
+        foreach ($this->dbOidAll as $key=>$val)
         {
             $this->dbOidIndex[$val['oid']]['key']=$key;
             $this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -314,13 +314,13 @@ 
      * @param bool $onlyTraps : set to false to get all and not only traps.
      * @return boolean : false if it's a trap , true if not
      */
-    private function detect_trap($curElement,$onlyTraps)
+    private function detect_trap($curElement, $onlyTraps)
     {
         // Get oid or pass if not found
-        if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+        if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
         {
-            $this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_parse_num'] ++;
+            $this->timing['base_parse_time']+=microtime(true) - $this->timing['base_time'];
+            $this->timing['base_parse_num']++;
             return true;
         }
         $this->oidDesc['oid']=$this->objectsAll[$curElement];
@@ -329,9 +329,9 @@ 
         $curElement++;
         $match=$snmptrans=array();
         if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-            $this->objectsAll[$curElement],$match))
+            $this->objectsAll[$curElement], $match))
         {
-            $this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['base_check_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['base_check_num']++;
             return true;
         }
@@ -339,22 +339,22 @@ 
         $this->oidDesc['name']=$match[1]; // Name
         $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+        if ($this->oidDesc['type'] == 0) // object type=0 : check if v1 trap
         {
             // Check if next is suboid -> in that case is cannot be a trap
-            if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
+            if (preg_match("/^".$this->oidDesc['oid']."/", $this->objectsAll[$curElement + 1]))
             {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['type0_check_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
             unset($snmptrans);
             $retVal=0;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
-            if ($retVal!=0)
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -Td '.$this->oidDesc['oid'].' | grep OBJECTS ', $snmptrans, $retVal);
+            if ($retVal != 0)
             {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['type0_check_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -362,9 +362,9 @@ 
             // Force as trap.
             $this->oidDesc['type']=21;
         }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+        if ($onlyTraps === true && $this->oidDesc['type'] != 21) // if only traps and not a trap, continue
         {
-            $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['nottrap_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -379,35 +379,35 @@ 
     {
         $retVal=0;
         $match=$snmptrans=array();
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -Td '.$this->oidDesc['oid'], $snmptrans, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR);
+            $this->logging->log('error executing snmptranslate', ERROR);
             return $snmptrans;
         }
         
-        if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+        if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
         {
-            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
+            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : '.$snmptrans[0], ERROR);
             return $snmptrans;
         }
         $this->oidDesc['mib']=$match[1];
         
         $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $snmptrans[$numLine], $match)) $numLine++;
         if (isset($snmptrans[$numLine]))
         {
-            $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+            $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
             
-            while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+            while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
             {
-                $this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+                $this->oidDesc['description'].=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
                 $numLine++;
             }
             if (isset($snmptrans[$numLine])) {
-                $this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
-                $this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
+                $this->oidDesc['description'].=preg_replace('/".*/', '', $snmptrans[$numLine]);
+                $this->oidDesc['description']=preg_replace('/[\t ]+/', ' ', $this->oidDesc['description']);
             }
             
         }
@@ -425,23 +425,23 @@ 
         $match=array();
         foreach ($snmptrans as $line)
         {
-            if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+            if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
             {
                 $objectName=$match[1];
             }
         }
         if ($objectName == null)
         {
-            $this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->logging->log('No objects for '.$this->oidDesc['oid'], DEBUG);
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             return null;
         }
         
         $trapObjects=array();
-        while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
+        while (preg_match('/ *([^ ,]+) *,* */', $objectName, $match))
         {
-            array_push($trapObjects,$match[1]);
-            $objectName=preg_replace('/'.$match[0].'/','',$objectName);
+            array_push($trapObjects, $match[1]);
+            $objectName=preg_replace('/'.$match[0].'/', '', $objectName);
         }
         return $trapObjects;
     }
@@ -453,18 +453,18 @@ 
      * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
      * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
      */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+    public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
     {
         // Global Timing
-        $timeTaken = microtime(true);
+        $timeTaken=microtime(true);
         
         $numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
         
         $this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
         
-        $step=$basestep=$numElements/10; // output display of % done
+        $step=$basestep=$numElements / 10; // output display of % done
         $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+        $timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
         
         // Create index for trap objects
         $this->trapObjectsIndex=array();
@@ -472,33 +472,33 @@ 
         // detailed timing (time_* vars)
         $this->reset_update_timers();
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
+        for ($curElement=0; $curElement < $numElements; $curElement++)
         {
-            $this->timing['base_time']= microtime(true);
+            $this->timing['base_time']=microtime(true);
             if ($display_progress)
             {
-                if ((microtime(true)-$timeFiveSec) > 2)
+                if ((microtime(true) - $timeFiveSec) > 2)
                 { // echo a . every 2 sec
                     echo '.';
-                    $timeFiveSec = microtime(true);
+                    $timeFiveSec=microtime(true);
                 }
-                if ($curElement>$step)
+                if ($curElement > $step)
                 { // display progress
                     $num_step++;
                     $step+=$basestep;   
-                    echo "\n" . ($num_step*10). '% : ';
+                    echo "\n".($num_step * 10).'% : ';
                 }
             }
             
             $this->reset_oidDesc();
-            if ($this->detect_trap($curElement,$onlyTraps)===true)
+            if ($this->detect_trap($curElement, $onlyTraps) === true)
             {
                 continue;
             }
             
             $this->timing['num_traps']++;
             
-            $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
+            $this->logging->log('Found trap : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], INFO);
             if ($display_progress) echo '#'; // echo a # when trap found
 
             // get trap objects & source MIB
@@ -508,14 +508,14 @@ 
 
             $update=$this->update_oid(); // Do update of trap.
             
-            $this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['update_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['update_num']++;
             
-            $this->timing['base_time']= microtime(true); // Reset to check object time
+            $this->timing['base_time']=microtime(true); // Reset to check object time
             
-            if (($update==0) && ($check_change===false))
+            if (($update == 0) && ($check_change === false))
             { // Trapd didn't change & force check disabled
-                $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
                 if ($display_progress) echo "C";
                 continue;
             }
@@ -528,17 +528,17 @@ 
            
             $this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
             
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['objects_num']++;
         }
         
         if ($display_progress)
         {
-            echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
-            echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
-            echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
-            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
-            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
+            echo "\nNumber of processed traps :  ".$this->timing['num_traps']."\n";
+            echo "\nParsing : ".number_format($this->timing['base_parse_time'] + $this->timing['base_check_time'], 1)." sec / ".($this->timing['base_parse_num'] + $this->timing['base_check_num'])." occurences\n";
+            echo "Detecting traps : ".number_format($this->timing['type0_check_time'] + $this->timing['nottrap_time'], 1)." sec / ".($this->timing['type0_check_num'] + $this->timing['nottrap_num'])." occurences\n";
+            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'], 1)." sec , ";
+            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'], 1)." sec \n";
             
             $timeTaken=microtime(true) - $timeTaken;
             echo "Global time : ".round($timeTaken)." seconds\n";

Braces +20 added lines, -6 removed lines

@@ -188,7 +188,10 @@ 
             $this->reset_oidDesc();
             
             $snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
-            if ($snmptrans === null) continue; // object not found
+            if ($snmptrans === null) {
+            	continue;
+            }
+            // object not found
             
             $this->parse_object($snmptrans);
 
@@ -339,12 +342,14 @@ 
         $this->oidDesc['name']=$match[1]; // Name
         $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+        if ($this->oidDesc['type']==0) {
+        	// object type=0 : check if v1 trap
         {
             // Check if next is suboid -> in that case is cannot be a trap
             if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
             {
                 $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+        }
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -362,9 +367,11 @@ 
             // Force as trap.
             $this->oidDesc['type']=21;
         }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+        if ($onlyTraps===true && $this->oidDesc['type']!=21) {
+        	// if only traps and not a trap, continue
         {
             $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+        }
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -395,7 +402,9 @@ 
         $this->oidDesc['mib']=$match[1];
         
         $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+        	$numLine++;
+        }
         if (isset($snmptrans[$numLine]))
         {
             $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -499,7 +508,10 @@ 
             $this->timing['num_traps']++;
             
             $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+            if ($display_progress) {
+            	echo '#';
+            }
+            // echo a # when trap found
 
             // get trap objects & source MIB
             
@@ -516,7 +528,9 @@ 
             if (($update==0) && ($check_change===false))
             { // Trapd didn't change & force check disabled
                 $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-                if ($display_progress) echo "C";
+                if ($display_progress) {
+                	echo "C";
+                }
                 continue;
             }
             

application/controllers/HandlerController.php

Indentation +250 added lines, -251 removed lines

@@ -11,13 +11,12 @@ 
 
 //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 @@ 
 	 */
 	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 @@ 
 	 */
 	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 @@ 
 	 */
 	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->getUIDatabase()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getUIDatabase()->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 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getUIDatabase()->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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->getUIDatabase()->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 @@ 
 	 */
 	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 @@ 
 		//$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 @@ 
 			$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 @@ 
 	}
 	
 	/** 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();
@@ -428,7 +427,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
+				$this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
 			}
 			catch (Exception $e)
 			{
@@ -438,7 +437,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -465,7 +464,7 @@ 
 			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
 			if (! $isHostGroup ) 
 			{  // checks if selection by host 
-			    $hostAddr=$this->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
+				$hostAddr=$this->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
 				$params['ip6']['val']=$hostAddr->ip6;
 				$checkHostName=$hostAddr->name;
@@ -476,8 +475,8 @@ 
 				}
 				if (!is_numeric($params['serviceid']['val']))
 				{
-				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
-				    return;
+					$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)
@@ -488,7 +487,7 @@ 
 			}
 			else
 			{
-			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
+				$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"));
@@ -509,11 +508,11 @@ 
 			// echo '<br>';	print_r($dbparams);echo '<br>';
 			if ($params['db_rule']['val'] == -1 ) 
 			{
-			    $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'];
 			}
 		}
@@ -527,9 +526,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');  }
@@ -545,14 +544,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)
@@ -566,9 +565,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');  }
@@ -584,7 +583,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
@@ -600,10 +599,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');  }
@@ -614,7 +613,7 @@ 
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
@@ -631,7 +630,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +82 added lines, -82 removed lines

@@ -23,16 +23,16 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('status');
 
-		$dbConn = $this->getUIDatabase()->getDb();
+		$dbConn=$this->getUIDatabase()->getDb();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		$this->getHandlerListTable()->setConnection($dbConn);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
 		// Apply pagination limits 
-		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
-		$this->view->filterEditor = $this->getHandlerListTable()->getFilterEditor($this->getRequest());		
+		$this->view->filterEditor=$this->getHandlerListTable()->getFilterEditor($this->getRequest());		
 	
 		//$this->displayExitError('Handler/indexAction','Not implemented');
 	}
@@ -42,7 +42,7 @@ 
 	public function testruleAction()
 	{
 	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
+	    $this->getTabs()->add('get', array(
 	        'active'	=> true,
 	        'label'		=> $this->translate('Test Rule'),
 	        'url'		=> Url::fromRequest()
@@ -51,7 +51,7 @@ 
 
 	    if ($this->params->get('rule') !== null) 
 	    {
-	        $this->view->rule= $this->params->get('rule');
+	        $this->view->rule=$this->params->get('rule');
 	    }
 	    else
 	    {
@@ -110,12 +110,12 @@ 
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+	        $this->displayExitError('Add handler : get host by IP/Name ', $e->getMessage());
 	    }
 	    
 	    
 	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
+	    if (count($hosts) == 1) {
 	        $this->view->hostname=$hosts[0]->name;
 	        //$hostid=$hosts[0]->id;
 	        // Tell JS to get services when page is loaded
@@ -124,9 +124,9 @@ 
 	    }
 	    else
 	    {
-	        foreach($hosts as $key=>$val)
+	        foreach ($hosts as $key=>$val)
 	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
+	            array_push($this->view->hostlist, $hosts[$key]->name);
 	        }
 	    }
 	    
@@ -165,18 +165,18 @@ 
 	            $currentObjectTypeEnum
 	        );
 	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
+	        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
+	    if ($allObjects != null) // in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val == null) { continue; }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -204,9 +204,9 @@ 
 	    // Check if hostname still exists
 	    $host_get=$this->getUIDatabase()->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
+	    if (count($host_get) == 0)
 	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='Host '.$this->view->hostname.' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
 	    }
 	    else
@@ -214,10 +214,10 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        // get service id for form to set :
-	        $serviceID=$this->getUIDatabase()->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
+	        $serviceID=$this->getUIDatabase()->getServiceIDByName($this->view->hostname, $ruleDetail->service_name);
+	        if (count($serviceID) == 0)
 	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	        else
 	        {
@@ -234,9 +234,9 @@ 
 	{
 	    // Check if groupe exists
 	    $group_get=$this->getUIDatabase()->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
+	    if (count($group_get) == 0)
 	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname.' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
 	    }
 	    else
@@ -254,9 +254,9 @@ 
 	        
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
+	        if ($foundGrpService == 0)
 	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message.=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	    }
 	}
@@ -274,12 +274,12 @@ 
 	    $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))
+	    while (preg_match('/_OID\(([\.0-9\*]+)\)/', $display, $matches) ||
+	        preg_match('/_OID\(([\.0-9\*]+)\)/', $rule, $matches))
 	    {
 	        $curOid=$matches[1];
 	        
-	        if ( (preg_match('/\*/',$curOid) == 0 ) 
+	        if ((preg_match('/\*/', $curOid) == 0) 
 	            && ($object=$this->getMIB()->translateOID($curOid)) != null)
 	        {
 	            array_push($curObjectList, array(
@@ -304,9 +304,9 @@ 
 	                'not found'
 	            ));
 	        }
-	        $curOid = preg_replace('/\*/','\*',$curOid);
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+	        $curOid=preg_replace('/\*/', '\*', $curOid);
+	        $display=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $display);
+	        $rule=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $rule);
 	        $index++;
 	    }
 	    return $curObjectList;
@@ -320,7 +320,7 @@ 
 	{
 		$this->checkConfigPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Add handler'),
 			'url'		=> Url::fromRequest()
@@ -333,7 +333,7 @@ 
 		
 		//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
 		
-		if (($trapid = $this->params->get('fromid')) !== null) {
+		if (($trapid=$this->params->get('fromid')) !== null) {
 		    /********** Setup from existing trap ***************/
             $this->add_from_existing($trapid);
 			return;
@@ -353,7 +353,7 @@ 
 			$this->view->setRuleMatch=$ruleDetail->action_match;
 			$this->view->setRuleNoMatch=$ruleDetail->action_nomatch;
 			$this->view->hostgroupname=$ruleDetail->host_group_name;
-			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z",$ruleDetail->modified);
+			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z", $ruleDetail->modified);
 			$this->view->modifier=$ruleDetail->modifier;
 			
 			// Warning message if host/service don't exists anymore
@@ -405,26 +405,26 @@ 
 	
 		$params=array(
 			// id (also db) => 	array('post' => post id, 'val' => default val, 'db' => send to table)
-			'hostgroup'		=>	array('post' => 'hostgroup','db'=>false),
-			'db_rule'		=>	array('post' => 'db_rule','db'=>false),
-			'hostid'		=>	array('post' => 'hostid','db'=>false),
-			'host_name'		=>	array('post' => 'hostname','val' => null,'db'=>true),
-			'host_group_name'=>	array('post' => null,'val' => null,'db'=>true),
-			'serviceid'		=>	array('post' => 'serviceid','db'=>false),
-			'service_name'	=>	array('post' => 'serviceName','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),
-			'rule'			=>	array('post' => 'rule','val' => '','db'=>true),			
-			'action_match'	=>	array('post' => 'ruleMatch','val' => -1,'db'=>true),
-			'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','db'=>false)
+			'hostgroup'		=>	array('post' => 'hostgroup', 'db'=>false),
+			'db_rule'		=>	array('post' => 'db_rule', 'db'=>false),
+			'hostid'		=>	array('post' => 'hostid', 'db'=>false),
+			'host_name'		=>	array('post' => 'hostname', 'val' => null, 'db'=>true),
+			'host_group_name'=>	array('post' => null, 'val' => null, 'db'=>true),
+			'serviceid'		=>	array('post' => 'serviceid', 'db'=>false),
+			'service_name'	=>	array('post' => 'serviceName', '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),
+			'rule'			=>	array('post' => 'rule', 'val' => '', 'db'=>true),			
+			'action_match'	=>	array('post' => 'ruleMatch', 'val' => -1, 'db'=>true),
+			'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', 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
-			&& $postData[$params['action_form']['post']] == 'delete' )
+			&& $postData[$params['action_form']['post']] == 'delete')
 		{
 			try
 			{
@@ -444,16 +444,16 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
-			if (! isset($postData[$params[$key]['post']]))
+			if ($params[$key]['post'] == null) continue; // data not sent in post vars
+			if (!isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
-				$this->_helper->json(array('status'=>'No ' . $key));
+				$this->_helper->json(array('status'=>'No '.$key));
 			}
 			else
 			{
 				$data=$postData[$params[$key]['post']];
-				if ($data!=null && $data !="")
+				if ($data != null && $data != "")
 				{
 					$params[$key]['val']=$postData[$params[$key]['post']];
 				}
@@ -462,8 +462,8 @@ 
 
 		try 
 		{
-			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
-			if (! $isHostGroup ) 
+			$isHostGroup=($params['hostgroup']['val'] == 1) ?true:false;
+			if (!$isHostGroup) 
 			{  // checks if selection by host 
 			    $hostAddr=$this->getUIDatabase()->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
@@ -476,7 +476,7 @@ 
 				}
 				if (!is_numeric($params['serviceid']['val']))
 				{
-				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+				    $this->_helper->json(array('status'=>"Invalid service id ".$params['serviceid']['val']));
 				    return;
 				}
 				$serviceName=$this->getUIDatabase()->getObjectNameByid($params['serviceid']['val']);
@@ -495,25 +495,25 @@ 
 					return;					
 				}
 				// Put param in correct column (group_name)
-				$params['host_group_name']['val'] = $params['host_name']['val'];
+				$params['host_group_name']['val']=$params['host_name']['val'];
 				$params['host_name']['val']=null;
 			}
 			$dbparams=array();
 			foreach ($params as $key=>$val)
 			{
-				if ($val['db']==true )
+				if ($val['db'] == true)
 				{
-					$dbparams[$key] = $val['val'];
+					$dbparams[$key]=$val['val'];
 				}
 			}
 			// echo '<br>';	print_r($dbparams);echo '<br>';
-			if ($params['db_rule']['val'] == -1 ) 
+			if ($params['db_rule']['val'] == -1) 
 			{
 			    $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'];
 			}
 		}
@@ -532,10 +532,10 @@ 
 	*/
 	protected function getTrapDetail($trapid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get main data
 		// extract columns and titles;
@@ -545,19 +545,19 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->getModuleConfig()->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null ) 
+			if ($trapDetail == null) 
 			{
-			    $trapDetail = 'NULL';
+			    $trapDetail='NULL';
 			    throw new Exception('No traps was found with id = '.$trapid);
 			}
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
+			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail, true), $e->getMessage());
 			return;
 		}
 
@@ -571,10 +571,10 @@ 
 	*/
 	protected function getTrapobjects($trapid)
 	{	
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get object data
 		// extract columns and titles;
@@ -584,15 +584,15 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 				$trapDetail=$dbConn->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
+			$this->displayExitError('Add handler : get trap data detail : ', $e->getMessage());
 			return array();
 		}
 
@@ -606,24 +606,24 @@ 
 	*/
 	protected function getRuleDetail($ruleid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $ruleid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
-				->where('id=?',$ruleid);
+		    $query=$dbConn->select()
+				->from($this->getModuleConfig()->getTrapRuleName(), $queryArray)
+				->where('id=?', $ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
+			if ($ruleDetail == null) throw new Exception('No rule was found with id = '.$ruleid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
-			throw new Exception('Error : ' . $e->getMessage());
+			$this->displayExitError('Update handler : get rule detail', $e->getMessage());
+			throw new Exception('Error : '.$e->getMessage());
 		}
 
 		return $ruleDetail;
@@ -636,7 +636,7 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/handler')
+			'url'   => $this->getModuleConfig()->urlPath().'/handler')
 		);
 	} 
 	

Braces +44 added lines, -42 removed lines

@@ -24,7 +24,9 @@ 
 		$this->prepareTabs()->activate('status');
 
 		$dbConn = $this->getUIDatabase()->getDb();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		$this->getHandlerListTable()->setConnection($dbConn);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
@@ -52,8 +54,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -107,8 +108,7 @@ 
 	    try
 	    {
 	        $hosts=$this->getUIDatabase()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 	    }
@@ -121,8 +121,7 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        
-	    }
-	    else
+	    } else
 	    {
 	        foreach($hosts as $key=>$val)
 	        {
@@ -172,11 +171,14 @@ 
 	            $allObjects[$val->oid]=null;
 	        }
 	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+	    if ($allObjects!=null) {
+	    	// in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val==null) { continue;
+	    }
+	    }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -208,8 +210,7 @@ 
 	    {
 	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
@@ -218,8 +219,7 @@ 
 	        if (count($serviceID) ==0)
 	        {
 	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
+	        } else
 	        {
 	            $this->view->serviceSet=$serviceID[0]->id;
 	        }
@@ -238,8 +238,7 @@ 
 	    {
 	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        $grpServices=$this->getUIDatabase()->getServicesByHostGroupid($group_get[0]->id);
 	        $foundGrpService=0;
@@ -291,8 +290,7 @@ 
 	                $object['type'],
 	                $object['type_enum']
 	            ));
-	        }
-	        else
+	        } else
 	        {
 	            array_push($curObjectList, array(
 	                $index,
@@ -363,8 +361,7 @@ 
 			    $this->view->selectGroup=false;
 			    // Check if hostname still exists
 			    $this->add_check_host_exists($ruleDetail);
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
@@ -372,9 +369,11 @@ 
 			
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
-			if ($oidName != null)  // oid is found in mibs
+			if ($oidName != null) {
+				// oid is found in mibs
 			{
-				$this->view->mib=$oidName['mib']; 
+				$this->view->mib=$oidName['mib'];
+			}
 				$this->view->name=$oidName['name'];
 				$this->view->trapListForMIB=$this->getMIB()
 					->getTrapList($oidName['mib']);				
@@ -429,8 +428,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -444,13 +442,15 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
+			if ($params[$key]['post']==null) {
+				continue;
+			}
+			// data not sent in post vars
 			if (! isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
 				$this->_helper->json(array('status'=>'No ' . $key));
-			}
-			else
+			} else
 			{
 				$data=$postData[$params[$key]['post']];
 				if ($data!=null && $data !="")
@@ -485,8 +485,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -510,14 +509,12 @@ 
 			if ($params['db_rule']['val'] == -1 ) 
 			{
 			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>$e->getMessage()));
 			return;
@@ -536,7 +533,9 @@ 
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -554,8 +553,7 @@ 
 			    $trapDetail = 'NULL';
 			    throw new Exception('No traps was found with id = '.$trapid);
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
 			return;
@@ -575,7 +573,9 @@ 
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -589,8 +589,7 @@ 
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
 			return array();
@@ -610,7 +609,9 @@ 
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		try
 		{		
@@ -618,9 +619,10 @@ 
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
-		}
-		catch (Exception $e)
+			if ( $ruleDetail == null ) {
+				throw new Exception('No rule was found with id = '.$ruleid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
 			throw new Exception('Error : ' . $e->getMessage());

tests/expr_test.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
   $inputStream=fopen('php://stdin', 'r');
   if ($inputStream === false)
   {
-      exit(1);
+	  exit(1);
   }
   $rule=chop(fgets($inputStream));
 } else

Spacing +10 added lines, -10 removed lines

@@ -5,18 +5,18 @@ 
 
 require_once 'bin/trap_class.php';
 
-$options = getopt("r:d:");
+$options=getopt("r:d:");
 
-$icingaweb2Etc=(array_key_exists('d',$options))?$options['d']:"/etc/icingaweb2";
+$icingaweb2Etc=(array_key_exists('d', $options)) ? $options['d'] : "/etc/icingaweb2";
 
-$debugLevel=4;// 0=No output 1=critical 2=warning 3=trace 4=ALL
+$debugLevel=4; // 0=No output 1=critical 2=warning 3=trace 4=ALL
 
-$trap = new trap($icingaweb2Etc);
-$trap->setLogging($debugLevel,'display');
+$trap=new trap($icingaweb2Etc);
+$trap->setLogging($debugLevel, 'display');
 
-$input=array_key_exists('r',$options);
+$input=array_key_exists('r', $options);
 
-if (! $input) {
+if (!$input) {
   $inputStream=fopen('php://stdin', 'r');
   if ($inputStream === false)
   {
@@ -31,10 +31,10 @@ 
   $rule=$trap->ruleClass->eval_cleanup($rule);
   //echo 'After cleanup : #'.$rule."#\n";
   $item=0;
-  $val = $trap->ruleClass->evaluation($rule,$item);
-  if ($val==true) { printf( "true"); } else { printf( "false");}
+  $val=$trap->ruleClass->evaluation($rule, $item);
+  if ($val == true) { printf("true"); } else { printf("false"); }
   printf("\n");
 }
-catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
+catch (Exception $e) { printf("%s\n", $e->getMessage()); exit(1); }
 
 exit(0);

Braces +3 added lines, -3 removed lines

@@ -23,8 +23,9 @@ 
       exit(1);
   }
   $rule=chop(fgets($inputStream));
-} else
+} else {
   $rule=$options['r'];
+}
 
 try
 {
@@ -34,7 +35,6 @@ 
   $val = $trap->ruleClass->evaluation($rule,$item);
   if ($val==true) { printf( "true"); } else { printf( "false");}
   printf("\n");
-}
-catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
+} catch (Exception $e) { printf("%s\n",$e->getMessage()); exit(1);}
 
 exit(0);