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/ReceivedController.php

Spacing +33 added lines, -33 removed lines

@@ -20,19 +20,19 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('traps');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getTrapListTable()->setConnection($db);
 		
 		// Apply pagination limits
-		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
 		//$postData=$this->getRequest()->getPost();
 		$filter=array();
-		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$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);
+		$this->view->table->updateFilter(Url::fromRequest(), $filter);
 		
 		//$this->view->filterEditor = $this->getTrapListTable()->getFilterEditor($this->getRequest());
 
@@ -46,7 +46,7 @@ 
 		
 		$this->checkReadPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Detailed status'),
 			'url'		=> Url::fromRequest()
@@ -56,11 +56,11 @@ 
 		$this->view->trapid=$trapid;
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
-			$this->getModuleConfig()->urlPath() . '/handler/add',
+			$this->getModuleConfig()->urlPath().'/handler/add',
 			array('fromid' => $trapid));
 		// ***************  Get main data
 		// extract columns and titles;
@@ -72,27 +72,27 @@ 
 		// Do DB query for trap. 
 		try
 		{
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=strftime('%c', $trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
-			array_push($queryArray[$key],$cval);
+			array_push($queryArray[$key], $cval);
 		}
-		$this->view->rowset = $queryArray;
+		$this->view->rowset=$queryArray;
 
 		// **************   Check for additionnal data
 		
@@ -104,17 +104,17 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->fetchAll($query);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 		// TODO : code this in a better & simpler way
-		if ($trapDetail == null ) 
+		if ($trapDetail == null) 
 		{
 			$this->view->data=false;
 		}
@@ -126,9 +126,9 @@ 
 			foreach ($trapDetail as $key => $val) 
 			{	
 				$trapval[$key]=array();
-				foreach (array_keys($queryArrayData) as $vkey ) 
+				foreach (array_keys($queryArrayData) as $vkey) 
 				{
-					array_push($trapval[$key],$val->$vkey);
+					array_push($trapval[$key], $val->$vkey);
 				}
 			}
 			$this->view->data_val=$trapval;
@@ -144,19 +144,19 @@ 
 	    $this->checkReadPermission();
 	    $this->prepareTabs()->activate('hosts');
 	    
-	    $db = $this->getDb();
+	    $db=$this->getDb();
 	    $this->getTrapHostListTable()->setConnection($db);
 	    
 	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+	    $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['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);
+	    $this->view->table->updateFilter(Url::fromRequest(), $filter);
 	}
 	
 	public function deleteAction()
@@ -175,15 +175,15 @@ 
 	{
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received')
+			'url'   => $this->getModuleConfig()->urlPath().'/received')
 		    )
 		    ->add('hosts', array(
 		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+		        'url'   => $this->getModuleConfig()->urlPath().'/received/hosts')
 		    )
 		    ->add('delete', array(
 			'label' => $this->translate('Delete'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
+			'url'   => $this->getModuleConfig()->urlPath().'/received/delete')
 		  );
 	} 
 
@@ -209,13 +209,13 @@ 
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 		}
-		if ($action =="count")
+		if ($action == "count")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->countTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->countTrap($ip, $oid)));
 		}
-		if ($action =="delete")
+		if ($action == "delete")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->deleteTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->deleteTrap($ip, $oid)));
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));
 	}

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/HandlerController.php

Spacing +76 added lines, -76 removed lines

@@ -23,14 +23,14 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('status');
 
-		$db = $this->getDb();
+		$db=$this->getDb();
 		$this->getHandlerListTable()->setConnection($db);
 		$this->getHandlerListTable()->setMibloader($this->getMIB());
 		// Apply pagination limits 
-		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getHandlerListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
-		$this->view->filterEditor = $this->getHandlerListTable()->getFilterEditor($this->getRequest());		
+		$this->view->filterEditor=$this->getHandlerListTable()->getFilterEditor($this->getRequest());		
 	
 		//$this->displayExitError('Handler/indexAction','Not implemented');
 	}
@@ -40,7 +40,7 @@ 
 	public function testruleAction()
 	{
 	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
+	    $this->getTabs()->add('get', array(
 	        'active'	=> true,
 	        'label'		=> $this->translate('Test Rule'),
 	        'url'		=> Url::fromRequest()
@@ -50,7 +50,7 @@ 
 
 	    if ($this->params->get('rule') !== null) 
 	    {
-	        $this->view->rule= $this->params->get('rule');
+	        $this->view->rule=$this->params->get('rule');
 	    }
 	    else
 	    {
@@ -66,7 +66,7 @@ 
 	{
 		$this->checkConfigPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Add handler'),
 			'url'		=> Url::fromRequest()
@@ -116,12 +116,12 @@ 
 			}
 			catch (Exception $e)
 			{
-				$this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+				$this->displayExitError('Add handler : get host by IP/Name ', $e->getMessage());
 			}
 			
 			
 			// if one unique host found -> put id text input
-			if (count($hosts)==1) {
+			if (count($hosts) == 1) {
 				$this->view->hostname=$hosts[0]->name;
 				//$hostid=$hosts[0]->id;
 				// Tell JS to get services when page is loaded
@@ -130,9 +130,9 @@ 
 			}
 			else
 			{
-				foreach($hosts as $key=>$val)
+				foreach ($hosts as $key=>$val)
 				{
-					array_push($this->view->hostlist,$hosts[$key]->name);
+					array_push($this->view->hostlist, $hosts[$key]->name);
 				}
 			}
 			
@@ -171,18 +171,18 @@ 
 					$currentObjectTypeEnum
 				);
 				$oid_index++;
-				array_push($this->view->objectList,$currentObject);
+				array_push($this->view->objectList, $currentObject);
 				// set currrent object to null in allObjects
 				if (isset($allObjects[$val->oid]))
 				{
 					$allObjects[$val->oid]=null;
 				}
 			}
-			if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+			if ($allObjects != null) // in case trap doesn't have objects or is not resolved
 			{
 				foreach ($allObjects as $key => $val)
 				{
-					if ($val==null) { continue; }
+					if ($val == null) { continue; }
 					array_push($this->view->objectList, array(
 					    $oid_index,
 						$key,
@@ -216,7 +216,7 @@ 
 			$this->view->setRuleMatch=$ruleDetail->action_match;
 			$this->view->setRuleNoMatch=$ruleDetail->action_nomatch;
 			$this->view->hostgroupname=$ruleDetail->host_group_name;
-			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z",$ruleDetail->modified);
+			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z", $ruleDetail->modified);
 			$this->view->modifier=$ruleDetail->modifier;
 			
 			// Warning message if host/service don't exists anymore
@@ -227,9 +227,9 @@ 
 			    // Check if hostname still exists
 			    $host_get=$this->getHostByName($this->view->hostname);
 			    
-			    if (count($host_get)==0)
+			    if (count($host_get) == 0)
 			    {
-			        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+			        $this->view->warning_message='Host '.$this->view->hostname.' doesn\'t exists anymore';
 			        $this->view->serviceGet=false;
 			    }
 			    else
@@ -237,10 +237,10 @@ 
     				// 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)
+    				$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';
+    				    $this->view->warning_message=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
     				} 
     				else
     				{
@@ -253,9 +253,9 @@ 
 			    $this->view->selectGroup=true;
 			    // Check if groupe exists
 			    $group_get=$this->getHostGroupByName($this->view->hostgroupname);
-			    if (count($group_get)==0)
+			    if (count($group_get) == 0)
 			    {
-			        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+			        $this->view->warning_message='HostGroup '.$this->view->hostgroupname.' doesn\'t exists anymore';
 			        $this->view->serviceGroupGet=false;
 			    }
 			    else
@@ -273,9 +273,9 @@ 
 			        
 			        // Tell JS to get services when page is loaded
 			        $this->view->serviceGroupGet=true;
-			        if ($foundGrpService==0)
+			        if ($foundGrpService == 0)
 			        {
-			            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+			            $this->view->warning_message.=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 			        }
 			    }				
 			}
@@ -295,8 +295,8 @@ 
 			$index=1; 
 			// check in display & rule for : OID(<oid>)
 			$matches=array();
-			while ( preg_match('/_OID\(([\.0-9]+)\)/',$display,$matches) ||
-					preg_match('/_OID\(([\.0-9]+)\)/',$rule,$matches))
+			while (preg_match('/_OID\(([\.0-9]+)\)/', $display, $matches) ||
+					preg_match('/_OID\(([\.0-9]+)\)/', $rule, $matches))
 			{
 				$curOid=$matches[1];
 				if (($object=$this->getMIB()->translateOID($curOid)) != null)
@@ -322,8 +322,8 @@ 
 						'not found'
 					));
 				}
-				$display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-				$rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+				$display=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $display);
+				$rule=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $rule);
 				$index++;
 			}
 			// set display
@@ -345,26 +345,26 @@ 
 	
 		$params=array(
 			// id (also db) => 	array('post' => post id, 'val' => default val, 'db' => send to table)
-			'hostgroup'		=>	array('post' => 'hostgroup','db'=>false),
-			'db_rule'		=>	array('post' => 'db_rule','db'=>false),
-			'hostid'		=>	array('post' => 'hostid','db'=>false),
-			'host_name'		=>	array('post' => 'hostname','val' => null,'db'=>true),
-			'host_group_name'=>	array('post' => null,'val' => null,'db'=>true),
-			'serviceid'		=>	array('post' => 'serviceid','db'=>false),
-			'service_name'	=>	array('post' => 'serviceName','db'=>true),
-			'trap_oid'		=>	array('post' => 'oid','db'=>true),
-			'revert_ok'		=>	array('post' => 'revertOK','val' => 0,'db'=>true),
-			'display'		=>	array('post' => 'display','val' => '','db'=>true),
-			'rule'			=>	array('post' => 'rule','val' => '','db'=>true),			
-			'action_match'	=>	array('post' => 'ruleMatch','val' => -1,'db'=>true),
-			'action_nomatch'=>	array('post' => 'ruleNoMatch','val' => -1,'db'=>true),					
-			'ip4'			=>	array('post' => null,'val' => null,'db'=>true),
-			'ip6'			=>	array('post' => null,'val' => null,'db'=>true),
-			'action_form'	=>	array('post' => 'action_form','db'=>false)
+			'hostgroup'		=>	array('post' => 'hostgroup', 'db'=>false),
+			'db_rule'		=>	array('post' => 'db_rule', 'db'=>false),
+			'hostid'		=>	array('post' => 'hostid', 'db'=>false),
+			'host_name'		=>	array('post' => 'hostname', 'val' => null, 'db'=>true),
+			'host_group_name'=>	array('post' => null, 'val' => null, 'db'=>true),
+			'serviceid'		=>	array('post' => 'serviceid', 'db'=>false),
+			'service_name'	=>	array('post' => 'serviceName', 'db'=>true),
+			'trap_oid'		=>	array('post' => 'oid', 'db'=>true),
+			'revert_ok'		=>	array('post' => 'revertOK', 'val' => 0, 'db'=>true),
+			'display'		=>	array('post' => 'display', 'val' => '', 'db'=>true),
+			'rule'			=>	array('post' => 'rule', 'val' => '', 'db'=>true),			
+			'action_match'	=>	array('post' => 'ruleMatch', 'val' => -1, 'db'=>true),
+			'action_nomatch'=>	array('post' => 'ruleNoMatch', 'val' => -1, 'db'=>true),					
+			'ip4'			=>	array('post' => null, 'val' => null, 'db'=>true),
+			'ip6'			=>	array('post' => null, 'val' => null, 'db'=>true),
+			'action_form'	=>	array('post' => 'action_form', 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
-			&& $postData[$params['action_form']['post']] == 'delete' )
+			&& $postData[$params['action_form']['post']] == 'delete')
 		{
 			try
 			{
@@ -384,16 +384,16 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
-			if (! isset($postData[$params[$key]['post']]))
+			if ($params[$key]['post'] == null) continue; // data not sent in post vars
+			if (!isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
-				$this->_helper->json(array('status'=>'No ' . $key));
+				$this->_helper->json(array('status'=>'No '.$key));
 			}
 			else
 			{
 				$data=$postData[$params[$key]['post']];
-				if ($data!=null && $data !="")
+				if ($data != null && $data != "")
 				{
 					$params[$key]['val']=$postData[$params[$key]['post']];
 				}
@@ -402,8 +402,8 @@ 
 
 		try 
 		{
-			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
-			if (! $isHostGroup ) 
+			$isHostGroup=($params['hostgroup']['val'] == 1) ?true:false;
+			if (!$isHostGroup) 
 			{  // checks if selection by host 
 				$hostAddr=$this->getHostInfoByID($params['hostid']['val']);
 				$params['ip4']['val']=$hostAddr->ip4;
@@ -430,25 +430,25 @@ 
 					return;					
 				}
 				// Put param in correct column (group_name)
-				$params['host_group_name']['val'] = $params['host_name']['val'];
+				$params['host_group_name']['val']=$params['host_name']['val'];
 				$params['host_name']['val']=null;
 			}
 			$dbparams=array();
 			foreach ($params as $key=>$val)
 			{
-				if ($val['db']==true )
+				if ($val['db'] == true)
 				{
-					$dbparams[$key] = $val['val'];
+					$dbparams[$key]=$val['val'];
 				}
 			}
 			// echo '<br>';	print_r($dbparams);echo '<br>';
-			if ($params['db_rule']['val'] == -1 ) 
+			if ($params['db_rule']['val'] == -1) 
 			{
 				$ruleID=$this->addHandlerRule($dbparams);
 			}
 			else
 			{
-				$this->updateHandlerRule($dbparams,$params['db_rule']['val']);
+				$this->updateHandlerRule($dbparams, $params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
@@ -467,10 +467,10 @@ 
 	*/
 	protected function getTrapDetail($trapid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		// extract columns and titles;
 		$elmts=NULL;
@@ -479,15 +479,15 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 			$trapDetail=$db->fetchRow($query);
-			if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
+			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail, true), $e->getMessage());
 		}
 
 		return $trapDetail;
@@ -500,10 +500,10 @@ 
 	*/
 	protected function getTrapobjects($trapid)
 	{	
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get object data
 		// extract columns and titles;
 		$data_elmts=NULL;
@@ -512,15 +512,15 @@ 
 		}
 		try
 		{		
-			$query = $db->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+			$query=$db->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$db->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap data detail',$e->getMessage());
+			$this->displayExitError('Add handler : get trap data detail', $e->getMessage());
 		}
 
 		return $trapDetail;
@@ -532,22 +532,22 @@ 
 	*/
 	protected function getRuleDetail($ruleid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $ruleid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// ***************  Get main data
 		try
 		{		
-			$query = $db->select()
-				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
-				->where('id=?',$ruleid);
+			$query=$db->select()
+				->from($this->getModuleConfig()->getTrapRuleName(), $queryArray)
+				->where('id=?', $ruleid);
 			$ruleDetail=$db->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
+			if ($ruleDetail == null) throw new Exception('No rule was found with id = '.$ruleid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
+			$this->displayExitError('Update handler : get rule detail', $e->getMessage());
 		}
 
 		return $ruleDetail;
@@ -560,7 +560,7 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/handler')
+			'url'   => $this->getModuleConfig()->urlPath().'/handler')
 		);
 	} 
 	

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

Spacing +45 added lines, -45 removed lines

@@ -22,18 +22,18 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-			$db = $this->getDb()->getConnection();
-			$query = $db->select()->from(
+			$db=$this->getDb()->getConnection();
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$db->fetchOne($query);
-			$query = $db->select()->from(
+			$query=$db->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,7 +59,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -85,7 +85,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -94,33 +94,33 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $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'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					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' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
 				$name=$_FILES['mibfile']['name'];
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
-				$destination = array_shift($DirConf) .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				if (move_uploaded_file($_FILES['mibfile']['tmp_name'],$destination)==false)
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
+				$destination=array_shift($DirConf).'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				if (move_uploaded_file($_FILES['mibfile']['tmp_name'], $destination) == false)
 				{
 					$this->view->uploadStatus='ERROR, file not loaded. Check mibs directory permission';
 				}
@@ -133,13 +133,13 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
@@ -157,47 +157,47 @@ 
 		// mib database
 		
 		$this->view->mibDbCount=$this->getMIB()->countObjects();
-		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21);
+		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21);
 		
 		// mib dirs
 		$DirConf=$this->Config()->get('config', 'snmptranslate_dirs');
 		$dirArray=array();
-		$dirArray=explode(':',$DirConf);
+		$dirArray=explode(':', $DirConf);
 
 		// Get base directories from net-snmp-config
 		$output=$matches=array();
 		$retVal=0;
-		$sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal);
-		if ($retVal==0)
+		$sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal);
+		if ($retVal == 0)
 		{
-			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
+			$dirArray=array_merge($dirArray, explode(':', $sysDirs));
 		}
 		else
 		{
-			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
-			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
+			$translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
+			if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches))
 			{
-				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
+				$dirArray=array_merge($dirArray, explode(':', $matches[1]));
 			}
 			else
 			{
-				array_push($dirArray,'Install net-snmp-config to see system directories');
+				array_push($dirArray, 'Install net-snmp-config to see system directories');
 			}
 		}
 		
 		$this->view->dirArray=$dirArray;
 		
 		$output=null;
-		foreach (explode(':',$DirConf) as $mibdir)
+		foreach (explode(':', $DirConf) as $mibdir)
 		{
-			exec('ls '.$mibdir.' | grep -v traplist.txt',$output);
+			exec('ls '.$mibdir.' | grep -v traplist.txt', $output);
 		}
 		//$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++];
 		//$this->view->fileList=explode(' ',$listFiles);
 		$this->view->fileList=$output;
 		
 		// Zend form 
-		$this->view->form= new UploadForm();
+		$this->view->form=new UploadForm();
 		//$this->view->form= new Form('upload-form');
 		
 		
@@ -221,18 +221,18 @@ 
 		$this->view->templateForm_output='';
 		if (isset($postData['template_name']) && isset($postData['template_revert_time']))
 		{
-			$template_create = 'icingacli director service create --json \'{ "check_command": "dummy", ';
-			$template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
-			$template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
+			$template_create='icingacli director service create --json \'{ "check_command": "dummy", ';
+			$template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
+			$template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
 			$output=array();
 			$ret_code=0;
-			exec($template_create,$output,$ret_code);
+			exec($template_create, $output, $ret_code);
 			if ($ret_code != 0)
 			{
-				$this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create);
+				$this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create);
 			}
-			exec('icingacli director config deploy',$output,$ret_code);
-			$this->view->templateForm_output='Template '.$postData['template_name']. ' created';
+			exec('icingacli director config deploy', $output, $ret_code);
+			$this->view->templateForm_output='Template '.$postData['template_name'].' created';
 		}
 		
 		// template creation form
@@ -245,13 +245,13 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 		);
 	} 
 }
@@ -259,7 +259,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -268,11 +268,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $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);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }