patrickpr / trapdirector

configuration.php

Spacing +4 added lines, -4 removed lines

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

application/clicommands/StatusCommand.php

Spacing +9 added lines, -9 removed lines

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

application/clicommands/TrapsCommand.php

Spacing +10 added lines, -10 removed lines

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

application/forms/TrapsConfigForm.php

Spacing +3 added lines, -3 removed lines

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

application/controllers/SettingsController.php

Spacing +63 added lines, -63 removed lines

@@ -55,15 +55,15 @@ 
     }
 	// Test Database
 	$db_message=array( // index => ( message OK, message NOK, optional link if NOK ) 
-		0	=>	array('Database configuration OK','',''),
-		1	=>	array('Database set in config.ini','No database in config.ini',''),
-		2	=>	array('Database exists in Icingaweb2 config','Database does not exist in Icingaweb2 : ',
+		0	=>	array('Database configuration OK', '', ''),
+		1	=>	array('Database set in config.ini', 'No database in config.ini', ''),
+		2	=>	array('Database exists in Icingaweb2 config', 'Database does not exist in Icingaweb2 : ',
 					Url::fromPath('config/resource')),
-		3	=>	array('Database credentials OK','Database does not exist/invalid credentials/no schema : ',
+		3	=>	array('Database credentials OK', 'Database does not exist/invalid credentials/no schema : ',
 					Url::fromPath('trapdirector/settings/createschema')),
-		4	=>	array('Schema is set','Schema is not set for ',
+		4	=>	array('Schema is set', 'Schema is not set for ',
 					Url::fromPath('trapdirector/settings/createschema')),					
-		5	=>	array('Schema is up to date','Schema is outdated :',
+		5	=>	array('Schema is up to date', 'Schema is outdated :',
 					Url::fromPath('trapdirector/settings/updateschema')),
 	);
 		
@@ -74,13 +74,13 @@ 
 	{
 		case 2:
 		case 4:
-			$db_message[$dberror[0]][1] .= $dberror[1];
+			$db_message[$dberror[0]][1].=$dberror[1];
 			break;
 		case 3:
-			$db_message[$dberror[0]][1] .= $dberror[1] . ', Message : ' . $dberror[2];
+			$db_message[$dberror[0]][1].=$dberror[1].', Message : '.$dberror[2];
 			break;
 		case 5:
-			$db_message[$dberror[0]][1] .= ' version '. $dberror[1] . ', version needed : ' .$dberror[2];
+			$db_message[$dberror[0]][1].=' version '.$dberror[1].', version needed : '.$dberror[2];
 			break;
 		case 0:
 		case 1:
@@ -92,18 +92,18 @@ 
 	
 	$dberror=$this->getIdoDb(true); // Get IDO DB in test mode
 	$this->view->ido_db_error=$dberror[0];
-	$this->view->ido_message='IDO Database : ' . $dberror[1];
+	$this->view->ido_message='IDO Database : '.$dberror[1];
 	
 	//********* Test API
 	if ($this->Config()->get('config', 'icingaAPI_host') != '')
 	{
-	    $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'),$this->Config()->get('config', 'icingaAPI_port'));
+	    $apitest=new Icinga2Api($this->Config()->get('config', 'icingaAPI_host'), $this->Config()->get('config', 'icingaAPI_port'));
     	$apitest->setCredentials($this->Config()->get('config', 'icingaAPI_user'), $this->Config()->get('config', 'icingaAPI_password'));
     	try {
-    	    list($this->view->apimessageError,$this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
+    	    list($this->view->apimessageError, $this->view->apimessage)=$apitest->test($this->getModuleConfig()::getapiUserPermissions());
     	    //$this->view->apimessageError=false;
     	} catch (RuntimeException $e) {
-    	    $this->view->apimessage='API config : ' . $e->getMessage();
+    	    $this->view->apimessage='API config : '.$e->getMessage();
     	    $this->view->apimessageError=true;
     	} 
 	}
@@ -114,18 +114,18 @@ 
 	}
 	
 	//*********** Test snmptrapd alive and options
-	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
+	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage)=$this->checkSnmpTrapd();
 
 	// List DB in $ressources
-	$resources = array();
-	$allowed = array('mysql', 'pgsql');
+	$resources=array();
+	$allowed=array('mysql', 'pgsql');
 	foreach (ResourceFactory::getResourceConfigs() as $name => $resource) {
 		if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) {
-			$resources[$name] = $name;
+			$resources[$name]=$name;
 		}
 	}
 
-    $this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+    $this->view->tabs=$this->Module()->getConfigTabs()->activate('config');
 
 	// Check standard Icingaweb2 path
 	$this->view->icingaEtcWarn=0;
@@ -134,9 +134,9 @@ 
 	{
 	    $output=array();
 	    
-	    exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2_etc=" ',$output);
+	    exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2_etc=" ', $output);
 	    
-	    if (! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+	    if (!preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
 	    {
     	    $this->view->icingaEtcWarn=1;
 	        $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -144,23 +144,23 @@ 
 	}
 
 	// Setup path for mini documentation
-	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=PHP_BINARY.' '.$this->Module()->getBaseDir().'/bin/trap_in.php';
 	
-	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
+	$this->view->installer=$this->Module()->getBaseDir().'/bin/installer.sh '
 	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . PHP_BINARY
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.PHP_BINARY
+	    . ' -a '.exec('whoami')
+	    . ' -w '.Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
-	$this->view->form = $form = new TrapsConfigForm();
+	$this->view->form=$form=new TrapsConfigForm();
 	
 	// set default paths;
-	$this->view->form->setPaths($this->Module()->getBaseDir(),Icinga::app()->getConfigDir());
+	$this->view->form->setPaths($this->Module()->getBaseDir(), Icinga::app()->getConfigDir());
 	
 	// set default ido database
-	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring','backends')->get('icinga','resource'));
+	$this->view->form->setDefaultIDODB($this->Config()->module('monitoring', 'backends')->get('icinga', 'resource'));
 	
 	// Make form handle request.
 	$form->setIniConfig($this->Config())
@@ -172,7 +172,7 @@ 
   public function createschemaAction()
   {
 	$this->checkModuleConfigPermission();
-	$this->getTabs()->add('create_schema',array(
+	$this->getTabs()->add('create_schema', array(
 		'active'	=> true,
 		'label'		=> $this->translate('Create Schema'),
 		'url'		=> Url::fromRequest()
@@ -193,7 +193,7 @@ 
 		$dbName=$this->Config()->get('config', 'database');
 
 		try {
-		  $dbResource = ResourceFactory::getResourceConfig($dbName);
+		  $dbResource=ResourceFactory::getResourceConfig($dbName);
 		  $dbType=$dbResource->get('db');
 		  switch ($dbType) {
 		      case 'mysql':
@@ -205,34 +205,34 @@ 
 		      default:
 		          throw new ConfigurationError('Unsuported database : '.$dbType);
 		  }
-		} catch (ConfigurationError $e )
+		} catch (ConfigurationError $e)
 		{
-		    printf("Database configuration error : %s",$e->getMessage());
+		    printf("Database configuration error : %s", $e->getMessage());
 		    return;
 		}
 		printf('<pre>');
-		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
+		require_once $this->Module()->getBaseDir().'/bin/trap_class.php';
 		
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$debug_level=4;
-		$Trap = new Trap($icingaweb2_etc);
-		$Trap->setLogging($debug_level,'display');
+		$Trap=new Trap($icingaweb2_etc);
+		$Trap->setLogging($debug_level, 'display');
 		
 		$prefix=$this->Config()->get('config', 'database_prefix');
 		// schema file : <path>/SQL/schema_v<verion>.<dbtype>
-		$schema=$this->Module()->getBaseDir() . 
-		'/SQL/schema_v'. $this->getModuleConfig()->getDbCurVersion() . '.' . $dbFileExt;
+		$schema=$this->Module()->getBaseDir(). 
+		'/SQL/schema_v'.$this->getModuleConfig()->getDbCurVersion().'.'.$dbFileExt;
 		
-		$Trap->create_schema($schema,$prefix);
+		$Trap->create_schema($schema, $prefix);
 		echo '</pre>';
 	}
-	echo '<br><br>Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a>';
+	echo '<br><br>Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a>';
   }
 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-    	$this->getTabs()->add('get',array(
+    	$this->getTabs()->add('get', array(
     		'active'	=> true,
     		'label'		=> $this->translate('Update Schema'),
     		'url'		=> Url::fromRequest()
@@ -241,7 +241,7 @@ 
 	  
 	  $dberror=$this->getDb(true); // Get DB in test mode
 	  
-	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
+	  echo 'Return to <a href="'.Url::fromPath('trapdirector/settings').'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] == 0)
 	  {
@@ -254,40 +254,40 @@ 
 	      return;
 	  }
       // setup
-	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	  require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
-	  $Trap = new Trap($icingaweb2_etc);
+	  $Trap=new Trap($icingaweb2_etc);
 	  
 	  
 	  $prefix=$this->Config()->get('config', 'database_prefix');
-	  $updateSchema=$this->Module()->getBaseDir() . '/SQL/';
+	  $updateSchema=$this->Module()->getBaseDir().'/SQL/';
 	  
 	  $target_version=$dberror[2];
 	  
 	  if ($this->params->get('msgok') == null) {
 	      // Check for messages and display if any
               echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
-	      $Trap->setLogging(2,'syslog');
-	      $message = $Trap->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->update_schema($updateSchema, $target_version, $prefix, true);
 	      if ($message != '')
 	      {
 	          echo 'Note :<br><pre>';
 	          echo $message;
 	          echo '</pre>';
 	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="'.Url::fromPath('trapdirector/settings/updateschema').'?msgok=1">Click here to update</a>';
 	          echo '<br>';
 	          return;
 	      }
 	  }
 	  
-	  $Trap->setLogging($debug_level,'display');
+	  $Trap->setLogging($debug_level, 'display');
 	  
-	  echo 'Updating schema to '. $target_version . ': <br>';
+	  echo 'Updating schema to '.$target_version.': <br>';
 	  echo '<pre>';
 	  	  
-	  $Trap->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -295,26 +295,26 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      exec('netstat -an |grep -E "udp.*:162"',$psOutput);
+      exec('netstat -an |grep -E "udp.*:162"', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : snmptrapd must not be started');
+          return array(1, 'Port UDP/162 is not open : snmptrapd must not be started');
       }
       $psOutput=array();
-      exec('ps fax |grep snmptrapd |grep -v grep',$psOutput);
+      exec('ps fax |grep snmptrapd |grep -v grep', $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,"UDP/162 : OK, but no snmptrapd process (?)");
+          return array(1, "UDP/162 : OK, but no snmptrapd process (?)");
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
-      $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      $line=preg_replace('/^.*snmptrapd /', '', $psOutput[0]);
+      if (!preg_match('/-n/', $line))
+          return array(1, 'snmptrapd has no -n option : '.$line);
+      if (!preg_match('/-O[^ ]*n/', $line))
+          return array(1, 'snmptrapd has no -On option : '.$line);
+      if (!preg_match('/-O[^ ]*e/', $line))
+          return array(1, 'snmptrapd has no -Oe option : '.$line);
       
-      return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+      return array(0, 'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

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

application/clicommands/MibCommand.php

Spacing +23 added lines, -23 removed lines

@@ -36,39 +36,39 @@ 
 	*/
 	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;
+	    $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');
+	        $file=@fopen($background, 'w');
 	        if ($file == false)
 	        {
 	            echo 'Error : cannot open pid file '.$background;
 	            return 1;
 	        }
-	        $pid = pcntl_fork();
+	        $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');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-		$trap = new Trap($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);
+		        fwrite($file, $pid);
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
@@ -82,11 +82,11 @@ 
                 fclose(STDERR);
                 try
                 {
-                    $trap->update_mib_database(false,$forceCheck);
+                    $trap->update_mib_database(false, $forceCheck);
                 }
                 catch (Exception $e)
                 {
-                    $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
+                    $trap->trapLog('Error in updating : '.$e->getMessage(), 2);
                 }
                 unlink($background);
                 return 0;
@@ -98,13 +98,13 @@ 
 		{
 			echo "Update main mib database : \n";
 			echo "# (trap found) C (trap already processed) . (every 2 seconds) : \n";
-			$trap->update_mib_database(true,$forceCheck);
+			$trap->update_mib_database(true, $forceCheck);
 			echo "Done\n";
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}
 		if ($pid != 1)
 		{
@@ -128,26 +128,26 @@ 
 		echo "Not implemented";
 		// TODO : implement
 		return;
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$db=IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
-			$query = $db->select()->from($Config->getTrapTableName(),array('COUNT(*)'));			
-			echo "Number of traps : " . $db->fetchOne($query) ."\n";
-			$query = $db->select()->from($Config->getTrapDataTableName(),array('COUNT(*)'));			
-			echo "Number of trap objects : " . $db->fetchOne($query) ."\n";
-			$query = $db->select()->from($Config->getTrapRuleName(),array('COUNT(*)'));			
-			echo "Number of rules : " . $db->fetchOne($query) ."\n";		
+			$query=$db->select()->from($Config->getTrapTableName(), array('COUNT(*)'));			
+			echo "Number of traps : ".$db->fetchOne($query)."\n";
+			$query=$db->select()->from($Config->getTrapDataTableName(), array('COUNT(*)'));			
+			echo "Number of trap objects : ".$db->fetchOne($query)."\n";
+			$query=$db->select()->from($Config->getTrapRuleName(), array('COUNT(*)'));			
+			echo "Number of rules : ".$db->fetchOne($query)."\n";		
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in DB : ' . $e->getMessage();
+			echo 'Error in DB : '.$e->getMessage();
 		}	   
 	}  	 	
 

library/Trapdirector/Tables/TrapTable.php

Spacing +25 added lines, -25 removed lines

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

library/Trapdirector/Tables/HandlerTableList.php

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;