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 (

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');

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

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

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')
 		  );

application/clicommands/MibCommand.php

Indentation +71 added lines, -71 removed lines

@@ -20,77 +20,77 @@ 
 class MibCommand extends Command
 {
 	/**
-	*	Update mib database
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib update
-	*	
-	*	OPTIONS
-	*	
-	*	--pid <file> : run in background with pid in <file>
-	*
-	*	--verb    : Set output log to verbose
-	*
-	*   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
-	*/
+	 *	Update mib database
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib update
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--pid <file> : run in background with pid in <file>
+	 *
+	 *	--verb    : Set output log to verbose
+	 *
+	 *   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
+	 */
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
-	    $pid=1;
-	    if ($background != null)
-	    {
-	        $file=@fopen($background,'w');
-	        if ($file == false)
-	        {
-	            echo 'Error : cannot open pid file '.$background;
-	            return 1;
-	        }
-	        $pid = pcntl_fork();
-	        if ($pid == -1) {
-	            echo 'Error : Cannot fork process';
-	            return 1;
-	        }
-	    }
-	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
+		$background = $this->params->get('pid', null);
+		$logLevel= $this->params->has('verb') ? 4 : 2;
+		if ($this->params->has('force-check')) { echo "Not implemented"; return;}
+		$forceCheck=$this->params->has('force-check')?True:False;
+		$pid=1;
+		if ($background != null)
+		{
+			$file=@fopen($background,'w');
+			if ($file == false)
+			{
+				echo 'Error : cannot open pid file '.$background;
+				return 1;
+			}
+			$pid = pcntl_fork();
+			if ($pid == -1) {
+				echo 'Error : Cannot fork process';
+				return 1;
+			}
+		}
+		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
 		require_once($module->getBaseDir() .'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$trap = new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+			$trap->setLogging($logLevel,'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
-		    if ($pid != 0)
-		    {
-		        // father process
-		        fwrite($file,$pid);
-		        fclose($file);
-		        echo "OK : process $pid in bckground";
-		        return 0;
-		    }
-		    else
-		    {  // son process : close all file descriptors and go to a new session
-		        fclose($file);		        
+			if ($pid != 0)
+			{
+				// father process
+				fwrite($file,$pid);
+				fclose($file);
+				echo "OK : process $pid in bckground";
+				return 0;
+			}
+			else
+			{  // son process : close all file descriptors and go to a new session
+				fclose($file);		        
 // 		        $sid = posix_setsid();
-                fclose(STDIN);
-                fclose(STDOUT);
-                fclose(STDERR);
-                try
-                {
-                    $trap->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
-                {
-                    $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
-                }
-                unlink($background);
-                return 0;
-		    }
+				fclose(STDIN);
+				fclose(STDOUT);
+				fclose(STDERR);
+				try
+				{
+					$trap->update_mib_database(false,$forceCheck);
+				}
+				catch (Exception $e)
+				{
+					$trap->trapLog('Error in updating : ' . $e->getMessage(),2);
+				}
+				unlink($background);
+				return 0;
+			}
 		    
 		}
 		
@@ -108,20 +108,20 @@ 
 		}
 		if ($pid != 1)
 		{
-		    unlink($background);
+			unlink($background);
 		}
 	}
 	/**
-	*	purge all mib database NOT IMPLEMENTED
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib purge --confirm yes
-	*	
-	*	OPTIONS
-	*	
-	*	--confirm yes : needed to execute purge
-	*/
+	 *	purge all mib database NOT IMPLEMENTED
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib purge --confirm yes
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--confirm yes : needed to execute purge
+	 */
 	public function purgeAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');

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;
+	}	
 
 }
 

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;
+	}	
 
 }
 

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;
+	}	
 
 }