patrickpr / trapdirector

configuration.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 $this->providePermission('trapdirector/config', $this->translate('Allow to create and modify traps services'));
 
 $this->provideConfigTab('config', array(
-    'title' => 'Configuration',
-    'url'   => 'settings'
+	'title' => 'Configuration',
+	'url'   => 'settings'
 ));
 
 $section = $this->menuSection(N_('Traps'),array (

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

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 class StatusCommand extends Command
 {
 	/**
-	* Get database counts
-	*
-	* Get number of traps, rules
-	*/
+	 * Get database counts
+	 *
+	 * Get number of traps, rules
+	 */
 	public function dbAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');

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)

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

Indentation +17 added lines, -17 removed lines

@@ -17,16 +17,16 @@ 
 class TrapsCommand extends Command
 {
 	/**
-	*	Delete old traps
-	*
-	*	USAGE 
-	*
-	*	icingali trapdirector traps rotate [options]
-	*	
-	*	OPTIONS
-	*	
-	*	--days	remove traps older than <n> days
-	*/
+	 *	Delete old traps
+	 *
+	 *	USAGE 
+	 *
+	 *	icingali trapdirector traps rotate [options]
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--days	remove traps older than <n> days
+	 */
 	public function rotateAction()
 	{
 		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
@@ -56,13 +56,13 @@ 
 	}  	
 	
 	/**
-	*	Reset services to OK state if timeout is passed
-	*
-	*	USAGE
-	*
-	*	icingali trapdirector traps reset_services
-	*
-	*/
+	 *	Reset services to OK state if timeout is passed
+	 *
+	 *	USAGE
+	 *
+	 *	icingali trapdirector traps reset_services
+	 *
+	 */
 	public function resetOKAction()
 	{
 		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());

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();
 		}
 	} 	
 	

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/forms/TrapsConfigForm.php

Indentation +82 added lines, -82 removed lines

@@ -32,13 +32,13 @@ 
 	
 	public function setDefaultIDODB($idoDbName)
 	{
-	    $this->idoDbName=$idoDbName;
-	    return $this;
+		$this->idoDbName=$idoDbName;
+		return $this;
 	}
 	
-    public function createElements(array $formData)
-    {
-        $this->addElement(
+	public function createElements(array $formData)
+	{
+		$this->addElement(
 			'select',
 			'config_database',
 			array(
@@ -72,14 +72,14 @@ 
 			 )
 		);		
 		$this->addElement(
-            'text',
-            'config_icingaweb2_etc',
-            array(
-                    'required'      => true,
-                    'label'             => $this->translate('icingaweb2 config dir'),
+			'text',
+			'config_icingaweb2_etc',
+			array(
+					'required'      => true,
+					'label'             => $this->translate('icingaweb2 config dir'),
 					'value'			=> $this->icinga_base_path,
-             )
-        );
+			 )
+		);
 		$retval=0;
 		$output=array();
 		$snmptranslate=exec('which snmptranslate',$output,$retval);
@@ -88,68 +88,68 @@ 
 			$snmptranslate='/usr/bin/snmptranslate';
 		}
 		$this->addElement(
-            'text',
-            'config_snmptranslate',
-            array(
-                    'required'      => true,
-                    'label'             => $this->translate('snmptranslate binary with path'),
+			'text',
+			'config_snmptranslate',
+			array(
+					'required'      => true,
+					'label'             => $this->translate('snmptranslate binary with path'),
 					'value'			=> $snmptranslate,
-             )
-        );
+			 )
+		);
 		$this->addElement(
-            'text',
-            'config_snmptranslate_dirs',
-            array(
-                    'required'      => true,
-                    'label'         => $this->translate('Path for mibs'),
+			'text',
+			'config_snmptranslate_dirs',
+			array(
+					'required'      => true,
+					'label'         => $this->translate('Path for mibs'),
 					'value'			=> $this->module_base_path.'/mibs',
-             )
-        );		
+			 )
+		);		
 		$this->addElement(
-            'text',
-            'config_icingacmd',
-            array(
-                    'required'      => true,
-                    'label'         => $this->translate('icingacmd with path'),
+			'text',
+			'config_icingacmd',
+			array(
+					'required'      => true,
+					'label'         => $this->translate('icingacmd with path'),
 					'value'			=> '/var/run/icinga2/cmd/icinga2.cmd',
-             )
-        );
+			 )
+		);
 		$this->addElement(
-		    'text',
-		    'config_icingaAPI_host',
-		    array(
-		        'required'      => false,
-		        'label'         => $this->translate('icinga2 API Host IP'),
-		        'value'			=> '',
-		    )
+			'text',
+			'config_icingaAPI_host',
+			array(
+				'required'      => false,
+				'label'         => $this->translate('icinga2 API Host IP'),
+				'value'			=> '',
+			)
 		);
 		$this->addElement(
-		    'text',
-		    'config_icingaAPI_port',
-		    array(
-		        'required'      => false,
-		        'label'         => $this->translate('icinga2 API TCP Port'),
-		        'value'			=> '5665',
-		    )
-		    );
+			'text',
+			'config_icingaAPI_port',
+			array(
+				'required'      => false,
+				'label'         => $this->translate('icinga2 API TCP Port'),
+				'value'			=> '5665',
+			)
+			);
 		$this->addElement(
-		    'text',
-		    'config_icingaAPI_user',
-		    array(
-		        'required'      => false,
-		        'label'         => $this->translate('icinga2 API username'),
-		        'value'			=> '',
-		    )
-        );
+			'text',
+			'config_icingaAPI_user',
+			array(
+				'required'      => false,
+				'label'         => $this->translate('icinga2 API username'),
+				'value'			=> '',
+			)
+		);
 		$this->addElement(
-		    'text',
-		    'config_icingaAPI_password',
-		    array(
-		        'required'      => false,
-		        'label'         => $this->translate('icinga2 API password'),
-		        'value'			=> '',
-		    )
-	    );
+			'text',
+			'config_icingaAPI_password',
+			array(
+				'required'      => false,
+				'label'         => $this->translate('icinga2 API password'),
+				'value'			=> '',
+			)
+		);
 		/*$this->addElement(
 		    'radio',
 		    'config_icinga2api_use',
@@ -159,7 +159,7 @@ 
 		        'value'			=> array('Yes', 'No'),//array('1' => 'Yes', '0' => 'No'),
 		    )
 		);*/  
-		    // For Icinga2 API connexion
+			// For Icinga2 API connexion
 	//	$icinga2API=new Fieldset('Icinga2 API connection');
 	/* 	$icinga2API_select=new radioBtn('icinga2API_use');
 		$icinga2API_select->setLabel('Use icinga2 API instead of cmd file?');
@@ -169,30 +169,30 @@ 
 		]);
 		$icinga2API->add($icinga2API_select);
 		$this->add($icinga2API); */
-    }	
+	}	
 
     
-    public function render(Zend_View_Interface $view = NULL)
-    {
+	public function render(Zend_View_Interface $view = NULL)
+	{
         
 
-        //return $html;
-        return parent::render($view);
-    }
+		//return $html;
+		return parent::render($view);
+	}
     
-    /**
-     * {@inheritdoc}
-     */
-    public function onSuccess()
-    {
-        parent::onSuccess();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function onSuccess()
+	{
+		parent::onSuccess();
+	}
     
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
 	public function save()
-    {
+	{
 		parent::save();
 	}
 }

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/ReceivedController.php

Indentation +21 added lines, -21 removed lines

@@ -39,8 +39,8 @@ 
 	}
 
 	/** 
-	*	Trap detail page
-	*/	
+	 *	Trap detail page
+	 */	
 	public function trapdetailAction() 
 	{
 		
@@ -141,22 +141,22 @@ 
 	 */
 	public function hostsAction()
 	{
-	    $this->checkReadPermission();
-	    $this->prepareTabs()->activate('hosts');
+		$this->checkReadPermission();
+		$this->prepareTabs()->activate('hosts');
 	    
-	    $db = $this->getDb();
-	    $this->getTrapHostListTable()->setConnection($db);
+		$db = $this->getDb();
+		$this->getTrapHostListTable()->setConnection($db);
 	    
-	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+		// Apply pagination limits
+		$this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
 	    
-	    // Set Filter
-	    //$postData=$this->getRequest()->getPost();
-	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
-	    $filter['done']=$this->params->get('done');
-	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+		// Set Filter
+		//$postData=$this->getRequest()->getPost();
+		$filter=array();
+		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['done']=$this->params->get('done');
+		$this->view->filter=$filter;
+		$this->view->table->updateFilter(Url::fromRequest(),$filter);
 	}
 	
 	public function deleteAction()
@@ -176,12 +176,12 @@ 
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received')
-		    )
-		    ->add('hosts', array(
-		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
-		    )
-		    ->add('delete', array(
+			)
+			->add('hosts', array(
+				'label' => $this->translate('Hosts'),
+				'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+			)
+			->add('delete', array(
 			'label' => $this->translate('Delete'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
 		  );

Spacing +33 added lines, -33 removed lines

@@ -20,19 +20,19 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('traps');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getTrapListTable()->setConnection($db);
 		
 		// Apply pagination limits
-		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
 		//$postData=$this->getRequest()->getPost();
 		$filter=array();
-		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 		$filter['done']=$this->params->get('done');
 		$this->view->filter=$filter;
-		$this->view->table->updateFilter(Url::fromRequest(),$filter);
+		$this->view->table->updateFilter(Url::fromRequest(), $filter);
 		
 		//$this->view->filterEditor = $this->getTrapListTable()->getFilterEditor($this->getRequest());
 
@@ -46,7 +46,7 @@ 
 		
 		$this->checkReadPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Detailed status'),
 			'url'		=> Url::fromRequest()
@@ -56,11 +56,11 @@ 
 		$this->view->trapid=$trapid;
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
-			$this->getModuleConfig()->urlPath() . '/handler/add',
+			$this->getModuleConfig()->urlPath().'/handler/add',
 			array('fromid' => $trapid));
 		// ***************  Get main data
 		// extract columns and titles;
@@ -72,28 +72,28 @@ 
 		// Do DB query for trap. 
 		try
 		{
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->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);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 			return;
 		}
 
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=strftime('%c', $trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
-			array_push($queryArray[$key],$cval);
+			array_push($queryArray[$key], $cval);
 		}
-		$this->view->rowset = $queryArray;
+		$this->view->rowset=$queryArray;
 
 		// **************   Check for additionnal data
 		
@@ -105,17 +105,17 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->fetchAll($query);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 		// TODO : code this in a better & simpler way
-		if ($trapDetail == null ) 
+		if ($trapDetail == null) 
 		{
 			$this->view->data=false;
 		}
@@ -127,9 +127,9 @@ 
 			foreach ($trapDetail as $key => $val) 
 			{	
 				$trapval[$key]=array();
-				foreach (array_keys($queryArrayData) as $vkey ) 
+				foreach (array_keys($queryArrayData) as $vkey) 
 				{
-					array_push($trapval[$key],$val->$vkey);
+					array_push($trapval[$key], $val->$vkey);
 				}
 			}
 			$this->view->data_val=$trapval;
@@ -145,19 +145,19 @@ 
 	    $this->checkReadPermission();
 	    $this->prepareTabs()->activate('hosts');
 	    
-	    $db = $this->getDb();
+	    $db=$this->getDb();
 	    $this->getTrapHostListTable()->setConnection($db);
 	    
 	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(), $this->getModuleConfig()->itemListDisplay());
 	    
 	    // Set Filter
 	    //$postData=$this->getRequest()->getPost();
 	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+	    $filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 	    $filter['done']=$this->params->get('done');
 	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+	    $this->view->table->updateFilter(Url::fromRequest(), $filter);
 	}
 	
 	public function deleteAction()
@@ -176,15 +176,15 @@ 
 	{
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received')
+			'url'   => $this->getModuleConfig()->urlPath().'/received')
 		    )
 		    ->add('hosts', array(
 		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+		        'url'   => $this->getModuleConfig()->urlPath().'/received/hosts')
 		    )
 		    ->add('delete', array(
 			'label' => $this->translate('Delete'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
+			'url'   => $this->getModuleConfig()->urlPath().'/received/delete')
 		  );
 	} 
 
@@ -211,14 +211,14 @@ 
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;
 		}
-		if ($action =="count")
+		if ($action == "count")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->countTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->countTrap($ip, $oid)));
 			return;
 		}
-		if ($action =="delete")
+		if ($action == "delete")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->deleteTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->deleteTrap($ip, $oid)));
 			return;
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));

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());
 			return;
@@ -109,8 +110,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());
 		}
@@ -118,8 +118,7 @@ 
 		if ($trapDetail == null ) 
 		{
 			$this->view->data=false;
-		}
-		else
+		} else
 		{
 			$this->view->data=true;
 			// Store result in array.
@@ -205,8 +204,7 @@ 
 			$ip=$postData['IP'];
 			$oid=$postData['OID'];
 			$action=$postData['action'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;

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/TrapTableHostList.php

Indentation +81 added lines, -81 removed lines

@@ -21,13 +21,13 @@ 
 	protected $lastHost;
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
-	    return $this->moduleConfig->getTrapHostListTitles();
+		return $this->moduleConfig->getTrapHostListTitles();
 	}
 		
 	// ******************  Render table in html 
@@ -35,45 +35,45 @@ 
 	// Host grouping
 	protected function renderHostIfNew($IP,$hostname)
 	{
-	    $view = $this->getView();
+		$view = $this->getView();
 	    
-	    if ($this->lastHost === $IP) {
-	        return;
-	    }
+		if ($this->lastHost === $IP) {
+			return;
+		}
 	    
-	    if ($this->lastHost === null) 
-	    {
-	        $htm = "<thead>\n  <tr>\n";
-	    } else {
-	        $htm = "</tbody>\n<thead>\n  <tr>\n";
-	    }
+		if ($this->lastHost === null) 
+		{
+			$htm = "<thead>\n  <tr>\n";
+		} else {
+			$htm = "</tbody>\n<thead>\n  <tr>\n";
+		}
 	    
-	    if ($this->columnCount === null) 
-	    {
-	        $this->columnCount = count($this->getTitles());
-	    }
+		if ($this->columnCount === null) 
+		{
+			$this->columnCount = count($this->getTitles());
+		}
 	    
-	    $htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($IP);
-	    if ($hostname != null)
-	    {
-	        $htm .= ' ('.$hostname.')';
-	    }
-	    $htm .= '</th>' . "\n";
-	    if ($this->lastHost === null) {
-	        $htm .= "  </tr>\n";
-	    } else {
-	        $htm .= "  </tr>\n</thead>\n";
-	    }
+		$htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($IP);
+		if ($hostname != null)
+		{
+			$htm .= ' ('.$hostname.')';
+		}
+		$htm .= '</th>' . "\n";
+		if ($this->lastHost === null) {
+			$htm .= "  </tr>\n";
+		} else {
+			$htm .= "  </tr>\n</thead>\n";
+		}
 	    
-	    $this->lastHost = $IP;
+		$this->lastHost = $IP;
 	    
-	    return $htm . "<tbody>\n";
+		return $htm . "<tbody>\n";
 	}		
 	
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	public function render()
 	{
@@ -139,9 +139,9 @@ 
 
 	}
 
-    public function count()
-    {  
-        $db=$this->db();
+	public function count()
+	{  
+		$db=$this->db();
 		
 		$query = $this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
@@ -149,16 +149,16 @@ 
 		
 		return count($values);
 		
-        //return $db->fetchOne($query);
-    }
+		//return $db->fetchOne($query);
+	}
 	
-    public function getPaginator()
-    {
-        $paginator = new Paginator();
-        $paginator->setQuery($this);
+	public function getPaginator()
+	{
+		$paginator = new Paginator();
+		$paginator->setQuery($this);
 
-        return $paginator;
-    }
+		return $paginator;
+	}
 	
 	// ****************** DB connection and query
 	
@@ -168,24 +168,24 @@ 
 		
 		$query = $this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
-       if ($this->hasLimit() || $this->hasOffset()) {
-            $query->limit($this->getLimit(), $this->getOffset());
-        }		
+	   if ($this->hasLimit() || $this->hasOffset()) {
+			$query->limit($this->getLimit(), $this->getOffset());
+		}		
 		
 		return $db->fetchAll($query);
 	}
 	 
-    public function getBaseQuery()
-    {
+	public function getBaseQuery()
+	{
 		$db=$this->db();
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapTableName(),
-		    $this->moduleConfig->getTrapHostListDisplayColumns()
-		    )->group(array('t.source_ip','t.source_name','t.trap_oid'))
-		    ->order('t.source_ip');
+			$this->moduleConfig->getTrapTableName(),
+			$this->moduleConfig->getTrapHostListDisplayColumns()
+			)->group(array('t.source_ip','t.source_name','t.trap_oid'))
+			->order('t.source_ip');
 
-        return $query;
-    }	 
+		return $query;
+	}	 
 	
 	// ****************** Filters
 
@@ -215,39 +215,39 @@ 
 		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
 	}
 	
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	public function getColumns()
 	{
 		return $this->moduleConfig->getTrapListDisplayColumns();
 	}
 
-    public function setFilter($filter)
-    {
-        $this->filter = $filter;
-        return $this;
-    }
+	public function setFilter($filter)
+	{
+		$this->filter = $filter;
+		return $this;
+	}
 	
 	public function getFilterEditor(Request $request)
-    {
-        $filterEditor = Widget::create('filterEditor')
-            ->setColumns(array_keys($this->getColumns()))
-            ->setSearchColumns(array_keys($this->getSearchColumns()))
-            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
-            ->ignoreParams('page')
-            ->handleRequest($request);
+	{
+		$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();
-        $this->setFilter($filter);
+		$filter = $filterEditor->getFilter();
+		$this->setFilter($filter);
 
-        return $filterEditor;
-    }
+		return $filterEditor;
+	}
 	
-    protected function applyFiltersToQuery($query)
-    {
+	protected function applyFiltersToQuery($query)
+	{
 		
 		$sql='';
 		if ($this->filter_query != '')
@@ -268,8 +268,8 @@ 
 			$sql.="(status != 'done')";
 		}
 		if ($sql != '') $query->where($sql);		
-        return $query;
-    }	
+		return $query;
+	}	
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -256,7 +256,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" ".$column." LIKE  '%".$this->filter_query."%' ";
 			}
@@ -264,10 +266,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;
     }	
 

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."%' ";
 			}

library/Trapdirector/Tables/TrapTable.php

Indentation +123 added lines, -123 removed lines

@@ -26,7 +26,7 @@ 
 
 	// view limits
 	protected $limit;
-    protected $offset;
+	protected $offset;
 
 	// Used for rendering days in list
 	protected $columnCount;
@@ -34,55 +34,55 @@ 
 	
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	
 	// Must return titles in array ( id => display_name )
 	abstract protected function getTitles();
 	// ****************** Day header
-    protected function renderDayIfNew($timestamp)
-    {
-        $view = $this->getView();
+	protected function renderDayIfNew($timestamp)
+	{
+		$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);
-        } else {
-            $day = strftime('%A, %e. %B, %Y', (int) $timestamp);
-        }
-
-        if ($this->lastDay === $day) {
-            return;
-        }
-
-        if ($this->lastDay === null) {
-            $htm = "<thead>\n  <tr>\n";
-        } else {
-            $htm = "</tbody>\n<thead>\n  <tr>\n";
-        }
-
-        if ($this->columnCount === null) {
-            $this->columnCount = count($this->getTitles());
-        }
-
-        $htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($day) . '</th>' . "\n";
-        if ($this->lastDay === null) {
-            $htm .= "  </tr>\n";
-        } else {
-            $htm .= "  </tr>\n</thead>\n";
-        }
-
-        $this->lastDay = $day;
-
-        return $htm . "<tbody>\n";
-    }		
+		if (in_array(setlocale(LC_ALL, 0), array('en_US.UTF-8', 'C'))) {
+			$day = date('l, jS F Y', (int) $timestamp);
+		} else {
+			$day = strftime('%A, %e. %B, %Y', (int) $timestamp);
+		}
+
+		if ($this->lastDay === $day) {
+			return;
+		}
+
+		if ($this->lastDay === null) {
+			$htm = "<thead>\n  <tr>\n";
+		} else {
+			$htm = "</tbody>\n<thead>\n  <tr>\n";
+		}
+
+		if ($this->columnCount === null) {
+			$this->columnCount = count($this->getTitles());
+		}
+
+		$htm .= '<th colspan="' . $this->columnCount . '">' . $view->escape($day) . '</th>' . "\n";
+		if ($this->lastDay === null) {
+			$htm .= "  </tr>\n";
+		} else {
+			$htm .= "  </tr>\n</thead>\n";
+		}
+
+		$this->lastDay = $day;
+
+		return $htm . "<tbody>\n";
+	}		
 	// ******************  Render table in html  
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	abstract public function render();
 	
@@ -92,76 +92,76 @@ 
 		$this->moduleConfig = $conf;
 	}
 	// ******************  View get/set
-    protected function getView()
-    {
-        if ($this->view === null) {
-            $this->view = Icinga::app()->getViewRenderer()->view;
-        }
-        return $this->view;
-    }
+	protected function getView()
+	{
+		if ($this->view === null) {
+			$this->view = Icinga::app()->getViewRenderer()->view;
+		}
+		return $this->view;
+	}
 
-    public function setView($view)
-    {
-        $this->view = $view;
-    }	
+	public function setView($view)
+	{
+		$this->view = $view;
+	}	
 	
 	// Limits
 	
-    public function limit($count = null, $offset = null)
-    {
-        $this->limit = $count;
-        $this->offset = $offset;
+	public function limit($count = null, $offset = null)
+	{
+		$this->limit = $count;
+		$this->offset = $offset;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function hasLimit()
-    {
-        return $this->limit !== null;
-    }
+	public function hasLimit()
+	{
+		return $this->limit !== null;
+	}
 
-    public function getLimit()
-    {
-        return $this->limit;
-    }
+	public function getLimit()
+	{
+		return $this->limit;
+	}
 
-    public function hasOffset()
-    {
-        return $this->offset !== null;
-    }
+	public function hasOffset()
+	{
+		return $this->offset !== null;
+	}
 
-    public function getOffset()
-    {
-        return $this->offset;
-    }
+	public function getOffset()
+	{
+		return $this->offset;
+	}
 	
 	abstract function count();
 	
-    public function getPaginator()
-    {
-        $paginator = new Paginator();
-        $paginator->setQuery($this);
+	public function getPaginator()
+	{
+		$paginator = new Paginator();
+		$paginator->setQuery($this);
 
-        return $paginator;
-    }
+		return $paginator;
+	}
 	
 	// ****************** DB connection and query
 	
-    public function setConnection(Selectable $connection)
-    {
-        $this->connection = $connection;
-        return $this;
-    }
+	public function setConnection(Selectable $connection)
+	{
+		$this->connection = $connection;
+		return $this;
+	}
 
-    protected function connection()
-    {
-        return $this->connection;
-    }
+	protected function connection()
+	{
+		return $this->connection;
+	}
 
-    protected function db()
-    {
-        return $this->connection()->getConnection();
-    }
+	protected function db()
+	{
+		return $this->connection()->getConnection();
+	}
 	
 	protected function getTable()
 	{
@@ -169,52 +169,52 @@ 
 		
 		$query = $this->getBaseQuery();
 		
-       if ($this->hasLimit() || $this->hasOffset()) {
-            $query->limit($this->getLimit(), $this->getOffset());
-        }		
+	   if ($this->hasLimit() || $this->hasOffset()) {
+			$query->limit($this->getLimit(), $this->getOffset());
+		}		
 		
 		return $db->fetchAll($query);
 	}
 	 
-    abstract public function getBaseQuery(); 
+	abstract public function getBaseQuery(); 
 	
 	// ****************** Filters
 
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	abstract public function getColumns();
 
-    public function setFilter($filter)
-    {
-        $this->filter = $filter;
-        return $this;
-    }
+	public function setFilter($filter)
+	{
+		$this->filter = $filter;
+		return $this;
+	}
 	
 	public function getFilterEditor(Request $request)
-    {
-        $filterEditor = Widget::create('filterEditor')
-            ->setColumns(array_keys($this->getColumns()))
-            ->setSearchColumns(array_keys($this->getSearchColumns()))
-            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
-            ->ignoreParams('page')
-            ->handleRequest($request);
+	{
+		$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();
-        $this->setFilter($filter);
+		$filter = $filterEditor->getFilter();
+		$this->setFilter($filter);
 
-        return $filterEditor;
-    }
+		return $filterEditor;
+	}
 	
 	protected function renderFilter($filter)
 	{ // TODO : create a better filter wher user can choose host/oid to filter
 	}
 	
-    protected function applyFiltersToQuery($query)
-    {
-        /*
+	protected function applyFiltersToQuery($query)
+	{
+		/*
 		$filter = null;
         $enforced = $this->enforcedFilters;
         if ($this->filter && ! $this->filter->isEmpty()) {
@@ -230,8 +230,8 @@ 
             $query->where($this->renderFilter($filter));
         }
 		*/
-        return $query;
-    }	
+		return $query;
+	}	
 
 }
 

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/HandlerTableList.php

Indentation +59 added lines, -59 removed lines

@@ -31,9 +31,9 @@ 
 	
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	protected function getTitles() {
 		return $this->moduleConfig->getHandlerListTitles();
@@ -45,10 +45,10 @@ 
 		$this->doTranslate=true;
 	}
 	// ******************  Render table in html  
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	public function render()
 	{
@@ -153,30 +153,30 @@ 
 
 	}
 
-    public function count()
-    {
-        $db = $this->connection()->getConnection();
-        $query = clone($this->getBaseQuery());
-        $query->reset('order')->columns(array('COUNT(*)'));
-        $this->applyFiltersToQuery($query);
+	public function count()
+	{
+		$db = $this->connection()->getConnection();
+		$query = clone($this->getBaseQuery());
+		$query->reset('order')->columns(array('COUNT(*)'));
+		$this->applyFiltersToQuery($query);
 
 		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapRuleName(),
-            array('COUNT(*)')
-        );
+			$this->moduleConfig->getTrapRuleName(),
+			array('COUNT(*)')
+		);
 		
-        return $db->fetchOne($query);
-    }
+		return $db->fetchOne($query);
+	}
 	
-    public function getPaginator()
-    {
-        $paginator = new Paginator();
-        $paginator->setQuery($this);
+	public function getPaginator()
+	{
+		$paginator = new Paginator();
+		$paginator->setQuery($this);
 
-        return $paginator;
-    }
+		return $paginator;
+	}
 	
 	// ****************** DB connection and query
 	
@@ -186,63 +186,63 @@ 
 		
 		$query = $this->getBaseQuery();
 		
-       if ($this->hasLimit() || $this->hasOffset()) {
-            $query->limit($this->getLimit(), $this->getOffset());
-        }		
+	   if ($this->hasLimit() || $this->hasOffset()) {
+			$query->limit($this->getLimit(), $this->getOffset());
+		}		
 		
 		return $db->fetchAll($query);
 	}
 	 
-    public function getBaseQuery()
-    {
+	public function getBaseQuery()
+	{
 		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapRuleName(),
-            $this->moduleConfig->getHandlerListDisplayColumns()
-        )->order('host_name DESC,trap_oid DESC');
+			$this->moduleConfig->getTrapRuleName(),
+			$this->moduleConfig->getHandlerListDisplayColumns()
+		)->order('host_name DESC,trap_oid DESC');
 
-        return $query;
-    }	 
+		return $query;
+	}	 
 	
 	// ****************** Filters
 
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	public function getColumns()
 	{
 		return $this->moduleConfig->getHandlerListDisplayColumns();
 	}
 
-    public function setFilter($filter)
-    {
-        $this->filter = $filter;
-        return $this;
-    }
+	public function setFilter($filter)
+	{
+		$this->filter = $filter;
+		return $this;
+	}
 	
 	public function getFilterEditor(Request $request)
-    {
-        $filterEditor = Widget::create('filterEditor')
-            ->setColumns(array_keys($this->getColumns()))
-            ->setSearchColumns(array_keys($this->getSearchColumns()))
-            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
-            ->ignoreParams('page')
-            ->handleRequest($request);
+	{
+		$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();
-        $this->setFilter($filter);
+		$filter = $filterEditor->getFilter();
+		$this->setFilter($filter);
 
-        return $filterEditor;
-    }
+		return $filterEditor;
+	}
 	
-    protected function applyFiltersToQuery($query)
-    {
+	protected function applyFiltersToQuery($query)
+	{
 		// TODO : implement
 		
-        /*$filter = null;
+		/*$filter = null;
         $enforced = $this->enforcedFilters;
         if ($this->filter && ! $this->filter->isEmpty()) {
             $filter = $this->filter;
@@ -257,8 +257,8 @@ 
         }
 		*/
 		
-        return $query;
-    }	
+		return $query;
+	}	
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -32,8 +32,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		return $this->moduleConfig->getHandlerListTitles();
@@ -53,34 +53,34 @@ 
 	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);
 			
 			
 			// Render row
-			$htm .= '<tr '.' >';
-			foreach ( $titles as $rowkey => $title) 
+			$htm.='<tr '.' >';
+			foreach ($titles as $rowkey => $title) 
 			{
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
@@ -93,7 +93,7 @@ 
 						break;
 						case 'trap_oid': // try to traslate oids.
 						
-							if ($this->doTranslate==true)
+							if ($this->doTranslate == true)
 							{
 								$oidName=$this->MIB->translateOID($row->$rowkey);
 								if (isset($oidName['name']))
@@ -102,52 +102,52 @@ 
 								}
 								else
 								{
-									$val = $row->$rowkey;
+									$val=$row->$rowkey;
 								}								
 							}
 							else
 							{
-								$val = $row->$rowkey;
+								$val=$row->$rowkey;
 							}
 						break;
 						case 'host_name': // switch to hostgroup if name is null
 							if ($row->$rowkey == null)
 							{
-								$val = $row->host_group_name;
+								$val=$row->host_group_name;
 							}
 							else
 							{
-								$val = $row->$rowkey;
+								$val=$row->$rowkey;
 							}
 						break;
 						default:
-							$val = $row->$rowkey;
+							$val=$row->$rowkey;
 					}
-					if ($rowkey == 'trap_oid' && $this->doTranslate==true)
+					if ($rowkey == 'trap_oid' && $this->doTranslate == true)
 					{					
 							
 					}
 				} 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() . '/handler/add', 
+										$this->moduleConfig->urlPath().'/handler/add', 
 										array('ruleid' => $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;
 
@@ -155,14 +155,14 @@ 
 
     public function count()
     {
-        $db = $this->connection()->getConnection();
-        $query = clone($this->getBaseQuery());
+        $db=$this->connection()->getConnection();
+        $query=clone($this->getBaseQuery());
         $query->reset('order')->columns(array('COUNT(*)'));
         $this->applyFiltersToQuery($query);
 
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapRuleName(),
             array('COUNT(*)')
         );
@@ -172,7 +172,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -184,7 +184,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -197,7 +197,7 @@ 
     {
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapRuleName(),
             $this->moduleConfig->getHandlerListDisplayColumns()
         )->order('host_name DESC,trap_oid DESC');
@@ -219,20 +219,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;

Braces +3 added lines, -6 removed lines

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