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/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);
-                exit(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);
+				exit(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');

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/controllers/SettingsController.php

Indentation +100 added lines, -100 removed lines

@@ -22,37 +22,37 @@ 
   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();
 	// Get message : sent on configuration problems detected by controllers
 	$dberrorMsg=$this->params->get('dberror');
 	if ($dberrorMsg != '')
-	    $this->view->errorDetected=$dberrorMsg;
-    $dberrorMsg=$this->params->get('idodberror');
-    if ($dberrorMsg != '')
-        $this->view->errorDetected=$dberrorMsg;
+		$this->view->errorDetected=$dberrorMsg;
+	$dberrorMsg=$this->params->get('idodberror');
+	if ($dberrorMsg != '')
+		$this->view->errorDetected=$dberrorMsg;
     
-    $this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
+	$this->view->configErrorDetected == NULL; // Displayed error on various conifugration errors.
     
-    // Test if configuration exists, if not create for installer script
+	// Test if configuration exists, if not create for installer script
 	$emptyConfig=0;
-    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)';
+	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();
-        }
+		}
+		catch (Exception $e)
+		{
+			$this->view->configErrorDetected=$e->getMessage();
+		}
         
-    }
+	}
 	// Test Database
 	$db_message=array( // index => ( message OK, message NOK, optional link if NOK ) 
 		0	=>	array('Database configuration OK','',''),
@@ -97,20 +97,20 @@ 
 	//********* 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->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;
-    	} 
+		$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;
+		$this->view->apimessage='API parameters not configured';
+		$this->view->apimessageError=true;
 	}
 	
 	//*********** Test snmptrapd alive and options
@@ -125,33 +125,33 @@ 
 		}
 	}
 
-    $this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
+	$this->view->tabs = $this->Module()->getConfigTabs()->activate('config');
 
 	// Check standard Icingaweb2 path
 	$this->view->icingaEtcWarn=0;
 	$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 	if ($icingaweb2_etc != "/etc/icingaweb2/" && $icingaweb2_etc != '')
 	{
-	    $output=array();
+		$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]))
-	    {
-    	    $this->view->icingaEtcWarn=1;
-	        $this->view->icingaweb2_etc=$icingaweb2_etc;
-	    }
+		if (! preg_match('#"'. $icingaweb2_etc .'"#',$output[0]))
+		{
+			$this->view->icingaEtcWarn=1;
+			$this->view->icingaweb2_etc=$icingaweb2_etc;
+		}
 	}
 
 	// Setup path for mini documentation
 	$this->view->traps_in_config= PHP_BINARY . ' ' . $this->Module()->getBaseDir() . '/bin/trap_in.php';
 	
 	$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();
+		. ' -c all ' 
+		. ' -d ' . $this->Module()->getBaseDir()
+		. ' -p ' . PHP_BINARY
+		. ' -a ' . exec('whoami')
+		. ' -w ' . Icinga::app()->getConfigDir();
 	        
 	// ******************* configuration form setup*******************
 	$this->view->form = $form = new TrapsConfigForm();
@@ -196,19 +196,19 @@ 
 		  $dbResource = ResourceFactory::getResourceConfig($dbName);
 		  $dbType=$dbResource->get('db');
 		  switch ($dbType) {
-		      case 'mysql':
-		          $dbFileExt='sql';
-		          break;
-		      case 'pgsql':
-		          $dbFileExt='pgsql';
-		          break;
-		      default:
-		          throw new ConfigurationError('Unsuported database : '.$dbType);
+			  case 'mysql':
+				  $dbFileExt='sql';
+				  break;
+			  case 'pgsql':
+				  $dbFileExt='pgsql';
+				  break;
+			  default:
+				  throw new ConfigurationError('Unsuported database : '.$dbType);
 		  }
 		} catch (ConfigurationError $e )
 		{
-		    printf("Database configuration error : %s",$e->getMessage());
-		    return;
+			printf("Database configuration error : %s",$e->getMessage());
+			return;
 		}
 		printf('<pre>');
 		require_once $this->Module()->getBaseDir() .'/bin/trap_class.php';
@@ -232,11 +232,11 @@ 
   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=$this->getDb(true); // Get DB in test mode
@@ -245,15 +245,15 @@ 
 	  
 	  if ($dberror[0] == 0)
 	  {
-	      echo 'Schema already exists and is up to date<br>';
-	      return;
+		  echo 'Schema already exists and is up to date<br>';
+		  return;
 	  }
 	  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;
@@ -266,20 +266,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->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->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');
@@ -293,28 +293,28 @@ 
 
   private function checkSnmpTrapd()
   {
-      $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);
-      if (count($psOutput) == 0)
-      {
-          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);
-      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... 
+	  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');
+	  }
+	  $psOutput=array();
+	  exec('ps fax |grep snmptrapd |grep -v grep',$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);
+	  return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }
 }

application/controllers/HandlerController.php

Indentation +88 added lines, -89 removed lines

@@ -11,13 +11,12 @@ 
 
 //use Icinga\Web\Form as Form;
 /** Rules management
-
-*/
+ */
 class HandlerController extends TrapsController
 {
 
 	/** index : list existing rules 
-	*/
+	 */
 	public function indexAction()
 	{	
 		$this->checkReadPermission();
@@ -39,29 +38,29 @@ 
 	 */
 	public function testruleAction()
 	{
-	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
-	        'active'	=> true,
-	        'label'		=> $this->translate('Test Rule'),
-	        'url'		=> Url::fromRequest()
-	    ));
+		$this->checkReadPermission();
+		$this->getTabs()->add('get',array(
+			'active'	=> true,
+			'label'		=> $this->translate('Test Rule'),
+			'url'		=> Url::fromRequest()
+		));
 	    
-	    //$db = $this->getDb();
+		//$db = $this->getDb();
 
-	    if ($this->params->get('rule') !== null) 
-	    {
-	        $this->view->rule= $this->params->get('rule');
-	    }
-	    else
-	    {
-	        $this->view->rule='';
-	    }
+		if ($this->params->get('rule') !== null) 
+		{
+			$this->view->rule= $this->params->get('rule');
+		}
+		else
+		{
+			$this->view->rule='';
+		}
 	}
 	
 	/** Add a handler  
-	*	Get params fromid : setup from existing trap (id of trap table)
-	*	Get param ruleid : edit from existing handler (id of rule table)
-	*/
+	 *	Get params fromid : setup from existing trap (id of trap table)
+	 *	Get param ruleid : edit from existing handler (id of rule table)
+	 */
 	public function addAction()
 	{
 		$this->checkConfigPermission();
@@ -162,7 +161,7 @@ 
 					$currentObjectTypeEnum=$allObjects[$val->oid]['type_enum'];
 				}
 				$currentObject=array(
-				    $oid_index,
+					$oid_index,
 					$val->oid,
 					$val->oid_name_mib,
 					$val->oid_name,
@@ -184,7 +183,7 @@ 
 				{
 					if ($val==null) { continue; }
 					array_push($this->view->objectList, array(
-					    $oid_index,
+						$oid_index,
 						$key,
 						$allObjects[$key]['mib'],
 						$allObjects[$key]['name'],
@@ -223,61 +222,61 @@ 
 			$this->view->warning_message='';
 			if ($this->view->hostname != null)
 			{
-			    $this->view->selectGroup=false;
-			    // Check if hostname still exists
-			    $host_get=$this->getHostByName($this->view->hostname);
+				$this->view->selectGroup=false;
+				// Check if hostname still exists
+				$host_get=$this->getHostByName($this->view->hostname);
 			    
-			    if (count($host_get)==0)
-			    {
-			        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
-			        $this->view->serviceGet=false;
-			    }
-			    else
-			    {
-    				// Tell JS to get services when page is loaded
-    				$this->view->serviceGet=true;
-    				// get service id for form to set :			
-    				$serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-    				if (count($serviceID) ==0)
-    				{
-    				    $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-    				} 
-    				else
-    				{
-    				    $this->view->serviceSet=$serviceID[0]->id;
-    				}
-			    }
+				if (count($host_get)==0)
+				{
+					$this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+					$this->view->serviceGet=false;
+				}
+				else
+				{
+					// Tell JS to get services when page is loaded
+					$this->view->serviceGet=true;
+					// get service id for form to set :			
+					$serviceID=$this->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
+					if (count($serviceID) ==0)
+					{
+						$this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+					} 
+					else
+					{
+						$this->view->serviceSet=$serviceID[0]->id;
+					}
+				}
 			}
 			else
 			{
-			    $this->view->selectGroup=true;
-			    // Check if groupe exists
-			    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-			    if (count($group_get)==0)
-			    {
-			        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
-			        $this->view->serviceGroupGet=false;
-			    }
-			    else
-			    {
-			        $grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
-			        $foundGrpService=0;
-			        foreach ($grpServices as $grpService)
-			        {
-			            if ($grpService[0] == $ruleDetail->service_name)
-			            {
-			                $foundGrpService=1;
-			                $this->view->serviceSet=$ruleDetail->service_name;
-			            }
-			        }
+				$this->view->selectGroup=true;
+				// Check if groupe exists
+				$group_get=$this->getHostGroupByName($this->view->hostgroupname);
+				if (count($group_get)==0)
+				{
+					$this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+					$this->view->serviceGroupGet=false;
+				}
+				else
+				{
+					$grpServices=$this->getServicesByHostGroupid($group_get[0]->id);
+					$foundGrpService=0;
+					foreach ($grpServices as $grpService)
+					{
+						if ($grpService[0] == $ruleDetail->service_name)
+						{
+							$foundGrpService=1;
+							$this->view->serviceSet=$ruleDetail->service_name;
+						}
+					}
 			        
-			        // Tell JS to get services when page is loaded
-			        $this->view->serviceGroupGet=true;
-			        if ($foundGrpService==0)
-			        {
-			            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
-			        }
-			    }				
+					// Tell JS to get services when page is loaded
+					$this->view->serviceGroupGet=true;
+					if ($foundGrpService==0)
+					{
+						$this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+					}
+				}				
 			}
 			$this->view->mainoid=$ruleDetail->trap_oid;
 			$oidName=$this->getMIB()->translateOID($ruleDetail->trap_oid);
@@ -302,7 +301,7 @@ 
 				if (($object=$this->getMIB()->translateOID($curOid)) != null)
 				{
 					array_push($curObjectList, array(
-					    $index,
+						$index,
 						$curOid,
 						$object['mib'],
 						$object['name'],
@@ -314,7 +313,7 @@ 
 				else
 				{
 					array_push($curObjectList, array(
-					    $index,
+						$index,
 						$curOid,
 						'not found',
 						'not found',
@@ -335,9 +334,9 @@ 
 	}
 	
 	/** Validate form and output message to user  
-	*	@param in postdata 
-	* 	@return string status : OK / <Message>
-	**/
+	 *	@param in postdata 
+	 * 	@return string status : OK / <Message>
+	 **/
 	protected function handlerformAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -378,7 +377,7 @@ 
 			//$this->Module()->
 			$this->_helper->json(array(
 				'status'=>'OK',
-			    'redirect'=>'trapdirector/handler'
+				'redirect'=>'trapdirector/handler'
 			      
 			));
 		}		
@@ -462,9 +461,9 @@ 
 	}
 
 	/** Get trap detail by trapid. 
-	*	@param $trapid int id of trap in received table
-	*	@return array (objects)
-	*/
+	 *	@param $trapid int id of trap in received table
+	 *	@return array (objects)
+	 */
 	protected function getTrapDetail($trapid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -495,9 +494,9 @@ 
 	}
 
 	/** Get trap objects
-	*	@param : trap id
-	* 	@return array of objects
-	*/
+	 *	@param : trap id
+	 * 	@return array of objects
+	 */
 	protected function getTrapobjects($trapid)
 	{	
 		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
@@ -527,9 +526,9 @@ 
 	}
 
 	/** Get rule detail by ruleid.
-	*	@param $ruleid int id of rule in rule table
-	*	@return array (objects)
-	*/
+	 *	@param $ruleid int id of rule in rule table
+	 *	@return array (objects)
+	 */
 	protected function getRuleDetail($ruleid) 
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
@@ -555,7 +554,7 @@ 
 	}
 
 	/** Setup tabs for rules 
-	*/
+	 */
 	protected function prepareTabs()
 	{
 		return $this->getTabs()->add('status', array(

application/controllers/StatusController.php

Indentation +27 added lines, -27 removed lines

@@ -65,10 +65,10 @@ 
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -87,21 +87,21 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -109,7 +109,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -259,20 +259,20 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }