patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Rule.php

Braces +47 added lines, -20 removed lines

@@ -60,14 +60,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++;
@@ -95,7 +96,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);
@@ -129,7 +132,9 @@ 
     
     protected function eval_getOper($rule,&$item)
     {
-        while ($rule[$item]==' ') $item++;
+        while ($rule[$item]==' ') {
+        	$item++;
+        }
         switch ($rule[$item])
         {
             case '<':
@@ -156,12 +161,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;
         }
@@ -181,7 +187,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;
     }
@@ -202,10 +211,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;
         }
         
@@ -214,31 +227,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])
         {
@@ -266,7 +289,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;
@@ -287,10 +312,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)
         {