patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Mib.php

Braces +27 added lines, -10 removed lines

@@ -86,8 +86,7 @@ 
                 }
                 $this->logging->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
                 return 1;
-            }
-            else
+            } else
             {
                 $this->logging->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
                 return 0;
@@ -103,7 +102,9 @@ 
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->trapsDB->trapDBType == 'pgsql') {
+        	$sql .= 'RETURNING id';
+        }
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -143,7 +144,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->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
                 break;
             default:
@@ -301,7 +304,10 @@ 
             $this->reset_oidDesc();
             
             $snmptrans=$this->get_object_details($object, $trapmib); // Get object mib & details
-            if ($snmptrans === null) continue; // object not found
+            if ($snmptrans === null) {
+            	continue;
+            }
+            // object not found
             
             $this->parse_object($snmptrans);
 
@@ -452,12 +458,14 @@ 
         $this->oidDesc['name']=$match[1]; // Name
         $this->oidDesc['type']=$match[2]; // type (21=trap, 0: may be trap, else : not trap
         
-        if ($this->oidDesc['type']==0) // object type=0 : check if v1 trap
+        if ($this->oidDesc['type']==0) {
+        	// object type=0 : check if v1 trap
         {
             // Check if next is suboid -> in that case is cannot be a trap
             if (preg_match("/^".$this->oidDesc['oid']."/",$this->objectsAll[$curElement+1]))
             {
                 $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+        }
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -475,9 +483,11 @@ 
             // Force as trap.
             $this->oidDesc['type']=21;
         }
-        if ($onlyTraps===true && $this->oidDesc['type']!=21) // if only traps and not a trap, continue
+        if ($onlyTraps===true && $this->oidDesc['type']!=21) {
+        	// if only traps and not a trap, continue
         {
             $this->timing['nottrap_time'] += microtime(true) - $this->timing['base_time'];
+        }
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -503,7 +513,9 @@ 
         $this->oidDesc['mib']=$match[1];
         
         $numLine=1;
-        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+        while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+        	$numLine++;
+        }
         if (isset($snmptrans[$numLine]))
         {
             $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -575,7 +587,10 @@ 
             $this->timing['num_traps']++;
             
             $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+            if ($display_progress) {
+            	echo '#';
+            }
+            // echo a # when trap found
             
             //################################
             // get trap objects & source MIB
@@ -593,7 +608,9 @@ 
             if (($update==0) && ($check_change===false))
             { // Trapd didn't change & force check disabled
                 $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
-                if ($display_progress) echo "C";
+                if ($display_progress) {
+                	echo "C";
+                }
                 continue;
             }