patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Mib.php

Braces +27 added lines, -10 removed lines

@@ -87,8 +87,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;
@@ -104,7 +103,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);
         
@@ -144,7 +145,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:
@@ -302,7 +305,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);
 
@@ -453,12 +459,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;
             }
@@ -476,9 +484,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]);
@@ -607,7 +619,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
             
@@ -624,7 +639,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;
             }
             

application/clicommands/MibCommand.php

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
 		if ($pid == 1)
 		{
 		    $trap->setLogging($logLevel,'display');
-		}
-		else
+		} else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
@@ -74,8 +73,7 @@ 
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
-		    }
-		    else
+		    } else
 		    {  // son process : close all file descriptors and go to a new session
 		        fclose($file);		        
 // 		        $sid = posix_setsid();
@@ -85,8 +83,7 @@ 
                 try
                 {
                     $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
                 }
@@ -103,8 +100,7 @@ 
 			$trap->mibClass->update_mib_database(true,$forceCheck);
 			echo "Done\n";
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}
@@ -147,8 +143,7 @@ 
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
             echo 'Deleted '. $query . " traps and objects\n";
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in DB : ' . $e->getMessage();
 		}