patrickpr / trapdirector

application/controllers/SettingsController.php

Braces +17 added lines, -17 removed lines

@@ -52,8 +52,7 @@ 
               $this->Config()->saveIni();
               $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
               //$emptyConfig=1;
-          }
-          catch (Exception $e)
+          } catch (Exception $e)
           {
               $this->view->configErrorDetected=$e->getMessage();
           }
@@ -141,8 +140,7 @@ 
               $this->view->apimessage='API config : ' . $e->getMessage();
               $this->view->apimessageError=true;
           }
-      }
-      else
+      } else
       {
           $this->view->apimessage='API parameters not configured';
           $this->view->apimessageError=true;
@@ -208,7 +206,9 @@ 
           $input="154865134987aaaa";
           exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (! isset($output[0])) {
+          	$output[0]="NO OUT";
+          }
           
           if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
           {
@@ -310,8 +310,7 @@ 
 	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
 	    printf('Schema already exists');
 	    
-	} 
-	catch (DBException $e) 
+	} catch (DBException $e) 
 	{
 
 		printf('Creating schema : <br>');
@@ -367,8 +366,7 @@ 
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
           echo 'Schema already exists and is up to date<br>';
           return;
-      }
-      catch (DBException $e)
+      } catch (DBException $e)
       {
           $dberror=$e->getArray(); 
       }
@@ -452,16 +450,18 @@ 
           }
           // 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);
+          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);
-      }
-      else
+      } else
       {
           return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
       }

Indentation +225 added lines, -225 removed lines

@@ -25,16 +25,16 @@ 
    */
   private function get_param()
   {
-      $dberrorMsg=$this->params->get('dberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
-      $dberrorMsg=$this->params->get('idodberror');
-      if ($dberrorMsg != '')
-      {
-          $this->view->errorDetected=$dberrorMsg;
-      }
+	  $dberrorMsg=$this->params->get('dberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
+	  $dberrorMsg=$this->params->get('idodberror');
+	  if ($dberrorMsg != '')
+	  {
+		  $this->view->errorDetected=$dberrorMsg;
+	  }
   }
   
   /**
@@ -43,22 +43,22 @@ 
    */
   private function check_empty_config()
   {
-      $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
-      if ($this->Config()->isEmpty() == true)
-      {
-          $this->Config()->setSection('config'); // Set base config section.
-          try
-          {
-              $this->Config()->saveIni();
-              $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
-              //$emptyConfig=1;
-          }
-          catch (Exception $e)
-          {
-              $this->view->configErrorDetected=$e->getMessage();
-          }
+	  $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	  if ($this->Config()->isEmpty() == true)
+	  {
+		  $this->Config()->setSection('config'); // Set base config section.
+		  try
+		  {
+			  $this->Config()->saveIni();
+			  $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
+			  //$emptyConfig=1;
+		  }
+		  catch (Exception $e)
+		  {
+			  $this->view->configErrorDetected=$e->getMessage();
+		  }
           
-      }
+	  }
   }
   
   /**
@@ -71,56 +71,56 @@ 
    */
   private function check_db()
   {
-      $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 : ',
-              Url::fromPath('config/resource')),
-          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 ',
-              Url::fromPath('trapdirector/settings/createschema')),
-          5	=>	array('Schema is up to date','Schema is outdated :',
-              Url::fromPath('trapdirector/settings/updateschema')),
-      );
+	  $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 : ',
+			  Url::fromPath('config/resource')),
+		  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 ',
+			  Url::fromPath('trapdirector/settings/createschema')),
+		  5	=>	array('Schema is up to date','Schema is outdated :',
+			  Url::fromPath('trapdirector/settings/updateschema')),
+	  );
       
-      try {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->db_error=$dberror[0];
-      switch ($dberror[0])
-      {
-          case 2:
-          case 4:
-              $db_message[$dberror[0]][1] .= $dberror[1];
-              break;
-          case 3:
-              $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];
-              break;
-          case 0:
-          case 1:
-              break;
-          default:
-              new ProgrammingError('Out of bond result from database test');
-      }
-      $this->view->message=$db_message;
+	  $this->view->db_error=$dberror[0];
+	  switch ($dberror[0])
+	  {
+		  case 2:
+		  case 4:
+			  $db_message[$dberror[0]][1] .= $dberror[1];
+			  break;
+		  case 3:
+			  $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];
+			  break;
+		  case 0:
+		  case 1:
+			  break;
+		  default:
+			  new ProgrammingError('Out of bond result from database test');
+	  }
+	  $this->view->message=$db_message;
       
-      try {
-          $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
-      } catch (DBException $e) {
-          $dberror = $e->getArray();
-      }
+	  try {
+		  $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
+		  $dberror=array(0,'');
+	  } catch (DBException $e) {
+		  $dberror = $e->getArray();
+	  }
       
-      $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+	  $this->view->ido_db_error=$dberror[0];
+	  $this->view->ido_message='IDO Database : ' . $dberror[1];
   }
   
   /**
@@ -130,23 +130,23 @@ 
    */
   private function check_api()
   {
-      if ($this->Config()->get('config', 'icingaAPI_host') != '')
-      {
-          $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());
-              //$this->view->apimessageError=false;
-          } catch (RuntimeException $e) {
-              $this->view->apimessage='API config : ' . $e->getMessage();
-              $this->view->apimessageError=true;
-          }
-      }
-      else
-      {
-          $this->view->apimessage='API parameters not configured';
-          $this->view->apimessageError=true;
-      }
+	  if ($this->Config()->get('config', 'icingaAPI_host') != '')
+	  {
+		  $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());
+			  //$this->view->apimessageError=false;
+		  } catch (RuntimeException $e) {
+			  $this->view->apimessage='API config : ' . $e->getMessage();
+			  $this->view->apimessageError=true;
+		  }
+	  }
+	  else
+	  {
+		  $this->view->apimessage='API parameters not configured';
+		  $this->view->apimessageError=true;
+	  }
   }
 
   /**
@@ -157,21 +157,21 @@ 
    */
   private function check_icingaweb_path()
   {
-      $this->view->icingaEtcWarn=0;
-      $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-      if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
-      {
-          $output=array();
+	  $this->view->icingaEtcWarn=0;
+	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+	  if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
+	  {
+		  $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+		  exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
-          {
-              $this->view->icingaEtcWarn=1;
-              $this->view->icingaweb2_etc=$icingaweb2_etc;
-          }
-      }
+		  if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		  {
+			  $this->view->icingaEtcWarn=1;
+			  $this->view->icingaweb2_etc=$icingaweb2_etc;
+		  }
+	  }
       
   }
   
@@ -182,15 +182,15 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
-      foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
-      {
-          if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
-          {
-              $resources[$name] = $name;
-          }
-      }
-      return $resources;
+	  $resources = array();
+	  foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
+	  {
+		  if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
+		  {
+			  $resources[$name] = $name;
+		  }
+	  }
+	  return $resources;
   }
   
   /**
@@ -199,23 +199,23 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+	  $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
-      {
-          $output=array();
-          $retCode=255;
-          $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+	  foreach ($phpBinary as $phpBin )
+	  {
+		  $output=array();
+		  $retCode=255;
+		  $input="154865134987aaaa";
+		  exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+		  if (! isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
-          {
-              return $phpBin;
-          }          
-      }
-      return NULL;
+		  if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+		  {
+			  return $phpBin;
+		  }          
+	  }
+	  return NULL;
   }
   
   /**
@@ -234,7 +234,7 @@ 
   public function indexAction()
   {
       
-    // CHeck permissions : display tests in any case, but no configuration.
+	// CHeck permissions : display tests in any case, but no configuration.
 	$this->view->configPermission=$this->checkModuleConfigPermission(1);
 	// But check read permission
 	$this->checkReadPermission();
@@ -242,16 +242,16 @@ 
 	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
-    $this->get_param();
+	$this->get_param();
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	$this->check_empty_config();
 
 	// Test Database
-    $this->check_db();
+	$this->check_db();
 	
 	//********* Test API
-    $this->check_api();
+	$this->check_api();
 	
 	//*********** Test snmptrapd alive and options
 	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
@@ -265,7 +265,7 @@ 
 	$phpBinary = $this->get_php_binary();
 	if ($phpBinary == null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+		$phpBinary = ' PHP BINARY NOT FOUND ';
 	    
 	}
 	
@@ -273,11 +273,11 @@ 
 	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$this->view->installer= $this->Module()->getBaseDir() . '/bin/installer.sh '
-	    . ' -c all ' 
-	    . ' -d ' . $this->Module()->getBaseDir()
-	    . ' -p ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . $phpBinary
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -307,8 +307,8 @@ 
 	
 	try 
 	{
-	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-	    printf('Schema already exists');
+		$this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		printf('Schema already exists');
 	    
 	} 
 	catch (DBException $e) 
@@ -319,19 +319,19 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
-        $dbType=$dbResource->get('db');
-        switch ($dbType) {
-          case 'mysql':
-              $dbFileExt='sql';
-              break;
-          case 'pgsql':
-              $dbFileExt='pgsql';
-              break;
-          default:
-              printf("Database configuration error : Unsuported DB");
-              return;
-        } 
+		$dbResource = ResourceFactory::getResourceConfig($dbName);
+		$dbType=$dbResource->get('db');
+		switch ($dbType) {
+		  case 'mysql':
+			  $dbFileExt='sql';
+			  break;
+		  case 'pgsql':
+			  $dbFileExt='pgsql';
+			  break;
+		  default:
+			  printf("Database configuration error : Unsuported DB");
+			  return;
+		} 
 
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -355,32 +355,32 @@ 
   public function updateschemaAction()
   {
 	  $this->checkModuleConfigPermission();
-      $this->getTabs()->add('get',array(
-    		'active'	=> true,
-    		'label'		=> $this->translate('Update Schema'),
-    		'url'		=> Url::fromRequest()
-    	));
+	  $this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Update Schema'),
+			'url'		=> Url::fromRequest()
+		));
 	  // check if needed
 	  $dberror=array();
-      try
-      {
-          $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          echo 'Schema already exists and is up to date<br>';
-          return;
-      }
-      catch (DBException $e)
-      {
-          $dberror=$e->getArray(); 
-      }
+	  try
+	  {
+		  $this->getUIDatabase()->testGetDb(); // Get DB in test mode
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
+	  }
+	  catch (DBException $e)
+	  {
+		  $dberror=$e->getArray(); 
+	  }
 	  
 	  echo 'Return to <a href="' . Url::fromPath('trapdirector/settings') .'" class="link-button icon-wrench"> settings page </a><br><br>';
 	  
 	  if ($dberror[0] != 5)
 	  {
-	      echo 'Database does not exists or is not setup correctly<br>';
-	      return;
+		  echo 'Database does not exists or is not setup correctly<br>';
+		  return;
 	  }
-      // setup
+	  // setup
 	  require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
 	  $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	  $debug_level=4;
@@ -393,20 +393,20 @@ 
 	  $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->trapsDB->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 '<br>';
-	          return;
-	      }
+		  // 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->trapsDB->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 '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -420,50 +420,50 @@ 
 
   private function checkSnmpTrapd()
   {
-      $psOutput=array();
-      // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
-      {
-          // RHEL based systems
-          $sspath = '/usr/sbin/ss';
-      }
-      if(!is_executable("$sspath"))
-      {
-          return array(1,"Can not execute $sspath");
-      }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
-      if (count($psOutput) == 0)
-      {
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?');
-      }
-      $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
-      {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
-      }
-      if($selinux_state !== 'Enforcing')
-      {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
-          if (count($psOutput) == 0)
-          {
-              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);
+	  $psOutput=array();
+	  // First check is someone is listening to port 162. As not root, we can't have pid... 
+	  $sspath = exec('which ss 2>/dev/null');
+	  if(empty($sspath))
+	  {
+		  // RHEL based systems
+		  $sspath = '/usr/sbin/ss';
+	  }
+	  if(!is_executable("$sspath"))
+	  {
+		  return array(1,"Can not execute $sspath");
+	  }
+	  exec("$sspath -lun | grep ':162 '",$psOutput);
+	  if (count($psOutput) == 0)
+	  {
+		  return array(1,'Port UDP/162 is not open : is snmptrapd running?');
+	  }
+	  $psOutput=array();
+	  $selinux_state = '';
+	  if(is_executable('/usr/sbin/getenforce'))
+	  {
+		  $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+	  }
+	  if($selinux_state !== 'Enforcing')
+	  {
+		  exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+		  if (count($psOutput) == 0)
+		  {
+			  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);
 
-          return array(0,'snmptrapd listening to UDP/162, options : '.$line);
-      }
-      else
-      {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
-      }
+		  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
+	  }
+	  else
+	  {
+		  return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+	  }
   }
 }

Spacing +82 added lines, -82 removed lines

@@ -72,23 +72,23 @@ 
   private function check_db()
   {
       $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')),
       );
       
       try {
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->db_error=$dberror[0];
@@ -96,13 +96,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:
@@ -114,13 +114,13 @@ 
       
       try {
           $this->getUIDatabase()->testGetIdoDb(); // Get DB in test mode
-          $dberror=array(0,'');
+          $dberror=array(0, '');
       } catch (DBException $e) {
-          $dberror = $e->getArray();
+          $dberror=$e->getArray();
       }
       
       $this->view->ido_db_error=$dberror[0];
-      $this->view->ido_message='IDO Database : ' . $dberror[1];
+      $this->view->ido_message='IDO Database : '.$dberror[1];
   }
   
   /**
@@ -132,13 +132,13 @@ 
   {
       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;
           }
       }
@@ -163,10 +163,10 @@ 
       {
           $output=array();
           
-          exec('cat ' . $this->module->getBaseDir() .'/bin/trap_in.php | grep "\$icingaweb2Etc=" ',$output);
+          exec('cat '.$this->module->getBaseDir().'/bin/trap_in.php | grep "\$icingaweb2Etc=" ', $output);
           
           
-          if (! isset($output[0]) || ! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+          if (!isset($output[0]) || !preg_match('#"'.$icingaweb2_etc.'"#', $output[0]))
           {
               $this->view->icingaEtcWarn=1;
               $this->view->icingaweb2_etc=$icingaweb2_etc;
@@ -182,12 +182,12 @@ 
    */
   private function get_db_list($allowed)
   {
-      $resources = array();
+      $resources=array();
       foreach (ResourceFactory::getResourceConfigs() as $name => $resource) 
       {
           if ($resource->get('type') === 'db' && in_array($resource->get('db'), $allowed)) 
           {
-              $resources[$name] = $name;
+              $resources[$name]=$name;
           }
       }
       return $resources;
@@ -199,18 +199,18 @@ 
    */
   private function get_php_binary()
   {
-      $phpBinary= array( PHP_BINARY, PHP_BINDIR . "/php", '/usr/bin/php');
+      $phpBinary=array(PHP_BINARY, PHP_BINDIR."/php", '/usr/bin/php');
 
-      foreach ($phpBinary as $phpBin )
+      foreach ($phpBinary as $phpBin)
       {
           $output=array();
           $retCode=255;
           $input="154865134987aaaa";
-          exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
+          exec("$phpBin -r \"echo '$input';\"", $output, $retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (!isset($output[0])) $output[0]="NO OUT";
           
-          if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
+          if ($retCode == 0 && preg_match("/$input/", $output[0]) == 1)
           {
               return $phpBin;
           }          
@@ -239,7 +239,7 @@ 
 	// But check read permission
 	$this->checkReadPermission();
 	
-	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+	$this->view->tabs=$this->Module()->getConfigTabs()->activate('config');
 	
 	// Get message : sent on configuration problems detected by controllers
     $this->get_param();
@@ -254,39 +254,39 @@ 
     $this->check_api();
 	
 	//*********** 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 = $this->get_db_list(array('mysql', 'pgsql')); 
+	$resources=$this->get_db_list(array('mysql', 'pgsql')); 
 
 	// Check standard Icingaweb2 path
 	$this->check_icingaweb_path();
 
-	$phpBinary = $this->get_php_binary();
+	$phpBinary=$this->get_php_binary();
 	if ($phpBinary == null)
 	{
-	    $phpBinary = ' PHP BINARY NOT FOUND ';
+	    $phpBinary=' PHP BINARY NOT FOUND ';
 	    
 	}
 	
 	// Setup path for mini documentation
-	$this->view->traps_in_config= $phpBinary . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
+	$this->view->traps_in_config=$phpBinary.' '.$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 ' . $phpBinary
-	    . ' -a ' . exec('whoami')
-	    . ' -w ' . Icinga::app()->getConfigDir();
+	    . ' -d '.$this->Module()->getBaseDir()
+	    . ' -p '.$phpBinary
+	    . ' -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())
@@ -298,7 +298,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()
@@ -319,7 +319,7 @@ 
 		// Get module database name
 		$dbName=$this->Config()->get('config', 'database');
 
-        $dbResource = ResourceFactory::getResourceConfig($dbName);
+        $dbResource=ResourceFactory::getResourceConfig($dbName);
         $dbType=$dbResource->get('db');
         switch ($dbType) {
           case 'mysql':
@@ -334,28 +334,28 @@ 
         } 
 
 		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->trapsDB->create_schema($schema,$prefix);
+		$Trap->trapsDB->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()
@@ -373,7 +373,7 @@ 
           $dberror=$e->getArray(); 
       }
 	  
-	  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] != 5)
 	  {
@@ -381,40 +381,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->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+	      $Trap->setLogging(2, 'syslog');
+	      $message=$Trap->trapsDB->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->trapsDB->update_schema($updateSchema,$target_version,$prefix);
+	  $Trap->trapsDB->update_schema($updateSchema, $target_version, $prefix);
 	  echo '</pre>';
   }  
 
@@ -422,48 +422,48 @@ 
   {
       $psOutput=array();
       // First check is someone is listening to port 162. As not root, we can't have pid... 
-      $sspath = exec('which ss 2>/dev/null');
-      if(empty($sspath))
+      $sspath=exec('which ss 2>/dev/null');
+      if (empty($sspath))
       {
           // RHEL based systems
-          $sspath = '/usr/sbin/ss';
+          $sspath='/usr/sbin/ss';
       }
-      if(!is_executable("$sspath"))
+      if (!is_executable("$sspath"))
       {
-          return array(1,"Can not execute $sspath");
+          return array(1, "Can not execute $sspath");
       }
-      exec("$sspath -lun | grep ':162 '",$psOutput);
+      exec("$sspath -lun | grep ':162 '", $psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?');
+          return array(1, 'Port UDP/162 is not open : is snmptrapd running?');
       }
       $psOutput=array();
-      $selinux_state = '';
-      if(is_executable('/usr/sbin/getenforce'))
+      $selinux_state='';
+      if (is_executable('/usr/sbin/getenforce'))
       {
-          $selinux_state = exec('/usr/sbin/getenforce 2>/dev/null');
+          $selinux_state=exec('/usr/sbin/getenforce 2>/dev/null');
       }
-      if($selinux_state !== 'Enforcing')
+      if ($selinux_state !== 'Enforcing')
       {
-          exec('ps --no-headers -o command -C snmptrapd',$psOutput);
+          exec('ps --no-headers -o command -C snmptrapd', $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);
       }
       else
       {
-          return array(0,'A daemon (hidden by SELinux) is listening on UDP/162');
+          return array(0, 'A daemon (hidden by SELinux) is listening on UDP/162');
       }
   }
 }