patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Rule.php

Indentation +253 added lines, -253 removed lines

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

Spacing +70 added lines, -70 removed lines

@@ -26,14 +26,14 @@ 
     }
     
     
-    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);
         }
@@ -50,54 +50,54 @@ 
         { // function
             return $this->get_function($rule, $item);
         }
-        throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+        throw new Exception("number/string not found in ".$rule." at ".$item.' : '.$rule[$item]);
         
     }
     
-    protected function eval_getNext($rule,$item,$tok)
+    protected function eval_getNext($rule, $item, $tok)
     {
         while (
-            ($rule[$item] != $tok ) 
+            ($rule[$item] != $tok) 
             && ($item < strlen($rule))) 
         { 
             $item++;
         }
-        if ($item==strlen($rule)) {
-            throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+        if ($item == strlen($rule)) {
+            throw new Exception("closing '".$tok."' not found in ".$rule." at ".$item);
         }
-        return $item+1;
+        return $item + 1;
     }
     
-    protected function eval_getOper($rule,&$item)
+    protected function eval_getOper($rule, &$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item] == ' ') $item++;
         switch ($rule[$item])
         {
             case '<':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-                $item++; return array(0,"<");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "<="); }
+                $item++; return array(0, "<");
             case '>':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-                $item++; return array(0,">");
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, ">="); }
+                $item++; return array(0, ">");
             case '=':
-                $item++; return array(0,"=");
+                $item++; return array(0, "=");
             case '!':
-                if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+                if ($rule[$item + 1] == '=') { $item+=2; return array(0, "!="); }
+                throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule." at ".$item);
             case '~':
-                $item++; return array(0,"~");
+                $item++; return array(0, "~");
             case '|':
-                $item++; return array(1,"|");
+                $item++; return array(1, "|");
             case '&':
-                $item++; return array(1,"&");
+                $item++; return array(1, "&");
             default	:
-                throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+                throw new Exception("Erreur in expr - operator not found in ".$rule." at ".$item);
         }
     }
     
-    private function check_negate_first($rule,&$item)
+    private function check_negate_first($rule, &$item)
     {
-        if ( $rule[$item] == '!') // If '!' found, negate next expression.
+        if ($rule[$item] == '!') // If '!' found, negate next expression.
         {
             $item++;
             return true;
@@ -108,21 +108,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;
     }
@@ -135,56 +135,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]);
         }
@@ -197,17 +197,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;
@@ -236,7 +236,7 @@ 
         // replace * with \* in oid for preg_replace
         $oid=preg_replace('/\*/', '\*', $oid);
         
-        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR,DEBUG );
+        $this->logging->log('Regexp eval : '.$oid.' / '.$oidR, DEBUG);
         
         return $oidR;
     }
@@ -247,50 +247,50 @@ 
      *  @param array $oidList : OIDs values to sustitute.
      *	@return bool : true : rule match, false : rule don't match , throw exception on error.
      */   
-    public function eval_rule($rule,$oidList)
+    public function eval_rule($rule, $oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule == null || $rule == '') // Empty rule is always true
         {
             return true;
         }
         $matches=array();
-        while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+        while (preg_match('/_OID\(([0-9\.\*]+)\)/', $rule, $matches) == 1)
         {
             $oid=$matches[1];
             $found=0;
             // Test and transform regexp
-            $oidR = $this->regexp_eval($oid);
+            $oidR=$this->regexp_eval($oid);
             
-            foreach($oidList as $val)
+            foreach ($oidList as $val)
             {
-                if (preg_match("/^$oidR$/",$val->oid) == 1)
+                if (preg_match("/^$oidR$/", $val->oid) == 1)
                 {
-                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/',$val->value))
+                    if (!preg_match('/^-?[0-9]*\.?[0-9]+$/', $val->value))
                     { // If not a number, change " to ' and put " around it
-                        $val->value=preg_replace('/"/',"'",$val->value);
+                        $val->value=preg_replace('/"/', "'", $val->value);
                         $val->value='"'.$val->value.'"';
                     }
                     $rep=0;
-                    $rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-                    if ($rep==0)
+                    $rule=preg_replace('/_OID\('.$oid.'\)/', $val->value, $rule, -1, $rep);
+                    if ($rep == 0)
                     {
-                        $this->logging->log("Error in rule_eval",WARN,'');
+                        $this->logging->log("Error in rule_eval", WARN, '');
                         return false;
                     }
                     $found=1;
                     break;
                 }
             }
-            if ($found==0)
+            if ($found == 0)
             {	// OID not found : throw error
                 throw new Exception('OID '.$oid.' not found in trap');
             }
         }
         $item=0;
         $rule=$this->eval_cleanup($rule);
-        $this->logging->log('Rule after clenup: '.$rule,INFO );
+        $this->logging->log('Rule after clenup: '.$rule, INFO);
         
-        return  $this->evaluation($rule,$item);
+        return  $this->evaluation($rule, $item);
     }
     
 }
\ No newline at end of file

Braces +43 added lines, -17 removed lines

@@ -32,7 +32,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);
@@ -70,7 +72,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -97,12 +101,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;
         }
@@ -122,7 +127,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;
     }
@@ -143,10 +151,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;
         }
         
@@ -155,31 +167,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])
         {
@@ -207,7 +229,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;
@@ -249,10 +273,12 @@ 
      */   
     public function eval_rule($rule,$oidList)
     {
-        if ($rule==null || $rule == '') // Empty rule is always true
+        if ($rule==null || $rule == '') {
+        	// Empty rule is always true
         {
             return true;
         }
+        }
         $matches=array();
         while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
         {

library/Trapdirector/TrapsProcess/RuleUtils.php

Indentation +108 added lines, -108 removed lines

@@ -12,126 +12,126 @@
 trait RuleUtils
 {
 
-    /**
-     * Get full number
-     * @param string $rule Rule as string
-     * @param int item current eval position
-     * @return array<int,string>
-     */
-    private function get_number(string $rule,int &$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";
+	/**
+	 * Get full number
+	 * @param string $rule Rule as string
+	 * @param int item current eval position
+	 * @return array<int,string>
+	 */
+	private function get_number(string $rule,int &$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);
+	}
 
-    /**
-     * Get a string (between ") 
-     * @param string $rule Rule as string
-     * @param int item current eval position
-     * @return array<int,string>
-     */
-    private function get_string(string $rule,int &$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);
+	/**
+	 * Get a string (between ") 
+	 * @param string $rule Rule as string
+	 * @param int item current eval position
+	 * @return array<int,string>
+	 */
+	private function get_string(string $rule,int &$item)
+	{
+		$item++;
+		$item2=$this->eval_getNext($rule,$item,'"');
+		$val=substr($rule,$item,$item2-$item-1);
+		$item=$item2;
+		//echo "string : ".$val."\n";
+		return array(1,$val);
         
-    }
+	}
     
-    /**
-     * Parse elements inside () : jumps over "" and count parenthesis.
-     * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
-     * @param string $rule : the current rule
-     * @param int $item : actual position in rule
-     * @throws Exception
-     * @return string : everything inside parenthesis
-     */
-    private function parse_parenthesis(string $rule,int &$item) : string
-    {
-        $item++;
-        $start=$item;
-        $parenthesis_count=0;
-        while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
-        {
-            if ($rule[$item] == '"' )
-            { // pass through string
-                $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
-            }
-            else{
-                if ($rule[$item] == '(')
-                {
-                    $parenthesis_count++;
-                }
-                if ($rule[$item] == ')')
-                {
-                    $parenthesis_count--;
-                }
-                $item++;
-            }
-        }
+	/**
+	 * Parse elements inside () : jumps over "" and count parenthesis.
+	 * Ex : ( "test" != ")test" & (1==2) ) will return "test" != ")test" & (1==2)
+	 * @param string $rule : the current rule
+	 * @param int $item : actual position in rule
+	 * @throws Exception
+	 * @return string : everything inside parenthesis
+	 */
+	private function parse_parenthesis(string $rule,int &$item) : string
+	{
+		$item++;
+		$start=$item;
+		$parenthesis_count=0;
+		while (($item < strlen($rule)) // Not end of string AND
+			&& ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+		{
+			if ($rule[$item] == '"' )
+			{ // pass through string
+				$item++;
+				$item=$this->eval_getNext($rule,$item,'"');
+			}
+			else{
+				if ($rule[$item] == '(')
+				{
+					$parenthesis_count++;
+				}
+				if ($rule[$item] == ')')
+				{
+					$parenthesis_count--;
+				}
+				$item++;
+			}
+		}
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
-        $item++;
-        return $val;
-    }
+		if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
+		$val=substr($rule,$start,$item-$start);
+		$item++;
+		return $val;
+	}
 
-    /**
-     * Get and eval a grouped condition - ex : (1==1)
-     * @param string $rule
-     * @param int $item
-     * @return array<int,string>
-     */
-    private function get_group(string $rule,int &$item) : array
-    {
-        // gets eveything inside parenthesis
-        $val=$this->parse_parenthesis($rule, $item);
-        // Returns boolean with evaluation of all inside parenthesis
-        $start=0;
-        return array(2,$this->evaluation($val,$start));
-    }
+	/**
+	 * Get and eval a grouped condition - ex : (1==1)
+	 * @param string $rule
+	 * @param int $item
+	 * @return array<int,string>
+	 */
+	private function get_group(string $rule,int &$item) : array
+	{
+		// gets eveything inside parenthesis
+		$val=$this->parse_parenthesis($rule, $item);
+		// Returns boolean with evaluation of all inside parenthesis
+		$start=0;
+		return array(2,$this->evaluation($val,$start));
+	}
     
-    /**
-     * @param string $rule
-     * @param int $item
-     * @throws Exception
-     * @return array<int,string>
-     */
-    private function get_function(string $rule,int &$item) : array
-    {
-        // function is : __function(param1,param2...)
-        $start=$item;
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
-        {
-            $item++;
-        }
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+	/**
+	 * @param string $rule
+	 * @param int $item
+	 * @throws Exception
+	 * @return array<int,string>
+	 */
+	private function get_function(string $rule,int &$item) : array
+	{
+		// function is : __function(param1,param2...)
+		$start=$item;
+		while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+		{
+			$item++;
+		}
+		if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
-        // get parameters between parenthesis
+		// get parameters between parenthesis
         
-        $this->parse_parenthesis($rule, $item);
+		$this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+		$val=substr($rule,$start,$item-$start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+		$this->logging->log('got function ' . $val,DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+		return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
         
-    }
+	}
     
 }
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -18,20 +18,20 @@ 
      * @param int item current eval position
      * @return array<int,string>
      */
-    private function get_number(string $rule,int &$item)
+    private function get_number(string $rule, int &$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);
     }
 
     /**
@@ -40,14 +40,14 @@ 
      * @param int item current eval position
      * @return array<int,string>
      */
-    private function get_string(string $rule,int &$item)
+    private function get_string(string $rule, int &$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);
         
     }
     
@@ -59,20 +59,20 @@ 
      * @throws Exception
      * @return string : everything inside parenthesis
      */
-    private function parse_parenthesis(string $rule,int &$item) : string
+    private function parse_parenthesis(string $rule, int &$item) : string
     {
         $item++;
         $start=$item;
         $parenthesis_count=0;
         while (($item < strlen($rule)) // Not end of string AND
-            && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+            && (($rule[$item] != ')') || $parenthesis_count > 0)) // Closing ')' or embeded ()
         {
-            if ($rule[$item] == '"' )
+            if ($rule[$item] == '"')
             { // pass through string
                 $item++;
-                $item=$this->eval_getNext($rule,$item,'"');
+                $item=$this->eval_getNext($rule, $item, '"');
             }
-            else{
+            else {
                 if ($rule[$item] == '(')
                 {
                     $parenthesis_count++;
@@ -85,8 +85,8 @@ 
             }
         }
         
-        if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-        $val=substr($rule,$start,$item-$start);
+        if ($item == strlen($rule)) {throw new Exception("no closing () in ".$rule." at ".$item); }
+        $val=substr($rule, $start, $item - $start);
         $item++;
         return $val;
     }
@@ -97,13 +97,13 @@ 
      * @param int $item
      * @return array<int,string>
      */
-    private function get_group(string $rule,int &$item) : array
+    private function get_group(string $rule, int &$item) : array
     {
         // gets eveything inside parenthesis
         $val=$this->parse_parenthesis($rule, $item);
         // Returns boolean with evaluation of all inside parenthesis
         $start=0;
-        return array(2,$this->evaluation($val,$start));
+        return array(2, $this->evaluation($val, $start));
     }
     
     /**
@@ -112,25 +112,25 @@ 
      * @throws Exception
      * @return array<int,string>
      */
-    private function get_function(string $rule,int &$item) : array
+    private function get_function(string $rule, int &$item) : array
     {
         // function is : __function(param1,param2...)
         $start=$item;
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(')) // Not end of string AND not opening '('
         {
             $item++;
         }
-        if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
+        if ($item == strlen($rule)) {throw new Exception("no opening () for function in ".$rule." at ".$item); }
         
         // get parameters between parenthesis
         
         $this->parse_parenthesis($rule, $item);
         
-        $val=substr($rule,$start,$item-$start);
+        $val=substr($rule, $start, $item - $start);
         
-        $this->logging->log('got function ' . $val,DEBUG);
+        $this->logging->log('got function '.$val, DEBUG);
         
-        return array(2,$this->trapClass->pluginClass->evaluateFunctionString($val));
+        return array(2, $this->trapClass->pluginClass->evaluateFunctionString($val));
         
     }
     

Braces +7 added lines, -4 removed lines

@@ -65,14 +65,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++;
@@ -116,10 +117,12 @@ 
     {
         // function is : __function(param1,param2...)
         $start=$item;
-        while (($item < strlen($rule)) && ($rule[$item] != '(' )) // Not end of string AND not opening '('
+        while (($item < strlen($rule)) && ($rule[$item] != '(' )) {
+        	// Not end of string AND not opening '('
         {
             $item++;
         }
+        }
         if ($item==strlen($rule)) {throw new Exception("no opening () for function in ".$rule ." at " .$item);}
         
         // get parameters between parenthesis

library/Trapdirector/TrapsProcess/MibDatabase.php

Indentation +154 added lines, -154 removed lines

@@ -12,183 +12,183 @@
  */
 trait MibDatabase
 {   
-    /** @var array $oidDesc MUST be overide by calling class */
-    //protected $oidDesc;
+	/** @var array $oidDesc MUST be overide by calling class */
+	//protected $oidDesc;
     
-    /** @var array $dbOidIndex MUST be overide by calling class */
-    //protected $dbOidIndex;
+	/** @var array $dbOidIndex MUST be overide by calling class */
+	//protected $dbOidIndex;
     
-    /** @return \Trapdirector\Logging */
-    abstract public function getLogging();
+	/** @return \Trapdirector\Logging */
+	abstract public function getLogging();
     
-    /** @return \Trapdirector\Database */
-    abstract public function getTrapsDB();
+	/** @return \Trapdirector\Database */
+	abstract public function getTrapsDB();
 
     
-    /**
-     * Update or add an OID to database uses $this->dbOidIndex for mem cache
-     * and $this->oidDesc doe data
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    public function update_oid()
-    {
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Quote description.
-        $this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
+	/**
+	 * Update or add an OID to database uses $this->dbOidIndex for mem cache
+	 * and $this->oidDesc doe data
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	public function update_oid()
+	{
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Quote description.
+		$this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
         
-        if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
-        { // oid exists in db, so update
-            return $this->update_oid_update();
-        }
-        // create new OID.
-        return $this->update_oid_create();
+		if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
+		{ // oid exists in db, so update
+			return $this->update_oid_update();
+		}
+		// create new OID.
+		return $this->update_oid_create();
         
-    }
+	}
     
-    /**
-     * Update object in DB with object in dbOidIndex if name/mib/type has changed.
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_update()
-    {
+	/**
+	 * Update object in DB with object in dbOidIndex if name/mib/type has changed.
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_update()
+	{
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
         
-        if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
-        { // newly created.
-            return 0;
-        }
-        $oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
-        $dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
-        if ( $this->oidDesc['name'] != $dbOid['name'] ||
-            $this->oidDesc['mib'] != $dbOid['mib'] ||
-            $this->oidDesc['type'] !=$dbOid['type']
-            )
-        { // Do update
-            $sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
-                'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
-                ', syntax = :syntax, type_enum = :type_enum, description = :description '.
-                ' WHERE id= :id';
-            $sqlQuery=$db_conn->prepare($sql);
+		if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
+		{ // newly created.
+			return 0;
+		}
+		$oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
+		$dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
+		if ( $this->oidDesc['name'] != $dbOid['name'] ||
+			$this->oidDesc['mib'] != $dbOid['mib'] ||
+			$this->oidDesc['type'] !=$dbOid['type']
+			)
+		{ // Do update
+			$sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
+				'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
+				', syntax = :syntax, type_enum = :type_enum, description = :description '.
+				' WHERE id= :id';
+			$sqlQuery=$db_conn->prepare($sql);
             
-            $sqlParam=array(
-                ':name' => $this->oidDesc['name'],
-                ':type' => $this->oidDesc['type'],
-                ':mib' => $this->oidDesc['mib'],
-                ':tc' =>  $this->oidDesc['textconv']??'null',
-                ':display_hint' => $this->oidDesc['dispHint']??'null' ,
-                ':syntax' => $this->oidDesc['syntax']==null??'null',
-                ':type_enum' => $this->oidDesc['type_enum']??'null',
-                ':description' => $this->oidDesc['description']??'null',
-                ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
-            );
+			$sqlParam=array(
+				':name' => $this->oidDesc['name'],
+				':type' => $this->oidDesc['type'],
+				':mib' => $this->oidDesc['mib'],
+				':tc' =>  $this->oidDesc['textconv']??'null',
+				':display_hint' => $this->oidDesc['dispHint']??'null' ,
+				':syntax' => $this->oidDesc['syntax']==null??'null',
+				':type_enum' => $this->oidDesc['type_enum']??'null',
+				':description' => $this->oidDesc['description']??'null',
+				':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
-            }
-            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 1;
-        }
-        else
-        {
-            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 0;
-        }
-    }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
+			}
+			$this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 1;
+		}
+		else
+		{
+			$this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 0;
+		}
+	}
 
-    /**
-     * Create object in DB with object in dbOidIndex
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_create()
-    {
-        // Insert data
+	/**
+	 * Create object in DB with object in dbOidIndex
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_create()
+	{
+		// Insert data
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        $sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
-            '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
-            'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-            ', :syntax, :type_enum, :description )';
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		$sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
+			'(oid, name, type , mib, textual_convention, display_hint '.
+			', syntax, type_enum , description ) ' .
+			'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
         
-        $sqlQuery=$db_conn->prepare($sql);
+		$sqlQuery=$db_conn->prepare($sql);
         
-        $sqlParam=array(
-            ':oid' => $this->oidDesc['oid'],
-            ':name' => $this->oidDesc['name'],
-            ':type' => $this->oidDesc['type'],
-            ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  $this->oidDesc['textconv']??'null',
-            ':display_hint' => $this->oidDesc['dispHint']??'null',
-            ':syntax' => $this->oidDesc['syntax']??'null',
-            ':type_enum' => $this->oidDesc['type_enum']??'null',
-            ':description' => $this->oidDesc['description']??'null'
-        );
+		$sqlParam=array(
+			':oid' => $this->oidDesc['oid'],
+			':name' => $this->oidDesc['name'],
+			':type' => $this->oidDesc['type'],
+			':mib' => $this->oidDesc['mib'],
+			':tc' =>  $this->oidDesc['textconv']??'null',
+			':display_hint' => $this->oidDesc['dispHint']??'null',
+			':syntax' => $this->oidDesc['syntax']??'null',
+			':type_enum' => $this->oidDesc['type_enum']??'null',
+			':description' => $this->oidDesc['description']??'null'
+		);
         
-        if ($sqlQuery->execute($sqlParam) === false) {
-            $this->getLogging()->log('Error in query : ' . $sql,1,'');
-        }
+		if ($sqlQuery->execute($sqlParam) === false) {
+			$this->getLogging()->log('Error in query : ' . $sql,1,'');
+		}
         
-        switch ($this->getTrapsDB()->trapDBType)
-        {
-            case 'pgsql':
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->getLogging()->log('Error getting id - pgsql - ',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
-                    return 0;
-                }
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
-                    return 0;
-                }
+		switch ($this->getTrapsDB()->trapDBType)
+		{
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
+					$this->getLogging()->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
+					return 0;
+				}
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
+					return 0;
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
-                break;
-            default:
-                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
-                return 0;
-        }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
+				break;
+			default:
+				$this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
+				return 0;
+		}
         
-        // Set as newly created.
-        $this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
-        return 2;
-    }
+		// Set as newly created.
+		$this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
+		return 2;
+	}
 
-    /**
-     * get all objects for a trap.
-     * @param integer $trapId
-     * @return array : array of cached objects
-     */
-    private function cache_db_objects($trapId)
-    {
-        $dbObjects=array(); // cache of objects for trap in db
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Get all objects
-        $sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->getLogging()->log('No result in query : ' . $sql,1,'');
-        }
-        $dbObjectsRaw=$ret_code->fetchAll();
+	/**
+	 * get all objects for a trap.
+	 * @param integer $trapId
+	 * @return array : array of cached objects
+	 */
+	private function cache_db_objects($trapId)
+	{
+		$dbObjects=array(); // cache of objects for trap in db
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Get all objects
+		$sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+		$this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->getLogging()->log('No result in query : ' . $sql,1,'');
+		}
+		$dbObjectsRaw=$ret_code->fetchAll();
         
-        foreach ($dbObjectsRaw as $val)
-        {
-            $dbObjects[$val['object_id']]=1;
-        }
-        return $dbObjects;
-    }
+		foreach ($dbObjectsRaw as $val)
+		{
+			$dbObjects[$val['object_id']]=1;
+		}
+		return $dbObjects;
+	}
     
 
 }
\ No newline at end of file