patrickpr / trapdirector

configuration.php

Spacing +4 added lines, -4 removed lines

@@ -10,22 +10,22 @@
     'url'   => 'settings'
 ));
 
-$section = $this->menuSection(N_('Traps'),array (
+$section=$this->menuSection(N_('Traps'), array(
 	'icon'	=> 'filter',
 	'url'	=> 'trapdirector'
 ));
 
-$section->add(N_('Status & Mibs'),array(
+$section->add(N_('Status & Mibs'), array(
 	'url'			=> 'trapdirector/status/',
 	'permission' 	=> 'trapdirector/view'
 ));
 
-$section->add(N_('Received'),array(
+$section->add(N_('Received'), array(
 	'url'			=> 'trapdirector/received/',
 	'permission' 	=> 'trapdirector/view'
 ));
 
-$section->add(N_('Handlers'),array(
+$section->add(N_('Handlers'), array(
 	'url'			=> 'trapdirector/handler/',
 	'permission' 	=> 'trapdirector/config'
 ));

application/clicommands/StatusCommand.php

Spacing +9 added lines, -9 removed lines

@@ -24,21 +24,21 @@
 	public function dbAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
-			printf("DB name : %s\n",$dbresource);
-			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			printf("DB name : %s\n", $dbresource);
+			$dataBase=IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
-			$query = $dataBase->select()->from($Config->getTrapTableName(),array('COUNT(*)'));			
-			printf("Number of traps : %s\n", $dataBase->fetchOne($query) );
-			$query = $dataBase->select()->from($Config->getTrapDataTableName(),array('COUNT(*)'));			
-			printf("Number of trap objects : %s\n", $dataBase->fetchOne($query) );
-			$query = $dataBase->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
-			printf("Number of rules : %s\n", $dataBase->fetchOne($query) );
+			$query=$dataBase->select()->from($Config->getTrapTableName(), array('COUNT(*)'));			
+			printf("Number of traps : %s\n", $dataBase->fetchOne($query));
+			$query=$dataBase->select()->from($Config->getTrapDataTableName(), array('COUNT(*)'));			
+			printf("Number of trap objects : %s\n", $dataBase->fetchOne($query));
+			$query=$dataBase->select()->from($Config->getTrapRuleName(), array('COUNT(*)'));			
+			printf("Number of rules : %s\n", $dataBase->fetchOne($query));
 			
 		}
 		catch (Exception $e)

application/clicommands/TrapsCommand.php

Spacing +10 added lines, -10 removed lines

@@ -30,16 +30,16 @@ 
 	public function rotateAction()
 	{
 		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=2;
-		$trap = new Trap($icingaweb2_etc);
-		$trap->setLogging($debug_level,'display');
+		$trap=new Trap($icingaweb2_etc);
+		$trap->setLogging($debug_level, 'display');
 		try
 		{
-			$days = $this->params->get('days', '<default>');
+			$days=$this->params->get('days', '<default>');
 			echo $this->screen->colorize("Deleting traps older than $days days\n", 'lightblue');
-			if ($days=='<default>')
+			if ($days == '<default>')
 			{
 				$trap->eraseOldTraps();
 			}
@@ -51,7 +51,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}	   
 	}  	
 	
@@ -66,18 +66,18 @@ 
 	public function resetOKAction()
 	{
 		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=2;
-		$trap = new Trap($icingaweb2_etc);
-		$trap->setLogging($debug_level,'display');
+		$trap=new Trap($icingaweb2_etc);
+		$trap->setLogging($debug_level, 'display');
 		try 
 		{
 			$trap->reset_services();
 		} 
 		catch (Exception $e) 
 		{
-			echo 'ERROR : '. $e->getMessage();
+			echo 'ERROR : '.$e->getMessage();
 		}
 	} 	
 	

application/forms/TrapsConfigForm.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 		$this->setName('form_config_traps');
 		$this->setSubmitLabel($this->translate('Save Changes'));
 	}
-	public function setPaths($module_base_path,$icinga_base_path)
+	public function setPaths($module_base_path, $icinga_base_path)
 	{
 		$this->module_base_path=$module_base_path;
 		$this->icinga_base_path=$icinga_base_path;
@@ -82,7 +82,7 @@ 
         );
 		$retval=0;
 		$output=array();
-		$snmptranslate=exec('which snmptranslate',$output,$retval);
+		$snmptranslate=exec('which snmptranslate', $output, $retval);
 		if ($retval != 0) 
 		{
 			$snmptranslate='/usr/bin/snmptranslate';
@@ -172,7 +172,7 @@ 
     }	
 
     
-    public function render(Zend_View_Interface $view = NULL)
+    public function render(Zend_View_Interface $view=NULL)
     {
         
 

application/controllers/ErrorController.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	
 	public function indexAction()
 	{	  
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Error'),
 			'url'		=> Url::fromRequest()

library/Trapdirector/Tables/TrapTable.php

Spacing +25 added lines, -25 removed lines

@@ -35,8 +35,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	
 	// Must return titles in array ( id => display_name )
@@ -44,13 +44,13 @@ 
 	// ****************** Day header
     protected function renderDayIfNew($timestamp)
     {
-        $view = $this->getView();
+        $view=$this->getView();
 
 		// Check for date local format
         if (in_array(setlocale(LC_ALL, 0), array('en_US.UTF-8', 'C'))) {
-            $day = date('l, jS F Y', (int) $timestamp);
+            $day=date('l, jS F Y', (int) $timestamp);
         } else {
-            $day = strftime('%A, %e. %B, %Y', (int) $timestamp);
+            $day=strftime('%A, %e. %B, %Y', (int) $timestamp);
         }
 
         if ($this->lastDay === $day) {
@@ -58,25 +58,25 @@ 
         }
 
         if ($this->lastDay === null) {
-            $htm = "<thead>\n  <tr>\n";
+            $htm="<thead>\n  <tr>\n";
         } else {
-            $htm = "</tbody>\n<thead>\n  <tr>\n";
+            $htm="</tbody>\n<thead>\n  <tr>\n";
         }
 
         if ($this->columnCount === null) {
-            $this->columnCount = count($this->getTitles());
+            $this->columnCount=count($this->getTitles());
         }
 
-        $htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($day) . '</th>' . "\n";
+        $htm.='<th colspan="'.$this->columnCount.'">'.$view->escape($day).'</th>'."\n";
         if ($this->lastDay === null) {
-            $htm .= "  </tr>\n";
+            $htm.="  </tr>\n";
         } else {
-            $htm .= "  </tr>\n</thead>\n";
+            $htm.="  </tr>\n</thead>\n";
         }
 
-        $this->lastDay = $day;
+        $this->lastDay=$day;
 
-        return $htm . "<tbody>\n";
+        return $htm."<tbody>\n";
     }		
 	// ******************  Render table in html  
     public function __toString()
@@ -89,28 +89,28 @@ 
 	// ******************  Static config set
 	public function setConfig($conf)
 	{
-		$this->moduleConfig = $conf;
+		$this->moduleConfig=$conf;
 	}
 	// ******************  View get/set
     protected function getView()
     {
         if ($this->view === null) {
-            $this->view = Icinga::app()->getViewRenderer()->view;
+            $this->view=Icinga::app()->getViewRenderer()->view;
         }
         return $this->view;
     }
 
     public function setView($view)
     {
-        $this->view = $view;
+        $this->view=$view;
     }	
 	
 	// Limits
 	
-    public function limit($count = null, $offset = null)
+    public function limit($count=null, $offset=null)
     {
-        $this->limit = $count;
-        $this->offset = $offset;
+        $this->limit=$count;
+        $this->offset=$offset;
 
         return $this;
     }
@@ -139,7 +139,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -149,7 +149,7 @@ 
 	
     public function setConnection(Selectable $connection)
     {
-        $this->connection = $connection;
+        $this->connection=$connection;
         return $this;
     }
 
@@ -167,7 +167,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -189,20 +189,20 @@ 
 
     public function setFilter($filter)
     {
-        $this->filter = $filter;
+        $this->filter=$filter;
         return $this;
     }
 	
 	public function getFilterEditor(Request $request)
     {
-        $filterEditor = Widget::create('filterEditor')
+        $filterEditor=Widget::create('filterEditor')
             ->setColumns(array_keys($this->getColumns()))
             ->setSearchColumns(array_keys($this->getSearchColumns()))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
+        $filter=$filterEditor->getFilter();
         $this->setFilter($filter);
 
         return $filterEditor;

library/Trapdirector/Tables/TrapTableList.php

Spacing +35 added lines, -35 removed lines

@@ -21,8 +21,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -38,60 +38,60 @@ 
 	public function render()
 	{
 		$data=$this->getTable();
-		$view = $this->getView();
-		$this->columnCount = count($this->getTitles());
+		$view=$this->getView();
+		$this->columnCount=count($this->getTitles());
 		$this->lastDay=null;
 		// Table start
-		$htm  = '<table class="simple common-table table-row-selectable">';
+		$htm='<table class="simple common-table table-row-selectable">';
 		
 		// Titles
-		$htm .= "<thead>\n  <tr>\n";
-		$titles = $this->getTitles();
+		$htm.="<thead>\n  <tr>\n";
+		$titles=$this->getTitles();
 		foreach ($titles as $title) 
 		{
-			$htm .= '    <th>' . $view->escape($view->translate($title)) . "</th>\n";
+			$htm.='    <th>'.$view->escape($view->translate($title))."</th>\n";
 		}
-		$htm .= "  </tr>\n</thead>\n";
+		$htm.="  </tr>\n</thead>\n";
 		
 		// Rows
-		$htm .= "<tbody>\n";
+		$htm.="<tbody>\n";
 		
 		foreach ($data as $row) 
 		{
-			$firstCol = true;
+			$firstCol=true;
 			// Put date header
-			$htm .= $this->renderDayIfNew($row->timestamp);
+			$htm.=$this->renderDayIfNew($row->timestamp);
 			
 			
 			// Render row
-			$htm .= '<tr '.' >';
-			foreach ( $titles as $rowkey => $title) 
+			$htm.='<tr '.' >';
+			foreach ($titles as $rowkey => $title) 
 			{
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
 				{
-					$val = ($rowkey=='timestamp') ?  strftime('%T',$row->$rowkey) : $row->$rowkey;
+					$val=($rowkey == 'timestamp') ?  strftime('%T', $row->$rowkey) : $row->$rowkey;
 				} else {
-					$val = '-';
+					$val='-';
 				}
 				if ($firstCol == true) { // Put link in first column for trap detail.
-					$htm .= '<td>' 
+					$htm.='<td>' 
 							. $view->qlink(
 									$view->escape($val),  
 									Url::fromPath(
-										$this->moduleConfig->urlPath() . '/received/trapdetail', 
+										$this->moduleConfig->urlPath().'/received/trapdetail', 
 										array('id' => $row->id)
 									)
 							)
 							. '</td>';
 				} else {
-					$htm .= '<td>' . $view->escape($val) . '</td>';
+					$htm.='<td>'.$view->escape($val).'</td>';
 				}
 				$firstCol=false;
 			}
-			$htm .= "<tr>\n";
+			$htm.="<tr>\n";
 		}
-		$htm .= "</tbody></table>\n";
+		$htm.="</tbody></table>\n";
 		//$htm .= "Filter : " . $this->filter."<br>\n";
 		return $htm;
 
@@ -101,7 +101,7 @@ 
     {
         $db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             array('COUNT(*)')
         );
@@ -112,7 +112,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -124,7 +124,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -137,7 +137,7 @@ 
     {
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             $this->moduleConfig->getTrapListDisplayColumns()
         )->order('timestamp DESC');
@@ -150,7 +150,7 @@ 
 	protected $filter_Handler;
 	protected $filter_query='';
 	protected $filter_done='';
-	protected $filter_query_list=array('q','done');
+	protected $filter_query_list=array('q', 'done');
 	public function renderFilterHTML()
 	{
 		$htm=' <form id="filter" name="mainFilter" 
@@ -160,17 +160,17 @@ 
 		$htm.='<input type="text" name="q" title="Search is simple! Try to combine multiple words" 
 		placeholder="Search..." class="search" value="'.$this->filter_query.'">';
 		$htm.='<input type="checkbox" id="checkbox_done" name="done" value="1" class="autosubmit" ';
-		if	($this->filter_done == 1) { $htm.=' checked ';}
+		if ($this->filter_done == 1) { $htm.=' checked '; }
 		$htm.='> <label for="checkbox_done">Hide processed traps</label>';
 		$htm.='</form>';
 		return $htm;
 	}
 	
-	public function updateFilter($handler,$filter)
+	public function updateFilter($handler, $filter)
 	{
 		$this->filter_Handler=$handler->remove($this->filter_query_list)->__toString();
-		$this->filter_query=(isset($filter['q']))?$this->filter_query=$filter['q']:'';
-		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
+		$this->filter_query=(isset($filter['q'])) ? $this->filter_query=$filter['q'] : '';
+		$this->filter_done=(isset($filter['done'])) ? $this->filter_done=$filter['done'] : 0;
 	}
 	
     protected function getSearchColumns()
@@ -185,20 +185,20 @@ 
 
     public function setFilter($filter)
     {
-        $this->filter = $filter;
+        $this->filter=$filter;
         return $this;
     }
 	
 	public function getFilterEditor(Request $request)
     {
-        $filterEditor = Widget::create('filterEditor')
+        $filterEditor=Widget::create('filterEditor')
             ->setColumns(array_keys($this->getColumns()))
             ->setSearchColumns(array_keys($this->getSearchColumns()))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
+        $filter=$filterEditor->getFilter();
         $this->setFilter($filter);
 
         return $filterEditor;
@@ -212,9 +212,9 @@ 
 		{
 			$sql.='(';
 			$first=1;
-			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
+			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."%' ";
 			}

library/Trapdirector/Config/TrapModuleConfig.php

Spacing +31 added lines, -31 removed lines

@@ -14,22 +14,22 @@ 
 		'log_level' => 2, // log level
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	// Minimum DB version
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	// Current DB version
-	static public function getDbCurVersion() { return 2;}
+	static public function getDbCurVersion() { return 2; }
 
 	/************ Module configuration **********************/
 	// Module base path
 	static public function urlPath() { return 'trapdirector'; }
-	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service" , "actions/process-check-result"); } //< api user permissions required
+	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service", "actions/process-check-result"); } //< api user permissions required
 	
 	/*********** Log configuration *************************/
 	protected $logLevels=array(0=>'No output', 1=>'critical', 2=>'warning', 3=>'trace', 4=>'ALL');
-	public function getlogLevels() { return $this->logLevels;}
-	protected $logDestinations=array('syslog'=>'syslog','file'=>'file','display'=>'display');
-	public function getLogDestinations() { return $this->logDestinations;}
+	public function getlogLevels() { return $this->logLevels; }
+	protected $logDestinations=array('syslog'=>'syslog', 'file'=>'file', 'display'=>'display');
+	public function getLogDestinations() { return $this->logDestinations; }
 	
 	function __construct($prefix)
 	{
@@ -40,29 +40,29 @@ 
 	// DB table name of trap received list : prefix 't'
 	public function getTrapTableName() 
 	{ 
-		return array('t' => $this->table_prefix . 'received'); 
+		return array('t' => $this->table_prefix.'received'); 
 	}
 	// DB table name of trap data  list : prefix 'd'
 	public function getTrapDataTableName() 
 	{ 
-		return array('d' => $this->table_prefix . 'received_data'); 
+		return array('d' => $this->table_prefix.'received_data'); 
 	}	
 
 	// DB table name of rules : prefix 'r'
 	public function getTrapRuleName() 
 	{ 
-		return array('r' => $this->table_prefix . 'rules'); 
+		return array('r' => $this->table_prefix.'rules'); 
 	}		
 	
 	// DB table name of db config : prefix 'c'
 	public function getDbConfigTableName() 
 	{ 
-		return array('c' => $this->table_prefix . 'db_config');
+		return array('c' => $this->table_prefix.'db_config');
 	}
 	
 	// Mib cache tables
-	public function getMIBCacheTableName() { return $this->table_prefix . 'mib_cache'; }
-	public function getMIBCacheTableTrapObjName() { return $this->table_prefix . 'mib_cache_trap_object'; }
+	public function getMIBCacheTableName() { return $this->table_prefix.'mib_cache'; }
+	public function getMIBCacheTableTrapObjName() { return $this->table_prefix.'mib_cache_trap_object'; }
 	
 	
 	/****************** Database queries *******************/
@@ -143,7 +143,7 @@ 
 	public function getHandlerListDisplayColumns()
 	{
 		return array(
-			'host_name'		=> 'r.host_name',//'UNIX_TIMESTAMP(t.date_received)',
+			'host_name'		=> 'r.host_name', //'UNIX_TIMESTAMP(t.date_received)',
 			'host_group_name'=> 'r.host_group_name',
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
@@ -196,32 +196,32 @@ 
 	public function trapDetailQuery()
 	{
 		return array(
-			'timestamp'			=> array('Date','UNIX_TIMESTAMP(t.date_received)'),
-			'source_ip'			=> array('Source IP','t.source_ip'),
-			'source_name'		=> array('Source name','t.source_name'),
-			'source_port'		=> array('Source port','t.source_port'),
-			'destination_ip'	=> array('Destination IP','t.destination_ip'),
-			'destination_port'	=> array('Destination port','t.destination_port'),			
-			'trap_oid'			=> array('Numeric OID','t.trap_oid'),
-			'trap_name'			=> array('Trap name','t.trap_name'),
-			'trap_name_mib'		=> array('Trap MIB','t.trap_name_mib'),
-			'status'			=> array('Processing status','t.status'),
-			'status_detail'		=> array('Status details','t.status_detail'),
-			'process_time'		=> array('Trap processing time','t.process_time'),			
+			'timestamp'			=> array('Date', 'UNIX_TIMESTAMP(t.date_received)'),
+			'source_ip'			=> array('Source IP', 't.source_ip'),
+			'source_name'		=> array('Source name', 't.source_name'),
+			'source_port'		=> array('Source port', 't.source_port'),
+			'destination_ip'	=> array('Destination IP', 't.destination_ip'),
+			'destination_port'	=> array('Destination port', 't.destination_port'),			
+			'trap_oid'			=> array('Numeric OID', 't.trap_oid'),
+			'trap_name'			=> array('Trap name', 't.trap_name'),
+			'trap_name_mib'		=> array('Trap MIB', 't.trap_name_mib'),
+			'status'			=> array('Processing status', 't.status'),
+			'status_detail'		=> array('Status details', 't.status_detail'),
+			'process_time'		=> array('Trap processing time', 't.process_time'),			
 		);
 	}
 	// Trap detail : additional data (<key> => <title> <sql select>)
 	public function trapDataDetailQuery()
 	{
 		return array(
-			'oid'				=> array('Numeric OID','d.oid'),
-			'oid_name'			=> array('Text OID','d.oid_name'),
-			'oid_name_mib'		=> array('MIB','d.oid_name_mib'),
-			'value'				=> array('Value','d.value'),
+			'oid'				=> array('Numeric OID', 'd.oid'),
+			'oid_name'			=> array('Text OID', 'd.oid_name'),
+			'oid_name_mib'		=> array('MIB', 'd.oid_name_mib'),
+			'value'				=> array('Value', 'd.value'),
 		);
 	}
 	// foreign key of trap data table
-	public function trapDataFK() { return 'trap_id';}
+	public function trapDataFK() { return 'trap_id'; }
 	
 	// Max items in a list
 	public function itemListDisplay() { return 25; }

library/Trapdirector/Tables/TrapTableHostList.php

Spacing +49 added lines, -49 removed lines

@@ -22,8 +22,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -33,9 +33,9 @@ 
 	// ******************  Render table in html 
 	
 	// Host grouping
-	protected function renderHostIfNew($IP,$hostname)
+	protected function renderHostIfNew($IP, $hostname)
 	{
-	    $view = $this->getView();
+	    $view=$this->getView();
 	    
 	    if ($this->lastHost === $IP) {
 	        return;
@@ -43,31 +43,31 @@ 
 	    
 	    if ($this->lastHost === null) 
 	    {
-	        $htm = "<thead>\n  <tr>\n";
+	        $htm="<thead>\n  <tr>\n";
 	    } else {
-	        $htm = "</tbody>\n<thead>\n  <tr>\n";
+	        $htm="</tbody>\n<thead>\n  <tr>\n";
 	    }
 	    
 	    if ($this->columnCount === null) 
 	    {
-	        $this->columnCount = count($this->getTitles());
+	        $this->columnCount=count($this->getTitles());
 	    }
 	    
-	    $htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($IP);
+	    $htm.='<th colspan="'.$this->columnCount.'">'.$view->escape($IP);
 	    if ($hostname != null)
 	    {
-	        $htm .= ' ('.$hostname.')';
+	        $htm.=' ('.$hostname.')';
 	    }
-	    $htm .= '</th>' . "\n";
+	    $htm.='</th>'."\n";
 	    if ($this->lastHost === null) {
-	        $htm .= "  </tr>\n";
+	        $htm.="  </tr>\n";
 	    } else {
-	        $htm .= "  </tr>\n</thead>\n";
+	        $htm.="  </tr>\n</thead>\n";
 	    }
 	    
-	    $this->lastHost = $IP;
+	    $this->lastHost=$IP;
 	    
-	    return $htm . "<tbody>\n";
+	    return $htm."<tbody>\n";
 	}		
 	
     public function __toString()
@@ -78,62 +78,62 @@ 
 	public function render()
 	{
 		$data=$this->getTable();
-		$view = $this->getView();
-		$this->columnCount = count($this->getTitles());
+		$view=$this->getView();
+		$this->columnCount=count($this->getTitles());
 		$this->lastHost=null;
 		// Table start
-		$htm  = '<table class="simple common-table table-row-selectable">';
+		$htm='<table class="simple common-table table-row-selectable">';
 		
 		// Titles
-		$htm .= "<thead>\n  <tr>\n";
-		$titles = $this->getTitles();
+		$htm.="<thead>\n  <tr>\n";
+		$titles=$this->getTitles();
 		foreach ($titles as $title) 
 		{
-			$htm .= '    <th>' . $view->escape($view->translate($title)) . "</th>\n";
+			$htm.='    <th>'.$view->escape($view->translate($title))."</th>\n";
 		}
-		$htm .= "  </tr>\n</thead>\n";
+		$htm.="  </tr>\n</thead>\n";
 		
 		// Rows
-		$htm .= "<tbody>\n";
+		$htm.="<tbody>\n";
 		
 		foreach ($data as $row) 
 		{
 
-			$firstCol = true;
+			$firstCol=true;
 			// Put host header
-			$source_name=(property_exists($row,'source_name'))?$row->source_name:null;
-			$htm .= $this->renderHostIfNew($row->source_ip,$source_name);
+			$source_name=(property_exists($row, 'source_name')) ? $row->source_name : null;
+			$htm.=$this->renderHostIfNew($row->source_ip, $source_name);
 			
 			
 			// Render row
-			$htm .= '<tr '.' >';
-			foreach ( $titles as $rowkey => $title) 
+			$htm.='<tr '.' >';
+			foreach ($titles as $rowkey => $title) 
 			{
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
 				{
-					$val = ($rowkey=='last_sent') ?  strftime('%c',$row->$rowkey) : $row->$rowkey;
+					$val=($rowkey == 'last_sent') ?  strftime('%c', $row->$rowkey) : $row->$rowkey;
 				} else {
-					$val = '-';
+					$val='-';
 				}
 				if ($firstCol === true) { // Put link in first column for trap detail.
-					$htm .= '<td>' 
+					$htm.='<td>' 
 							. $view->qlink(
 									$view->escape($val),  
 									Url::fromPath(
-										$this->moduleConfig->urlPath() . '/received', 
+										$this->moduleConfig->urlPath().'/received', 
 										array('q' => $row->trap_oid)
 									)
 							)
 							. '</td>';
 				} else {
-					$htm .= '<td>' . $view->escape($val) . '</td>';
+					$htm.='<td>'.$view->escape($val).'</td>';
 				}
 				$firstCol=false;
 			}
-			$htm .= "<tr>\n";
+			$htm.="<tr>\n";
 		}
-		$htm .= "</tbody></table>\n";
+		$htm.="</tbody></table>\n";
 		//$htm .= "Filter : " . $this->filter."<br>\n";
 		return $htm;
 
@@ -143,7 +143,7 @@ 
     {  
         $db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
 		$values=$db->fetchAll($query);
 		
@@ -154,7 +154,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -166,7 +166,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -178,10 +178,10 @@ 
     public function getBaseQuery()
     {
 		$db=$this->db();
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
 		    $this->moduleConfig->getTrapHostListDisplayColumns()
-		    )->group(array('t.source_ip','t.source_name','t.trap_oid'))
+		    )->group(array('t.source_ip', 't.source_name', 't.trap_oid'))
 		    ->order('t.source_ip');
 
         return $query;
@@ -192,7 +192,7 @@ 
 	protected $filter_Handler;
 	protected $filter_query='';
 	protected $filter_done='';
-	protected $filter_query_list=array('q','done');
+	protected $filter_query_list=array('q', 'done');
 	public function renderFilterHTML()
 	{
 		$htm=' <form id="filter" name="mainFilter" 
@@ -202,17 +202,17 @@ 
 		$htm.='<input type="text" name="q" title="Search is simple! Try to combine multiple words" 
 		placeholder="Search..." class="search" value="'.$this->filter_query.'">';
 		$htm.='<input type="checkbox" id="checkbox_done" name="done" value="1" class="autosubmit" ';
-		if	($this->filter_done == 1) { $htm.=' checked ';}
+		if ($this->filter_done == 1) { $htm.=' checked '; }
 		$htm.='> <label for="checkbox_done">Hide processed traps</label>';
 		$htm.='</form>';
 		return $htm;
 	}
 	
-	public function updateFilter($handler,$filter)
+	public function updateFilter($handler, $filter)
 	{
 		$this->filter_Handler=$handler->remove($this->filter_query_list)->__toString();
-		$this->filter_query=(isset($filter['q']))?$this->filter_query=$filter['q']:'';
-		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
+		$this->filter_query=(isset($filter['q'])) ? $this->filter_query=$filter['q'] : '';
+		$this->filter_done=(isset($filter['done'])) ? $this->filter_done=$filter['done'] : 0;
 	}
 	
     protected function getSearchColumns()
@@ -227,20 +227,20 @@ 
 
     public function setFilter($filter)
     {
-        $this->filter = $filter;
+        $this->filter=$filter;
         return $this;
     }
 	
 	public function getFilterEditor(Request $request)
     {
-        $filterEditor = Widget::create('filterEditor')
+        $filterEditor=Widget::create('filterEditor')
             ->setColumns(array_keys($this->getColumns()))
             ->setSearchColumns(array_keys($this->getSearchColumns()))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
+        $filter=$filterEditor->getFilter();
         $this->setFilter($filter);
 
         return $filterEditor;
@@ -254,9 +254,9 @@ 
 		{
 			$sql.='(';
 			$first=1;
-			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
+			foreach ($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first == 0) $sql.=' OR ';
 				$first=0;
 				$sql.=" ".$column." LIKE  '%".$this->filter_query."%' ";
 			}