patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Rule.php

Indentation +342 added lines, -342 removed lines

@@ -7,396 +7,396 @@
 class Rule
 {
     
-    /** @var Logging $logging logging class*/
-    protected $logging;
+	/** @var Logging $logging logging class*/
+	protected $logging;
     
-    /** @var Trap $trapClass */
-    protected $trapClass;
+	/** @var Trap $trapClass */
+	protected $trapClass;
     
-    /**
-     * Setup Rule Class
-     * @param Trap $trapClass : To get logging class & plugin class
-     */
-    function __construct($trapClass)
-    {
-        $this->trapClass=$trapClass;
-        $this->logging=$trapClass->logging;
-    }
+	/**
+	 * Setup Rule Class
+	 * @param Trap $trapClass : To get logging class & plugin class
+	 */
+	function __construct($trapClass)
+	{
+		$this->trapClass=$trapClass;
+		$this->logging=$trapClass->logging;
+	}
 
 /**
  * Get full number 
  * @return array<number,string>
  */
-    private function get_number($rule,&$item)
-    {
-        $item2=$item+1;
-        while (
-            ($item2!=strlen($rule)) 
-            && (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
-        { 
-            $item2++ ;
-        }
-        $val=substr($rule,$item,$item2-$item);
-        $item=$item2;
-        //echo "number ".$val."\n";
+	private function get_number($rule,&$item)
+	{
+		$item2=$item+1;
+		while (
+			($item2!=strlen($rule)) 
+			&& (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
+		{ 
+			$item2++ ;
+		}
+		$val=substr($rule,$item,$item2-$item);
+		$item=$item2;
+		//echo "number ".$val."\n";
         
-        return array(0,$val);
-    }
+		return array(0,$val);
+	}
 
-    private function get_string($rule,&$item)
-    {
-        $item++;
-        $item2=$this->eval_getNext($rule,$item,'"');
-        $val=substr($rule,$item,$item2-$item-1);
-        $item=$item2;
-        //echo "string : ".$val."\n";
-        return array(1,$val);
+	private function get_string($rule,&$item)
+	{
+		$item++;
+		$item2=$this->eval_getNext($rule,$item,'"');
+		$val=substr($rule,$item,$item2-$item-1);
+		$item=$item2;
+		//echo "string : ".$val."\n";
+		return array(1,$val);
         
-    }
+	}
     
-    /**
-     * Parse elements inside () : jumps over "" and count parenthesis.
-     * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
-     * @param string $rule : the current rule
-     * @param int $item : actual position in rule
-     * @throws Exception
-     * @return string : everything inside parenthesis
-     */
-    private function parse_parenthesis(string $rule,int &$item) : string
-    {
-        $item++;
-        $start=$item;
-        $parenthesis_count=0;
-        while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
-        {
-            if ($rule[$item] == '"' )
-            { // pass through string
-                $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
-            }
-            else{
-                if ($rule[$item] == '(')
-                {
-                    $parenthesis_count++;
-                }
-                if ($rule[$item] == ')')
-                {
-                    $parenthesis_count--;
-                }
-                $item++;
-            }
-        }
+	/**
+	 * Parse elements inside () : jumps over "" and count parenthesis.
+	 * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
+	 * @param string $rule : the current rule
+	 * @param int $item : actual position in rule
+	 * @throws Exception
+	 * @return string : everything inside parenthesis
+	 */
+	private function parse_parenthesis(string $rule,int &$item) : string
+	{
+		$item++;
+		$start=$item;
+		$parenthesis_count=0;
+		while (($item < strlen($rule)) // Not end of string AND
+			&& ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+		{
+			if ($rule[$item] == '"' )
+			{ // pass through string
+				$item++;
+				$item=$this->eval_getNext($rule,$item,'"');
+			}
+			else{
+				if ($rule[$item] == '(')
+				{
+					$parenthesis_count++;
+				}
+				if ($rule[$item] == ')')
+				{
+					$parenthesis_count--;
+				}
+				$item++;
+			}
+		}
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
-        $item++;
-        return $val;
-    }
+		if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
+		$val=substr($rule,$start,$item-$start);
+		$item++;
+		return $val;
+	}
 
     
-    /**
-     * Get and eval a grouped condition - ex : (1==1)
-     * @param string $rule
-     * @param int $item
-     * @return array
-     */
-    private function get_group(string $rule,int &$item) : array
-    {
-        // gets eveything inside parenthesis
-        $val=$this->parse_parenthesis($rule, $item);
-        // Returns boolean with evaluation of all inside parenthesis
-        $start=0;
-        return array(2,$this->evaluation($val,$start));
-    }
+	/**
+	 * Get and eval a grouped condition - ex : (1==1)
+	 * @param string $rule
+	 * @param int $item
+	 * @return array
+	 */
+	private function get_group(string $rule,int &$item) : array
+	{
+		// gets eveything inside parenthesis
+		$val=$this->parse_parenthesis($rule, $item);
+		// Returns boolean with evaluation of all inside parenthesis
+		$start=0;
+		return array(2,$this->evaluation($val,$start));
+	}
 
-    private function get_function(string $rule,int &$item) : array
-    {
-        // function is : __function(param1,param2...)
-        $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
-        {
-            $item++;
-        }        
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+	private function get_function(string $rule,int &$item) : array
+	{
+		// function is : __function(param1,param2...)
+		$start=$item; 
+		while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+		{
+			$item++;
+		}        
+		if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
-        // get parameters between parenthesis
+		// get parameters between parenthesis
         
-        $this->parse_parenthesis($rule, $item);
+		$this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+		$val=substr($rule,$start,$item-$start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+		$this->logging->log('got function ' . $val,DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+		return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
         
-    }
+	}
     
-    protected function eval_getElement($rule,&$item)
-    {
-        if ($item >= strlen($rule))
-        {
-            throw new Exception("Early end of string ".$rule ." at " .$item );
-        }
-        while ($rule[$item]==' ') $item++;
-        if (preg_match('/[\-0-9\.]/',$rule[$item]))
-        { // number
-            return $this->get_number($rule, $item);
-        }
-        if ($rule[$item] == '"')
-        { // string
-            return $this->get_string($rule, $item);
-        }
+	protected function eval_getElement($rule,&$item)
+	{
+		if ($item >= strlen($rule))
+		{
+			throw new Exception("Early end of string ".$rule ." at " .$item );
+		}
+		while ($rule[$item]==' ') $item++;
+		if (preg_match('/[\-0-9\.]/',$rule[$item]))
+		{ // number
+			return $this->get_number($rule, $item);
+		}
+		if ($rule[$item] == '"')
+		{ // string
+			return $this->get_string($rule, $item);
+		}
         
-        if ($rule[$item] == '(')
-        { // grouping
-            return $this->get_group($rule, $item);
-        }
-        if ($rule[$item] == '_')
-        { // function
-            return $this->get_function($rule, $item);
-        }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+		if ($rule[$item] == '(')
+		{ // grouping
+			return $this->get_group($rule, $item);
+		}
+		if ($rule[$item] == '_')
+		{ // function
+			return $this->get_function($rule, $item);
+		}
+		throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
         
-    }
+	}
     
-    protected function eval_getNext($rule,$item,$tok)
-    {
-        while (
-            ($rule[$item] != $tok ) 
-            && ($item < strlen($rule))) 
-        { 
-            $item++;
-        }
-        if ($item==strlen($rule)) {
-            throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
-        }
-        return $item+1;
-    }
+	protected function eval_getNext($rule,$item,$tok)
+	{
+		while (
+			($rule[$item] != $tok ) 
+			&& ($item < strlen($rule))) 
+		{ 
+			$item++;
+		}
+		if ($item==strlen($rule)) {
+			throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		}
+		return $item+1;
+	}
     
-    protected function eval_getOper($rule,&$item)
-    {
-        while ($rule[$item]==' ') $item++;
-        switch ($rule[$item])
-        {
-            case '<':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-                $item++; return array(0,"<");
-            case '>':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-                $item++; return array(0,">");
-            case '=':
-                $item++; return array(0,"=");
-            case '!':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
-            case '~':
-                $item++; return array(0,"~");
-            case '|':
-                $item++; return array(1,"|");
-            case '&':
-                $item++; return array(1,"&");
-            default	:
-                throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
-        }
-    }
+	protected function eval_getOper($rule,&$item)
+	{
+		while ($rule[$item]==' ') $item++;
+		switch ($rule[$item])
+		{
+			case '<':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
+				$item++; return array(0,"<");
+			case '>':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
+				$item++; return array(0,">");
+			case '=':
+				$item++; return array(0,"=");
+			case '!':
+				if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
+				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+			case '~':
+				$item++; return array(0,"~");
+			case '|':
+				$item++; return array(1,"|");
+			case '&':
+				$item++; return array(1,"&");
+			default	:
+				throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+		}
+	}
     
-    private function check_negate_first($rule,&$item)
-    {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
-        {
-            $item++;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+	private function check_negate_first($rule,&$item)
+	{
+		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		{
+			$item++;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
 
-    private function do_compare($val1,$val2,$comp,$negate)
-    {
-        switch ($comp){
-            case '<':	$retVal= ($val1 < $val2); break;
-            case '<=':	$retVal= ($val1 <= $val2); break;
-            case '>':	$retVal= ($val1 > $val2); break;
-            case '>=':	$retVal= ($val1 >= $val2); break;
-            case '=':	$retVal= ($val1 == $val2); break;
-            case '!=':	$retVal= ($val1 != $val2); break;
-            case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-            case '|':	$retVal= ($val1 || $val2); break;
-            case '&':	$retVal= ($val1 && $val2); break;
-            default:  throw new Exception("Error in expression - unknown comp : ".$comp);
-        }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+	private function do_compare($val1,$val2,$comp,$negate)
+	{
+		switch ($comp){
+			case '<':	$retVal= ($val1 < $val2); break;
+			case '<=':	$retVal= ($val1 <= $val2); break;
+			case '>':	$retVal= ($val1 > $val2); break;
+			case '>=':	$retVal= ($val1 >= $val2); break;
+			case '=':	$retVal= ($val1 == $val2); break;
+			case '!=':	$retVal= ($val1 != $val2); break;
+			case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
+			case '|':	$retVal= ($val1 || $val2); break;
+			case '&':	$retVal= ($val1 && $val2); break;
+			default:  throw new Exception("Error in expression - unknown comp : ".$comp);
+		}
+		if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
         
-        return $retVal;
-    }
+		return $retVal;
+	}
     
-    /** Evaluation : makes token and evaluate.
-     *	Public function for expressions testing
-     *	accepts : < > = <= >= !=  (typec = 0)
-     *	operators : & | (typec=1)
-     *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
-     *   comparison int vs strings will return null (error)
-     *	return : bool or null on error
-     */
-    public function evaluation($rule,&$item)
-    {
-        //echo "Evaluation of ".substr($rule,$item)."\n";
-        $negate=$this->check_negate_first($rule, $item);
-        // First element : number, string or ()
-        list($type1,$val1) = $this->eval_getElement($rule,$item);
-        //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
+	/** Evaluation : makes token and evaluate.
+	 *	Public function for expressions testing
+	 *	accepts : < > = <= >= !=  (typec = 0)
+	 *	operators : & | (typec=1)
+	 *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
+	 *   comparison int vs strings will return null (error)
+	 *	return : bool or null on error
+	 */
+	public function evaluation($rule,&$item)
+	{
+		//echo "Evaluation of ".substr($rule,$item)."\n";
+		$negate=$this->check_negate_first($rule, $item);
+		// First element : number, string or ()
+		list($type1,$val1) = $this->eval_getElement($rule,$item);
+		//echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
-        {
-            if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
-            return $val1;
-        }
+		if ($item==strlen($rule)) // If only element, return value, but only boolean
+		{
+			if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
+			if ($negate === true) $val1= ! $val1;
+			return $val1;
+		}
         
-        // Second element : operator
-        list($typec,$comp) = $this->eval_getOper($rule,$item);
-        //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
+		// Second element : operator
+		list($typec,$comp) = $this->eval_getOper($rule,$item);
+		//echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
-        // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
-        {
-            $item++;
-            if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-            $val2= ! $this->evaluation($rule,$item);
-            $type2=2; // result is a boolean
-        }
-        else
-        {
-            list($type2,$val2) = $this->eval_getElement($rule,$item);
-        }
-        //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
+		// Third element : number, string or ()
+		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+		{
+			$item++;
+			if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+			$val2= ! $this->evaluation($rule,$item);
+			$type2=2; // result is a boolean
+		}
+		else
+		{
+			list($type2,$val2) = $this->eval_getElement($rule,$item);
+		}
+		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
-        {
-            throw new Exception("Cannot compare string & number : ".$rule);
-        }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
-        {
-            throw new Exception("Cannot use boolean operators with string & number : ".$rule);
-        }
+		if ($type1!=$type2)  // cannot compare different types
+		{
+			throw new Exception("Cannot compare string & number : ".$rule);
+		}
+		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+		{
+			throw new Exception("Cannot use boolean operators with string & number : ".$rule);
+		}
         
-        $retVal = $this->do_compare($val1, $val2, $comp, $negate);
+		$retVal = $this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
-        // check for logical operator :
-        switch ($rule[$item])
-        {
-            case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-            case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+		if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+		// check for logical operator :
+		switch ($rule[$item])
+		{
+			case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
+			case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
             
-            default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
-        }
-    }
+			default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
+		}
+	}
     
-    // Remove all whitespaces (when not quoted)
-    public function eval_cleanup($rule)
-    {
-        $item=0;
-        $rule2='';
-        while ($item < strlen($rule))
-        {
-            if ($rule[$item]==' ') { $item++; continue; }
-            if ($rule[$item]=='"')
-            {
-                $rule2.=$rule[$item];
-                $item++;
-                while (($item < strlen($rule)) && ($rule[$item]!='"') )
-                {
-                    $rule2.=$rule[$item];
-                    $item++;
-                }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
-                $rule2.=$rule[$item];
-                $item++;
-                continue;
-            }
+	// Remove all whitespaces (when not quoted)
+	public function eval_cleanup($rule)
+	{
+		$item=0;
+		$rule2='';
+		while ($item < strlen($rule))
+		{
+			if ($rule[$item]==' ') { $item++; continue; }
+			if ($rule[$item]=='"')
+			{
+				$rule2.=$rule[$item];
+				$item++;
+				while (($item < strlen($rule)) && ($rule[$item]!='"') )
+				{
+					$rule2.=$rule[$item];
+					$item++;
+				}
+				if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				$rule2.=$rule[$item];
+				$item++;
+				continue;
+			}
             
-            $rule2.=$rule[$item];
-            $item++;
-        }
+			$rule2.=$rule[$item];
+			$item++;
+		}
         
-        return $rule2;
-    }
+		return $rule2;
+	}
 
 
-    /**
-     * Get '*' or '**' and transform in [0-9]+ or .* in return string
-     * @param string $oid OID in normal or regexp format. '*' will be escaped ('\*')
-     * @return string correct regexp format
-     */
-    public function regexp_eval(string &$oid)
-    {
-        // ** replaced by .*
-        $oidR=preg_replace('/\*\*/', '.*', $oid);
-        // * replaced by [0-9]+
-        $oidR=preg_replace('/\*/', '[0-9]+', $oidR);
+	/**
+	 * Get '*' or '**' and transform in [0-9]+ or .* in return string
+	 * @param string $oid OID in normal or regexp format. '*' will be escaped ('\*')
+	 * @return string correct regexp format
+	 */
+	public function regexp_eval(string &$oid)
+	{
+		// ** replaced by .*
+		$oidR=preg_replace('/\*\*/', '.*', $oid);
+		// * replaced by [0-9]+
+		$oidR=preg_replace('/\*/', '[0-9]+', $oidR);
         
-        // replace * with \* in oid for preg_replace
-        $oid=preg_replace('/\*/', '\*', $oid);
+		// replace * with \* in oid for preg_replace
+		$oid=preg_replace('/\*/', '\*', $oid);
         
-        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
+		$this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
         
-        return $oidR;
-    }
+		return $oidR;
+	}
     
     
-    /** Evaluation rule (uses eval_* functions recursively)
-     *	@param string $rule : rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
-     *  @param array $oidList : OIDs values to sustitute.
-     *	@return bool : true : rule match, false : rule don't match , throw exception on error.
-     */   
-    public function eval_rule($rule,$oidList)
-    {
-        if ($rule==null || $rule == '') // Empty rule is always true
-        {
-            return true;
-        }
-        $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
-        {
-            $oid=$matches[1];
-            $found=0;
-            // Test and transform regexp
-            $oidR = $this->regexp_eval($oid);
+	/** Evaluation rule (uses eval_* functions recursively)
+	 *	@param string $rule : rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
+	 *  @param array $oidList : OIDs values to sustitute.
+	 *	@return bool : true : rule match, false : rule don't match , throw exception on error.
+	 */   
+	public function eval_rule($rule,$oidList)
+	{
+		if ($rule==null || $rule == '') // Empty rule is always true
+		{
+			return true;
+		}
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+		{
+			$oid=$matches[1];
+			$found=0;
+			// Test and transform regexp
+			$oidR = $this->regexp_eval($oid);
             
-            foreach($oidList as $val)
-            {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
-                {
-                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
-                    { // If not a number, change " to ' and put " around it
-                        $val->value=preg_replace('/"/',"'",$val->value);
-                        $val->value='"'.$val->value.'"';
-                    }
-                    $rep=0;
-                    $rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-                    if ($rep==0)
-                    {
-                        $this->logging->log("Error in rule_eval",WARN,'');
-                        return false;
-                    }
-                    $found=1;
-                    break;
-                }
-            }
-            if ($found==0)
-            {	// OID not found : throw error
-                throw new Exception('OID '.$oid.' not found in trap');
-            }
-        }
-        $item=0;
-        $rule=$this->eval_cleanup($rule);
-        $this->logging->log('Rule after clenup: '.$rule,INFO );
+			foreach($oidList as $val)
+			{
+				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				{
+					if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
+					{ // If not a number, change " to ' and put " around it
+						$val->value=preg_replace('/"/',"'",$val->value);
+						$val->value='"'.$val->value.'"';
+					}
+					$rep=0;
+					$rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
+					if ($rep==0)
+					{
+						$this->logging->log("Error in rule_eval",WARN,'');
+						return false;
+					}
+					$found=1;
+					break;
+				}
+			}
+			if ($found==0)
+			{	// OID not found : throw error
+				throw new Exception('OID '.$oid.' not found in trap');
+			}
+		}
+		$item=0;
+		$rule=$this->eval_cleanup($rule);
+		$this->logging->log('Rule after clenup: '.$rule,INFO );
         
-        return  $this->evaluation($rule,$item);
-    }
+		return  $this->evaluation($rule,$item);
+	}
     
 }
\ No newline at end of file

Spacing +96 added lines, -96 removed lines

@@ -27,30 +27,30 @@ 
  * Get full number 
  * @return array<number,string>
  */
-    private function get_number($rule,&$item)
+    private function get_number($rule, &$item)
     {
-        $item2=$item+1;
+        $item2=$item + 1;
         while (
-            ($item2!=strlen($rule)) 
-            && (preg_match('/[\-0-9\.]/',$rule[$item2]))) 
+            ($item2 != strlen($rule)) 
+            && (preg_match('/[\-0-9\.]/', $rule[$item2]))) 
         { 
-            $item2++ ;
+            $item2++;
         }
-        $val=substr($rule,$item,$item2-$item);
+        $val=substr($rule, $item, $item2 - $item);
         $item=$item2;
         //echo "number ".$val."\n";
         
-        return array(0,$val);
+        return array(0, $val);
     }
 
-    private function get_string($rule,&$item)
+    private function get_string($rule, &$item)
     {
         $item++;
-        $item2=$this->eval_getNext($rule,$item,'"');
-        $val=substr($rule,$item,$item2-$item-1);
+        $item2=$this->eval_getNext($rule, $item, '"');
+        $val=substr($rule, $item, $item2 - $item - 1);
         $item=$item2;
         //echo "string : ".$val."\n";
-        return array(1,$val);
+        return array(1, $val);
         
     }
     
@@ -62,20 +62,20 @@ 
      * @throws Exception
      * @return string : everything inside parenthesis
      */
-    private function parse_parenthesis(string $rule,int &$item) : string
+    private function parse_parenthesis(string $rule, int &$item) : string
     {
         $item++;
         $start=$item;
         $parenthesis_count=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+            && (($rule[$item] != ')') || $parenthesis_count > 0)) // Closing ')' or embeded ()
         {
-            if ($rule[$item] == '"' )
+            if ($rule[$item] == '"')
             { // pass through string
                 $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
+                $item=$this->eval_getNext($rule, $item, '"');
             }
-            else{
+            else {
                 if ($rule[$item] == '(')
                 {
                     $parenthesis_count++;
@@ -88,8 +88,8 @@ 
             }
         }
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
+        if ($item == strlen($rule)) {throw new Exception("no closing () in ".$rule." at ".$item); }
+        $val=substr($rule, $start, $item - $start);
         $item++;
         return $val;
     }
@@ -101,45 +101,45 @@ 
      * @param int $item
      * @return array
      */
-    private function get_group(string $rule,int &$item) : array
+    private function get_group(string $rule, int &$item) : array
     {
         // gets eveything inside parenthesis
         $val=$this->parse_parenthesis($rule, $item);
         // Returns boolean with evaluation of all inside parenthesis
         $start=0;
-        return array(2,$this->evaluation($val,$start));
+        return array(2, $this->evaluation($val, $start));
     }
 
-    private function get_function(string $rule,int &$item) : array
+    private function get_function(string $rule, int &$item) : array
     {
         // function is : __function(param1,param2...)
         $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(')) // Not end of string AND not opening '('
         {
             $item++;
         }        
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+        if ($item == strlen($rule)) {throw new Exception("no opening () for function in ".$rule." at ".$item); }
         
         // get parameters between parenthesis
         
         $this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+        $val=substr($rule, $start, $item - $start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+        $this->logging->log('got function '.$val, DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+        return array(2, $this->trapClass->pluginClass->evaluateFunctionString($val));
         
     }
     
-    protected function eval_getElement($rule,&$item)
+    protected function eval_getElement($rule, &$item)
     {
         if ($item >= strlen($rule))
         {
-            throw new Exception("Early end of string ".$rule ." at " .$item );
+            throw new Exception("Early end of string ".$rule." at ".$item);
         }
-        while ($rule[$item]==' ') $item++;
-        if (preg_match('/[\-0-9\.]/',$rule[$item]))
+        while ($rule[$item] == ' ') $item++;
+        if (preg_match('/[\-0-9\.]/', $rule[$item]))
         { // number
             return $this->get_number($rule, $item);
         }
@@ -156,54 +156,54 @@ 
         { // function
             return $this->get_function($rule, $item);
         }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+        throw new Exception("number/string not found in ".$rule." at ".$item.' : '.$rule[$item]);
         
     }
     
-    protected function eval_getNext($rule,$item,$tok)
+    protected function eval_getNext($rule, $item, $tok)
     {
         while (
-            ($rule[$item] != $tok ) 
+            ($rule[$item] != $tok) 
             && ($item < strlen($rule))) 
         { 
             $item++;
         }
-        if ($item==strlen($rule)) {
-            throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+        if ($item == strlen($rule)) {
+            throw new Exception("closing '".$tok."' not found in ".$rule." at ".$item);
         }
-        return $item+1;
+        return $item + 1;
     }
     
-    protected function eval_getOper($rule,&$item)
+    protected function eval_getOper($rule, &$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item] == ' ') $item++;
         switch ($rule[$item])
         {
             case '<':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-                $item++; return array(0,"<");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "<="); }
+                $item++; return array(0, "<");
             case '>':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-                $item++; return array(0,">");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, ">="); }
+                $item++; return array(0, ">");
             case '=':
-                $item++; return array(0,"=");
+                $item++; return array(0, "=");
             case '!':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "!="); }
+                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule." at ".$item);
             case '~':
-                $item++; return array(0,"~");
+                $item++; return array(0, "~");
             case '|':
-                $item++; return array(1,"|");
+                $item++; return array(1, "|");
             case '&':
-                $item++; return array(1,"&");
+                $item++; return array(1, "&");
             default	:
-                throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+                throw new Exception("Erreur in expr - operator not found in ".$rule." at ".$item);
         }
     }
     
-    private function check_negate_first($rule,&$item)
+    private function check_negate_first($rule, &$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ($rule[$item] == '!') // If '!' found, negate next expression.
         {
             $item++;
             return true;
@@ -214,21 +214,21 @@ 
         }
     }
 
-    private function do_compare($val1,$val2,$comp,$negate)
+    private function do_compare($val1, $val2, $comp, $negate)
     {
-        switch ($comp){
-            case '<':	$retVal= ($val1 < $val2); break;
-            case '<=':	$retVal= ($val1 <= $val2); break;
-            case '>':	$retVal= ($val1 > $val2); break;
-            case '>=':	$retVal= ($val1 >= $val2); break;
-            case '=':	$retVal= ($val1 == $val2); break;
-            case '!=':	$retVal= ($val1 != $val2); break;
-            case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-            case '|':	$retVal= ($val1 || $val2); break;
-            case '&':	$retVal= ($val1 && $val2); break;
+        switch ($comp) {
+            case '<':	$retVal=($val1 < $val2); break;
+            case '<=':	$retVal=($val1 <= $val2); break;
+            case '>':	$retVal=($val1 > $val2); break;
+            case '>=':	$retVal=($val1 >= $val2); break;
+            case '=':	$retVal=($val1 == $val2); break;
+            case '!=':	$retVal=($val1 != $val2); break;
+            case '~':	$retVal=(preg_match('/'.preg_replace('/"/', '', $val2).'/', $val1)); break;
+            case '|':	$retVal=($val1 || $val2); break;
+            case '&':	$retVal=($val1 && $val2); break;
             default:  throw new Exception("Error in expression - unknown comp : ".$comp);
         }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+        if ($negate === true) $retVal=!$retVal; // Inverse result if negate before expression
         
         return $retVal;
     }
@@ -241,56 +241,56 @@ 
      *   comparison int vs strings will return null (error)
      *	return : bool or null on error
      */
-    public function evaluation($rule,&$item)
+    public function evaluation($rule, &$item)
     {
         //echo "Evaluation of ".substr($rule,$item)."\n";
         $negate=$this->check_negate_first($rule, $item);
         // First element : number, string or ()
-        list($type1,$val1) = $this->eval_getElement($rule,$item);
+        list($type1, $val1)=$this->eval_getElement($rule, $item);
         //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
+        if ($item == strlen($rule)) // If only element, return value, but only boolean
         {
             if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
+            if ($negate === true) $val1=!$val1;
             return $val1;
         }
         
         // Second element : operator
-        list($typec,$comp) = $this->eval_getOper($rule,$item);
+        list($typec, $comp)=$this->eval_getOper($rule, $item);
         //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
         // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+        if ($rule[$item] == '!') // starts with a ! so evaluate whats next
         {
             $item++;
             if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-            $val2= ! $this->evaluation($rule,$item);
+            $val2=!$this->evaluation($rule, $item);
             $type2=2; // result is a boolean
         }
         else
         {
-            list($type2,$val2) = $this->eval_getElement($rule,$item);
+            list($type2, $val2)=$this->eval_getElement($rule, $item);
         }
         //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
+        if ($type1 != $type2)  // cannot compare different types
         {
             throw new Exception("Cannot compare string & number : ".$rule);
         }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+        if ($typec == 1 && $type1 != 2) // cannot use & or | with string/number
         {
             throw new Exception("Cannot use boolean operators with string & number : ".$rule);
         }
         
-        $retVal = $this->do_compare($val1, $val2, $comp, $negate);
+        $retVal=$this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+        if ($item == strlen($rule)) return $retVal; // End of string : return evaluation
         // check for logical operator :
         switch ($rule[$item])
         {
-            case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-            case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+            case '|':	$item++; return ($retVal || $this->evaluation($rule, $item));
+            case '&':	$item++; return ($retVal && $this->evaluation($rule, $item));
             
             default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
         }
@@ -303,17 +303,17 @@ 
         $rule2='';
         while ($item < strlen($rule))
         {
-            if ($rule[$item]==' ') { $item++; continue; }
-            if ($rule[$item]=='"')
+            if ($rule[$item] == ' ') { $item++; continue; }
+            if ($rule[$item] == '"')
             {
                 $rule2.=$rule[$item];
                 $item++;
-                while (($item < strlen($rule)) && ($rule[$item]!='"') )
+                while (($item < strlen($rule)) && ($rule[$item] != '"'))
                 {
                     $rule2.=$rule[$item];
                     $item++;
                 }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                if ($item == strlen($rule)) throw new Exception("closing '\"' not found in ".$rule." at ".$item);
                 $rule2.=$rule[$item];
                 $item++;
                 continue;
@@ -342,7 +342,7 @@ 
         // replace * with \* in oid for preg_replace
         $oid=preg_replace('/\*/', '\*', $oid);
         
-        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
+        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR, DEBUG);
         
         return $oidR;
     }
@@ -353,50 +353,50 @@ 
      *  @param array $oidList : OIDs values to sustitute.
      *	@return bool : true : rule match, false : rule don't match , throw exception on error.
      */   
-    public function eval_rule($rule,$oidList)
+    public function eval_rule($rule, $oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule == null || $rule == '') // Empty rule is always true
         {
             return true;
         }
         $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+        while (preg_match('/_OID\(([0-9\.\*]+)\)/', $rule, $matches) == 1)
         {
             $oid=$matches[1];
             $found=0;
             // Test and transform regexp
-            $oidR = $this->regexp_eval($oid);
+            $oidR=$this->regexp_eval($oid);
             
-            foreach($oidList as $val)
+            foreach ($oidList as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
+                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/', $val->value))
                     { // If not a number, change " to ' and put " around it
-                        $val->value=preg_replace('/"/',"'",$val->value);
+                        $val->value=preg_replace('/"/', "'", $val->value);
                         $val->value='"'.$val->value.'"';
                     }
                     $rep=0;
-                    $rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-                    if ($rep==0)
+                    $rule=preg_replace('/_OID\('.$oid.'\)/', $val->value, $rule, -1, $rep);
+                    if ($rep == 0)
                     {
-                        $this->logging->log("Error in rule_eval",WARN,'');
+                        $this->logging->log("Error in rule_eval", WARN, '');
                         return false;
                     }
                     $found=1;
                     break;
                 }
             }
-            if ($found==0)
+            if ($found == 0)
             {	// OID not found : throw error
                 throw new Exception('OID '.$oid.' not found in trap');
             }
         }
         $item=0;
         $rule=$this->eval_cleanup($rule);
-        $this->logging->log('Rule after clenup: '.$rule,INFO );
+        $this->logging->log('Rule after clenup: '.$rule, INFO);
         
-        return  $this->evaluation($rule,$item);
+        return  $this->evaluation($rule, $item);
     }
     
 }
\ No newline at end of file

Braces +50 added lines, -21 removed lines

@@ -68,14 +68,15 @@ 
         $start=$item;
         $parenthesis_count=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) {
+        	// Closing ')' or embeded ()
         {
             if ($rule[$item] == '"' )
             { // pass through string
                 $item++;
+        }
                 $item=$this->eval_getNext($rule,$item,'"');
-            }
-            else{
+            } else{
                 if ($rule[$item] == '(')
                 {
                     $parenthesis_count++;
@@ -114,9 +115,11 @@ 
     {
         // function is : __function(param1,param2...)
         $start=$item; 
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(' )) {
+        	// Not end of string AND not opening '('
         {
             $item++;
+        }
         }        
         if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
@@ -138,7 +141,9 @@ 
         {
             throw new Exception("Early end of string ".$rule ." at " .$item );
         }
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         if (preg_match('/[\-0-9\.]/',$rule[$item]))
         { // number
             return $this->get_number($rule, $item);
@@ -176,7 +181,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -203,12 +210,13 @@ 
     
     private function check_negate_first($rule,&$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ( $rule[$item] == '!') {
+        	// If '!' found, negate next expression.
         {
             $item++;
-            return true;
         }
-        else
+            return true;
+        } else
         {
             return false;
         }
@@ -228,7 +236,10 @@ 
             case '&':	$retVal= ($val1 && $val2); break;
             default:  throw new Exception("Error in expression - unknown comp : ".$comp);
         }
-        if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+        if ($negate === true) {
+        	$retVal = ! $retVal;
+        }
+        // Inverse result if negate before expression
         
         return $retVal;
     }
@@ -249,10 +260,14 @@ 
         list($type1,$val1) = $this->eval_getElement($rule,$item);
         //echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
         
-        if ($item==strlen($rule)) // If only element, return value, but only boolean
+        if ($item==strlen($rule)) {
+        	// If only element, return value, but only boolean
         {
             if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-            if ($negate === true) $val1= ! $val1;
+        }
+            if ($negate === true) {
+            	$val1= ! $val1;
+            }
             return $val1;
         }
         
@@ -261,31 +276,41 @@ 
         //echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
         // Third element : number, string or ()
-        if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+        if ( $rule[$item] == '!') {
+        	// starts with a ! so evaluate whats next
         {
             $item++;
-            if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+        }
+            if ($typec != 1) {
+            	throw new Exception("Mixing boolean and comparison : ".$rule);
+            }
             $val2= ! $this->evaluation($rule,$item);
             $type2=2; // result is a boolean
-        }
-        else
+        } else
         {
             list($type2,$val2) = $this->eval_getElement($rule,$item);
         }
         //echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
         
-        if ($type1!=$type2)  // cannot compare different types
+        if ($type1!=$type2) {
+        	// cannot compare different types
         {
             throw new Exception("Cannot compare string & number : ".$rule);
         }
-        if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+        }
+        if ($typec==1 && $type1 !=2) {
+        	// cannot use & or | with string/number
         {
             throw new Exception("Cannot use boolean operators with string & number : ".$rule);
         }
+        }
         
         $retVal = $this->do_compare($val1, $val2, $comp, $negate);
         
-        if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+        if ($item==strlen($rule)) {
+        	return $retVal;
+        }
+        // End of string : return evaluation
         // check for logical operator :
         switch ($rule[$item])
         {
@@ -313,7 +338,9 @@ 
                     $rule2.=$rule[$item];
                     $item++;
                 }
-                if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                if ($item == strlen ($rule)) {
+                	throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+                }
                 $rule2.=$rule[$item];
                 $item++;
                 continue;
@@ -355,10 +382,12 @@ 
      */   
     public function eval_rule($rule,$oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule==null || $rule == '') {
+        	// Empty rule is always true
         {
             return true;
         }
+        }
         $matches=array();
         while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
         {

library/Trapdirector/TrapsProcess/Trap.php

Indentation +969 added lines, -969 removed lines

@@ -16,960 +16,960 @@ 
  */
 class Trap
 {
-    // Configuration files and dirs
-    /** @var string Icinga etc path */
-    protected $icingaweb2Etc;
-    /** @var string $trapModuleConfig config.ini of module */
-    protected $trapModuleConfig;
-    /** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
-    protected $icingaweb2Ressources;
-    // Options from config.ini (default values)
-    /** @var string $snmptranslate */
-    protected $snmptranslate='/usr/bin/snmptranslate';
-    /** @var string $snmptranslate_dirs */
-    protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
-    /** @var string $icinga2cmd */
-    protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
-    /** @var string $dbPrefix */
-    protected $dbPrefix='traps_';
-    
-    // API
-    /** @var boolean $apiUse */
-    protected $apiUse=false;
-    /** @var Icinga2API $icinga2api */
-    protected $icinga2api=null;
-    /** @var string $apiHostname */
-    protected $apiHostname='';
-    /** @var integer $apiPort */
-    protected $apiPort=0;
-    /** @var string $apiUsername */
-    protected $apiUsername='';
-    /** @var string $apiPassword */
-    protected $apiPassword='';
-    
-    // Logs
-    /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
-    /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
-    
-    // Databases
-    /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
-    
-    // Trap received data
-    protected $receivingHost;
-    /** @var array	Main trap data (oid, source...) */
-    public $trapData=array();
-    /** @var array $trapDataExt Additional trap data objects (oid/value).*/
-    public $trapDataExt=array(); 
-    /** @var int $trapId trap_id after sql insert*/
-    public $trapId=null;
-    /** @var string $trapAction trap action for final write*/
-    public $trapAction=null;
-    /** @var boolean $trapToDb log trap to DB */
-    protected $trapToDb=true;
-    
-    /** @var Mib mib class */
-    public $mibClass = null;
-    
-    /** @var Rule rule class */
-    public $ruleClass = null;
-    
-    /** @var Plugins plugins manager **/
-    public $pluginClass = null;
-    
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
-    {
-        // Paths of ini files
-        $this->icingaweb2Etc=$etcDir;
-        $this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
-        $this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
-        
-        //************* Setup logging
-        $this->logging = new Logging();
-        if ($baseLogLevel != null)
-        {
-            $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-            $this->logSetup=true;
-        }
-        else
-        {
-            $this->logSetup=false;
-        }
-        $this->logging->log('Loggin started', INFO);
-        
-        //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
-        {
-            throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
-        }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
-        if ($trapConfig == false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
-            throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
-        }
-        $this->getMainOptions($trapConfig); // Get main options from ini file
-        
-        //*************** Setup database class & get options
-        $this->setupDatabase($trapConfig);
-        
-        $this->getDatabaseOptions(); // Get options in database
-        
-        //*************** Setup API
-        if ($this->apiUse === true) $this->getAPI(); // Setup API
-        
-        //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
-        
-        //*************** Setup Rule
-        $this->ruleClass = new Rule($this); //< Create Rule class
-        
-        $this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
-            'source_ip'	=> 'unknown',
-            'source_port'	=> 'unknown',
-            'destination_ip'	=> 'unknown',
-            'destination_port'	=> 'unknown',
-            'trap_oid'	=> 'unknown'
-        );
-        
-        //*************** Setup Plugins
-        //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+	// Configuration files and dirs
+	/** @var string Icinga etc path */
+	protected $icingaweb2Etc;
+	/** @var string $trapModuleConfig config.ini of module */
+	protected $trapModuleConfig;
+	/** @var string $icingaweb2Ressources resources.ini of icingaweb2 */
+	protected $icingaweb2Ressources;
+	// Options from config.ini (default values)
+	/** @var string $snmptranslate */
+	protected $snmptranslate='/usr/bin/snmptranslate';
+	/** @var string $snmptranslate_dirs */
+	protected $snmptranslate_dirs='/usr/share/icingaweb2/modules/trapdirector/mibs';
+	/** @var string $icinga2cmd */
+	protected $icinga2cmd='/var/run/icinga2/cmd/icinga2.cmd';
+	/** @var string $dbPrefix */
+	protected $dbPrefix='traps_';
+    
+	// API
+	/** @var boolean $apiUse */
+	protected $apiUse=false;
+	/** @var Icinga2API $icinga2api */
+	protected $icinga2api=null;
+	/** @var string $apiHostname */
+	protected $apiHostname='';
+	/** @var integer $apiPort */
+	protected $apiPort=0;
+	/** @var string $apiUsername */
+	protected $apiUsername='';
+	/** @var string $apiPassword */
+	protected $apiPassword='';
+    
+	// Logs
+	/** @var Logging Logging class. */
+	public $logging;    //< Logging class.
+	/** @var bool true if log was setup in constructor */
+	protected $logSetup;   //< bool true if log was setup in constructor
+    
+	// Databases
+	/** @var Database $trapsDB  Database class*/
+	public $trapsDB = null;
+    
+	// Trap received data
+	protected $receivingHost;
+	/** @var array	Main trap data (oid, source...) */
+	public $trapData=array();
+	/** @var array $trapDataExt Additional trap data objects (oid/value).*/
+	public $trapDataExt=array(); 
+	/** @var int $trapId trap_id after sql insert*/
+	public $trapId=null;
+	/** @var string $trapAction trap action for final write*/
+	public $trapAction=null;
+	/** @var boolean $trapToDb log trap to DB */
+	protected $trapToDb=true;
+    
+	/** @var Mib mib class */
+	public $mibClass = null;
+    
+	/** @var Rule rule class */
+	public $ruleClass = null;
+    
+	/** @var Plugins plugins manager **/
+	public $pluginClass = null;
+    
+	function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	{
+		// Paths of ini files
+		$this->icingaweb2Etc=$etcDir;
+		$this->trapModuleConfig=$this->icingaweb2Etc."/modules/trapdirector/config.ini";
+		$this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
+        
+		//************* Setup logging
+		$this->logging = new Logging();
+		if ($baseLogLevel != null)
+		{
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
+		}
+		else
+		{
+			$this->logSetup=false;
+		}
+		$this->logging->log('Loggin started', INFO);
+        
+		//*************** Get options from ini files
+		if (! is_file($this->trapModuleConfig))
+		{
+			throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
+		}
+		$trapConfig=parse_ini_file($this->trapModuleConfig,true);
+		if ($trapConfig == false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+			throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
+		}
+		$this->getMainOptions($trapConfig); // Get main options from ini file
+        
+		//*************** Setup database class & get options
+		$this->setupDatabase($trapConfig);
+        
+		$this->getDatabaseOptions(); // Get options in database
+        
+		//*************** Setup API
+		if ($this->apiUse === true) $this->getAPI(); // Setup API
+        
+		//*************** Setup MIB
+		$this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        
+		//*************** Setup Rule
+		$this->ruleClass = new Rule($this); //< Create Rule class
+        
+		$this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
+			'source_ip'	=> 'unknown',
+			'source_port'	=> 'unknown',
+			'destination_ip'	=> 'unknown',
+			'destination_port'	=> 'unknown',
+			'trap_oid'	=> 'unknown'
+		);
+        
+		//*************** Setup Plugins
+		//Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
+		$this->pluginClass = new Plugins($this);
             
             
-    }
-    
-    /**
-     * Get option from array of ini file, send message if empty
-     * @param string $option_array Array of ini file
-     * @param string $option_category category in ini file
-     * @param string $option_name name of option in category
-     * @param mixed $option_var variable to fill if found, left untouched if not found
-     * @param integer $log_level default 2 (warning)
-     * @param string $message warning message if not found
-     * @return boolean true if found, or false
-     */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
-    {
-        if (!isset($option_array[$option_category][$option_name]))
-        {
-            if ($message === null)
-            {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
-            }
-            $this->logging->log($message,$log_level);
-            return false;
-        }
-        else
-        {
-            $option_var=$option_array[$option_category][$option_name];
-            return true;
-        }
-    }
-    
-    /**
-     * Get options from ini file
-     * @param array $trap_config : ini file array
-     */
-    protected function getMainOptions($trapConfig)
-    {
-        
-        // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
-        
-        // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
-        
-        // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
-        
-        // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
-        
-        // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
-        {
-            $this->apiUse=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
-        }
-    }
-    
-    /**
-     * Create and setup database class for trap & ido (if no api) db
-     * @param array $trap_config : ini file array
-     */
-    protected function setupDatabase($trapConfig)
-    {
-        // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
-        
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        if (!array_key_exists($dbTrapName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
-        
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
-        
-        // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-        {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
-        }
-        $dbIdoName=$trapConfig['config']['IDOdatabase'];
-        
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        
-        $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
-    }
-    
-    /**
-     * Get options in database
-     */
-    protected function getDatabaseOptions()
-    {
-        // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
-        {
-            $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
-        }
-    }
-    
-    /** Set $variable to value if $element found in database config table
-     * @param string $element
-     * @param string $variable
-     */
-    protected function getDBConfigIfSet($element,&$variable)
-    {
-        $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
-    }
-    
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    protected function getDBConfig($element)  // TODO : put this in DB class
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
-    
-    /** OBSOLETE Send log. Throws exception on critical error
-     *	@param	string $message Message to log
-     *	@param	int $level 1=critical 2=warning 3=trace 4=debug
-     *	@param  string $destination file/syslog/display
-     *	@return void
-     **/
-    public function trapLog( $message, $level, $destination ='') // OBSOLETE
-    {
-        // TODO : replace ref with $this->logging->log
-        $this->logging->log($message, $level, $destination);
-    }
-    
-    public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
-    {
-        $this->logging->setLogging($debugLvl, $outputType,$outputOption);
-    }
-    
-    /**
-     * Returns or create new IcingaAPI object
-     * @return \Icinga\Module\Trapdirector\Icinga2API
-     */
-    protected function getAPI()
-    {
-        if ($this->icinga2api == null)
-        {
-            $this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
-        }
-        return $this->icinga2api;
-    }
-    
-    
-    /**
-     * read data from stream
-     *	@param $stream string input stream, defaults to "php://stdin"
-     *	@return mixed array trap data or exception with error
-     */
-    public function read_trap($stream='php://stdin')
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($stream, 'r');
-        
-        if ($input_stream === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-            $this->logging->log("Error reading stdin !",ERROR,'');
-            return null; // note : exception thrown by logging
-        }
-        
-        // line 1 : host
-        $this->receivingHost=chop(fgets($input_stream));
-        if ($this->receivingHost === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-            $this->logging->log("Error reading Host !",ERROR,'');
-        }
-        // line 2 IP:port=>IP:port
-        $IP=chop(fgets($input_stream));
-        if ($IP === false)
-        {
-            $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-            $this->logging->log("Error reading IP !",ERROR,'');
-        }
-        $matches=array();
-        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-        if ($ret_code===0 || $ret_code===false)
-        {
-            $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-            $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
-        {
-            $this->trapData['source_ip']=$matches[1];
-            $this->trapData['destination_ip']=$matches[3];
-            $this->trapData['source_port']=$matches[2];
-            $this->trapData['destination_port']=$matches[4];
-        }
-        
-        while (($vars=fgets($input_stream)) !==false)
-        {
-            $vars=chop($vars);
-            $ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-            if ($ret_code===0 || $ret_code===false)
-            {
-                $this->logging->log('No match on trap data : '.$vars,WARN,'');
-            }
-            else
-            {
-                if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
-                {
-                    $this->trapData['trap_oid']=$matches[2];
-                }
-                else
-                {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trapDataExt,$object);
-                }
-            }
-        }
-        
-        if ($this->trapData['trap_oid']=='unknown')
-        {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
-        }
-        
-        // Translate oids.
-        
-        $retArray=$this->translateOID($this->trapData['trap_oid']);
-        if ($retArray != null)
-        {
-            $this->trapData['trap_name']=$retArray['trap_name'];
-            $this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
-        }
-        foreach ($this->trapDataExt as $key => $val)
-        {
-            $retArray=$this->translateOID($val->oid);
-            if ($retArray != null)
-            {
-                $this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
-                $this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
-            }
-        }
-        
-        
-        $this->trapData['status']= 'waiting';
-        
-        return $this->trapData;
-    }
-    
-    /**
-     * Translate oid into array(MIB,Name)
-     * @param $oid string oid to translate
-     * @return mixed : null if not found or array(MIB,Name)
-     */
-    public function translateOID($oid)
-    {
-        // try from database
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $name=$ret_code->fetch();
-        if ($name['name'] != null)
-        {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
-        }
-        
-        // Also check if it is an instance of OID
-        $oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
-        
-        $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $name=$ret_code->fetch();
-        if ($name['name'] != null)
-        {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
-        }
-        
-        // Try to get oid name from snmptranslate
-        $translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-            ' '.$oid);
-        $matches=array();
-        $ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-        if ($ret_code===0 || $ret_code === false) {
-            return NULL;
-        } else {
-            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-            return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
-        }
-    }
-    
-    /**
-     * Erase old trap records
-     *	@param integer $days : erase traps when more than $days old
-     *	@return integer : number of lines deleted
-     **/
-    public function eraseOldTraps($days=0)
-    {
-        if ($days==0)
-        {
-            if (($days=$this->getDBConfig('db_remove_days')) == null)
-            {
-                $this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
-                return;
-            }
-        }
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $daysago = strtotime("-".$days." day");
-        $sql= 'delete from '.$this->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error erasing traps : '.$sql,ERROR,'');
-        }
-        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
-    }
-    
-    /** Write error to received trap database
-     */
-    public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
-    {
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        // add date time
-        $insert_col ='date_received,status';
-        $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
-        
-        if ($sourceIP !=null)
-        {
-            $insert_col .=',source_ip';
-            $insert_val .=",'". $sourceIP ."'";
-        }
-        if ($trapoid !=null)
-        {
-            $insert_col .=',trap_oid';
-            $insert_val .=",'". $trapoid ."'";
-        }
-        $insert_col .=',status_detail';
-        $insert_val .=",'". $message ."'";
-        
-        $sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
-        
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO);
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+	}
+    
+	/**
+	 * Get option from array of ini file, send message if empty
+	 * @param string $option_array Array of ini file
+	 * @param string $option_category category in ini file
+	 * @param string $option_name name of option in category
+	 * @param mixed $option_var variable to fill if found, left untouched if not found
+	 * @param integer $log_level default 2 (warning)
+	 * @param string $message warning message if not found
+	 * @return boolean true if found, or false
+	 */
+	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+	{
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+			}
+			$this->logging->log($message,$log_level);
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
+	}
+    
+	/**
+	 * Get options from ini file
+	 * @param array $trap_config : ini file array
+	 */
+	protected function getMainOptions($trapConfig)
+	{
+        
+		// Snmptranslate binary path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        
+		// mibs path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        
+		// icinga2cmd path
+		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        
+		// table prefix
+		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        
+		// API options
+		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+		{
+			$this->apiUse=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
+		}
+	}
+    
+	/**
+	 * Create and setup database class for trap & ido (if no api) db
+	 * @param array $trap_config : ini file array
+	 */
+	protected function setupDatabase($trapConfig)
+	{
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        
+		if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        
+		if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+        
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];
+        
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+        
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+	}
+    
+	/**
+	 * Get options in database
+	 */
+	protected function getDatabaseOptions()
+	{
+		// Database options
+		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		{
+			$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+		}
+	}
+    
+	/** Set $variable to value if $element found in database config table
+	 * @param string $element
+	 * @param string $variable
+	 */
+	protected function getDBConfigIfSet($element,&$variable)
+	{
+		$value=$this->getDBConfig($element);
+		if ($value != null) $variable=$value;
+	}
+    
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	protected function getDBConfig($element)  // TODO : put this in DB class
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
+    
+	/** OBSOLETE Send log. Throws exception on critical error
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 **/
+	public function trapLog( $message, $level, $destination ='') // OBSOLETE
+	{
+		// TODO : replace ref with $this->logging->log
+		$this->logging->log($message, $level, $destination);
+	}
+    
+	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	{
+		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+	}
+    
+	/**
+	 * Returns or create new IcingaAPI object
+	 * @return \Icinga\Module\Trapdirector\Icinga2API
+	 */
+	protected function getAPI()
+	{
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+		}
+		return $this->icinga2api;
+	}
+    
+    
+	/**
+	 * read data from stream
+	 *	@param $stream string input stream, defaults to "php://stdin"
+	 *	@return mixed array trap data or exception with error
+	 */
+	public function read_trap($stream='php://stdin')
+	{
+		//Read data from snmptrapd from stdin
+		$input_stream=fopen($stream, 'r');
+        
+		if ($input_stream === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->logging->log("Error reading stdin !",ERROR,'');
+			return null; // note : exception thrown by logging
+		}
+        
+		// line 1 : host
+		$this->receivingHost=chop(fgets($input_stream));
+		if ($this->receivingHost === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$this->logging->log("Error reading Host !",ERROR,'');
+		}
+		// line 2 IP:port=>IP:port
+		$IP=chop(fgets($input_stream));
+		if ($IP === false)
+		{
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
+			$this->logging->log("Error reading IP !",ERROR,'');
+		}
+		$matches=array();
+		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
+		if ($ret_code===0 || $ret_code===false)
+		{
+			$this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
+			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+		}
+		else
+		{
+			$this->trapData['source_ip']=$matches[1];
+			$this->trapData['destination_ip']=$matches[3];
+			$this->trapData['source_port']=$matches[2];
+			$this->trapData['destination_port']=$matches[4];
+		}
+        
+		while (($vars=fgets($input_stream)) !==false)
+		{
+			$vars=chop($vars);
+			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
+			if ($ret_code===0 || $ret_code===false)
+			{
+				$this->logging->log('No match on trap data : '.$vars,WARN,'');
+			}
+			else
+			{
+				if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+				{
+					$this->trapData['trap_oid']=$matches[2];
+				}
+				else
+				{
+					$object= new stdClass;
+					$object->oid =$matches[1];
+					$object->value = $matches[2];
+					array_push($this->trapDataExt,$object);
+				}
+			}
+		}
+        
+		if ($this->trapData['trap_oid']=='unknown')
+		{
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
+			$this->logging->log('no trap oid found',ERROR,'');
+		}
+        
+		// Translate oids.
+        
+		$retArray=$this->translateOID($this->trapData['trap_oid']);
+		if ($retArray != null)
+		{
+			$this->trapData['trap_name']=$retArray['trap_name'];
+			$this->trapData['trap_name_mib']=$retArray['trap_name_mib'];
+		}
+		foreach ($this->trapDataExt as $key => $val)
+		{
+			$retArray=$this->translateOID($val->oid);
+			if ($retArray != null)
+			{
+				$this->trapDataExt[$key]->oid_name=$retArray['trap_name'];
+				$this->trapDataExt[$key]->oid_name_mib=$retArray['trap_name_mib'];
+			}
+		}
+        
+        
+		$this->trapData['status']= 'waiting';
+        
+		return $this->trapData;
+	}
+    
+	/**
+	 * Translate oid into array(MIB,Name)
+	 * @param $oid string oid to translate
+	 * @return mixed : null if not found or array(MIB,Name)
+	 */
+	public function translateOID($oid)
+	{
+		// try from database
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$name=$ret_code->fetch();
+		if ($name['name'] != null)
+		{
+			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+		}
+        
+		// Also check if it is an instance of OID
+		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+        
+		$sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$name=$ret_code->fetch();
+		if ($name['name'] != null)
+		{
+			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+		}
+        
+		// Try to get oid name from snmptranslate
+		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+			' '.$oid);
+		$matches=array();
+		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
+		if ($ret_code===0 || $ret_code === false) {
+			return NULL;
+		} else {
+			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
+			return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+		}
+	}
+    
+	/**
+	 * Erase old trap records
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
+	public function eraseOldTraps($days=0)
+	{
+		if ($days==0)
+		{
+			if (($days=$this->getDBConfig('db_remove_days')) == null)
+			{
+				$this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+				return;
+			}
+		}
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$daysago = strtotime("-".$days." day");
+		$sql= 'delete from '.$this->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+		}
+		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+	}
+    
+	/** Write error to received trap database
+	 */
+	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+	{
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		// add date time
+		$insert_col ='date_received,status';
+		$insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+        
+		if ($sourceIP !=null)
+		{
+			$insert_col .=',source_ip';
+			$insert_val .=",'". $sourceIP ."'";
+		}
+		if ($trapoid !=null)
+		{
+			$insert_col .=',trap_oid';
+			$insert_val .=",'". $trapoid ."'";
+		}
+		$insert_col .=',status_detail';
+		$insert_val .=",'". $message ."'";
+        
+		$sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO);
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',1,'');
-                }
-                $this->trapId=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',1,'');
-                }
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',1,'');
+				}
+				$this->trapId=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-        }
-        
-        $this->logging->log('id found: '. $this->trapId,INFO );
-    }
-    
-    /** Write trap data to trap database
-     */
-    public function writeTrapToDB()
-    {
-        
-        // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
-        
-        
-        $db_conn=$this->trapsDB->db_connect_trap();
-        
-        $insert_col='';
-        $insert_val='';
-        // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
-        
-        $firstcol=1;
-        foreach ($this->trapData as $col => $val)
-        {
-            if ($firstcol==0)
-            {
-                $insert_col .=',';
-                $insert_val .=',';
-            }
-            $insert_col .= $col ;
-            $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-            $firstcol=0;
-        }
-        
-        $sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO );
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
+        
+		$this->logging->log('id found: '. $this->trapId,INFO );
+	}
+    
+	/** Write trap data to trap database
+	 */
+	public function writeTrapToDB()
+	{
+        
+		// If action is ignore -> don't send t DB
+		if ($this->trapToDb === false) return;
+        
+        
+		$db_conn=$this->trapsDB->db_connect_trap();
+        
+		$insert_col='';
+		$insert_val='';
+		// add date time
+		$this->trapData['date_received'] = date("Y-m-d H:i:s");
+        
+		$firstcol=1;
+		foreach ($this->trapData as $col => $val)
+		{
+			if ($firstcol==0)
+			{
+				$insert_col .=',';
+				$insert_val .=',';
+			}
+			$insert_col .= $col ;
+			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$firstcol=0;
+		}
+        
+		$sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO );
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',ERROR,'');
-                }
-                $this->trapId=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
-                }
-                $this->logging->log('SQL insertion OK',INFO );
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
-                }
+					$this->logging->log('Erreur recuperation id',ERROR,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',ERROR,'');
+				}
+				$this->trapId=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',ERROR,'');
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->trapId=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
-        }
-        $this->logging->log('id found: '.$this->trapId,INFO );
-        
-        // Fill trap extended data table
-        foreach ($this->trapDataExt as $value) {
-            // TODO : detect if trap value is encoded and decode it to UTF-8 for database
-            $firstcol=1;
-            $value->trap_id = $this->trapId;
-            $insert_col='';
-            $insert_val='';
-            foreach ($value as $col => $val)
-            {
-                if ($firstcol==0)
-                {
-                    $insert_col .=',';
-                    $insert_val .=',';
-                }
-                $insert_col .= $col;
-                $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
-                $firstcol=0;
-            }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->trapId=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+		}
+		$this->logging->log('id found: '.$this->trapId,INFO );
+        
+		// Fill trap extended data table
+		foreach ($this->trapDataExt as $value) {
+			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
+			$firstcol=1;
+			$value->trap_id = $this->trapId;
+			$insert_col='';
+			$insert_val='';
+			foreach ($value as $col => $val)
+			{
+				if ($firstcol==0)
+				{
+					$insert_col .=',';
+					$insert_val .=',';
+				}
+				$insert_col .= $col;
+				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$firstcol=0;
+			}
             
-            $sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+			$sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
             
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
-            }
-        }
-    }
-    
-    /** Get rules from rule database with ip and oid
-     *	@param $ip string ipv4 or ipv6
-     *	@param $oid string oid in numeric
-     *	@return mixed|boolean : PDO object or false
-     */
-    protected function getRules($ip,$oid)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        // fetch rules based on IP in rule and OID
-        $sql='SELECT * from '.$this->dbPrefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return false;
-        }
-        $rules_all=$ret_code->fetchAll();
-        //echo "rule all :\n";print_r($rules_all);echo "\n";
-        $rules_ret=array();
-        $rule_ret_key=0;
-        foreach ($rules_all as $key => $rule)
-        {
-            if ($rule['ip4']==$ip || $rule['ip6']==$ip)
-            {
-                $rules_ret[$rule_ret_key]=$rules_all[$key];
-                //TODO : get host name by API (and check if correct in rule).
-                $rule_ret_key++;
-                continue;
-            }
-            // TODO : get hosts IP by API
-            if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
-            { // get ips of group members by oid
-                $db_conn2=$this->trapsDB->db_connect_ido();
-                $sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+			}
+		}
+	}
+    
+	/** Get rules from rule database with ip and oid
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed|boolean : PDO object or false
+	 */
+	protected function getRules($ip,$oid)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		// fetch rules based on IP in rule and OID
+		$sql='SELECT * from '.$this->dbPrefix.'rules WHERE trap_oid=\''.$oid.'\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return false;
+		}
+		$rules_all=$ret_code->fetchAll();
+		//echo "rule all :\n";print_r($rules_all);echo "\n";
+		$rules_ret=array();
+		$rule_ret_key=0;
+		foreach ($rules_all as $key => $rule)
+		{
+			if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+			{
+				$rules_ret[$rule_ret_key]=$rules_all[$key];
+				//TODO : get host name by API (and check if correct in rule).
+				$rule_ret_key++;
+				continue;
+			}
+			// TODO : get hosts IP by API
+			if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+			{ // get ips of group members by oid
+				$db_conn2=$this->trapsDB->db_connect_ido();
+				$sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
 						FROM icinga_objects as o
 						LEFT JOIN icinga_hostgroups as h ON o.object_id=h.hostgroup_object_id
 						LEFT JOIN icinga_hostgroup_members as m ON h.hostgroup_id=m.hostgroup_id
 						LEFT JOIN icinga_hosts as a ON a.host_object_id = m.host_object_id
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
-                if (($ret_code2=$db_conn2->query($sql)) === false) {
-                    $this->logging->log('No result in query : ' . $sql,WARN,'');
-                    continue;
-                }
-                $grouphosts=$ret_code2->fetchAll();
-                //echo "rule grp :\n";print_r($grouphosts);echo "\n";
-                foreach ( $grouphosts as $host)
-                {
-                    //echo $host['ip4']."\n";
-                    if ($host['ip4']==$ip || $host['ip6']==$ip)
-                    {
-                        //echo "Rule added \n";
-                        $rules_ret[$rule_ret_key]=$rules_all[$key];
-                        $rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
-                        $rule_ret_key++;
-                    }
-                }
-            }
-        }
-        //echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
-        return $rules_ret;
-    }
-    
-    /** Add rule match to rule
-     *	@param id int : rule id
-     *   @param set int : value to set
-     */
-    protected function add_rule_match($id, $set)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql="UPDATE ".$this->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
-    
-    /** Send SERVICE_CHECK_RESULT with icinga2cmd or API
-     *
-     * @param string $host
-     * @param string $service
-     * @param integer $state numerical staus
-     * @param string $display
-     * @returnn bool true is service check was sent without error
-     */
-    public function serviceCheckResult($host,$service,$state,$display)
-    {
-        if ($this->apiUse === false)
-        {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+				if (($ret_code2=$db_conn2->query($sql)) === false) {
+					$this->logging->log('No result in query : ' . $sql,WARN,'');
+					continue;
+				}
+				$grouphosts=$ret_code2->fetchAll();
+				//echo "rule grp :\n";print_r($grouphosts);echo "\n";
+				foreach ( $grouphosts as $host)
+				{
+					//echo $host['ip4']."\n";
+					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					{
+						//echo "Rule added \n";
+						$rules_ret[$rule_ret_key]=$rules_all[$key];
+						$rules_ret[$rule_ret_key]['host_name']=$host['host_name'];
+						$rule_ret_key++;
+					}
+				}
+			}
+		}
+		//echo "rule rest :\n";print_r($rules_ret);echo "\n";exit(0);
+		return $rules_ret;
+	}
+    
+	/** Add rule match to rule
+	 *	@param id int : rule id
+	 *   @param set int : value to set
+	 */
+	protected function add_rule_match($id, $set)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql="UPDATE ".$this->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
+    
+	/** Send SERVICE_CHECK_RESULT with icinga2cmd or API
+	 *
+	 * @param string $host
+	 * @param string $service
+	 * @param integer $state numerical staus
+	 * @param string $display
+	 * @returnn bool true is service check was sent without error
+	 */
+	public function serviceCheckResult($host,$service,$state,$display)
+	{
+		if ($this->apiUse === false)
+		{
+			$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
+				$host.';' .$service .';' . $state . ';'.$display;
+				$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
                 
-                // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-                exec('echo "'.$send.'" > ' .$this->icinga2cmd);
-                return true;
-        }
-        else
-        {
-            // Get perfdata if found
-            $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
-            {
-                $display=$matches[1];
-                $perfdata=$matches[2];
-            }
-            else
-            {
-                $perfdata='';
-            }
+				// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
+				exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+				return true;
+		}
+		else
+		{
+			// Get perfdata if found
+			$matches=array();
+			if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+			{
+				$display=$matches[1];
+				$perfdata=$matches[2];
+			}
+			else
+			{
+				$perfdata='';
+			}
             
-            $api = $this->getAPI();
-            $api->setCredentials($this->apiUsername, $this->apiPassword);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
-            if ($retcode == false)
-            {
-                $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-                return false;
-            }
-            else
-            {
-                $this->logging->log( "Sent result : " .$retmessage,INFO );
-                return true;
-            }
-        }
-    }
-    
-    public function getHostByIP($ip)
-    {
-        $api = $this->getAPI();
-        $api->setCredentials($this->apiUsername, $this->apiPassword);
-        return $api->getHostByIP($ip);
-    }
-    
-    /** Resolve display.
-     *	Changes _OID(<oid>) to value if found or text "<not in trap>"
-     *	@param $display string
-     *	@return string display
-     */
-    protected function applyDisplay($display)
-    {
-        $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$display,$matches) == 1)
-        {
-            $oid=$matches[1];
-            $found=0;
-            // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+			$api = $this->getAPI();
+			$api->setCredentials($this->apiUsername, $this->apiPassword);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+			if ($retcode == false)
+			{
+				$this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+				return false;
+			}
+			else
+			{
+				$this->logging->log( "Sent result : " .$retmessage,INFO );
+				return true;
+			}
+		}
+	}
+    
+	public function getHostByIP($ip)
+	{
+		$api = $this->getAPI();
+		$api->setCredentials($this->apiUsername, $this->apiPassword);
+		return $api->getHostByIP($ip);
+	}
+    
+	/** Resolve display.
+	 *	Changes _OID(<oid>) to value if found or text "<not in trap>"
+	 *	@param $display string
+	 *	@return string display
+	 */
+	protected function applyDisplay($display)
+	{
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$display,$matches) == 1)
+		{
+			$oid=$matches[1];
+			$found=0;
+			// Test and transform regexp
+			$oidR = $this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
-            {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
-                {
-                    $val->value=preg_replace('/"/','',$val->value);
-                    $rep=0;
-                    $display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-                    if ($rep==0)
-                    {
-                        $this->logging->log("Error in display",WARN,'');
-                        return $display;
-                    }
-                    $found=1;
-                    break;
-                }
-            }
-            if ($found==0)
-            {
-                $display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-                if ($rep==0)
-                {
-                    $this->logging->log("Error in display",WARN,'');
-                    return $display;
-                }
-            }
-        }
-        return $display;
-    }
-    
-    /** Match rules for current trap and do action
-     */
-    public function applyRules()
-    {
-        $rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
-        
-        if ($rules===false || count($rules)==0)
-        {
-            $this->logging->log('No rules found for this trap',INFO );
-            $this->trapData['status']='unknown';
-            $this->trapToDb=true;
-            return;
-        }
-        //print_r($rules);
-        // Evaluate all rules in sequence
-        $this->trapAction=null;
-        foreach ($rules as $rule)
-        {
+			foreach($this->trapDataExt as $val)
+			{
+				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				{
+					$val->value=preg_replace('/"/','',$val->value);
+					$rep=0;
+					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
+					if ($rep==0)
+					{
+						$this->logging->log("Error in display",WARN,'');
+						return $display;
+					}
+					$found=1;
+					break;
+				}
+			}
+			if ($found==0)
+			{
+				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
+				if ($rep==0)
+				{
+					$this->logging->log("Error in display",WARN,'');
+					return $display;
+				}
+			}
+		}
+		return $display;
+	}
+    
+	/** Match rules for current trap and do action
+	 */
+	public function applyRules()
+	{
+		$rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        
+		if ($rules===false || count($rules)==0)
+		{
+			$this->logging->log('No rules found for this trap',INFO );
+			$this->trapData['status']='unknown';
+			$this->trapToDb=true;
+			return;
+		}
+		//print_r($rules);
+		// Evaluate all rules in sequence
+		$this->trapAction=null;
+		foreach ($rules as $rule)
+		{
             
-            $host_name=$rule['host_name'];
-            $service_name=$rule['service_name'];
+			$host_name=$rule['host_name'];
+			$service_name=$rule['service_name'];
             
-            $display=$this->applyDisplay($rule['display']);
-            $this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
-            try
-            {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
-                //->eval_rule($rule['rule']);
+			$display=$this->applyDisplay($rule['display']);
+			$this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+			try
+			{
+				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+				//->eval_rule($rule['rule']);
                 
-                if ($evalr == true)
-                {
-                    //$this->logging->log('rules OOK: '.print_r($rule),INFO );
-                    $action=$rule['action_match'];
-                    $this->logging->log('action OK : '.$action,INFO );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
-                        {
-                            $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($action==-2)?false:true;
-                }
-                else
-                {
-                    //$this->logging->log('rules KOO : '.print_r($rule),INFO );
+				if ($evalr == true)
+				{
+					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
+					$action=$rule['action_match'];
+					$this->logging->log('action OK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						{
+							$this->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($action==-2)?false:true;
+				}
+				else
+				{
+					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
-                    $action=$rule['action_nomatch'];
-                    $this->logging->log('action NOK : '.$action,INFO );
-                    if ($action >= 0)
-                    {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-                        {
-                            $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
-                        {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                            $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
-                        }
-                    }
-                    else
-                    {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
-                    }
-                    $this->trapToDb=($action==-2)?false:true;
-                }
-                // Put name in source_name
-                if (!isset($this->trapData['source_name']))
-                {
-                    $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
-                {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
-                    { // only add if not present
-                        $this->trapData['source_name'].=','.$rule['host_name'];
-                    }
-                }
-            }
-            catch (Exception $e)
-            {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-                $this->trapAction.=' ERR : '.$e->getMessage();
-                $this->trapData['status']='error';
-            }
+					$action=$rule['action_nomatch'];
+					$this->logging->log('action NOK : '.$action,INFO );
+					if ($action >= 0)
+					{
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trapAction.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
+					}
+					else
+					{
+						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+					}
+					$this->trapToDb=($action==-2)?false:true;
+				}
+				// Put name in source_name
+				if (!isset($this->trapData['source_name']))
+				{
+					$this->trapData['source_name']=$rule['host_name'];
+				}
+				else
+				{
+					if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+					{ // only add if not present
+						$this->trapData['source_name'].=','.$rule['host_name'];
+					}
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trapAction.=' ERR : '.$e->getMessage();
+				$this->trapData['status']='error';
+			}
             
-        }
-        if ($this->trapData['status']=='error')
-        {
-            $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
-        {
-            $this->trapData['status']='done';
-        }
-    }
-    
-    /** Add Time a action to rule
-     *	@param string $time : time to process to insert in SQL
-     */
-    public function add_rule_final($time)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trapAction==null)
-        {
-            $this->trapAction='No action';
-        }
-        $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
-        if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
-        }
-    }
-    
-    /*********** UTILITIES *********************/
-    
-    /** reset service to OK after time defined in rule
-     *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better
-     *	@return integer : not in use
-     **/
-    public function reset_services()
-    {
-        // Get all services not in 'ok' state
-        $sql_query="SELECT s.service_object_id,
+		}
+		if ($this->trapData['status']=='error')
+		{
+			$this->trapToDb=true; // Always put errors in DB for the use can see
+		}
+		else
+		{
+			$this->trapData['status']='done';
+		}
+	}
+    
+	/** Add Time a action to rule
+	 *	@param string $time : time to process to insert in SQL
+	 */
+	public function add_rule_final($time)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		if ($this->trapAction==null)
+		{
+			$this->trapAction='No action';
+		}
+		$sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
+		if ($db_conn->query($sql) === false) {
+			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+		}
+	}
+    
+	/*********** UTILITIES *********************/
+    
+	/** reset service to OK after time defined in rule
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better
+	 *	@return integer : not in use
+	 **/
+	public function reset_services()
+	{
+		// Get all services not in 'ok' state
+		$sql_query="SELECT s.service_object_id,
 	 UNIX_TIMESTAMP(s.last_check) AS last_check,
 	s.current_state as state,
 	v.name1 as host_name,
@@ -977,43 +977,43 @@ 
 	FROM icinga_servicestatus AS s
     LEFT JOIN icinga_objects as v ON s.service_object_id=v.object_id
     WHERE s.current_state != 0;";
-        $db_conn=$this->trapsDB->db_connect_ido();
-        if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
-            return 0;
-        }
-        $services=$services_db->fetchAll();
-        
-        // Get all rules
-        $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."rules where revert_ok != 0;";
-        $db_conn2=$this->trapsDB->db_connect_trap();
-        if (($rules_db=$db_conn2->query($sql_query)) === false) {
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
-            return 0;
-        }
-        $rules=$rules_db->fetchAll();
-        
-        $now=date('U');
-        
-        $numreset=0;
-        foreach ($rules as $rule)
-        {
-            foreach ($services as $service)
-            {
-                if ($service['service_name'] == $rule['service_name'] &&
-                    $service['host_name'] == $rule['host_name'] &&
-                    ($service['last_check'] + $rule['revert_ok']) < $now)
-                {
-                    $this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
-                    $numreset++;
-                }
-            }
-        }
-        echo "\n";
-        echo $numreset . " service(s) reset to OK\n";
-        return 0;
-        
-    }
+		$db_conn=$this->trapsDB->db_connect_ido();
+		if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
+			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			return 0;
+		}
+		$services=$services_db->fetchAll();
+        
+		// Get all rules
+		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."rules where revert_ok != 0;";
+		$db_conn2=$this->trapsDB->db_connect_trap();
+		if (($rules_db=$db_conn2->query($sql_query)) === false) {
+			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			return 0;
+		}
+		$rules=$rules_db->fetchAll();
+        
+		$now=date('U');
+        
+		$numreset=0;
+		foreach ($rules as $rule)
+		{
+			foreach ($services as $service)
+			{
+				if ($service['service_name'] == $rule['service_name'] &&
+					$service['host_name'] == $rule['host_name'] &&
+					($service['last_check'] + $rule['revert_ok']) < $now)
+				{
+					$this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+					$numreset++;
+				}
+			}
+		}
+		echo "\n";
+		echo $numreset . " service(s) reset to OK\n";
+		return 0;
+        
+	}
     
     
 }
\ No newline at end of file

Spacing +199 added lines, -199 removed lines

@@ -49,13 +49,13 @@ 
     
     // Logs
     /** @var Logging Logging class. */
-    public $logging;    //< Logging class.
+    public $logging; //< Logging class.
     /** @var bool true if log was setup in constructor */
-    protected $logSetup;   //< bool true if log was setup in constructor
+    protected $logSetup; //< bool true if log was setup in constructor
     
     // Databases
     /** @var Database $trapsDB  Database class*/
-    public $trapsDB = null;
+    public $trapsDB=null;
     
     // Trap received data
     protected $receivingHost;
@@ -71,15 +71,15 @@ 
     protected $trapToDb=true;
     
     /** @var Mib mib class */
-    public $mibClass = null;
+    public $mibClass=null;
     
     /** @var Rule rule class */
-    public $ruleClass = null;
+    public $ruleClass=null;
     
     /** @var Plugins plugins manager **/
-    public $pluginClass = null;
+    public $pluginClass=null;
     
-    function __construct($etcDir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+    function __construct($etcDir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
     {
         // Paths of ini files
         $this->icingaweb2Etc=$etcDir;
@@ -87,10 +87,10 @@ 
         $this->icingaweb2Ressources=$this->icingaweb2Etc."/resources.ini";
         
         //************* Setup logging
-        $this->logging = new Logging();
+        $this->logging=new Logging();
         if ($baseLogLevel != null)
         {
-            $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+            $this->logging->setLogging($baseLogLevel, $baseLogMode, $baseLogFile);
             $this->logSetup=true;
         }
         else
@@ -100,14 +100,14 @@ 
         $this->logging->log('Loggin started', INFO);
         
         //*************** Get options from ini files
-        if (! is_file($this->trapModuleConfig))
+        if (!is_file($this->trapModuleConfig))
         {
             throw new Exception("Ini file ".$this->trapModuleConfig." does not exists");
         }
-        $trapConfig=parse_ini_file($this->trapModuleConfig,true);
+        $trapConfig=parse_ini_file($this->trapModuleConfig, true);
         if ($trapConfig == false)
         {
-            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig,ERROR,'syslog');
+            $this->logging->log("Error reading ini file : ".$this->trapModuleConfig, ERROR, 'syslog');
             throw new Exception("Error reading ini file : ".$this->trapModuleConfig);
         }
         $this->getMainOptions($trapConfig); // Get main options from ini file
@@ -121,10 +121,10 @@ 
         if ($this->apiUse === true) $this->getAPI(); // Setup API
         
         //*************** Setup MIB
-        $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
+        $this->mibClass=new Mib($this->logging, $this->trapsDB, $this->snmptranslate, $this->snmptranslate_dirs); // Create Mib class
         
         //*************** Setup Rule
-        $this->ruleClass = new Rule($this); //< Create Rule class
+        $this->ruleClass=new Rule($this); //< Create Rule class
         
         $this->trapData=array(  // TODO : put this in a reset function (DAEMON_MODE)
             'source_ip'	=> 'unknown',
@@ -136,7 +136,7 @@ 
         
         //*************** Setup Plugins
         //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
-        $this->pluginClass = new Plugins($this);
+        $this->pluginClass=new Plugins($this);
             
             
     }
@@ -151,15 +151,15 @@ 
      * @param string $message warning message if not found
      * @return boolean true if found, or false
      */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+    protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=2, $message=null)
     {
         if (!isset($option_array[$option_category][$option_name]))
         {
             if ($message === null)
             {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+                $message='No '.$option_name.' in config file: '.$this->trapModuleConfig;
             }
-            $this->logging->log($message,$log_level);
+            $this->logging->log($message, $log_level);
             return false;
         }
         else
@@ -177,24 +177,24 @@ 
     {
         
         // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
         
         // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
         
         // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        $this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
         
         // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        $this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->dbPrefix);
         
         // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+        if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->apiHostname))
         {
             $this->apiUse=true;
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->apiPort);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->apiUsername);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->apiPassword);
         }
     }
     
@@ -205,40 +205,40 @@ 
     protected function setupDatabase($trapConfig)
     {
         // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
+        if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trapModuleConfig, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+        if (($dbConfig=parse_ini_file($this->icingaweb2Ressources, true)) === false)
         {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
-        if (!array_key_exists($dbTrapName,$dbConfig))
+        if (!array_key_exists($dbTrapName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->dbPrefix);
         
         if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
         
         // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+        if (!array_key_exists('IDOdatabase', $trapConfig['config']))
         {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig, ERROR, '');
         }
         $dbIdoName=$trapConfig['config']['IDOdatabase'];
         
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+        $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         
@@ -253,9 +253,9 @@ 
         // Database options
         if ($this->logSetup === false) // Only if logging was no setup in constructor
         {
-            $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+            $this->getDBConfigIfSet('log_level', $this->logging->debugLevel);
+            $this->getDBConfigIfSet('log_destination', $this->logging->outputMode);
+            $this->getDBConfigIfSet('log_file', $this->logging->outputFile);
         }
     }
     
@@ -263,7 +263,7 @@ 
      * @param string $element
      * @param string $variable
      */
-    protected function getDBConfigIfSet($element,&$variable)
+    protected function getDBConfigIfSet($element, &$variable)
     {
         $value=$this->getDBConfig($element);
         if ($value != null) $variable=$value;
@@ -279,7 +279,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -296,15 +296,15 @@ 
      *	@param  string $destination file/syslog/display
      *	@return void
      **/
-    public function trapLog( $message, $level, $destination ='') // OBSOLETE
+    public function trapLog($message, $level, $destination='') // OBSOLETE
     {
         // TODO : replace ref with $this->logging->log
         $this->logging->log($message, $level, $destination);
     }
     
-    public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+    public function setLogging($debugLvl, $outputType, $outputOption=null)  // OBSOLETE
     {
-        $this->logging->setLogging($debugLvl, $outputType,$outputOption);
+        $this->logging->setLogging($debugLvl, $outputType, $outputOption);
     }
     
     /**
@@ -315,7 +315,7 @@ 
     {
         if ($this->icinga2api == null)
         {
-            $this->icinga2api = new Icinga2API($this->apiHostname,$this->apiPort);
+            $this->icinga2api=new Icinga2API($this->apiHostname, $this->apiPort);
         }
         return $this->icinga2api;
     }
@@ -334,7 +334,7 @@ 
         if ($input_stream === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-            $this->logging->log("Error reading stdin !",ERROR,'');
+            $this->logging->log("Error reading stdin !", ERROR, '');
             return null; // note : exception thrown by logging
         }
         
@@ -343,21 +343,21 @@ 
         if ($this->receivingHost === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-            $this->logging->log("Error reading Host !",ERROR,'');
+            $this->logging->log("Error reading Host !", ERROR, '');
         }
         // line 2 IP:port=>IP:port
         $IP=chop(fgets($input_stream));
         if ($IP === false)
         {
             $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-            $this->logging->log("Error reading IP !",ERROR,'');
+            $this->logging->log("Error reading IP !", ERROR, '');
         }
         $matches=array();
-        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-        if ($ret_code===0 || $ret_code===false)
+        $ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/', $IP, $matches);
+        if ($ret_code === 0 || $ret_code === false)
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-            $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+            $this->logging->log('Error parsing IP : '.$IP, ERROR, '');
         }
         else
         {
@@ -367,34 +367,34 @@ 
             $this->trapData['destination_port']=$matches[4];
         }
         
-        while (($vars=fgets($input_stream)) !==false)
+        while (($vars=fgets($input_stream)) !== false)
         {
             $vars=chop($vars);
-            $ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-            if ($ret_code===0 || $ret_code===false)
+            $ret_code=preg_match('/^([^ ]+) (.*)$/', $vars, $matches);
+            if ($ret_code === 0 || $ret_code === false)
             {
-                $this->logging->log('No match on trap data : '.$vars,WARN,'');
+                $this->logging->log('No match on trap data : '.$vars, WARN, '');
             }
             else
             {
-                if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+                if (($matches[1] == '.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1] == '.1.3.6.1.6.3.1.1.4.1'))
                 {
                     $this->trapData['trap_oid']=$matches[2];
                 }
                 else
                 {
-                    $object= new stdClass;
-                    $object->oid =$matches[1];
-                    $object->value = $matches[2];
-                    array_push($this->trapDataExt,$object);
+                    $object=new stdClass;
+                    $object->oid=$matches[1];
+                    $object->value=$matches[2];
+                    array_push($this->trapDataExt, $object);
                 }
             }
         }
         
-        if ($this->trapData['trap_oid']=='unknown')
+        if ($this->trapData['trap_oid'] == 'unknown')
         {
-            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trapData['source_ip']);
-            $this->logging->log('no trap oid found',ERROR,'');
+            $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trapData['source_ip']);
+            $this->logging->log('no trap oid found', ERROR, '');
         }
         
         // Translate oids.
@@ -416,7 +416,7 @@ 
         }
         
         
-        $this->trapData['status']= 'waiting';
+        $this->trapData['status']='waiting';
         
         return $this->trapData;
     }
@@ -432,40 +432,40 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid.'\';';
-        $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, '');
         }
         $name=$ret_code->fetch();
         if ($name['name'] != null)
         {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
         }
         
         // Also check if it is an instance of OID
-        $oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+        $oid_instance=preg_replace('/\.[0-9]+$/', '', $oid);
         
         $sql='SELECT mib,name from '.$this->dbPrefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-        $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, '');
         }
         $name=$ret_code->fetch();
         if ($name['name'] != null)
         {
-            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
         }
         
         // Try to get oid name from snmptranslate
-        $translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+        $translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
             ' '.$oid);
         $matches=array();
-        $ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-        if ($ret_code===0 || $ret_code === false) {
+        $ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+        if ($ret_code === 0 || $ret_code === false) {
             return NULL;
         } else {
-            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-            return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+            $this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid, INFO);
+            return array('trap_name_mib'=>$matches[1], 'trap_name'=>$matches[2]);
         }
     }
     
@@ -476,90 +476,90 @@ 
      **/
     public function eraseOldTraps($days=0)
     {
-        if ($days==0)
+        if ($days == 0)
         {
             if (($days=$this->getDBConfig('db_remove_days')) == null)
             {
-                $this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+                $this->logging->log('No days specified & no db value : no tap erase', WARN, '');
                 return;
             }
         }
         $db_conn=$this->trapsDB->db_connect_trap();
-        $daysago = strtotime("-".$days." day");
-        $sql= 'delete from '.$this->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+        $daysago=strtotime("-".$days." day");
+        $sql='delete from '.$this->dbPrefix.'received where date_received < \''.date("Y-m-d H:i:s", $daysago).'\';';
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+            $this->logging->log('Error erasing traps : '.$sql, ERROR, '');
         }
-        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+        $this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql, INFO);
     }
     
     /** Write error to received trap database
      */
-    public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+    public function writeTrapErrorToDB($message, $sourceIP=null, $trapoid=null)
     {
         
         $db_conn=$this->trapsDB->db_connect_trap();
         
         // add date time
-        $insert_col ='date_received,status';
-        $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+        $insert_col='date_received,status';
+        $insert_val="'".date("Y-m-d H:i:s")."','error'";
         
-        if ($sourceIP !=null)
+        if ($sourceIP != null)
         {
-            $insert_col .=',source_ip';
-            $insert_val .=",'". $sourceIP ."'";
+            $insert_col.=',source_ip';
+            $insert_val.=",'".$sourceIP."'";
         }
-        if ($trapoid !=null)
+        if ($trapoid != null)
         {
-            $insert_col .=',trap_oid';
-            $insert_val .=",'". $trapoid ."'";
+            $insert_col.=',trap_oid';
+            $insert_val.=",'".$trapoid."'";
         }
-        $insert_col .=',status_detail';
-        $insert_val .=",'". $message ."'";
+        $insert_col.=',status_detail';
+        $insert_val.=",'".$message."'";
         
-        $sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
         
         switch ($this->trapsDB->trapDBType)
         {
             case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO);
+                $sql.=' RETURNING id;';
+                $this->logging->log('sql : '.$sql, INFO);
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
+                    $this->logging->log('Error SQL insert : '.$sql, 1, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',1,'');
+                    $this->logging->log('Erreur recuperation id', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',1,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id', 1, '');
                 }
                 $this->trapId=$inserted_id_ret['id'];
                 break;
             case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=';';
+                $this->logging->log('sql : '.$sql, INFO);
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,1,'');
+                    $this->logging->log('Error SQL insert : '.$sql, 1, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',1,'');
+                    $this->logging->log('Erreur recuperation id', 1, '');
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
                 $this->trapId=$inserted_id;
                 break;
             default:
-                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+                $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType, 1, '');
         }
         
-        $this->logging->log('id found: '. $this->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
     }
     
     /** Write trap data to trap database
@@ -576,86 +576,86 @@ 
         $insert_col='';
         $insert_val='';
         // add date time
-        $this->trapData['date_received'] = date("Y-m-d H:i:s");
+        $this->trapData['date_received']=date("Y-m-d H:i:s");
         
         $firstcol=1;
         foreach ($this->trapData as $col => $val)
         {
-            if ($firstcol==0)
+            if ($firstcol == 0)
             {
-                $insert_col .=',';
-                $insert_val .=',';
+                $insert_col.=',';
+                $insert_val.=',';
             }
-            $insert_col .= $col ;
-            $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+            $insert_col.=$col;
+            $insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
             $firstcol=0;
         }
         
-        $sql= 'INSERT INTO '.$this->dbPrefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+        $sql='INSERT INTO '.$this->dbPrefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
         switch ($this->trapsDB->trapDBType)
         {
             case 'pgsql':
-                $sql .= ' RETURNING id;';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=' RETURNING id;';
+                $this->logging->log('sql : '.$sql, INFO);
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+                    $this->logging->log('Error SQL insert : '.$sql, ERROR, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
                     
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
+                    $this->logging->log('Erreur recuperation id', ERROR, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id',ERROR,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id', ERROR, '');
                 }
                 $this->trapId=$inserted_id_ret['id'];
                 break;
             case 'mysql':
-                $sql .= ';';
-                $this->logging->log('sql : '.$sql,INFO );
+                $sql.=';';
+                $this->logging->log('sql : '.$sql, INFO);
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+                    $this->logging->log('Error SQL insert : '.$sql, ERROR, '');
                 }
-                $this->logging->log('SQL insertion OK',INFO );
+                $this->logging->log('SQL insertion OK', INFO);
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur recuperation id',ERROR,'');
+                    $this->logging->log('Erreur recuperation id', ERROR, '');
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
                 $this->trapId=$inserted_id;
                 break;
             default:
-                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+                $this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType, ERROR, '');
         }
-        $this->logging->log('id found: '.$this->trapId,INFO );
+        $this->logging->log('id found: '.$this->trapId, INFO);
         
         // Fill trap extended data table
         foreach ($this->trapDataExt as $value) {
             // TODO : detect if trap value is encoded and decode it to UTF-8 for database
             $firstcol=1;
-            $value->trap_id = $this->trapId;
+            $value->trap_id=$this->trapId;
             $insert_col='';
             $insert_val='';
             foreach ($value as $col => $val)
             {
-                if ($firstcol==0)
+                if ($firstcol == 0)
                 {
-                    $insert_col .=',';
-                    $insert_val .=',';
+                    $insert_col.=',';
+                    $insert_val.=',';
                 }
-                $insert_col .= $col;
-                $insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+                $insert_col.=$col;
+                $insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
                 $firstcol=0;
             }
             
-            $sql= 'INSERT INTO '.$this->dbPrefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';
+            $sql='INSERT INTO '.$this->dbPrefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';
             
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+                $this->logging->log('Erreur insertion data : '.$sql, WARN, '');
             }
         }
     }
@@ -665,14 +665,14 @@ 
      *	@param $oid string oid in numeric
      *	@return mixed|boolean : PDO object or false
      */
-    protected function getRules($ip,$oid)
+    protected function getRules($ip, $oid)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
         // fetch rules based on IP in rule and OID
         $sql='SELECT * from '.$this->dbPrefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-        $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,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return false;
         }
         $rules_all=$ret_code->fetchAll();
@@ -681,7 +681,7 @@ 
         $rule_ret_key=0;
         foreach ($rules_all as $key => $rule)
         {
-            if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+            if ($rule['ip4'] == $ip || $rule['ip6'] == $ip)
             {
                 $rules_ret[$rule_ret_key]=$rules_all[$key];
                 //TODO : get host name by API (and check if correct in rule).
@@ -689,7 +689,7 @@ 
                 continue;
             }
             // TODO : get hosts IP by API
-            if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+            if (isset($rule['host_group_name']) && $rule['host_group_name'] != null)
             { // get ips of group members by oid
                 $db_conn2=$this->trapsDB->db_connect_ido();
                 $sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
@@ -700,15 +700,15 @@ 
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
                 if (($ret_code2=$db_conn2->query($sql)) === false) {
-                    $this->logging->log('No result in query : ' . $sql,WARN,'');
+                    $this->logging->log('No result in query : '.$sql, WARN, '');
                     continue;
                 }
                 $grouphosts=$ret_code2->fetchAll();
                 //echo "rule grp :\n";print_r($grouphosts);echo "\n";
-                foreach ( $grouphosts as $host)
+                foreach ($grouphosts as $host)
                 {
                     //echo $host['ip4']."\n";
-                    if ($host['ip4']==$ip || $host['ip6']==$ip)
+                    if ($host['ip4'] == $ip || $host['ip6'] == $ip)
                     {
                         //echo "Rule added \n";
                         $rules_ret[$rule_ret_key]=$rules_all[$key];
@@ -731,7 +731,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql="UPDATE ".$this->dbPrefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -743,23 +743,23 @@ 
      * @param string $display
      * @returnn bool true is service check was sent without error
      */
-    public function serviceCheckResult($host,$service,$state,$display)
+    public function serviceCheckResult($host, $service, $state, $display)
     {
         if ($this->apiUse === false)
         {
-            $send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-                $host.';' .$service .';' . $state . ';'.$display;
-                $this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+            $send='['.date('U').'] PROCESS_SERVICE_CHECK_RESULT;'.
+                $host.';'.$service.';'.$state.';'.$display;
+                $this->logging->log($send." : to : ".$this->icinga2cmd, INFO);
                 
                 // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-                exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+                exec('echo "'.$send.'" > '.$this->icinga2cmd);
                 return true;
         }
         else
         {
             // Get perfdata if found
             $matches=array();
-            if (preg_match('/(.*)\|(.*)/',$display,$matches) == 1)
+            if (preg_match('/(.*)\|(.*)/', $display, $matches) == 1)
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
@@ -769,17 +769,17 @@ 
                 $perfdata='';
             }
             
-            $api = $this->getAPI();
+            $api=$this->getAPI();
             $api->setCredentials($this->apiUsername, $this->apiPassword);
-            list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display,$perfdata);
+            list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display, $perfdata);
             if ($retcode == false)
             {
-                $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+                $this->logging->log("Error sending result : ".$retmessage, WARN, '');
                 return false;
             }
             else
             {
-                $this->logging->log( "Sent result : " .$retmessage,INFO );
+                $this->logging->log("Sent result : ".$retmessage, INFO);
                 return true;
             }
         }
@@ -787,7 +787,7 @@ 
     
     public function getHostByIP($ip)
     {
-        $api = $this->getAPI();
+        $api=$this->getAPI();
         $api->setCredentials($this->apiUsername, $this->apiPassword);
         return $api->getHostByIP($ip);
     }
@@ -800,35 +800,35 @@ 
     protected function applyDisplay($display)
     {
         $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$display,$matches) == 1)
+        while (preg_match('/_OID\(([0-9\.\*]+)\)/', $display, $matches) == 1)
         {
             $oid=$matches[1];
             $found=0;
             // Test and transform regexp
-            $oidR = $this->ruleClass->regexp_eval($oid);
+            $oidR=$this->ruleClass->regexp_eval($oid);
             
-            foreach($this->trapDataExt as $val)
+            foreach ($this->trapDataExt as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    $val->value=preg_replace('/"/','',$val->value);
+                    $val->value=preg_replace('/"/', '', $val->value);
                     $rep=0;
-                    $display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-                    if ($rep==0)
+                    $display=preg_replace('/_OID\('.$oid.'\)/', $val->value, $display, -1, $rep);
+                    if ($rep == 0)
                     {
-                        $this->logging->log("Error in display",WARN,'');
+                        $this->logging->log("Error in display", WARN, '');
                         return $display;
                     }
                     $found=1;
                     break;
                 }
             }
-            if ($found==0)
+            if ($found == 0)
             {
-                $display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-                if ($rep==0)
+                $display=preg_replace('/_OID\('.$oid.'\)/', '<not in trap>', $display, -1, $rep);
+                if ($rep == 0)
                 {
-                    $this->logging->log("Error in display",WARN,'');
+                    $this->logging->log("Error in display", WARN, '');
                     return $display;
                 }
             }
@@ -840,11 +840,11 @@ 
      */
     public function applyRules()
     {
-        $rules = $this->getRules($this->trapData['source_ip'],$this->trapData['trap_oid']);
+        $rules=$this->getRules($this->trapData['source_ip'], $this->trapData['trap_oid']);
         
-        if ($rules===false || count($rules)==0)
+        if ($rules === false || count($rules) == 0)
         {
-            $this->logging->log('No rules found for this trap',INFO );
+            $this->logging->log('No rules found for this trap', INFO);
             $this->trapData['status']='unknown';
             $this->trapToDb=true;
             return;
@@ -859,59 +859,59 @@ 
             $service_name=$rule['service_name'];
             
             $display=$this->applyDisplay($rule['display']);
-            $this->trapAction = ($this->trapAction==null)? '' : $this->trapAction . ', ';
+            $this->trapAction=($this->trapAction == null) ? '' : $this->trapAction.', ';
             try
             {
-                $this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt) ;
+                $this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+                $evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trapDataExt);
                 //->eval_rule($rule['rule']);
                 
                 if ($evalr == true)
                 {
                     //$this->logging->log('rules OOK: '.print_r($rule),INFO );
                     $action=$rule['action_match'];
-                    $this->logging->log('action OK : '.$action,INFO );
+                    $this->logging->log('action OK : '.$action, INFO);
                     if ($action >= 0)
                     {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+                        if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
                         }
                         else
                         {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                            $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
                     }
                     else
                     {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                        $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                     }
-                    $this->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($action == -2) ?false:true;
                 }
                 else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
                     $action=$rule['action_nomatch'];
-                    $this->logging->log('action NOK : '.$action,INFO );
+                    $this->logging->log('action NOK : '.$action, INFO);
                     if ($action >= 0)
                     {
-                        if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+                        if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
                         }
                         else
                         {
-                            $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                            $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
                     }
                     else
                     {
-                        $this->add_rule_match($rule['id'],$rule['num_match']+1);
+                        $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
                     }
-                    $this->trapToDb=($action==-2)?false:true;
+                    $this->trapToDb=($action == -2) ?false:true;
                 }
                 // Put name in source_name
                 if (!isset($this->trapData['source_name']))
@@ -920,7 +920,7 @@ 
                 }
                 else
                 {
-                    if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
+                    if (!preg_match('/'.$rule['host_name'].'/', $this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
@@ -928,13 +928,13 @@ 
             }
             catch (Exception $e)
             {
-                $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+                $this->logging->log('Error in rule eval : '.$e->getMessage(), WARN, '');
                 $this->trapAction.=' ERR : '.$e->getMessage();
                 $this->trapData['status']='error';
             }
             
         }
-        if ($this->trapData['status']=='error')
+        if ($this->trapData['status'] == 'error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
         }
@@ -950,13 +950,13 @@ 
     public function add_rule_final($time)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
-        if ($this->trapAction==null)
+        if ($this->trapAction == null)
         {
             $this->trapAction='No action';
         }
         $sql="UPDATE ".$this->dbPrefix."received SET process_time = '".$time."' , status_detail='".$this->trapAction."'  WHERE (id = '".$this->trapId."');";
         if ($db_conn->query($sql) === false) {
-            $this->logging->log('Error in update query : ' . $sql,WARN,'');
+            $this->logging->log('Error in update query : '.$sql, WARN, '');
         }
     }
     
@@ -979,7 +979,7 @@ 
     WHERE s.current_state != 0;";
         $db_conn=$this->trapsDB->db_connect_ido();
         if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+            $this->logging->log('No result in query : '.$sql_query, ERROR, '');
             return 0;
         }
         $services=$services_db->fetchAll();
@@ -988,7 +988,7 @@ 
         $sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->dbPrefix."rules where revert_ok != 0;";
         $db_conn2=$this->trapsDB->db_connect_trap();
         if (($rules_db=$db_conn2->query($sql_query)) === false) {
-            $this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+            $this->logging->log('No result in query : '.$sql_query, ERROR, '');
             return 0;
         }
         $rules=$rules_db->fetchAll();
@@ -1004,13 +1004,13 @@ 
                     $service['host_name'] == $rule['host_name'] &&
                     ($service['last_check'] + $rule['revert_ok']) < $now)
                 {
-                    $this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+                    $this->serviceCheckResult($service['host_name'], $service['service_name'], 0, 'Reset service to OK after '.$rule['revert_ok'].' seconds');
                     $numreset++;
                 }
             }
         }
         echo "\n";
-        echo $numreset . " service(s) reset to OK\n";
+        echo $numreset." service(s) reset to OK\n";
         return 0;
         
     }

library/Trapdirector/TrapsController.php

Spacing +112 added lines, -112 removed lines

@@ -22,14 +22,14 @@ 
 
 class TrapsController extends Controller
 {
-	protected $moduleConfig;  	//< TrapModuleConfig instance
-	protected $trapTableList; 	//< TrapTableList (by date)
-	protected $trapTableHostList; 	//< TrapTableList (by hosts)
-	protected $handlerTableList; 	//< HandlerTableList instance
-	protected $trapDB;			//< Trap database
-	protected $icingaDB;		//< Icinga IDO database;
-	protected $MIBData; 		//< MIBLoader class
-	protected $trapClass;		//< Trap class for bin/trap_class.php
+	protected $moduleConfig; //< TrapModuleConfig instance
+	protected $trapTableList; //< TrapTableList (by date)
+	protected $trapTableHostList; //< TrapTableList (by hosts)
+	protected $handlerTableList; //< HandlerTableList instance
+	protected $trapDB; //< Trap database
+	protected $icingaDB; //< Icinga IDO database;
+	protected $MIBData; //< MIBLoader class
+	protected $trapClass; //< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
 	*	@return TrapModuleConfig
@@ -43,14 +43,14 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
 	
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -60,7 +60,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -70,7 +70,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -82,15 +82,15 @@ 
 	*	@param $test_version bool if set to flase, does not test database version of trapDB
 	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
 	*/
-	public function getDbByName($DBname,$test=false,$test_version=true)
+	public function getDbByName($DBname, $test=false, $test_version=true)
 	{
 		try 
 		{
-			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+			$dbconn=IcingaDbConnection::fromResourceName($DBname);
 		} 
 		catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) return array(2, $DBname);
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -101,37 +101,37 @@ 
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
 			try
 			{
-				$query = $db->select()
-					->from($this->getModuleConfig()->getDbConfigTableName(),'value')
+				$query=$db->select()
+					->from($this->getModuleConfig()->getDbConfigTableName(), 'value')
 					->where('name=\'db_version\'');
 				$version=$db->fetchRow($query);
-				if ( ($version == null) || ! property_exists($version,'value') )
+				if (($version == null) || !property_exists($version, 'value'))
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) return array(4, $DBname);
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) return array(5, $version->value, $this->getModuleConfig()->getDbMinVersion());
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) return array(0, '');
 		return $dbconn;
 	}
 
@@ -142,17 +142,17 @@ 
 	 */
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test=false) return $this->trapDB;
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{	
-			if ($test) return array(1,'');
+			if ($test) return array(1, '');
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
-		$retDB=$this->getDbByName($dbresource,$test,true);
+		$retDB=$this->getDbByName($dbresource, $test, true);
 		if ($test === true) return $retDB;
 		$this->trapDB=$retDB;
 		return $this->trapDB;
@@ -160,78 +160,78 @@ 
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test=false) return $this->icingaDB;
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
+		$dbresource=$this->Config()->get('config', 'IDOdatabase'); ;
 
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) return array(1, 'No database in config.ini');
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		    $dbconn=IcingaDbConnection::fromResourceName($dbresource);
 		}
 		catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) return array(2, "Database $dbresource does not exists in IcingaWeb2");
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
 		
 		if ($test == false) 
 		{ 
-			$this->icingaDB = $dbconn; 
+			$this->icingaDB=$dbconn; 
 			return $this->icingaDB;
 		}
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
+		    $query=$dbconn->select()
+		    ->from('icinga_dbversion', array('version'));
 		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
+		    if (($version == null) || !property_exists($version, 'version'))
 		    {
-		        return array(4,"$dbresource does not look like an IDO database");
+		        return array(4, "$dbresource does not look like an IDO database");
 		    }
 		}
 		catch (Exception $e)
 		{
-			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+			return array(3, "Error connecting to $dbresource : ".$e->getMessage());
 		}
 		
-		return array(0,'');
+		return array(0, '');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -242,10 +242,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -257,10 +257,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -294,12 +294,12 @@ 
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -315,12 +315,12 @@ 
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -336,12 +336,12 @@ 
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hostgroups'),
 					'b.hostgroup_object_id=a.object_id',
@@ -357,8 +357,8 @@ 
 	*/
 	protected function getHostInfoByID($id) 
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -378,17 +378,17 @@ 
 	*/
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'a.object_id'))
+					array('name' => 'a.name1', 'id' => 'a.object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
-					array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-				->where('a.object_id = ?',$id);
+					array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?', $id);
 		return $db->fetchRow($query);
 	}	
 	
@@ -400,16 +400,16 @@ 
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
-					array('is_active'=>'a.is_active','name2'=>'a.name2'))
+					array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
 				->where('s.host_object_id='.$id.' AND a.is_active = 1');
 		return $db->fetchAll($query);
 	}	
@@ -422,8 +422,8 @@ 
 	*/
 	protected function getServicesByHostGroupid($id) 
 	{		
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_hostgroup_members'),
@@ -439,11 +439,11 @@ 
 		foreach ($hosts as $key => $host)
 		{ // For each host, get all services and add in common_services if not found or add counter
 			$host_services=$this->getServicesByHostid($host->host_object_id);
-			foreach($host_services as $service)
+			foreach ($host_services as $service)
 			{
 				if (isset($common_services[$service->name2]['num']))
 				{
-					$common_services[$service->name2]['num'] +=1;
+					$common_services[$service->name2]['num']+=1;
 				}
 				else
 				{
@@ -459,7 +459,7 @@ 
 		{
 		    if ($common_services[$key]['num'] == $num_hosts)
 			{
-				array_push($result,array($key,$common_services[$key]['name']));
+				array_push($result, array($key, $common_services[$key]['name']));
 			}
 		}
 		
@@ -472,9 +472,9 @@ 
 	*	@param $name string service name
 	*	@return array  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		if ($name == null)
 		{
 			return array();
@@ -483,7 +483,7 @@ 
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
@@ -501,12 +501,12 @@ 
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name1' => 'a.name1','name2' => 'a.name2'))
+					array('name1' => 'a.name1', 'name2' => 'a.name2'))
 				->where('a.object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchRow($query);
@@ -519,17 +519,17 @@ 
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['created'] = new Zend_Db_Expr('NOW()');
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['created']=new Zend_Db_Expr('NOW()');
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$query=$db->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$params
 		);
-		if($query==false)
+		if ($query == false)
 		{
 		  return null;
 		}
@@ -541,13 +541,13 @@ 
 	*   @param integer $ruleID : rule id in db
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$db->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -562,8 +562,8 @@ 
 	*/
 	protected function deleteRule($ruleID)
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
-		$db = $this->getDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -576,10 +576,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function deleteTrap($ip,$oid)
+	protected function deleteTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -587,10 +587,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if ($condition === null) return null;
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -604,10 +604,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function countTrap($ip,$oid)
+	protected function countTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -615,10 +615,10 @@ 
 		}
 		if ($oid != null)
 		{
-			$condition=($condition===null)?'':$condition.' AND ';
+			$condition=($condition === null) ? '' : $condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return 0;
+		if ($condition === null) return 0;
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -634,27 +634,27 @@ 
 	protected function getDBConfigValue($element)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
-			->where('name=?',$element);
+			->where('name=?', $element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row == null)  // value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+			if (!isset($default[$element])) return null; // no default and not value
 			
-			$this->addDBConfigValue($element,$default[$element]);
+			$this->addDBConfigValue($element, $default[$element]);
 			return $default[$element];
 		}
 		if ($return_row->value == null) // value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
-			$this->setDBConfigValue($element,$default[$element]);
+			if (!isset($default[$element])) return null; // no default and not value
+			$this->setDBConfigValue($element, $default[$element]);
 			return $default[$element];			
 		}
 		return $return_row->value;		
@@ -665,10 +665,10 @@ 
 	*   @param string $value : value
 	*/
 		
-	protected function addDBConfigValue($element,$value)
+	protected function addDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
@@ -684,10 +684,10 @@ 
 	*	@param string $element : name of config element
 	*   @param string $value : value
 	*/
-	protected function setDBConfigValue($element,$value)
+	protected function setDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$query=$db->update(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>$value),
@@ -702,10 +702,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

application/controllers/HelperController.php

Spacing +60 added lines, -60 removed lines

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

application/controllers/HandlerController.php

Indentation +240 added lines, -241 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();
@@ -39,23 +38,23 @@ 
 	 */
 	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()
+		));
 	    
-	    //$db = $this->getDb();
+		//$db = $this->getDb();
 
-	    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='';
+		}
 	}
 	
 	/**
@@ -63,31 +62,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;
 	}
 	
 	/**
@@ -96,102 +95,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->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
-	    }
+		// Get host
+		try
+		{
+			$hosts=$this->getHostByIP($hostfilter);
+		}
+		catch (Exception $e)
+		{
+			$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+		}
 	    
 	    
-	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
-	        $this->view->hostname=$hosts[0]->name;
-	        //$hostid=$hosts[0]->id;
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
+		// if one unique host found -> put id text input
+		if (count($hosts)==1) {
+			$this->view->hostname=$hosts[0]->name;
+			//$hostid=$hosts[0]->id;
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
 	        
-	    }
-	    else
-	    {
-	        foreach($hosts as $key=>$val)
-	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
-	        }
-	    }
+		}
+		else
+		{
+			foreach($hosts as $key=>$val)
+			{
+				array_push($this->view->hostlist,$hosts[$key]->name);
+			}
+		}
 	    
-	    // set up trap oid and objects received by the trap
+		// set up trap oid and objects received by the trap
 	    
-	    $this->view->mainoid=$trapDetail->trap_oid;
-	    if ($trapDetail->trap_name_mib != null)
-	    {
-	        $this->view->mib=$trapDetail->trap_name_mib;
-	        $this->view->name=$trapDetail->trap_name;
-	        $this->view->trapListForMIB=$this->getMIB()
-	        ->getTrapList($trapDetail->trap_name_mib);
-	    }
+		$this->view->mainoid=$trapDetail->trap_oid;
+		if ($trapDetail->trap_name_mib != null)
+		{
+			$this->view->mib=$trapDetail->trap_name_mib;
+			$this->view->name=$trapDetail->trap_name;
+			$this->view->trapListForMIB=$this->getMIB()
+			->getTrapList($trapDetail->trap_name_mib);
+		}
 	    
-	    // Get all objects that can be in trap from MIB
-	    $allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
-	    // Get all objects in current Trap
-	    $currentTrapObjects=$this->getTrapobjects($trapid);
-	    $oid_index=1;
-	    foreach ($currentTrapObjects as $key => $val)
-	    {
-	        $currentObjectType='Unknown';
-	        $currentObjectTypeEnum='Unknown';
-	        if (isset($allObjects[$val->oid]['type']))
-	        {
-	            $currentObjectType=$allObjects[$val->oid]['type'];
-	            $currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
-	        }
-	        $currentObject=array(
-	            $oid_index,
-	            $val->oid,
-	            $val->oid_name_mib,
-	            $val->oid_name,
-	            $val->value,
-	            $currentObjectType,
-	            $currentObjectTypeEnum
-	        );
-	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
-	        // set currrent object to null in allObjects
-	        if (isset($allObjects[$val->oid]))
-	        {
-	            $allObjects[$val->oid]=null;
-	        }
-	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
-	    {
-	        foreach ($allObjects as $key => $val)
-	        {
-	            if ($val==null) { continue; }
-	            array_push($this->view->objectList, array(
-	                $oid_index,
-	                $key,
-	                $allObjects[$key]['mib'],
-	                $allObjects[$key]['name'],
-	                '',
-	                $allObjects[$key]['type'],
-	                $allObjects[$key]['type_enum']
-	            ));
-	            $oid_index++;
-	        }
-	    }
+		// Get all objects that can be in trap from MIB
+		$allObjects=$this->getMIB()->getObjectList($trapDetail->trap_oid);
+		// Get all objects in current Trap
+		$currentTrapObjects=$this->getTrapobjects($trapid);
+		$oid_index=1;
+		foreach ($currentTrapObjects as $key => $val)
+		{
+			$currentObjectType='Unknown';
+			$currentObjectTypeEnum='Unknown';
+			if (isset($allObjects[$val->oid]['type']))
+			{
+				$currentObjectType=$allObjects[$val->oid]['type'];
+				$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
+			}
+			$currentObject=array(
+				$oid_index,
+				$val->oid,
+				$val->oid_name_mib,
+				$val->oid_name,
+				$val->value,
+				$currentObjectType,
+				$currentObjectTypeEnum
+			);
+			$oid_index++;
+			array_push($this->view->objectList,$currentObject);
+			// set currrent object to null in allObjects
+			if (isset($allObjects[$val->oid]))
+			{
+				$allObjects[$val->oid]=null;
+			}
+		}
+		if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+		{
+			foreach ($allObjects as $key => $val)
+			{
+				if ($val==null) { continue; }
+				array_push($this->view->objectList, array(
+					$oid_index,
+					$key,
+					$allObjects[$key]['mib'],
+					$allObjects[$key]['name'],
+					'',
+					$allObjects[$key]['type'],
+					$allObjects[$key]['type_enum']
+				));
+				$oid_index++;
+			}
+		}
 	    
-	    // Add a simple display
-	    $this->view->display='Trap '.$trapDetail->trap_name.' received';
-	    $this->view->create_basic_rule=true;
+		// Add a simple display
+		$this->view->display='Trap '.$trapDetail->trap_name.' received';
+		$this->view->create_basic_rule=true;
 	}
 
 	/**
@@ -200,29 +199,29 @@ 
 	 */
 	private function add_check_host_exists($ruleDetail)
 	{
-	    // Check if hostname still exists
-	    $host_get=$this->getHostByName($this->view->hostname);
+		// Check if hostname still exists
+		$host_get=$this->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
-	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
-	        $this->view->serviceGet=false;
-	    }
-	    else
-	    {
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGet=true;
-	        // get service id for form to set :
-	        $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
-	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
-	        {
-	            $this->view->serviceSet=$serviceID[0]->id;
-	        }
-	    }
+		if (count($host_get)==0)
+		{
+			$this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+			$this->view->serviceGet=false;
+		}
+		else
+		{
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGet=true;
+			// get service id for form to set :
+			$serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
+			if (count($serviceID) ==0)
+			{
+				$this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+			else
+			{
+				$this->view->serviceSet=$serviceID[0]->id;
+			}
+		}
 	}
 
 	/**
@@ -231,33 +230,33 @@ 
 	 */
 	private function add_check_hostgroup_exists($ruleDetail)
 	{
-	    // Check if groupe exists
-	    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
-	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
-	        $this->view->serviceGroupGet=false;
-	    }
-	    else
-	    {
-	        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
-	        $foundGrpService=0;
-	        foreach ($grpServices as $grpService)
-	        {
-	            if ($grpService[0] == $ruleDetail->service_name)
-	            {
-	                $foundGrpService=1;
-	                $this->view->serviceSet=$ruleDetail->service_name;
-	            }
-	        }
+		// Check if groupe exists
+		$group_get=$this->getHostGroupByName($this->view->hostgroupname);
+		if (count($group_get)==0)
+		{
+			$this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+			$this->view->serviceGroupGet=false;
+		}
+		else
+		{
+			$grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
+			$foundGrpService=0;
+			foreach ($grpServices as $grpService)
+			{
+				if ($grpService[0] == $ruleDetail->service_name)
+				{
+					$foundGrpService=1;
+					$this->view->serviceSet=$ruleDetail->service_name;
+				}
+			}
 	        
-	        // Tell JS to get services when page is loaded
-	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
-	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	    }
+			// Tell JS to get services when page is loaded
+			$this->view->serviceGroupGet=true;
+			if ($foundGrpService==0)
+			{
+				$this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			}
+		}
 	}
 	
 	/**
@@ -269,52 +268,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();
@@ -333,8 +332,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;
 		}
 		
@@ -359,14 +358,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;
@@ -394,9 +393,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();
@@ -437,7 +436,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -521,9 +520,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');  }
@@ -544,8 +543,8 @@ 
 			$trapDetail=$db->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)
@@ -559,9 +558,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');  }
@@ -592,9 +591,9 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param integer $ruleid int id of rule in rule table
-	*	@return object : column objects in db
-	*/
+	 *	@param integer $ruleid int id of rule in rule table
+	 *	@return object : column objects in db
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -621,7 +620,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

Spacing +80 added lines, -80 removed lines

@@ -23,14 +23,14 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('status');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getHandlerListTable()->setConnection($db);
 		$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');
 	}
@@ -40,7 +40,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()
@@ -50,7 +50,7 @@ 
 
 	    if ($this->params->get('rule') !== null) 
 	    {
-	        $this->view->rule= $this->params->get('rule');
+	        $this->view->rule=$this->params->get('rule');
 	    }
 	    else
 	    {
@@ -109,12 +109,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
@@ -123,9 +123,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);
 	        }
 	    }
 	    
@@ -164,18 +164,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,
@@ -203,9 +203,9 @@ 
 	    // Check if hostname still exists
 	    $host_get=$this->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
@@ -213,10 +213,10 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        // get service id for form to set :
-	        $serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
+	        $serviceID=$this->getServiceIDByName($this->view->hostname, $ruleDetail->service_name);
+	        if (count($serviceID) == 0)
 	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	        else
 	        {
@@ -233,9 +233,9 @@ 
 	{
 	    // Check if groupe exists
 	    $group_get=$this->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
@@ -253,9 +253,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';
 	        }
 	    }
 	}
@@ -273,12 +273,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(
@@ -303,9 +303,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;
@@ -319,7 +319,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()
@@ -332,7 +332,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;
@@ -352,7 +352,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
@@ -404,26 +404,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
 			{
@@ -443,16 +443,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']];
 				}
@@ -461,8 +461,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->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
@@ -489,25 +489,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->addHandlerRule($dbparams);
 			}
 			else
 			{
-				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->updateHandlerRule($dbparams, $params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
@@ -526,10 +526,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();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -538,19 +538,19 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 			$trapDetail=$db->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;
 		}
 
@@ -564,10 +564,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();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -576,15 +576,15 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->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();
 		}
 
@@ -597,22 +597,22 @@ 
 	*/
 	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();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
-				->where('id=?',$ruleid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapRuleName(), $queryArray)
+				->where('id=?', $ruleid);
 			$ruleDetail=$db->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());
+			$this->displayExitError('Update handler : get rule detail', $e->getMessage());
 			return array();
 		}
 
@@ -626,7 +626,7 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/handler')
+			'url'   => $this->getModuleConfig()->urlPath().'/handler')
 		);
 	}