patrickpr / trapdirector

application/controllers/SettingsController.php

Spacing +63 added lines, -63 removed lines

@@ -72,15 +72,15 @@ 
   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')),
       );
       
@@ -91,13 +91,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:
@@ -109,7 +109,7 @@ 
       
       $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];
   }
   
   /**
@@ -121,13 +121,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;
           }
       }
@@ -152,10 +152,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;
@@ -171,12 +171,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;
@@ -203,7 +203,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();
@@ -218,32 +218,32 @@ 
     $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();
 	
 	// 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())
@@ -255,7 +255,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()
@@ -276,7 +276,7 @@ 
 		$dbName=$this->Config()->get('config', 'database');
 
 		try {
-		  $dbResource = ResourceFactory::getResourceConfig($dbName);
+		  $dbResource=ResourceFactory::getResourceConfig($dbName);
 		  $dbType=$dbResource->get('db');
 		  switch ($dbType) {
 		      case 'mysql':
@@ -288,34 +288,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->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()
@@ -324,7 +324,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)
 	  {
@@ -337,40 +337,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>';
   }  
 
@@ -378,26 +378,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);
   }
 }