patrickpr / trapdirector

application/controllers/StatusController.php

Braces +19 added lines, -29 removed lines

@@ -22,7 +22,9 @@ 
 		try
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -41,8 +43,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getUIDatabase()->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +57,7 @@ 
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getUIDatabase()->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -69,8 +69,7 @@ 
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
 		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 		    $this->displayExitError('status',$e->getMessage());
 		}		
@@ -120,8 +119,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -137,22 +135,19 @@ 
 				if (!is_dir($destDir))
 				{
 				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
-				}
-				else
+				} else
 				{
 				    if (!is_writable($destDir))
 				    {
 				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
+				    } else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=htmlspecialchars($_FILES['mibfile']['tmp_name']);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
+    				    } else
     				    {
     				        $this->view->uploadStatus="File $name uploaded in $destDir";
     				    }
@@ -177,18 +172,15 @@ 
 			    {		    
     				$this->view->snmptranslate='works fine';
     				$this->view->snmptranslate_state='ok';
-			    }
-			    else
+			    } else
 			    {
 			        $this->view->snmptranslate='works fine but missing basic MIBs';
 			    }
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='Can execute but no OID to name resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='Cannot execute';
 		}
@@ -209,15 +201,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}
@@ -256,8 +246,7 @@ 
 	        if (!preg_match('/^[0-9]+$/', $maxRows) || $maxRows < 1)
 	        {
 	            $this->view->setError='Max rows must be a number';
-	        }
-	        else
+	        } else
 	        {
 	            $this->setitemListDisplay($maxRows);
 	            $this->view->setOKMsg='Set max rows to ' . $maxRows;
@@ -276,8 +265,9 @@ 
 	        $index = $this->getRequest()->getPost('index',NULL);
 	        $newname = $this->getRequest()->getPost('newname',NULL);
 
-	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1)
-	            $this->_helper->json(array('status'=>'Bad index'));
+	        if (!preg_match('/^[0-9]+$/', $index) || $index < 1) {
+	        	            $this->_helper->json(array('status'=>'Bad index'));
+	        }
 	        
 	        switch ($type)
 	        {

library/Trapdirector/TrapsActions/UIDatabase.php

Braces +18 added lines, -16 removed lines

@@ -126,8 +126,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -152,8 +151,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -167,8 +165,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -195,7 +192,9 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ( $this->trapDB != null ) {
+        	return $this->trapDB;
+        }
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
@@ -223,7 +222,9 @@ 
      */
     public function getDbConn()
     {
-        if ($this->getDb() == null) return null;
+        if ($this->getDb() == null) {
+        	return null;
+        }
         return $this->getDb()->getDbAdapter();
 //        return $this->getDb()->getConnection();
     }
@@ -254,7 +255,9 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ( $this->idoDB != null ) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
@@ -267,8 +270,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -285,7 +287,9 @@ 
      */
     public function getIdoDbConn()
     {
-        if ($this->getIdoDb() == null) return null;
+        if ($this->getIdoDb() == null) {
+        	return null;
+        }
         return $this->getIdoDb()->getConnection();
     }
     
@@ -307,8 +311,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -322,8 +325,7 @@ 
             {
                 throw new DBException( array(4,"$dbresource does not look like an IDO database"));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
         }

library/Trapdirector/TrapsProcess/TrapConfig.php

Braces +15 added lines, -8 removed lines

@@ -46,8 +46,7 @@ 
             }
             $this->getLogging()->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -60,16 +59,20 @@ 
     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->getLogging()->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
             $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
         }
         
         $tmpVal = -1; // Get boolean coded in database as 1/0
         $this->getDBConfigIfSet('use_SnmpTrapAddess', $tmpVal);
-        if ($tmpVal != -1) $this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        if ($tmpVal != -1) {
+        	$this->useSnmpTrapAddess = ($tmpVal == 1) ? TRUE : FALSE;
+        }
         
         $this->getDBConfigIfSet('SnmpTrapAddess_oid', $this->snmpTrapAddressOID); // Get oid then replace '.' with '\.' to use in regexp whrn reading traps
         $this->snmpTrapAddressOID = preg_replace('/\./', '\\.', $this->snmpTrapAddressOID);
@@ -82,7 +85,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
+        if ($value != null) {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -119,8 +124,7 @@ 
         {
             $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
             $this->getTrapApi()->setStatusMaster();
-        }
-        else 
+        } else 
         {
             if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
             {
@@ -189,7 +193,10 @@ 
         $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
         
         //TODO enable this again when API queries are all done :
-        if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+        if ($this->apiUse === true) {
+        	return;
+        }
+        // In case of API use, no IDO is necessary
         
         // IDO Database
         if (!array_key_exists('IDOdatabase',$trapConfig['config']))

library/Trapdirector/TrapsProcess/Trap.php

Braces +43 added lines, -43 removed lines

@@ -98,8 +98,7 @@ 
         {
             $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
             $this->logSetup=true;
-        }
-        else
+        } else
         {
             $this->logSetup=false;
         }
@@ -130,7 +129,10 @@ 
         $this->getDatabaseOptions(); // Get options in database
         
         // Setup API
-        if ($this->apiUse === true) $this->getAPI(); // Setup API
+        if ($this->apiUse === true) {
+        	$this->getAPI();
+        }
+        // Setup API
         
         // Setup MIB
         $this->mibClass = new Mib($this->logging,$this->trapsDB,$this->snmptranslate,$this->snmptranslate_dirs); // Create Mib class
@@ -149,7 +151,7 @@ 
         // Setup Plugins
         //Create plugin class. Plugins are not loaded here, but by calling registerAllPlugins
         $this->pluginClass = new Plugins($this);
-	}catch (Exception $e){ return; }
+	} catch (Exception $e){ return; }
             
     }
 
@@ -239,8 +241,7 @@ 
         {
             $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
             $this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-        }
-        else
+        } else
         {
             $this->trapData['source_ip']=$matches[1];
             $this->trapData['destination_ip']=$matches[3];
@@ -323,10 +324,10 @@ 
         $this->logging->log('SQL query : '.$sql,DEBUG );
         if (($ret_code=$db_conn->query($sql)) === false) {
             $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        else {
-            if (($name=$ret_code->fetch()) !== false)
-                return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+        } else {
+            if (($name=$ret_code->fetch()) !== false) {
+                            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            }
         }
         
         // Also check if it is an instance of OID
@@ -336,10 +337,10 @@ 
         $this->logging->log('SQL query : '.$sql,DEBUG );
         if (($ret_code=$db_conn->query($sql)) === false) {
             $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        else {
-            if (($name=$ret_code->fetch()) !== false)
-                return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+        } else {
+            if (($name=$ret_code->fetch()) !== false) {
+                            return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+            }
         }
         
         // Try to get oid name from snmptranslate
@@ -438,7 +439,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->trapId=$inserted_id;
                 break;
             default:
@@ -454,7 +457,9 @@ 
     {
         
         // If action is ignore -> don't send t DB
-        if ($this->trapToDb === false) return;
+        if ($this->trapToDb === false) {
+        	return;
+        }
         
         
         $db_conn=$this->trapsDB->db_connect_trap();
@@ -511,7 +516,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->trapId=$inserted_id;
                 break;
             default:
@@ -592,7 +599,7 @@ 
                         continue;
                     }
                     $grouphosts=$ret_code2->fetchAll();
-                }else{
+                } else{
                     $api = $this->getAPI();
                     $api->setCredentials($this->apiUsername, $this->apiPassword);
                     $grouphosts=$api->getHostsIPByHostGroup($rule['host_group_name']);
@@ -600,7 +607,9 @@ 
                 //echo "rule grp :\n";print_r($grouphosts);echo "\n";
                 foreach ( $grouphosts as $host)
                 {
-                    if( is_object( $host ) ) $host=(array)$host;
+                    if( is_object( $host ) ) {
+                    	$host=(array)$host;
+                    }
                     //echo $host['address']."\n";
                     if ($host['address']==$ip || $host['address6']==$ip)
                     {
@@ -649,8 +658,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();
@@ -658,8 +666,7 @@ 
             {
                 $display=$matches[1];
                 $perfdata=$matches[2];
-            }
-            else
+            } else
             {
                 $perfdata='';
             }
@@ -671,8 +678,7 @@ 
             {
                 $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
                 return false;
-            }
-            else
+            } else
             {
                 $this->logging->log( "Sent result : " .$retmessage,INFO );
                 return true;
@@ -771,20 +777,17 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
                     $this->trapToDb=($action==-2)?false:true;
-                }
-                else
+                } else
                 {
                     //$this->logging->log('rules KOO : '.print_r($rule),INFO );
                     
@@ -795,14 +798,12 @@ 
                         if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
                         {
                             $this->trapAction.='Error sending status : check cmd/API';
-                        }
-                        else
+                        } else
                         {
                             $this->add_rule_match($rule['id'],$rule['num_match']+1);
                             $this->trapAction.='Status '.$action.' to '.$host_name.'/'.$service_name;
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->add_rule_match($rule['id'],$rule['num_match']+1);
                     }
@@ -812,16 +813,14 @@ 
                 if (!isset($this->trapData['source_name']))
                 {
                     $this->trapData['source_name']=$rule['host_name'];
-                }
-                else
+                } else
                 {
                     if (!preg_match('/'.$rule['host_name'].'/',$this->trapData['source_name']))
                     { // only add if not present
                         $this->trapData['source_name'].=','.$rule['host_name'];
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
                 $this->trapAction.=' ERR : '.$e->getMessage();
@@ -832,8 +831,7 @@ 
         if ($this->trapData['status']=='error')
         {
             $this->trapToDb=true; // Always put errors in DB for the use can see
-        }
-        else
+        } else
         {
             $this->trapData['status']='done';
         }
@@ -880,7 +878,7 @@ 
                 return 0;
             }
             $services=$services_db->fetchAll();
-        }else{
+        } else{
             $api = $this->getAPI();
             $api->setCredentials($this->apiUsername, $this->apiPassword);
             $services=$api->getNOKservice();
@@ -900,7 +898,9 @@ 
         $numreset=0;
         foreach ($rules as $rule)
         {
-            if( is_object( $services ) ) $services=(array)$services;
+            if( is_object( $services ) ) {
+            	$services=(array)$services;
+            }
             foreach ($services as $service)
             {
                 if ($service['name'] == $rule['service_name'] &&