patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Rule.php

Indentation +289 added lines, -289 removed lines

@@ -7,331 +7,331 @@
 class Rule
 {
     
-    protected $logging; //< logging class
+	protected $logging; //< logging class
     
-    /**
-     * Setup Rule Class
-     * @param Logging $logClass : where to log
-     */
-    function __construct($logClass)
-    {
-        $this->logging=$logClass;
+	/**
+	 * Setup Rule Class
+	 * @param Logging $logClass : where to log
+	 */
+	function __construct($logClass)
+	{
+		$this->logging=$logClass;
 
-    }
+	}
 
 /**
  * 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);
         
-    }
+	}
     
-    private function get_group($rule,&$item)
-    {
-        $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++;
-            }
-        }
+	private function get_group($rule,&$item)
+	{
+		$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++;
-        $start=0;
-        //echo "group : ".$val."\n";
-        // returns evaluation of group as type 2 (boolean)
-        return array(2,$this->evaluation($val,$start));
-    }
+		if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
+		$val=substr($rule,$start,$item-$start);
+		$item++;
+		$start=0;
+		//echo "group : ".$val."\n";
+		// returns evaluation of group as type 2 (boolean)
+		return array(2,$this->evaluation($val,$start));
+	}
     
-    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);
-        }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+		if ($rule[$item] == '(')
+		{ // grouping
+			return $this->get_group($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;
+	}
     
-    /** 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.
-     */
+	/** 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;
-            // ** replaced by .*
-            $oidR=preg_replace('/\*\*/', '.*', $oid);
-            // * replaced by [0-9]+ 
-            $oidR=preg_replace('/\*/', '[0-9]+', $oidR);
+	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;
+			// ** 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('OID in rule : '.$oid.' / '.$oidR,DEBUG );
+			$this->logging->log('OID in rule : '.$oid.' / '.$oidR,DEBUG );
             
-            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 +88 added lines, -88 removed lines

@@ -23,47 +23,47 @@ 
  * 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);
         
     }
     
-    private function get_group($rule,&$item)
+    private function get_group($rule, &$item)
     {
         $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++;
@@ -76,23 +76,23 @@ 
             }
         }
         
-        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++;
         $start=0;
         //echo "group : ".$val."\n";
         // returns evaluation of group as type 2 (boolean)
-        return array(2,$this->evaluation($val,$start));
+        return array(2, $this->evaluation($val, $start));
     }
     
-    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);
         }
@@ -105,54 +105,54 @@ 
         { // grouping
             return $this->get_group($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;
@@ -163,21 +163,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;
     }
@@ -190,56 +190,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]);
         }
@@ -252,17 +252,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;
@@ -281,14 +281,14 @@ 
      *	@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;
@@ -300,38 +300,38 @@ 
             // replace * with \* in oid for preg_replace
             $oid=preg_replace('/\*/', '\*', $oid);
             
-            $this->logging->log('OID in rule : '.$oid.' / '.$oidR,DEBUG );
+            $this->logging->log('OID in rule : '.$oid.' / '.$oidR, DEBUG);
             
-            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 +47 added lines, -20 removed lines

@@ -56,14 +56,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++;
@@ -91,7 +92,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);
@@ -125,7 +128,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -152,12 +157,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;
         }
@@ -177,7 +183,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;
     }
@@ -198,10 +207,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;
         }
         
@@ -210,31 +223,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])
         {
@@ -262,7 +285,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;
@@ -283,10 +308,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)
         {

bin/trap_class.php

Indentation +224 added lines, -224 removed lines

@@ -18,7 +18,7 @@ 
 class Trap
 {
 	// Configuration files and dirs
-    /** @var string Icinga etc path */
+	/** @var string Icinga etc path */
 	protected $icingaweb2_etc;
 	protected $trap_module_config; //< config.ini of module	
 	protected $icingaweb2_ressources; //< resources.ini of icingaweb2
@@ -62,7 +62,7 @@ 
 	
 	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
 	{
-	    // Paths of ini files
+		// Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
 		$this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";		
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
@@ -71,23 +71,23 @@ 
 		$this->logging = new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-		    $this->logSetup=true;
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
 		}
 		else
-		    $this->logSetup=false;
+			$this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
 		if (! is_file($this->trap_module_config))
 		{
-		    throw new Exception("Ini file ".$this->trap_module_config." does not exists");
+			throw new Exception("Ini file ".$this->trap_module_config." does not exists");
 		}
 		$trapConfig=parse_ini_file($this->trap_module_config,true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
-		    throw new Exception("Error reading ini file : ".$this->trap_module_config);
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+			throw new Exception("Error reading ini file : ".$this->trap_module_config);
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -121,26 +121,26 @@ 
 	 */
 	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->trap_module_config;
-	        }
-	        $this->logging->log($message,$log_level);
-	        return false;
-	    }
-	    else
-	    {
-	        $option_var=$option_array[$option_category][$option_name];
-	        return true;
-	    }
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+			}
+			$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)
 	{
 
@@ -159,10 +159,10 @@ 
 		// API options
 		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
 		{
-		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+			$this->api_use=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -172,45 +172,45 @@ 
 	 */
 	protected function setupDatabase($trapConfig)
 	{
-	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
 	    
 	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
-	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+		if ($this->api_use === 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->trap_module_config,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->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,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->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
 	}
 	
 	/**
@@ -221,9 +221,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);
 		}
 	}
 
@@ -234,10 +234,10 @@ 
 	}
 	
 	/** 
-	*   Get data from db_config
-	*	@param $element string name of param
-	*	@return mixed : value (or null)
-	*/	
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */	
 	protected function getDBConfig($element)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -255,15 +255,15 @@ 
 	}
 	
 	/** 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
-	**/	
+	 *	@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);
+		$this->logging->log($message, $level, $destination);
 	}
 	
 	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
@@ -273,19 +273,19 @@ 
 	
 	protected function getAPI()
 	{
-	    if ($this->icinga2api == null)
-	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
-	    }
-	    return $this->icinga2api;
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+		}
+		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
-	*/
+	 *	@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
@@ -293,7 +293,7 @@ 
 
 		if ($input_stream === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
 			$this->logging->log("Error reading stdin !",ERROR,'');
 			return null; // note : exception thrown by logging
 		}
@@ -302,21 +302,21 @@ 
 		$this->receivingHost=chop(fgets($input_stream));
 		if ($this->receivingHost === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$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->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->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
 		} 
 		else 
@@ -337,7 +337,7 @@ 
 			}
 			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->trap_data['trap_oid']=$matches[2];
 				}
@@ -353,7 +353,7 @@ 
 
 		if ($this->trap_data['trap_oid']=='unknown')
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
 			$this->logging->log('no trap oid found',ERROR,'');
 		} 
 
@@ -383,9 +383,9 @@ 
 
 	/** 
 	 * Translate oid into array(MIB,Name)
-	* @param $oid string oid to translate
-	* @return mixed : null if not found or 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
@@ -418,7 +418,7 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$matches=array();
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code === false) {
@@ -431,9 +431,9 @@ 
 	
 	/** 
 	 * Erase old trap records 
-	*	@param integer $days : erase traps when more than $days old
-	*	@return integer : number of lines deleted
-	**/
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
 	public function eraseOldTraps($days=0)
 	{
 		if ($days==0)
@@ -458,72 +458,72 @@ 
 	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
 	{
 	    
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$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'";
+		// 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 ."'";
+		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->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql= 'INSERT INTO '.$this->db_prefix.'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) {
+		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->trap_id=$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->trap_id=$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->trap_id=$inserted_id;
-	            break;
-	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,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->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+		$this->logging->log('id found: '. $this->trap_id,INFO );    
 	}
 	
 	/** Write trap data to trap database
-	*/
+	 */
 	public function writeTrapToDB()
 	{
 		
@@ -621,10 +621,10 @@ 
 	}
 
 	/** 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
-	*/	
+	 *	@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();
@@ -683,9 +683,9 @@ 
 	}
 
 	/** Add rule match to rule
-	*	@param id int : rule id
-	*   @param set int : value to set
-	*/
+	 *	@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();
@@ -702,65 +702,65 @@ 
 	 * @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->api_use === false)
-	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+		if ($this->api_use === 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->api_username, $this->api_password);
-	        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;
-	        }
-	    }
+			$api = $this->getAPI();
+			$api->setCredentials($this->api_username, $this->api_password);
+			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->api_username, $this->api_password);
-	    return $api->getHostByIP($ip);
+		$api = $this->getAPI();
+		$api->setCredentials($this->api_username, $this->api_password);
+		return $api->getHostByIP($ip);
 	}
 	
 	/** Resolve display. 
-	*	Changes _OID(<oid>) to value if found or text "<not in trap>"
-	*	@param $display string
-	*	@return string 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)
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -794,7 +794,7 @@ 
 	}
 	
 	/** Match rules for current trap and do action
-	*/
+	 */
 	public function applyRules()
 	{
 		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
@@ -832,12 +832,12 @@ 
 					{
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
-						    $this->trap_action.='Error sending status : check cmd/API';
+							$this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
-						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
@@ -854,15 +854,15 @@ 
 					$this->logging->log('action NOK : '.$action,INFO );
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-					    {
-					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
-					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
-    						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-					    }
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
 					}
 					else
 					{
@@ -885,9 +885,9 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-			    $this->trap_action.=' ERR : '.$e->getMessage();
-			    $this->trap_data['status']='error';
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trap_action.=' ERR : '.$e->getMessage();
+				$this->trap_data['status']='error';
 			}
 			
 		}
@@ -902,8 +902,8 @@ 
 	}
 
 	/** Add Time a action to rule
-	*	@param string $time : time to process to insert in SQL
-	*/
+	 *	@param string $time : time to process to insert in SQL
+	 */
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -920,9 +920,9 @@ 
 	/*********** 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
-	**/
+	 *	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

Spacing +192 added lines, -192 removed lines

@@ -38,9 +38,9 @@ 
 
 	// Logs
 	/** @var Logging Logging class. */
-	protected $logging;    //< Logging class.
+	protected $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
 	public $trapsDB; //< Database class
@@ -60,7 +60,7 @@ 
 	/** @var Rule rule class */
 	public $ruleClass;
 	
-	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	function __construct($etc_dir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
 	{
 	    // Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
@@ -68,10 +68,10 @@ 
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/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
@@ -79,14 +79,14 @@ 
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
-		if (! is_file($this->trap_module_config))
+		if (!is_file($this->trap_module_config))
 		{
 		    throw new Exception("Ini file ".$this->trap_module_config." does not exists");
 		}
-		$trapConfig=parse_ini_file($this->trap_module_config,true);
+		$trapConfig=parse_ini_file($this->trap_module_config, true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+		    $this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog');
 		    throw new Exception("Error reading ini file : ".$this->trap_module_config);
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
@@ -95,9 +95,9 @@ 
 		$this->getDatabaseOptions(); // Get options in database
 		if ($this->api_use === true) $this->getAPI(); // Setup API
 		
-		$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
 		
-		$this->ruleClass = new Rule($this->logging); //< Create Rule class
+		$this->ruleClass=new Rule($this->logging); //< Create Rule class
 		
 		$this->trap_data=array(
 			'source_ip'	=> 'unknown',
@@ -119,15 +119,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->trap_module_config;
+	            $message='No '.$option_name.' in config file: '.$this->trap_module_config;
 	        }
-	        $this->logging->log($message,$log_level);
+	        $this->logging->log($message, $log_level);
 	        return false;
 	    }
 	    else
@@ -145,24 +145,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->db_prefix);
+		$this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->db_prefix);
 
 		// API options
-		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
+		if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->api_hostname))
 		{
 		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->api_port);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->api_username);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -173,40 +173,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->trap_module_config,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trap_module_config, 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->icingaweb2_ressources,true)) === false)
+	   if (($dbConfig=parse_ini_file($this->icingaweb2_ressources, true)) === false)
 	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
+	    if (!array_key_exists($dbTrapName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+	    $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->db_prefix);
 	    
 	    if ($this->api_use === 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->trap_module_config,ERROR,'');
+	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config, 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->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
@@ -221,13 +221,13 @@ 
 		// 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);
 		}
 	}
 
-	protected function getDBConfigIfSet($element,&$variable)
+	protected function getDBConfigIfSet($element, &$variable)
 	{
 		$value=$this->getDBConfig($element);
 		if ($value != 'null') $variable=$value;
@@ -243,7 +243,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql='SELECT value from '.$this->db_prefix.'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();
@@ -260,22 +260,22 @@ 
 	*	@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);
 	}
 	
 	protected function getAPI()
 	{
 	    if ($this->icinga2api == null)
 	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+	        $this->icinga2api=new Icinga2API($this->api_hostname, $this->api_port);
 	    }
 	    return $this->icinga2api;
 	}
@@ -294,7 +294,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
 		}
 
@@ -303,21 +303,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 
 		{		
@@ -327,34 +327,34 @@ 
 			$this->trap_data['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->trap_data['trap_oid']=$matches[2];
 				}
 				else
 				{
-					$object= new stdClass;
-					$object->oid =$matches[1];
-					$object->value = $matches[2];
-					array_push($this->trap_data_ext,$object);
+					$object=new stdClass;
+					$object->oid=$matches[1];
+					$object->value=$matches[2];
+					array_push($this->trap_data_ext, $object);
 				}
 			}
 		}
 
-		if ($this->trap_data['trap_oid']=='unknown')
+		if ($this->trap_data['trap_oid'] == 'unknown')
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-			$this->logging->log('no trap oid found',ERROR,'');
+		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trap_data['source_ip']);
+			$this->logging->log('no trap oid found', ERROR, '');
 		} 
 
 		// Translate oids.
@@ -376,7 +376,7 @@ 
 		}
 		
 
-		$this->trap_data['status']= 'waiting';
+		$this->trap_data['status']='waiting';
 		
 		return $this->trap_data;
 	}
@@ -392,40 +392,40 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'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->db_prefix.'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]);
 		}	
 	}
 	
@@ -436,90 +436,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->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		$daysago=strtotime("-".$days." day");
+		$sql='delete from '.$this->db_prefix.'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->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+	    $sql='INSERT INTO '.$this->db_prefix.'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->trap_id=$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->trap_id=$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->trap_id,INFO );    
+	    $this->logging->log('id found: '.$this->trap_id, INFO);    
 	}
 	
 	/** Write trap data to trap database
@@ -536,86 +536,86 @@ 
 		$insert_col='';
 		$insert_val='';
 		// add date time
-		$this->trap_data['date_received'] = date("Y-m-d H:i:s");
+		$this->trap_data['date_received']=date("Y-m-d H:i:s");
 
 		$firstcol=1;
 		foreach ($this->trap_data 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->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql='INSERT INTO '.$this->db_prefix.'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->trap_id=$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->trap_id=$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->trap_id,INFO );
+		$this->logging->log('id found: '.$this->trap_id, INFO);
 		
 		// Fill trap extended data table
 		foreach ($this->trap_data_ext as $value) {			
 			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
 			$firstcol=1;
-			$value->trap_id = $this->trap_id;
+			$value->trap_id=$this->trap_id;
 			$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->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';			
+			$sql='INSERT INTO '.$this->db_prefix.'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, '');
 			}	
 		}	
 	}
@@ -625,14 +625,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->db_prefix.'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();
@@ -641,7 +641,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).
@@ -649,7 +649,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
@@ -660,15 +660,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];
@@ -691,7 +691,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql="UPDATE ".$this->db_prefix."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, '');
 		}
 	}
 	
@@ -703,23 +703,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->api_use === 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];
@@ -729,17 +729,17 @@ 
 	            $perfdata='';
 	        }
 	        
-	        $api = $this->getAPI();
+	        $api=$this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
-	        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;
 	        }
 	    }
@@ -747,7 +747,7 @@ 
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
+	    $api=$this->getAPI();
 	    $api->setCredentials($this->api_username, $this->api_password);
 	    return $api->getHostByIP($ip);
 	}
@@ -760,32 +760,32 @@ 
 	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;
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
 				if ($oid == $val->oid)
 				{
-					$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;
 				}				
 			}
@@ -797,11 +797,11 @@ 
 	*/
 	public function applyRules()
 	{
-		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+		$rules=$this->getRules($this->trap_data['source_ip'], $this->trap_data['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->trap_data['status']='unknown';
 			$this->trap_to_db=true;
 			return;
@@ -816,59 +816,59 @@ 
 			$service_name=$rule['service_name'];
 			
 			$display=$this->applyDisplay($rule['display']);
-			$this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+			$this->trap_action=($this->trap_action == null) ? '' : $this->trap_action.', ';
 			try
 			{
-				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
-				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext) ;
+				$this->logging->log('Rule to eval : '.$rule['rule'], INFO);
+				$evalr=$this->ruleClass->eval_rule($rule['rule'], $this->trap_data_ext);
 				//->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->trap_action.='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->trap_action.='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->trap_to_db=($action==-2)?false:true;
+					$this->trap_to_db=($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->trap_action.='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->trap_action.='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->trap_to_db=($action==-2)?false:true;					
+					$this->trap_to_db=($action == -2) ?false:true;					
 				}
 				// Put name in source_name
 				if (!isset($this->trap_data['source_name']))
@@ -877,7 +877,7 @@ 
 				}
 				else
 				{
-					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+					if (!preg_match('/'.$rule['host_name'].'/', $this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
@@ -885,13 +885,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->trap_action.=' ERR : '.$e->getMessage();
 			    $this->trap_data['status']='error';
 			}
 			
 		}
-		if ($this->trap_data['status']=='error')
+		if ($this->trap_data['status'] == 'error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
 		}
@@ -907,13 +907,13 @@ 
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
-		if ($this->trap_action==null) 
+		if ($this->trap_action == null) 
 		{
 			$this->trap_action='No action';
 		}
 		$sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_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, '');
 		}
 	}
 	
@@ -936,7 +936,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();
@@ -945,7 +945,7 @@ 
 		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."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();
@@ -961,13 +961,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;
 		
 	}

Braces +40 added lines, -39 removed lines

@@ -73,9 +73,9 @@ 
 		{
 		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
 		    $this->logSetup=true;
+		} else {
+				    $this->logSetup=false;
 		}
-		else
-		    $this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
@@ -93,7 +93,10 @@ 
 		$this->setupDatabase($trapConfig); // Setup database class
 		
 		$this->getDatabaseOptions(); // Get options in database
-		if ($this->api_use === true) $this->getAPI(); // Setup API
+		if ($this->api_use === true) {
+			$this->getAPI();
+		}
+		// Setup API
 		
 		$this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
 		
@@ -129,8 +132,7 @@ 
 	        }
 	        $this->logging->log($message,$log_level);
 	        return false;
-	    }
-	    else
+	    } else
 	    {
 	        $option_var=$option_array[$option_category][$option_name];
 	        return true;
@@ -194,7 +196,10 @@ 
 	    
 	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+	    if ($this->api_use === true) {
+	    	return;
+	    }
+	    // In case of API use, no IDO is necessary
         
 	    // IDO Database
 	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
@@ -219,9 +224,11 @@ 
 	protected function getDatabaseOptions()
 	{
 		// Database options
-		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		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);
 		}
@@ -230,7 +237,9 @@ 
 	protected function getDBConfigIfSet($element,&$variable)
 	{
 		$value=$this->getDBConfig($element);
-		if ($value != 'null') $variable=$value;
+		if ($value != 'null') {
+			$variable=$value;
+		}
 	}
 	
 	/** 
@@ -318,8 +327,7 @@ 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-		} 
-		else 
+		} else 
 		{		
 			$this->trap_data['source_ip']=$matches[1];
 			$this->trap_data['destination_ip']=$matches[3];
@@ -334,14 +342,12 @@ 
 			if ($ret_code===0 || $ret_code===false)
 			{
 				$this->logging->log('No match on trap data : '.$vars,WARN,'');
-			}
-			else 
+			} 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->trap_data['trap_oid']=$matches[2];
-				}
-				else
+				} else
 				{
 					$object= new stdClass;
 					$object->oid =$matches[1];
@@ -512,7 +518,9 @@ 
 	            }
 	            
 	            $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->trap_id=$inserted_id;
 	            break;
 	        default:
@@ -528,7 +536,9 @@ 
 	{
 		
 		// If action is ignore -> don't send t DB
-		if ($this->trap_to_db === false) return;
+		if ($this->trap_to_db === false) {
+			return;
+		}
 		
 		
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -585,7 +595,9 @@ 
 				}
 
 				$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->trap_id=$inserted_id;
 			break;
 			default: 
@@ -714,8 +726,7 @@ 
     		// 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
+	    } else
 	    {
 	        // Get perfdata if found
 	        $matches=array();
@@ -723,8 +734,7 @@ 
 	        {
 	            $display=$matches[1];
 	            $perfdata=$matches[2];
-	        }
-	        else
+	        } else
 	        {
 	            $perfdata='';
 	        }
@@ -736,8 +746,7 @@ 
 	        {
 	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
 	            return false;
-	        }
-	        else 
+	        } else 
 	        {
 	            $this->logging->log( "Sent result : " .$retmessage,INFO );
 	            return true;
@@ -833,20 +842,17 @@ 
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
-						}
-						else
+						} else
 						{
 						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
 					$this->trap_to_db=($action==-2)?false:true;
-				}
-				else
+				} else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
@@ -857,14 +863,12 @@ 
 					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
+					    } else
 					    {
     						$this->add_rule_match($rule['id'],$rule['num_match']+1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
@@ -874,16 +878,14 @@ 
 				if (!isset($this->trap_data['source_name']))
 				{
 					$this->trap_data['source_name']=$rule['host_name'];
-				}
-				else
+				} else
 				{
 					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{ 
 			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
@@ -894,8 +896,7 @@ 
 		if ($this->trap_data['status']=='error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
-		}
-		else
+		} else
 		{
 		  $this->trap_data['status']='done';
 		}