patrickpr / trapdirector

application/clicommands/StatusCommand.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 			$query = $dataBase->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
 			printf("Number of rules : %s\n", $dataBase->fetchOne($query) );
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			printf('Error in DB : %s\n', $e->getMessage());
 		}	   

application/clicommands/TrapsCommand.php

Braces +3 added lines, -6 removed lines

@@ -42,14 +42,12 @@ 
 			if ($days=='<default>')
 			{
 				$trap->eraseOldTraps();
-			}
-			else
+			} else
 			{
 				$trap->eraseOldTraps($days);
 			}
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}	   
@@ -74,8 +72,7 @@ 
 		try 
 		{
 			$trap->reset_services();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{
 			echo 'ERROR : '. $e->getMessage();
 		}

application/clicommands/MibCommand.php

Braces +5 added lines, -10 removed lines

@@ -62,8 +62,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)
 		    {
@@ -72,8 +71,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();
@@ -83,8 +81,7 @@ 
                 try
                 {
                     $trap->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
                 }
@@ -101,8 +98,7 @@ 
 			$trap->update_mib_database(true,$forceCheck);
 			echo "Done\n";
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}
@@ -144,8 +140,7 @@ 
 			$query = $db->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
 			echo "Number of rules : " . $db->fetchOne($query) ."\n";		
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in DB : ' . $e->getMessage();
 		}	   

application/controllers/ReceivedController.php

Braces +7 added lines, -9 removed lines

@@ -76,9 +76,10 @@ 
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 		}
@@ -108,8 +109,7 @@ 
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$db->fetchAll($query);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 		}
@@ -117,8 +117,7 @@ 
 		if ($trapDetail == null ) 
 		{
 			$this->view->data=false;
-		}
-		else
+		} else
 		{
 			$this->view->data=true;
 			// Store result in array.
@@ -204,8 +203,7 @@ 
 			$ip=$postData['IP'];
 			$oid=$postData['OID'];
 			$action=$postData['action'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 		}

application/controllers/SettingsController.php

Braces +18 added lines, -16 removed lines

@@ -28,11 +28,13 @@ 
 	$this->checkReadPermission();
 	// Get message : sent on configuration problems detected by controllers
 	$dberrorMsg=$this->params->get('dberror');
-	if ($dberrorMsg != '')
-	    $this->view->errorDetected=$dberrorMsg;
+	if ($dberrorMsg != '') {
+		    $this->view->errorDetected=$dberrorMsg;
+	}
     $dberrorMsg=$this->params->get('idodberror');
-    if ($dberrorMsg != '')
-        $this->view->errorDetected=$dberrorMsg;
+    if ($dberrorMsg != '') {
+            $this->view->errorDetected=$dberrorMsg;
+    }
     
     $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
     
@@ -46,8 +48,7 @@ 
             $this->Config()->saveIni();
             $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
 			$emptyConfig=1;
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->view->configErrorDetected=$e->getMessage();
         }
@@ -106,8 +107,7 @@ 
     	    $this->view->apimessage='API config : ' . $e->getMessage();
     	    $this->view->apimessageError=true;
     	} 
-	}
-	else
+	} else
 	{
 	    $this->view->apimessage='API parameters not configured';
 	    $this->view->apimessageError=true;
@@ -184,8 +184,7 @@ 
 	if ($dberror[0] == 0)
 	{
 		printf('Schema already exists');
-	}
-	else
+	} else
 	{
 		printf('Creating schema : <br>');
 
@@ -308,12 +307,15 @@ 
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
       $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      if (!preg_match('/-n/',$line)) {
+                return array(1,'snmptrapd has no -n option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*n/',$line)) {
+                return array(1,'snmptrapd has no -On option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*e/',$line)) {
+                return array(1,'snmptrapd has no -Oe option : '.$line);
+      }
       
       return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }

application/controllers/HandlerController.php

Braces +35 added lines, -39 removed lines

@@ -51,8 +51,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -113,8 +112,7 @@ 
 			try
 			{
 				$hosts=$this->getHostByIP($hostfilter);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 			}
@@ -127,8 +125,7 @@ 
 				// Tell JS to get services when page is loaded
 				$this->view->serviceGet=true;
 				
-			}
-			else
+			} else
 			{
 				foreach($hosts as $key=>$val)
 				{
@@ -178,11 +175,14 @@ 
 					$allObjects[$val->oid]=null;
 				}
 			}
-			if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+			if ($allObjects!=null) {
+				// in case trap doesn't have objects or is not resolved
 			{
 				foreach ($allObjects as $key => $val)
 				{
-					if ($val==null) { continue; }
+					if ($val==null) { continue;
+			}
+			}
 					array_push($this->view->objectList, array(
 					    $oid_index,
 						$key,
@@ -231,8 +231,7 @@ 
 			    {
 			        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
 			        $this->view->serviceGet=false;
-			    }
-			    else
+			    } else
 			    {
     				// Tell JS to get services when page is loaded
     				$this->view->serviceGet=true;
@@ -241,14 +240,12 @@ 
     				if (count($serviceID) ==0)
     				{
     				    $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-    				} 
-    				else
+    				} else
     				{
     				    $this->view->serviceSet=$serviceID[0]->id;
     				}
 			    }
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    // Check if groupe exists
@@ -257,8 +254,7 @@ 
 			    {
 			        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 			        $this->view->serviceGroupGet=false;
-			    }
-			    else
+			    } else
 			    {
 			        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
 			        $foundGrpService=0;
@@ -281,9 +277,11 @@ 
 			}
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
-			if ($oidName != null)  // oid is found in mibs
+			if ($oidName != null) {
+				// oid is found in mibs
 			{
-				$this->view->mib=$oidName['mib']; 
+				$this->view->mib=$oidName['mib'];
+			}
 				$this->view->name=$oidName['name'];
 				$this->view->trapListForMIB=$this->getMIB()
 					->getTrapList($oidName['mib']);				
@@ -310,8 +308,7 @@ 
 						$object['type'],
 						$object['type_enum']
 					));
-				}
-				else
+				} else
 				{
 					array_push($curObjectList, array(
 					    $index,
@@ -369,8 +366,7 @@ 
 			try
 			{
 				$this->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -384,13 +380,15 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
+			if ($params[$key]['post']==null) {
+				continue;
+			}
+			// data not sent in post vars
 			if (! isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
 				$this->_helper->json(array('status'=>'No ' . $key));
-			}
-			else
+			} else
 			{
 				$data=$postData[$params[$key]['post']];
 				if ($data!=null && $data !="")
@@ -420,8 +418,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 				$object=$this->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -445,14 +442,12 @@ 
 			if ($params['db_rule']['val'] == -1 ) 
 			{
 				$ruleID=$this->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>$e->getMessage()));
 			return;
@@ -483,9 +478,10 @@ 
 				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null ) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
 		}
@@ -517,8 +513,7 @@ 
 				->where('trap_id=?',$trapid);
 			$trapDetail=$db->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap data detail',$e->getMessage());
 		}
@@ -543,9 +538,10 @@ 
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$db->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
-		}
-		catch (Exception $e)
+			if ( $ruleDetail == null ) {
+				throw new Exception('No rule was found with id = '.$ruleid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
 		}

application/controllers/StatusController.php

Braces +8 added lines, -16 removed lines

@@ -41,8 +41,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +55,7 @@ 
 			$this->view->currentLogFile=$this->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}		
@@ -106,8 +104,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));
 					}
@@ -123,8 +120,7 @@ 
 				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)==false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
-				}
-				else
+				} else
 				{
 					$this->view->uploadStatus="File $name uploaded";
 				}
@@ -143,13 +139,11 @@ 
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='can execute but no resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='cannot execute';
 		}
@@ -171,15 +165,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');
 			}

application/controllers/HelperController.php

Braces +26 added lines, -52 removed lines

@@ -20,8 +20,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'KO'));
 		}
@@ -47,8 +46,7 @@ 
 		if (isset($postData['hostFilter']))
 		{
 			$hostFilter=$postData['hostFilter'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Error : no filter'));
 		}
@@ -77,8 +75,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 		}
@@ -87,8 +84,7 @@ 
 		if (count($hostArray) > 1)
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 		}
@@ -117,8 +113,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 		}
@@ -127,8 +122,7 @@ 
 		if (count($hostArray) > 1)
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 		}
@@ -153,8 +147,7 @@ 
 		if (isset($postData['mib']))
 		{
 			$mib=$postData['mib'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No mib'));
 		}
@@ -162,8 +155,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -181,8 +173,7 @@ 
 		if (isset($postData['trap']))
 		{
 			$trap=$postData['trap'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No trap'));
 		}
@@ -190,8 +181,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -206,8 +196,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -225,8 +214,7 @@ 
 		if (isset($postData['oid']))
 		{
 			$oid=$postData['oid'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No oid'));
 		}
@@ -235,8 +223,7 @@ 
 		if (($object=$this->getMIB()->translateOID($oid)) == null)
 		{
 			$this->_helper->json(array('status'=>'Not found'));
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -268,8 +255,7 @@ 
 			{
 				$this->_helper->json(array('status'=>'invalid days : '.$days));
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No days'));
 		}
@@ -281,8 +267,7 @@ 
 				$this->_helper->json(array('status'=>'unknown action '.$action));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No action'));
 			return;
@@ -292,8 +277,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -311,8 +295,7 @@ 
 				$Trap = new Trap($icingaweb2_etc);
 				$Trap->setLogging($debug_level,'syslog');
 				$Trap->eraseOldTraps($days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
 				return;
@@ -339,8 +322,7 @@ 
 			{
 				$this->_helper->json(array('status'=>'invalid destination : '.$destination));
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No destination'));
 		}
@@ -352,14 +334,12 @@ 
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 			}
@@ -368,14 +348,12 @@ 
 		if (isset($postData['level']))
 		{ 
 			$level=$postData['level'];
-		}
-		else
+		} else
 		{
 			if ($destination != 'level')
 			{
 				$level=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No level'));
 			}
@@ -387,8 +365,7 @@ 
 			$this->setDBConfigValue('log_destination',$destination);
 			$this->setDBConfigValue('log_file',$file);
 			$this->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -410,8 +387,7 @@ 
 	    if (isset($postData['rule']))
 	    {
 	        $rule=$postData['rule'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No Rule'));
 	    }
@@ -423,8 +399,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -441,8 +416,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$Trap->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;