patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Trap.php

Braces +40 added lines, -39 removed lines

@@ -65,9 +65,9 @@ 
         {
             $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
             $this->logSetup=true;
+        } else {
+                    $this->logSetup=false;
         }
-        else
-            $this->logSetup=false;
             $this->logging->log('Loggin started', INFO);
             
             // Get options from ini files
@@ -85,7 +85,10 @@ 
             $this->setupDatabase($trapConfig); // Setup database class
             
             $this->getDatabaseOptions(); // Get options in database
-            if ($this->api_use === true) $this->getAPI(); // Setup API
+            if ($this->api_use === true) {
+            	$this->getAPI();
+            }
+            // Setup API
             
             $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
             
@@ -121,8 +124,7 @@ 
             }
             $this->logging->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -186,7 +188,10 @@ 
         
         $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
         
-        if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+        if ($this->api_use === true) {
+        	return;
+        }
+        // In case of API use, no IDO is necessary
         
         // IDO Database
         if (!array_key_exists('IDOdatabase',$trapConfig['config']))
@@ -211,9 +216,11 @@ 
     protected function getDatabaseOptions()
     {
         // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
+        if ($this->logSetup === false) {
+        	// Only if logging was no setup in constructor
         {
             $this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
             $this->getDBConfigIfSet('log_file',$this->logging->outputFile);
         }
@@ -222,7 +229,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != 'null') $variable=$value;
+        if ($value != 'null') {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -310,8 +319,7 @@ 
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
             $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
+        } else
         {
             $this->trap_data['source_ip']=$matches[1];
             $this->trap_data['destination_ip']=$matches[3];
@@ -326,14 +334,12 @@ 
             if ($ret_code===0 || $ret_code===false)
             {
                 $this->logging->log('No match on trap data : '.$vars,WARN,'');
-            }
-            else
+            } else
             {
                 if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
                 {
                     $this->trap_data['trap_oid']=$matches[2];
-                }
-                else
+                } else
                 {
                     $object= new stdClass;
                     $object->oid =$matches[1];
@@ -504,7 +510,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->trap_id=$inserted_id;
                 break;
             default:
@@ -520,7 +528,9 @@ 
     {
         
         // If action is ignore -> don't send t DB
-        if ($this->trap_to_db === false) return;
+        if ($this->trap_to_db === false) {
+        	return;
+        }
         
         
         $db_conn=$this->trapsDB->db_connect_trap();
@@ -577,7 +587,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->trap_id=$inserted_id;
                 break;
             default:
@@ -706,8 +718,7 @@ 
                 // TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
                 exec('echo "'.$send.'" > ' .$this->icinga2cmd);
                 return true;
-        }
-        else
+        } else
         {
             // Get perfdata if found
             $matches=array();
@@ -715,8 +726,7 @@ 
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
-            }
-            else
+            } else
             {
                 $perfdata='';
             }
@@ -728,8 +738,7 @@ 
             {
                 $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
                 return false;
-            }
-            else
+            } else
             {
                 $this->logging->log( "Sent result : " .$retmessage,INFO );
                 return true;
@@ -825,20 +834,17 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
                     $this->trap_to_db=($action==-2)?false:true;
-                }
-                else
+                } else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
@@ -849,14 +855,12 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
                         {
                             $this->trap_action.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
@@ -866,16 +870,14 @@ 
                 if (!isset($this->trap_data['source_name']))
                 {
                     $this->trap_data['source_name']=$rule['host_name'];
-                }
-                else
+                } else
                 {
                     if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
                     { // only add if not present
                         $this->trap_data['source_name'].=','.$rule['host_name'];
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
                 $this->trap_action.=' ERR : '.$e->getMessage();
@@ -886,8 +888,7 @@ 
         if ($this->trap_data['status']=='error')
         {
             $this->trap_to_db=true; // Always put errors in DB for the use can see
-        }
-        else
+        } else
         {
             $this->trap_data['status']='done';
         }