patrickpr / trapdirector

application/controllers/HelperController.php

Braces +24 added lines, -48 removed lines

@@ -65,8 +65,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -77,8 +76,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -114,8 +112,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -146,8 +143,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -169,8 +165,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -185,8 +180,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -209,8 +203,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -244,8 +237,7 @@ 
 			try
 			{
 				$this->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -263,8 +255,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;
@@ -292,8 +283,7 @@ 
 				$this->_helper->json(array('status'=>'invalid destination : '.$destination));
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No destination'));
 		}
@@ -306,14 +296,12 @@ 
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			    return;
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 				return;
@@ -323,8 +311,7 @@ 
 		if (isset($postData['level']))
 		{ 
 			$level=$postData['level'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No level'));
 			return;
@@ -335,8 +322,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;
@@ -358,8 +344,7 @@ 
 	    if (isset($postData['rule']))
 	    {
 	        $rule=$postData['rule'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No Rule'));
 	    }
@@ -371,8 +356,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -389,8 +373,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$Trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;
@@ -412,8 +395,7 @@ 
 	    if (isset($postData['name']))
 	    {
 	        $pluginName=$postData['name'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No plugin name'));
 	    }
@@ -425,8 +407,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -441,8 +422,7 @@ 
             $action=($action == 'enable') ? true : false;
             $retVal=$Trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
             return;
@@ -450,8 +430,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -468,8 +447,7 @@ 
 	    if (isset($postData['function']))
 	    {
 	        $functionString=$postData['function'];
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No function name'));
 	    }
@@ -481,8 +459,7 @@ 
 	            $this->_helper->json(array('status'=>'unknown action '.$action));
 	            return;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        $this->_helper->json(array('status'=>'No action'));
 	        return;
@@ -499,8 +476,7 @@ 
 	        $functionString = $Trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
 	        $result = $Trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
 	        return;