patrickpr / trapdirector

library/Trapdirector/Tables/HandlerTable.php

Braces +3 added lines, -6 removed lines

@@ -56,13 +56,11 @@ 
                               if (isset($oidName['name']))
                               {
                                   $val=$oidName['name'];
-                              }
-                              else
+                              } else
                               {
                                   $val = $row->$rowkey;
                               }
-                          }
-                          else
+                          } else
                           {
                               $val = $row->$rowkey;
                           }
@@ -71,8 +69,7 @@ 
                           if ($row->$rowkey == null)
                           {
                               $val = $row->host_group_name;
-                          }
-                          else
+                          } else
                           {
                               $val = $row->$rowkey;
                           }

library/Trapdirector/Tables/TrapTableList.php

Braces +9 added lines, -3 removed lines

@@ -212,7 +212,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}
@@ -220,10 +222,14 @@ 
 		}
 		if ($this->filter_done == 1)
 		{
-			if ($sql != '') $sql.=' AND ';
+			if ($sql != '') {
+				$sql.=' AND ';
+			}
 			$sql.="(status != 'done')";
 		}
-		if ($sql != '') $query->where($sql);	
+		if ($sql != '') {
+			$query->where($sql);
+		}
         return $query;
     }	
 

library/Trapdirector/Tables/TrapDirectorTable.php

Braces +38 added lines, -20 removed lines

@@ -82,17 +82,21 @@ 
     {
         $actionURL = $this->getCurrentURL() . '?' ;
         $QSList=array();
-        if ($caller != 'filter' && $this->curFilterQuery() != '')
-            array_push($QSList , $this->curFilterQuery());
+        if ($caller != 'filter' && $this->curFilterQuery() != '') {
+                    array_push($QSList , $this->curFilterQuery());
+        }
         
-        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '')
-            array_push($QSList , $this->curPagingQuery());
+        if ($caller != 'paging' && $caller != 'filter' && $this->curPagingQuery() != '') {
+                    array_push($QSList , $this->curPagingQuery());
+        }
  
-        if ($caller != 'order' && $this->curOrderQuery() != '')
-            array_push($QSList , $this->curOrderQuery());
+        if ($caller != 'order' && $this->curOrderQuery() != '') {
+                    array_push($QSList , $this->curOrderQuery());
+        }
         
-        if (count($QSList) != 0)
-            $actionURL .=  implode('&', $QSList);
+        if (count($QSList) != 0) {
+                    $actionURL .=  implode('&', $QSList);
+        }
         
         return $actionURL;
     }
@@ -135,7 +139,9 @@ 
         $filter='';
         foreach ($this->filterColumn as $column)
         {
-            if ($filter != "") $filter.=' OR ';
+            if ($filter != "") {
+            	$filter.=' OR ';
+            }
             //$filter .= "'" . $column . "' LIKE '%" . $this->filterString. "%'";
             $filter .= $column  . " LIKE '%" . $this->filterString. "%'";
         }
@@ -179,7 +185,9 @@ 
     
     protected function curFilterQuery()
     {
-        if ($this->filterQuery == '') return '';
+        if ($this->filterQuery == '') {
+        	return '';
+        }
         return 'f='.$this->filterQuery;
     }
     
@@ -193,7 +201,9 @@ 
         $orderSQL='';
         foreach ($this->order as $column => $direction)
         {
-            if ($orderSQL != "") $orderSQL.=',';
+            if ($orderSQL != "") {
+            	$orderSQL.=',';
+            }
             
             $orderSQL .= $column . ' ' . $direction;
         }
@@ -219,7 +229,9 @@ 
     
     protected function curOrderQuery()
     {
-        if ($this->orderQuery == '') return '';
+        if ($this->orderQuery == '') {
+        	return '';
+        }
         return 'o='.$this->orderQuery;
     }
     
@@ -256,7 +268,9 @@ 
 
     protected function curPagingQuery()
     {
-        if ($this->currentPage == '') return '';
+        if ($this->currentPage == '') {
+        	return '';
+        }
         return 'page='.$this->currentPage;
     }
     
@@ -268,10 +282,14 @@ 
             return  'count : ' . $this->count() . '<br>';
         }
         
-        if ($this->currentPage == 0) $this->currentPage = 1;
+        if ($this->currentPage == 0) {
+        	$this->currentPage = 1;
+        }
         
         $numPages = intdiv($count , $this->maxPerPage);
-        if ($count % $this->maxPerPage != 0 ) $numPages++;
+        if ($count % $this->maxPerPage != 0 ) {
+        	$numPages++;
+        }
         
         $html = '<div class="pagination-control" role="navigation">';
         $html .= '<ul class="nav tab-nav">';
@@ -285,8 +303,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else 
+        } else 
         {
             $html .= '
                 <li class="nav-item">
@@ -302,7 +319,9 @@ 
             $active = ($this->currentPage == $i) ? 'active' : '';
             $first = ($i-1)*$this->maxPerPage+1;
             $last = $i * $this->maxPerPage;
-            if ($last > $count) $last = $count;
+            if ($last > $count) {
+            	$last = $count;
+            }
             $display = 'Show rows '. $first . ' to '. $last .' of '. $count;
             $html .= '<li class="' . $active . ' nav-item">
                     <a href="'. $this->getCurrentURLAndQS('paging') .'&page='. $i .'" title="' . $display . '" aria-label="' . $display . '">
@@ -321,8 +340,7 @@ 
                      </span>
                 </li>
                ';
-        }
-        else
+        } else
         {
             $html .= '
                 <li class="nav-item">

application/controllers/HandlerController.php

Braces +44 added lines, -42 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');
+		}
 		
 		$this->view->handlerTable = new HandlerTable(
 		      $this->moduleConfig->getTrapRuleName(),
@@ -71,8 +73,7 @@ 
 	    if ($this->params->get('rule') !== null) 
 	    {
 	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
+	    } else
 	    {
 	        $this->view->rule='';
 	    }
@@ -126,8 +127,7 @@ 
 	    try
 	    {
 	        $hosts=$this->getUIDatabase()->getHostByIP($hostfilter);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
 	    }
@@ -140,8 +140,7 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        
-	    }
-	    else
+	    } else
 	    {
 	        foreach($hosts as $key=>$val)
 	        {
@@ -191,11 +190,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,
@@ -227,8 +229,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;
@@ -237,8 +238,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;
 	        }
@@ -257,8 +257,7 @@ 
 	    {
 	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
-	    }
-	    else
+	    } else
 	    {
 	        $grpServices=$this->getUIDatabase()->getServicesByHostGroupid($group_get[0]->id);
 	        $foundGrpService=0;
@@ -310,8 +309,7 @@ 
 	                $object['type'],
 	                $object['type_enum']
 	            ));
-	        }
-	        else
+	        } else
 	        {
 	            array_push($curObjectList, array(
 	                $index,
@@ -383,8 +381,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				
@@ -392,9 +389,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']);				
@@ -449,8 +448,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->deleteRule($postData[$params['db_rule']['post']]);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>$e->getMessage()));
 				return;
@@ -464,13 +462,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 !="")
@@ -505,8 +505,7 @@ 
 					$this->_helper->json(array('status'=>"Invalid service id : Please re enter service"));
 					return;
 				}
-			}
-			else
+			} else
 			{
 			    $object=$this->getUIDatabase()->getObjectNameByid($params['hostid']['val']);
 				if ($params['host_name']['val'] != $object->name1)
@@ -531,14 +530,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()));
 			return;
@@ -557,7 +554,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;
@@ -575,8 +574,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;
@@ -596,7 +594,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;
@@ -610,8 +610,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();
@@ -631,7 +630,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
 		{		
@@ -639,9 +640,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());