patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Mib.php

Spacing +116 added lines, -116 removed lines

@@ -32,7 +32,7 @@ 
      * @param Logging $logClass : where to log
      * @param Database $dbClass : Database
      */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+    function __construct($logClass, $dbClass, $snmptrans, $snmptransdir)
     {
         $this->logging=$logClass;
         $this->trapsDB=$dbClass;
@@ -59,9 +59,9 @@ 
             }
             $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'] ||
+            if ($this->oidDesc['name'] != $dbOid['name'] ||
                 $this->oidDesc['mib'] != $dbOid['mib'] ||
-                $this->oidDesc['type'] !=$dbOid['type']
+                $this->oidDesc['type'] != $dbOid['type']
                )
             { // Do update
                 $sql='UPDATE '.$this->trapsDB->dbPrefix.'mib_cache SET '.
@@ -75,22 +75,22 @@ 
                     ':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',
+                    ':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->logging->log('Error in query : ' . $sql,ERROR,'');
+                    $this->logging->log('Error in query : '.$sql, ERROR, '');
                 }
-                $this->logging->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+                $this->logging->log('Trap updated : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
                 return 1;
             }
             else
             {
-                $this->logging->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+                $this->logging->log('Trap unchanged : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
                 return 0;
             }
         }
@@ -100,11 +100,11 @@ 
         
         $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache '.
             '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
+            ', syntax, type_enum , description ) '.
             '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);
         
@@ -113,15 +113,15 @@ 
             ':name' => $this->oidDesc['name'],
             ':type' => $this->oidDesc['type'],
             ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  ($this->oidDesc['textconv']==null)?'null':$this->oidDesc['textconv'] ,
-            ':display_hint' => ($this->oidDesc['dispHint']==null)?'null':$this->oidDesc['dispHint'] ,
-            ':syntax' => ($this->oidDesc['syntax']==null)?'null':$this->oidDesc['syntax'],
-            ':type_enum' => ($this->oidDesc['type_enum']==null)?'null':$this->oidDesc['type_enum'],
-            ':description' => ($this->oidDesc['description']==null)?'null':$this->oidDesc['description']
+            ':tc' =>  ($this->oidDesc['textconv'] == null) ? 'null' : $this->oidDesc['textconv'],
+            ':display_hint' => ($this->oidDesc['dispHint'] == null) ? 'null' : $this->oidDesc['dispHint'],
+            ':syntax' => ($this->oidDesc['syntax'] == null) ? 'null' : $this->oidDesc['syntax'],
+            ':type_enum' => ($this->oidDesc['type_enum'] == null) ? 'null' : $this->oidDesc['type_enum'],
+            ':description' => ($this->oidDesc['description'] == null) ? 'null' : $this->oidDesc['description']
         );
         
         if ($sqlQuery->execute($sqlParam) === false) {
-            $this->logging->log('Error in query : ' . $sql,1,'');
+            $this->logging->log('Error in query : '.$sql, 1, '');
         }
         
         switch ($this->trapsDB->trapDBType)
@@ -129,10 +129,10 @@ 
             case 'pgsql':
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->logging->log('Error getting id - pgsql - ',1,'');
+                    $this->logging->log('Error getting id - pgsql - ', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id - pgsql - empty.',1,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id - pgsql - empty.', 1, '');
                 }
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
                 break;
@@ -140,15 +140,15 @@ 
                 // 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 getting id - mysql - ',1,'');
+                    $this->logging->log('Erreur getting id - mysql - ', 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->dbOidIndex[$this->oidDesc['oid']]['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, '');
         }
         
         // Set as newly created.
@@ -167,9 +167,9 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         // Get all objects
         $sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+        $this->logging->log('SQL query get all traps: '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,1,'');
+            $this->logging->log('No result in query : '.$sql, 1, '');
         }
         $dbObjectsRaw=$ret_code->fetchAll();
         
@@ -186,30 +186,30 @@ 
  * @param string $trapmib : mib of trap
  * @return NULL|array : null if not found, or output of snmptranslate
  */
-    private function get_object_details($object,$trapmib)
+    private function get_object_details($object, $trapmib)
     {
         $match=$snmptrans=array();
         $retVal=0;
         $this->oidDesc['mib']=$trapmib;
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -On -Td '.$this->oidDesc['mib'].'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -On -Td '.$this->oidDesc['mib'].'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+        if ($retVal != 0)
         {
             // Maybe not trap mib, search with IR
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+            if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
             { // Not found -> continue with warning
-                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+                $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
                 return null;
             }
             $this->oidDesc['mib']=$match[1];
             
             // Do the snmptranslate again.
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -On -Td '.$this->oidDesc['mib'].'::'.$object,$snmptrans,$retVal);
-            if ($retVal!=0) {
-                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object,2,'');
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -On -Td '.$this->oidDesc['mib'].'::'.$object, $snmptrans, $retVal);
+            if ($retVal != 0) {
+                $this->logging->log('Error finding trap object : '.$this->oidDesc['mib'].'::'.$object, 2, '');
                 return null;
             }
             
@@ -229,12 +229,12 @@ 
         
         foreach ($snmptrans as $line)
         {
-            if ($indesc===true)
+            if ($indesc === true)
             {
-                $line=preg_replace('/[\t ]+/',' ',$line);
-                if (preg_match('/(.*)"$/', $line,$match))
+                $line=preg_replace('/[\t ]+/', ' ', $line);
+                if (preg_match('/(.*)"$/', $line, $match))
                 {
-                    $this->oidDesc['description'] = $tmpdesc . $match[1];
+                    $this->oidDesc['description']=$tmpdesc.$match[1];
                     $indesc=false;
                 }
                 $tmpdesc.=$line;
@@ -245,34 +245,34 @@ 
                 $this->oidDesc['oid']=$line;
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 $this->oidDesc['type_enum']=$match[2];
                 continue;
             }
-            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['syntax']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['dispHint']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
             {
                 $this->oidDesc['description']=$match[1];
                 continue;
             }
-            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
             {
                 $tmpdesc=$match[1];
                 $indesc=true;
                 continue;
             }
-            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
             {
                 $this->oidDesc['textconv']=$match[1];
                 continue;
@@ -287,9 +287,9 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+    public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
     {              
-        $trapId = $this->dbOidIndex[$trapOID]['id']; // Get id of trap
+        $trapId=$this->dbOidIndex[$trapOID]['id']; // Get id of trap
         
         if ($check_existing === true)
         {
@@ -306,9 +306,9 @@ 
             
             $this->parse_object($snmptrans);
 
-            $this->oidDesc['name'] = $object;
+            $this->oidDesc['name']=$object;
             
-            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'],DEBUG );
+            $this->logging->log("Adding object ".$this->oidDesc['name']." : ".$this->oidDesc['oid']." / ".$this->oidDesc['syntax']." / ".$this->oidDesc['type_enum']." / ".$this->oidDesc['dispHint']." / ".$this->oidDesc['textconv'], DEBUG);
 
             // Update
             $this->update_oid();
@@ -333,7 +333,7 @@ 
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$this->oidDesc['oid']]['id'] ,1,'');
+                $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$this->oidDesc['oid']]['id'], 1, '');
             }
         }
         if ($check_existing === true)
@@ -350,7 +350,7 @@ 
         $this->oidDesc['type']=null;
         $this->oidDesc['mib']=null;
         $this->oidDesc['textconv']=null;
-        $this->oidDesc['dispHint'] =null;
+        $this->oidDesc['dispHint']=null;
         $this->oidDesc['syntax']=null;
         $this->oidDesc['type_enum']=null;
         $this->oidDesc['description']=null;
@@ -364,17 +364,17 @@ 
     {
         $retVal=0;
         // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+        $snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.' -On -Tto 2>/dev/null';
+        $this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
         unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
+        exec($snmpCommand, $this->objectsAll, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
+            $this->logging->log('error executing snmptranslate', ERROR, '');
         }
         // Count elements to show progress
         $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
         return $numElements;
     }
 
@@ -388,14 +388,14 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $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, '');
         }
         $this->dbOidAll=$ret_code->fetchAll();
         $this->dbOidIndex=array();
         // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
+        foreach ($this->dbOidAll as $key=>$val)
         {
             $this->dbOidIndex[$val['oid']]['key']=$key;
             $this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -428,13 +428,13 @@ 
      * @param bool $onlyTraps : set to false to get all and not only traps.
      * @return boolean : false if it's a trap , true if not
      */
-    private function detect_trap($curElement,$onlyTraps)
+    private function detect_trap($curElement, $onlyTraps)
     {
         // Get oid or pass if not found
-        if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+        if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
         {
-            $this->timing['base_parse_time'] += microtime(true) - $this->timing['base_time'];
-            $this->timing['base_parse_num'] ++;
+            $this->timing['base_parse_time']+=microtime(true) - $this->timing['base_time'];
+            $this->timing['base_parse_num']++;
             return true;
         }
         $this->oidDesc['oid']=$this->objectsAll[$curElement];
@@ -443,9 +443,9 @@ 
         $curElement++;
         $match=$snmptrans=array();
         if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-            $this->objectsAll[$curElement],$match))
+            $this->objectsAll[$curElement], $match))
         {
-            $this->timing['base_check_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['base_check_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['base_check_num']++;
             return true;
         }
@@ -453,22 +453,22 @@ 
         $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]))
+            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_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
             unset($snmptrans);
             $retVal=0;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-                ' -Td '.$this->oidDesc['oid'] . ' | grep OBJECTS ',$snmptrans,$retVal);
-            if ($retVal!=0)
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+                ' -Td '.$this->oidDesc['oid'].' | grep OBJECTS ', $snmptrans, $retVal);
+            if ($retVal != 0)
             {
-                $this->timing['type0_check_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['type0_check_time']+=microtime(true) - $this->timing['base_time'];
                 $this->timing['type0_check_num']++;
                 return true;
             }
@@ -476,9 +476,9 @@ 
             // 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_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['nottrap_num']++;
             return true;
         }
@@ -489,33 +489,33 @@ 
     {
         $retVal=0;
         $match=$snmptrans=array();
-        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslateDirs.
-            ' -Td '.$this->oidDesc['oid'],$snmptrans,$retVal);
-        if ($retVal!=0)
+        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslateDirs.
+            ' -Td '.$this->oidDesc['oid'], $snmptrans, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR);
+            $this->logging->log('error executing snmptranslate', ERROR);
         }
         
-        if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+        if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
         {
-            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : ' . $snmptrans[0],ERROR);
+            $this->logging->log('Error getting mib from trap '.$this->oidDesc['oid'].' : '.$snmptrans[0], ERROR);
         }
         $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]);
+            $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
             
-            while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+            while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
             {
-                $this->oidDesc['description'].=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+                $this->oidDesc['description'].=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
                 $numLine++;
             }
             if (isset($snmptrans[$numLine])) {
-                $this->oidDesc['description'].=preg_replace('/".*/','',$snmptrans[$numLine]);
-                $this->oidDesc['description']=preg_replace('/[\t ]+/',' ',$this->oidDesc['description']);
+                $this->oidDesc['description'].=preg_replace('/".*/', '', $snmptrans[$numLine]);
+                $this->oidDesc['description']=preg_replace('/[\t ]+/', ' ', $this->oidDesc['description']);
             }
             
         }
@@ -533,23 +533,23 @@ 
         $match=array();
         foreach ($snmptrans as $line)
         {
-            if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+            if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
             {
                 $objectName=$match[1];
             }
         }
         if ($objectName == null)
         {
-            $this->logging->log('No objects for ' . $this->oidDesc['oid'],DEBUG);
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->logging->log('No objects for '.$this->oidDesc['oid'], DEBUG);
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             return null;
         }
         
         $trapObjects=array();
-        while (preg_match('/ *([^ ,]+) *,* */',$objectName,$match))
+        while (preg_match('/ *([^ ,]+) *,* */', $objectName, $match))
         {
-            array_push($trapObjects,$match[1]);
-            $objectName=preg_replace('/'.$match[0].'/','',$objectName);
+            array_push($trapObjects, $match[1]);
+            $objectName=preg_replace('/'.$match[0].'/', '', $objectName);
         }
         return $trapObjects;
     }
@@ -561,18 +561,18 @@ 
      * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
      * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
      */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+    public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
     {
         // Global Timing
-        $timeTaken = microtime(true);
+        $timeTaken=microtime(true);
         
         $numElements=$this->load_mibs_snmptranslate(); // Load objectsAll
         
         $this->load_mibs_from_db(); // Load from db dbOidAll & dbOidIndex
         
-        $step=$basestep=$numElements/10; // output display of % done
+        $step=$basestep=$numElements / 10; // output display of % done
         $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+        $timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
         
         // Create index for trap objects
         $this->trapObjectsIndex=array();
@@ -580,33 +580,33 @@ 
         // detailed timing (time_* vars)
         $this->reset_update_timers();
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
+        for ($curElement=0; $curElement < $numElements; $curElement++)
         {
-            $this->timing['base_time']= microtime(true);
+            $this->timing['base_time']=microtime(true);
             if ($display_progress)
             {
-                if ((microtime(true)-$timeFiveSec) > 2)
+                if ((microtime(true) - $timeFiveSec) > 2)
                 { // echo a . every 2 sec
                     echo '.';
-                    $timeFiveSec = microtime(true);
+                    $timeFiveSec=microtime(true);
                 }
-                if ($curElement>$step)
+                if ($curElement > $step)
                 { // display progress
                     $num_step++;
                     $step+=$basestep;   
-                    echo "\n" . ($num_step*10). '% : ';
+                    echo "\n".($num_step * 10).'% : ';
                 }
             }
             
             $this->reset_oidDesc();
-            if ($this->detect_trap($curElement,$onlyTraps)===true)
+            if ($this->detect_trap($curElement, $onlyTraps) === true)
             {
                 continue;
             }
             
             $this->timing['num_traps']++;
             
-            $this->logging->log('Found trap : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],INFO );
+            $this->logging->log('Found trap : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], INFO);
             if ($display_progress) echo '#'; // echo a # when trap found
 
             // get trap objects & source MIB
@@ -616,14 +616,14 @@ 
 
             $update=$this->update_oid(); // Do update of trap.
             
-            $this->timing['update_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['update_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['update_num']++;
             
-            $this->timing['base_time']= microtime(true); // Reset to check object time
+            $this->timing['base_time']=microtime(true); // Reset to check object time
             
-            if (($update==0) && ($check_change===false))
+            if (($update == 0) && ($check_change === false))
             { // Trapd didn't change & force check disabled
-                $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+                $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
                 if ($display_progress) echo "C";
                 continue;
             }
@@ -636,17 +636,17 @@ 
            
             $this->trap_objects($this->oidDesc['oid'], $this->oidDesc['mib'], $trapObjects, false);
             
-            $this->timing['objects_time'] += microtime(true) - $this->timing['base_time'];
+            $this->timing['objects_time']+=microtime(true) - $this->timing['base_time'];
             $this->timing['objects_num']++;
         }
         
         if ($display_progress)
         {
-            echo "\nNumber of processed traps :  ". $this->timing['num_traps'] ."\n";
-            echo "\nParsing : " . number_format($this->timing['base_parse_time']+$this->timing['base_check_time'],1) ." sec / " . ($this->timing['base_parse_num']+ $this->timing['base_check_num'])  . " occurences\n";
-            echo "Detecting traps : " . number_format($this->timing['type0_check_time']+$this->timing['nottrap_time'],1) . " sec / " . ($this->timing['type0_check_num']+$this->timing['nottrap_num']) ." occurences\n";
-            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'],1)." sec , ";
-            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'],1)." sec \n";
+            echo "\nNumber of processed traps :  ".$this->timing['num_traps']."\n";
+            echo "\nParsing : ".number_format($this->timing['base_parse_time'] + $this->timing['base_check_time'], 1)." sec / ".($this->timing['base_parse_num'] + $this->timing['base_check_num'])." occurences\n";
+            echo "Detecting traps : ".number_format($this->timing['type0_check_time'] + $this->timing['nottrap_time'], 1)." sec / ".($this->timing['type0_check_num'] + $this->timing['nottrap_num'])." occurences\n";
+            echo "Trap processing (".$this->timing['update_num']."): ".number_format($this->timing['update_time'], 1)." sec , ";
+            echo "Objects processing (".$this->timing['objects_num'].") : ".number_format($this->timing['objects_time'], 1)." sec \n";
             
             $timeTaken=microtime(true) - $timeTaken;
             echo "Global time : ".round($timeTaken)." seconds\n";

application/clicommands/MibCommand.php

Spacing +19 added lines, -19 removed lines

@@ -38,39 +38,39 @@ 
 	*/
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
+	    $background=$this->params->get('pid', null);
+	    $logLevel=$this->params->has('verb') ? 4 : 2;
+	    if ($this->params->has('force-check')) { echo "Not implemented"; return; }
+	    $forceCheck=$this->params->has('force-check') ?True:False;
 	    $pid=1;
 	    if ($background != null)
 	    {
-	        $file=@fopen($background,'w');
+	        $file=@fopen($background, 'w');
 	        if ($file == false)
 	        {
 	            echo 'Error : cannot open pid file '.$background;
 	            return 1;
 	        }
-	        $pid = pcntl_fork();
+	        $pid=pcntl_fork();
 	        if ($pid == -1) {
 	            echo 'Error : Cannot fork process';
 	            return 1;
 	        }
 	    }
 	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-		$trap = new Trap($icingaweb2_etc);
+		$trap=new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+		    $trap->setLogging($logLevel, 'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
 		        // father process
-		        fwrite($file,$pid);
+		        fwrite($file, $pid);
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
@@ -84,11 +84,11 @@ 
                 fclose(STDERR);
                 try
                 {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
+                    $trap->mibClass->update_mib_database(false, $forceCheck);
                 }
                 catch (Exception $e)
                 {
-                    $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
+                    $trap->trapLog('Error in updating : '.$e->getMessage(), 2);
                 }
                 unlink($background);
                 return 0;
@@ -100,13 +100,13 @@ 
 		{
 			echo "Update main mib database : \n";
 			echo "# (trap found) C (trap already processed) . (every 2 seconds) : \n";
-			$trap->mibClass->update_mib_database(true,$forceCheck);
+			$trap->mibClass->update_mib_database(true, $forceCheck);
 			echo "Done\n";
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}
 		if ($pid != 1)
 		{
@@ -134,23 +134,23 @@ 
 		    return;
 		}
 		
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$db=IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
-			$query = $db->delete(
+			$query=$db->delete(
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+            echo 'Deleted '.$query." traps and objects\n";
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in DB : ' . $e->getMessage();
+			echo 'Error in DB : '.$e->getMessage();
 		}	   
 	}