patrickpr / trapdirector

library/Trapdirector/Icinga2Api.php

Braces +6 added lines, -6 removed lines

@@ -84,10 +84,11 @@ 
     {
         $host = $this->getHostByFilter(
             'host.__name=="'. $name .'"');
-        if (isset($host[0]))
-            return $host[0];
-        else
-            return NULL;
+        if (isset($host[0])) {
+                    return $host[0];
+        } else {
+                    return NULL;
+        }
     }
  
     /**
@@ -173,8 +174,7 @@ 
                 {
                     $serviceList[$service->name]=
                         array('num'=> 1 ,'__name' => $service->__name,'display_name' => $service->display_name);
-                }
-                else
+                } else
                 {
                     $serviceList[$service->name]['num']++;
                 }

library/Trapdirector/TrapsController.php

Braces +15 added lines, -5 removed lines

@@ -131,9 +131,11 @@ 
     	    $this->icingaAPI = new Icinga2API($host,$port);
     	    $this->icingaAPI->setCredentials($user, $pass);
     	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
-    	    if ($ret === TRUE) // On error, switch to ido DB
+    	    if ($ret === TRUE) {
+    	    	// On error, switch to ido DB
     	    {
     	        $this->apiMode = FALSE;
+    	    }
     	        return $this->getUIDatabase();
     	    }
     	    $this->apiMode = TRUE;
@@ -213,7 +215,9 @@ 
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
@@ -283,7 +287,9 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
+	        if ($catString != '' ) {
+	        	$catString .= '!';
+	        }
 	        $catString .= $index . ':' . $value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
@@ -293,8 +299,12 @@ 
 	{
 	    $catArray = $this->getHandlersCategory();
 	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
+	    while (isset($catArray[$i]) && $i < 100) {
+	    	$i++;
+	    }
+	    if ($i == 100) {
+	    	throw new ProgrammingError('Category array error');
+	    }
 	    $catArray[$i] = $catName;
 	    $this->setHandlerCategory($catArray);
 	}

application/controllers/HandlerController.php

Braces +49 added lines, -47 removed lines

@@ -25,7 +25,9 @@ 
 		$this->prepareTabs()->activate('status');
 
 		$dbConn = $this->getUIDatabase()->getDb();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		$handlerTable = new HandlerTable(
 		      $this->moduleConfig->getTrapRuleName(),
@@ -84,8 +86,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -139,8 +140,7 @@ 
 	    try
 	    {
 	        $hosts=$this->getIdoConn()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 	    }
@@ -153,8 +153,7 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        
-	    }
-	    else
+	    } else
 	    {
 	        foreach($hosts as $key=>$val)
 	        {
@@ -204,11 +203,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,
@@ -240,8 +242,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;
@@ -250,8 +251,7 @@ 
 	        if (count($serviceID) ==0)
 	        {
 	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-	        }
-	        else
+	        } else
 	        {
 	            $this->view->serviceSet=$serviceID[0]->id;
 	        }
@@ -270,8 +270,7 @@ 
 	    {
 	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        $grpServices=$this->getIdoConn()->getServicesByHostGroupid($group_get[0]->id);
 	        $foundGrpService=0;
@@ -323,8 +322,7 @@ 
 	                $object['type'],
 	                $object['type_enum']
 	            ));
-	        }
-	        else
+	        } else
 	        {
 	            array_push($curObjectList, array(
 	                $index,
@@ -402,8 +400,7 @@ 
 			    $this->view->selectGroup=false;
 			    // Check if hostname still exists
 			    $this->add_check_host_exists($ruleDetail);
-			}
-			else
+			} else
 			{
 			    $this->view->selectGroup=true;
 			    $this->add_check_hostgroup_exists($ruleDetail); //  Check if groupe exists				
@@ -411,9 +408,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']);				
@@ -470,8 +469,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Deleting Rule'));
 				return;
@@ -485,13 +483,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 !="")
@@ -507,7 +507,9 @@ 
 			if (! $isHostGroup ) 
 			{  // checks if selection by host 
 			    $hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
-			    if ($hostAddr === NULL) throw new \Exception("No object found");
+			    if ($hostAddr === NULL) {
+			    	throw new \Exception("No object found");
+			    }
 				$params['ip4']['val']=$hostAddr->ip4;
 				$params['ip6']['val']=$hostAddr->ip6;
 				$checkHostName=$hostAddr->name;
@@ -524,8 +526,7 @@ 
 				        $this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
 				        return;
 				    }
-				}
-				else
+				} else
 				{
     				if (!is_numeric($params['serviceid']['val']))
     				{
@@ -540,8 +541,7 @@ 
     					return;
     				}
 				}
-			}
-			else
+			} else
 			{
 			    if ($this->apiMode == TRUE)
 			    {
@@ -551,8 +551,7 @@ 
 			            $this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
 			            return;
 			        }
-			    }
-			    else 
+			    } else 
 			    {
     			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
     				if ($params['host_name']['val'] != $object->name1)
@@ -578,14 +577,12 @@ 
 			if ($params['db_rule']['val'] == -1 || $params['action_form']['val'] == 'clone') 
 			{  // If no rule number or action is clone, add the handler
 			    $ruleID=$this->getUIDatabase()->addHandlerRule($dbparams);
-			}
-			else
+			} else
 			{
 			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 		    $this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
 			return;
@@ -604,7 +601,9 @@ 
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -622,8 +621,7 @@ 
 			    $trapDetail = 'NULL';
 			    throw new Exception('No traps was found with id = '.$trapid);
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
 			return;
@@ -643,7 +641,9 @@ 
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -657,8 +657,7 @@ 
 				->where('trap_id=?',$trapid);
 				$trapDetail=$dbConn->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());
 			return array();
@@ -678,7 +677,9 @@ 
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		// ***************  Get main data
 		try
 		{		
@@ -686,9 +687,10 @@ 
 				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
 				->where('id=?',$ruleid);
 			$ruleDetail=$dbConn->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());
 			throw new Exception('Error : ' . $e->getMessage());

application/controllers/HelperController.php

Braces +18 added lines, -36 removed lines

@@ -26,8 +26,7 @@ 
         {
           $hosts=$this->getIdoConn()->getHostByNameOrIP($hostFilter);
           $retHosts['test']=count($hosts);
-        }
-        else 
+        } else 
         {
 		  $hosts=$this->getIdoConn()->getHostByIP($hostFilter);
         }
@@ -73,8 +72,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -85,8 +83,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;
@@ -122,8 +119,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;
@@ -154,8 +150,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -177,8 +172,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -193,8 +187,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -217,8 +210,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -253,8 +245,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -272,8 +263,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;
@@ -300,8 +290,7 @@ 
 	    {
 	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
 	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 	        return;
@@ -338,14 +327,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;
@@ -359,8 +346,7 @@ 
 		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
 		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
 		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -396,8 +382,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;
@@ -430,8 +415,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;
@@ -439,8 +423,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -471,8 +454,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;