patrickpr / trapdirector

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->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
-	      if ($message != '')
-	      {
-	          echo 'Note :<br><pre>';
-	          echo $message;
-	          echo '</pre>';
-	          echo '<br>';
-	          echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
-	          echo '<br>';
-	          return;
-	      }
+		  // Check for messages and display if any
+			  echo "Upgrade databse is going to start.<br>Don't forget to backup your database before update<br>";
+		  $Trap->setLogging(2,'syslog');
+		  $message = $Trap->trapsDB->update_schema($updateSchema,$target_version,$prefix,true);
+		  if ($message != '')
+		  {
+			  echo 'Note :<br><pre>';
+			  echo $message;
+			  echo '</pre>';
+			  echo '<br>';
+			  echo '<a  class="link-button" style="font-size:large;font-weight:bold" href="' . Url::fromPath('trapdirector/settings/updateschema') .'?msgok=1">Click here to update</a>';
+			  echo '<br>';
+			  return;
+		  }
 	  }
 	  
 	  $Trap->setLogging($debug_level,'display');
@@ -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);
   }
 }

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->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()
@@ -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->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>';
   }  
 
@@ -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);
   }
 }

bin/trap_class.php

Indentation +479 added lines, -479 removed lines

@@ -57,7 +57,7 @@ 
 	
 	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
 	{
-	    // Paths of ini files
+		// Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
 		$this->trap_module_config=$this->icingaweb2_etc."/modules/trapdirector/config.ini";		
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
@@ -66,18 +66,18 @@ 
 		$this->logging = new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
-		    $this->logSetup=true;
+			$this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+			$this->logSetup=true;
 		}
 		else 
-		    $this->logSetup=false;
+			$this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
 		$trapConfig=parse_ini_file($this->trap_module_config,true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+			$this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -109,26 +109,26 @@ 
 	 */
 	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
 	{
-	    if (!isset($option_array[$option_category][$option_name]))
-	    {
-	        if ($message === null)
-	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
-	        }
-	        $this->logging->log($message,$log_level,'syslog');
-	        return false;
-	    }
-	    else
-	    {
-	        $option_var=$option_array[$option_category][$option_name];
-	        return true;
-	    }
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+			}
+			$this->logging->log($message,$log_level,'syslog');
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
 	}
 	
 	/** 
 	 * Get options from ini file
 	 * @param array $trap_config : ini file array
-	*/
+	 */
 	protected function getMainOptions($trapConfig)
 	{
 
@@ -147,10 +147,10 @@ 
 		// API options
 		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
 		{
-		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+			$this->api_use=true;
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -160,45 +160,45 @@ 
 	 */
 	protected function setupDatabase($trapConfig)
 	{
-	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
 	    
 	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
-	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+		if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
-	    // IDO Database
-	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
-	    }
-	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];		
 
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
-	        return;
-	    }
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+			return;
+		}
 	    
-	    $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
 	}
 	
 	/**
@@ -209,9 +209,9 @@ 
 		// Database options
 		if ($this->logSetup === false) // Only if logging was no setup in constructor
 		{
-    		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-    		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-    		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+			$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
 		}
 	}
 
@@ -222,10 +222,10 @@ 
 	}
 	
 	/** 
-	*   Get data from db_config
-	*	@param $element string name of param
-	*	@return mixed : value (or null)
-	*/	
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */	
 	protected function getDBConfig($element)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -243,15 +243,15 @@ 
 	}
 	
 	/** OBSOLETE Send log. Throws exception on critical error
-	*	@param	string $message Message to log
-	*	@param	int $level 1=critical 2=warning 3=trace 4=debug
-	*	@param  string $destination file/syslog/display
-	*	@return void
-	**/	
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 **/	
 	public function trapLog( $message, $level, $destination ='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
-	    $this->logging->log($message, $level, $destination);
+		$this->logging->log($message, $level, $destination);
 	}
 	
 	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
@@ -261,19 +261,19 @@ 
 	
 	protected function getAPI()
 	{
-	    if ($this->icinga2api == null)
-	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
-	    }
-	    return $this->icinga2api;
+		if ($this->icinga2api == null)
+		{
+			$this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+		}
+		return $this->icinga2api;
 	}
 	
 	
 	/** 
 	 * read data from stream
-	*	@param $stream string input stream, defaults to "php://stdin"
-	*	@return mixed array trap data or exception with error
-	*/
+	 *	@param $stream string input stream, defaults to "php://stdin"
+	 *	@return mixed array trap data or exception with error
+	 */
 	public function read_trap($stream='php://stdin')
 	{
 		//Read data from snmptrapd from stdin
@@ -281,7 +281,7 @@ 
 
 		if ($input_stream === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
 			$this->logging->log("Error reading stdin !",ERROR,'');
 			return null; // note : exception thrown by logging
 		}
@@ -290,21 +290,21 @@ 
 		$this->receivingHost=chop(fgets($input_stream));
 		if ($this->receivingHost === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
 			$this->logging->log("Error reading Host !",ERROR,''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
-		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
+			$this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
 			$this->logging->log("Error reading IP !",ERROR,''); 
 		}
 		$matches=array();
 		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
 		if ($ret_code===0 || $ret_code===false) 
 		{
-		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
+			$this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
 		} 
 		else 
@@ -325,7 +325,7 @@ 
 			}
 			else 
 			{
-			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+				if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
 				}
@@ -341,7 +341,7 @@ 
 
 		if ($this->trap_data['trap_oid']=='unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
+			$this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
 			$this->logging->log('no trap oid found',ERROR,'');
 		} 
 
@@ -371,9 +371,9 @@ 
 
 	/** 
 	 * Translate oid into array(MIB,Name)
-	* @param $oid string oid to translate
-	* @return mixed : null if not found or array(MIB,Name)
-	*/
+	 * @param $oid string oid to translate
+	 * @return mixed : null if not found or array(MIB,Name)
+	 */
 	public function translateOID($oid)
 	{
 		// try from database
@@ -406,7 +406,7 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$matches=array();
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code === false) {
@@ -419,9 +419,9 @@ 
 	
 	/** 
 	 * Erase old trap records 
-	*	@param integer $days : erase traps when more than $days old
-	*	@return integer : number of lines deleted
-	**/
+	 *	@param integer $days : erase traps when more than $days old
+	 *	@return integer : number of lines deleted
+	 **/
 	public function eraseOldTraps($days=0)
 	{
 		if ($days==0)
@@ -446,72 +446,72 @@ 
 	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
 	{
 	    
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
 	    
-	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+		// add date time
+		$insert_col ='date_received,status';
+		$insert_val = "'" . date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
-	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
-	    }
-	    if ($trapoid !=null)
-	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
-	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+		if ($sourceIP !=null)
+		{
+			$insert_col .=',source_ip';
+			$insert_val .=",'". $sourceIP ."'";
+		}
+		if ($trapoid !=null)
+		{
+			$insert_col .=',trap_oid';
+			$insert_val .=",'". $trapoid ."'";
+		}
+		$insert_col .=',status_detail';
+		$insert_val .=",'". $message ."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
 	    
-	    switch ($this->trapsDB->trapDBType)
-	    {
-	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				$sql .= ' RETURNING id;';
+				$this->logging->log('sql : '.$sql,INFO);
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
-	            }
-	            $this->trap_id=$inserted_id_ret['id'];
-	            break;
-	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
-	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
-	            }
-	            $this->logging->log('SQL insertion OK',INFO );
-	            // Get last id to insert oid/values in secondary table
-	            $sql='SELECT LAST_INSERT_ID();';
-	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
-	            }
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id',1,'');
+				}
+				$this->trap_id=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				$sql .= ';';
+				$this->logging->log('sql : '.$sql,INFO );
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error SQL insert : '.$sql,1,'');
+				}
+				$this->logging->log('SQL insertion OK',INFO );
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur recuperation id',1,'');
+				}
 	            
-	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-	            $this->trap_id=$inserted_id;
-	            break;
-	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
-	    }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->trap_id=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+		}
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+		$this->logging->log('id found: '. $this->trap_id,INFO );    
 	}
 	
 	/** Write trap data to trap database
-	*/
+	 */
 	public function writeTrapToDB()
 	{
 		
@@ -609,10 +609,10 @@ 
 	}
 
 	/** Get rules from rule database with ip and oid
-	*	@param $ip string ipv4 or ipv6
-	*	@param $oid string oid in numeric
-	*	@return mixed : PDO object or false
-	*/	
+	 *	@param $ip string ipv4 or ipv6
+	 *	@param $oid string oid in numeric
+	 *	@return mixed : PDO object or false
+	 */	
 	protected function getRules($ip,$oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -671,9 +671,9 @@ 
 	}
 
 	/** Add rule match to rule
-	*	@param id int : rule id
-	*   @param set int : value to set
-	*/
+	 *	@param id int : rule id
+	 *   @param set int : value to set
+	 */
 	protected function add_rule_match($id, $set)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -690,53 +690,53 @@ 
 	 * @param integer $state numerical staus 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
-	*/
+	 */
 	public function serviceCheckResult($host,$service,$state,$display)
 	{
-	    if ($this->api_use === false)
-	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+		if ($this->api_use === false)
+		{
+			$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
+				$host.';' .$service .';' . $state . ';'.$display;
+			$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
     		
-    		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-    		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
-    		return true;
-	    }
-	    else
-	    {
-	        $api = $this->getAPI();
-	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
-	        if ($retcode == false)
-	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
-	            return false;
-	        }
-	        else 
-	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
-	            return true;
-	        }
-	    }
+			// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
+			exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+			return true;
+		}
+		else
+		{
+			$api = $this->getAPI();
+			$api->setCredentials($this->api_username, $this->api_password);
+			list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+			if ($retcode == false)
+			{
+				$this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+				return false;
+			}
+			else 
+			{
+				$this->logging->log( "Sent result : " .$retmessage,INFO );
+				return true;
+			}
+		}
 	}
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
-	    $api->setCredentials($this->api_username, $this->api_password);
-	    return $api->getHostByIP($ip);
+		$api = $this->getAPI();
+		$api->setCredentials($this->api_username, $this->api_password);
+		return $api->getHostByIP($ip);
 	}
 	
 	/** Resolve display. 
-	*	Changes OID(<oid>) to value if found or text "<not in trap>"
-	*	@param $display string
-	*	@return string display
-	*/
+	 *	Changes OID(<oid>) to value if found or text "<not in trap>"
+	 *	@param $display string
+	 *	@return string display
+	 */
 	protected function applyDisplay($display)
 	{
-	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+		$matches=array();
+		while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -796,11 +796,11 @@ 
 		
 		if ($rule[$item] == '(')
 		{ // grouping
-		    $item++;
+			$item++;
 			$start=$item;
 			$parenthesis_count=0; 
 			while (($item < strlen($rule)) // Not end of string AND
-			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+				  && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
 			{ 
 				if ($rule[$item] == '"' )
 				{ // pass through string
@@ -808,14 +808,14 @@ 
 					$item=$this->eval_getNext($rule,$item,'"');
 				} 
 				else{
-				    if ($rule[$item] == '(')
-				    {
-				        $parenthesis_count++;
-				    }
-				    if ($rule[$item] == ')')
-				    {
-				        $parenthesis_count--;
-				    }
+					if ($rule[$item] == '(')
+					{
+						$parenthesis_count++;
+					}
+					if ($rule[$item] == ')')
+					{
+						$parenthesis_count--;
+					}
 					$item++;
 				}
 			}
@@ -867,24 +867,24 @@ 
 	}
 	
 	/** Evaluation : makes token and evaluate. 
-	*	Public function for expressions testing
-	*	accepts : < > = <= >= !=  (typec = 0)
-	*	operators : & | (typec=1)
-	*	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
-	*   comparison int vs strings will return null (error)
-	*	return : bool or null on error
-	*/
+	 *	Public function for expressions testing
+	 *	accepts : < > = <= >= !=  (typec = 0)
+	 *	operators : & | (typec=1)
+	 *	with : integers/float  (type 0) or strings "" (type 1) or results (type 2)
+	 *   comparison int vs strings will return null (error)
+	 *	return : bool or null on error
+	 */
 	public function evaluation($rule,&$item)
 	{
-	    //echo "Evaluation of ".substr($rule,$item)."\n";
+		//echo "Evaluation of ".substr($rule,$item)."\n";
 		if ( $rule[$item] == '!') // If '!' found, negate next expression.
 		{
-		    $negate=true;
-		    $item++;
+			$negate=true;
+			$item++;
 		}
 		else
 		{
-		    $negate=false;
+			$negate=false;
 		}
 		// First element : number, string or ()
 		list($type1,$val1) = $this->eval_getElement($rule,$item);
@@ -904,24 +904,24 @@ 
 		// Third element : number, string or ()
 		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
 		{
-		    $item++;
-		    if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-		    $val2= ! $this->evaluation($rule,$item);
-		    $type2=2; // result is a boolean 
+			$item++;
+			if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+			$val2= ! $this->evaluation($rule,$item);
+			$type2=2; // result is a boolean 
 		}
 		else 
 		{
-		    list($type2,$val2) = $this->eval_getElement($rule,$item);
+			list($type2,$val2) = $this->eval_getElement($rule,$item);
 		}
 		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
 		
 		if ($type1!=$type2)  // cannot compare different types
 		{ 
-		    throw new Exception("Cannot compare string & number : ".$rule);
+			throw new Exception("Cannot compare string & number : ".$rule);
 		}
 		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
 		{
-		    throw new Exception("Cannot use boolean operators with string & number : ".$rule);
+			throw new Exception("Cannot use boolean operators with string & number : ".$rule);
 		}
 		
 		switch ($comp){
@@ -979,9 +979,9 @@ 
 	}		
 	
 	/** Evaluation rule (uses eval_* functions recursively)
-	*	@param $rule string rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
-	*	@return bool : true : rule match, false : rule don't match , throw exception on error.
-	*/
+	 *	@param $rule string rule ( _OID(.1.3.6.1.4.1.8072.2.3.2.1)=_OID(.1.3.6.1.2.1.1.3.0) )
+	 *	@return bool : true : rule match, false : rule don't match , throw exception on error.
+	 */
 	
 	protected function eval_rule($rule)
 	{
@@ -1026,7 +1026,7 @@ 
 			}
 			if ($found==0)
 			{	// OID not found : throw error
-			    throw new Exception('OID '.$oid.' not found in trap');
+				throw new Exception('OID '.$oid.' not found in trap');
 			}
 		}
 		$item=0;
@@ -1037,7 +1037,7 @@ 
 	}
 	
 	/** Match rules for current trap and do action
-	*/
+	 */
 	public function applyRules()
 	{
 		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
@@ -1074,12 +1074,12 @@ 
 					{
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
-						    $this->trap_action.='Error sending status : check cmd/API';
+							$this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
-						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
@@ -1096,15 +1096,15 @@ 
 					$this->logging->log('action NOK : '.$action,INFO );
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
-					    {
-					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
-					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
-    						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
-					    }
+						if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+						{
+							$this->trap_action.='Error sending status : check cmd/API';
+						}
+						else
+						{
+							$this->add_rule_match($rule['id'],$rule['num_match']+1);
+							$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
+						}
 					}
 					else
 					{
@@ -1127,9 +1127,9 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
-			    $this->trap_action.=' ERR : '.$e->getMessage();
-			    $this->trap_data['status']='error';
+				$this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+				$this->trap_action.=' ERR : '.$e->getMessage();
+				$this->trap_data['status']='error';
 			}
 			
 		}
@@ -1144,8 +1144,8 @@ 
 	}
 
 	/** Add Time a action to rule
-	*	@param string $time : time to process to insert in SQL
-	*/
+	 *	@param string $time : time to process to insert in SQL
+	 */
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -1162,9 +1162,9 @@ 
 	/*********** UTILITIES *********************/
 	
 	/** reset service to OK after time defined in rule
-	*	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
-	*	@return integer : not in use
-	**/
+	 *	TODO logic is : get all service in error + all rules, see if getting all rules then select services is better 
+	 *	@return integer : not in use
+	 **/
 	public function reset_services()
 	{
 		// Get all services not in 'ok' state
@@ -1236,105 +1236,105 @@ 
 		$description=$db_conn->quote($description);
 		if (isset($this->dbOidIndex[$oid]))
 		{
-		    if ($this->dbOidIndex[$oid]['key'] == -1)
-		    { // newly created.
-		        return 0;
-		    }
+			if ($this->dbOidIndex[$oid]['key'] == -1)
+			{ // newly created.
+				return 0;
+			}
 			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
-			    $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
-			    $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
-			    //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
-			    //$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
-			    //$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
-			    //$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
-			    //$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
-			    )
+				$mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
+				$type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
+				//$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
+				//$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
+				//$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
+				//$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
+				//$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
+				)
 			{ // Do update
-			    $sql='UPDATE '.$this->db_prefix.'mib_cache SET '.
- 			    'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'. 
- 			    ', syntax = :syntax, type_enum = :type_enum, description = :description '.
- 			    ' WHERE id= :id';
-			    $sqlQuery=$db_conn->prepare($sql);
+				$sql='UPDATE '.$this->db_prefix.'mib_cache SET '.
+ 				'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'. 
+ 				', syntax = :syntax, type_enum = :type_enum, description = :description '.
+ 				' WHERE id= :id';
+				$sqlQuery=$db_conn->prepare($sql);
 			    
-			    $sqlParam=array(
-			        ':name' => $name,
-			        ':type' => $type, 
-			        ':mib' => $mib, 
-			        ':tc' =>  ($textConv==null)?'null':$textConv , 
-			        ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-			        ':syntax' => ($syntax==null)?'null':$syntax,
-			        ':type_enum' => ($type_enum==null)?'null':$type_enum, 
-			        ':description' => ($description==null)?'null':$description,
-			        ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
-			    );
+				$sqlParam=array(
+					':name' => $name,
+					':type' => $type, 
+					':mib' => $mib, 
+					':tc' =>  ($textConv==null)?'null':$textConv , 
+					':display_hint' => ($dispHint==null)?'null':$dispHint ,
+					':syntax' => ($syntax==null)?'null':$syntax,
+					':type_enum' => ($type_enum==null)?'null':$type_enum, 
+					':description' => ($description==null)?'null':$description,
+					':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
+				);
 			    
-			    if ($sqlQuery->execute($sqlParam) === false) {
-			        $this->logging->log('Error in query : ' . $sql,ERROR,'');
-			    }
-			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+				if ($sqlQuery->execute($sqlParam) === false) {
+					$this->logging->log('Error in query : ' . $sql,ERROR,'');
+				}
+				$this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
 				return 1;
 			}
 			else
 			{
-			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
-			    return 0;
+				$this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+				return 0;
 			}
 		}
-        // create new OID.
+		// create new OID.
 			
 		// Insert data
 
 		$sql='INSERT INTO '.$this->db_prefix.'mib_cache '.
-		      '(oid, name, type , mib, textual_convention, display_hint '.
-              ', syntax, type_enum , description ) ' . 
-              'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-              ', :syntax, :type_enum, :description )';
+			  '(oid, name, type , mib, textual_convention, display_hint '.
+			  ', syntax, type_enum , description ) ' . 
+			  'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			  ', :syntax, :type_enum, :description )';
         
 		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
 		
 		$sqlQuery=$db_conn->prepare($sql);
 		
 		$sqlParam=array(
-		    ':oid' => $oid,
-		    ':name' => $name,
-		    ':type' => $type,
-		    ':mib' => $mib,
-		    ':tc' =>  ($textConv==null)?'null':$textConv ,
-		    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-		    ':syntax' => ($syntax==null)?'null':$syntax,
-		    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-		    ':description' => ($description==null)?'null':$description
+			':oid' => $oid,
+			':name' => $name,
+			':type' => $type,
+			':mib' => $mib,
+			':tc' =>  ($textConv==null)?'null':$textConv ,
+			':display_hint' => ($dispHint==null)?'null':$dispHint ,
+			':syntax' => ($syntax==null)?'null':$syntax,
+			':type_enum' => ($type_enum==null)?'null':$type_enum,
+			':description' => ($description==null)?'null':$description
 		);
 		
 		if ($sqlQuery->execute($sqlParam) === false) {
-		    $this->logging->log('Error in query : ' . $sql,1,'');
+			$this->logging->log('Error in query : ' . $sql,1,'');
 		}
 		
 		switch ($this->trapsDB->trapDBType)
 		{
-		    case 'pgsql':
-		        // Get last id to insert oid/values in secondary table
-		        if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
-		            $this->logging->log('Error getting id - pgsql - ',1,'');
-		        }
-		        if (! isset($inserted_id_ret['id'])) {
-		            $this->logging->log('Error getting id - pgsql - empty.',1,'');
-		        }
-		        $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
-		        break;
-		    case 'mysql':
-		        // Get last id to insert oid/values in secondary table
-		        $sql='SELECT LAST_INSERT_ID();';
-		        if (($ret_code=$db_conn->query($sql)) === false) {
-		            $this->logging->log('Erreur getting id - mysql - ',1,'');
-		        }
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
+					$this->logging->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id - pgsql - empty.',1,'');
+				}
+				$this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur getting id - mysql - ',1,'');
+				}
 		        
-		        $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-		        if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-		        $this->dbOidIndex[$oid]['id']=$inserted_id;
-		        break;
-		    default:
-		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->dbOidIndex[$oid]['id']=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
 		}
 
 		// Set as newly created.
@@ -1342,148 +1342,148 @@ 
 		return 2;
 	}
 
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
 	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
 	{
-	    $dbObjects=null; // cache of objects for trap in db
-	    $db_conn=$this->trapsDB->db_connect_trap();
+		$dbObjects=null; // cache of objects for trap in db
+		$db_conn=$this->trapsDB->db_connect_trap();
 	    
-	    // Get id of trapmib.
+		// Get id of trapmib.
 
-	    $trapId = $this->dbOidIndex[$trapOID]['id'];
-	    if ($check_existing === true)
-	    {
-	        // Get all objects
-	        $sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-	        $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
-	        if (($ret_code=$db_conn->query($sql)) === false) {
-	            $this->logging->log('No result in query : ' . $sql,1,'');
-	        }
-	        $dbObjectsRaw=$ret_code->fetchAll();
+		$trapId = $this->dbOidIndex[$trapOID]['id'];
+		if ($check_existing === true)
+		{
+			// Get all objects
+			$sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+			$this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+			if (($ret_code=$db_conn->query($sql)) === false) {
+				$this->logging->log('No result in query : ' . $sql,1,'');
+			}
+			$dbObjectsRaw=$ret_code->fetchAll();
 	        
-	        foreach ($dbObjectsRaw as $val)
-	        {
-	            $dbObjects[$val['object_id']]=1;
-	        }
-	    }
-	    foreach ($objects as $object)
-	    {
-	        $match=$snmptrans=array();
-	        $retVal=0;
-	        $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-	        $tmpdesc='';$indesc=false;
+			foreach ($dbObjectsRaw as $val)
+			{
+				$dbObjects[$val['object_id']]=1;
+			}
+		}
+		foreach ($objects as $object)
+		{
+			$match=$snmptrans=array();
+			$retVal=0;
+			$objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
+			$tmpdesc='';$indesc=false;
 	        
-	        $objMib=$trapmib;
-	        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	            ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	        if ($retVal!=0)
-	        {
-	            // Maybe not trap mib, search with IR
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-	            { // Not found -> continue with warning
-	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-	               continue;
-	            }
-	            $objMib=$match[1];
+			$objMib=$trapmib;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				// Maybe not trap mib, search with IR
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+				if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+				{ // Not found -> continue with warning
+				   $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+				   continue;
+				}
+				$objMib=$match[1];
 	            
-	            // Do the snmptranslate again.
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-	            if ($retVal!=0) {
-	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
-	            }
+				// Do the snmptranslate again.
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
+				if ($retVal!=0) {
+					$this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+				}
 	            
-	        }
-	        foreach ($snmptrans as $line)
-	        {
-	            if ($indesc===true)
-	            {
-	                $line=preg_replace('/[\t ]+/',' ',$line);
-	                if (preg_match('/(.*)"$/', $line,$match))
-	                {
-	                    $objDesc = $tmpdesc . $match[1];
-	                    $indesc=false;
-	                }
-	                $tmpdesc.=$line;
-	                continue;
-	            }
-	            if (preg_match('/^\.[0-9\.]+$/', $line))
-	            {
-	                $objOid=$line;
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-	            {
-	                $objSyntax=$match[1];
-                    $objEnum=$match[2];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-	            {
-	                $objSyntax=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-	            {
-	                $objDispHint=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-	            {
-	                $objDesc=$match[1];
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-	            {
-	                $tmpdesc=$match[1];
-	                $indesc=true;
-	                continue;
-	            }
-	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-	            {
-	                $objTc=$match[1];
-	                continue;
-	            }
-	        }
-	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
-	        //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
-	        // Update 
-	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+			}
+			foreach ($snmptrans as $line)
+			{
+				if ($indesc===true)
+				{
+					$line=preg_replace('/[\t ]+/',' ',$line);
+					if (preg_match('/(.*)"$/', $line,$match))
+					{
+						$objDesc = $tmpdesc . $match[1];
+						$indesc=false;
+					}
+					$tmpdesc.=$line;
+					continue;
+				}
+				if (preg_match('/^\.[0-9\.]+$/', $line))
+				{
+					$objOid=$line;
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					$objEnum=$match[2];
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDispHint=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDesc=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+				{
+					$tmpdesc=$match[1];
+					$indesc=true;
+					continue;
+				}
+				if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+				{
+					$objTc=$match[1];
+					continue;
+				}
+			}
+			$this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+			//echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
+			// Update 
+			$this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
             
-	        if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
-	        {   // if link exists, continue
-	            $dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
-	            continue;
-	        }
-	        if ($check_existing === true) 
-	        {
-	            // TODO : check link trap - objects exists, mark them.
-	        }
-	        // Associate in object table
-	        $sql='INSERT INTO '.$this->db_prefix.'mib_cache_trap_object (trap_id,object_id) '.
-	   	        'values (:trap_id, :object_id)';	        
-	        $sqlQuery=$db_conn->prepare($sql);	        
-	        $sqlParam=array(
-	            ':trap_id' => $trapId,
-	            ':object_id' => $this->dbOidIndex[$objOid]['id'],
-	        );
+			if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true) 
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$sql='INSERT INTO '.$this->db_prefix.'mib_cache_trap_object (trap_id,object_id) '.
+	   			'values (:trap_id, :object_id)';	        
+			$sqlQuery=$db_conn->prepare($sql);	        
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$objOid]['id'],
+			);
 	        
-	        if ($sqlQuery->execute($sqlParam) === false) {
-	            $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
-	        }
-	    }
-	    if ($check_existing === true)
-	    {
-	        // TODO : remove link trap - objects that wasn't marked.
-	    }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
 	    
 	}
 	
@@ -1493,7 +1493,7 @@ 
 	 * @param boolean $check_change : Force check of trap params & objects
 	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
 	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-	*/	
+	 */	
 	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
 	{
 		// Timing 
@@ -1545,7 +1545,7 @@ 
 		
 		for ($curElement=0;$curElement < $numElements;$curElement++)
 		{
-		    $time_1= microtime(true);
+			$time_1= microtime(true);
 			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
 			{ // echo a . every 2 sec
 				echo '.';
@@ -1563,8 +1563,8 @@ 
 			// Get oid or pass if not found
 			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
 			{
-			    $time_parse1 += microtime(true) - $time_1;
-			    $time_parse1N ++;
+				$time_parse1 += microtime(true) - $time_1;
+				$time_parse1N ++;
 				continue;
 			}
 			$oid=$this->objectsAll[$curElement];
@@ -1575,7 +1575,7 @@ 
 			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
 						$this->objectsAll[$curElement],$match))
 			{
-			    $time_check1 += microtime(true) - $time_1;
+				$time_check1 += microtime(true) - $time_1;
 				$time_check1N++;
 				continue;
 			}
@@ -1588,8 +1588,8 @@ 
 				// Check if next is suboid -> in that case is cannot be a trap
 				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
 				{
-				    $time_check2 += microtime(true) - $time_1;
-				    $time_check2N++;
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
 					continue;
 				}		
 				unset($snmptrans);
@@ -1597,8 +1597,8 @@ 
 					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
 				if ($retVal!=0)
 				{
-				    $time_check2 += microtime(true) - $time_1;
-				    $time_check2N++;
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
 					continue;
 				}
 				//echo "\n v1 trap found : $oid \n";
@@ -1607,7 +1607,7 @@ 
 			}
 			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
 			{
-			    $time_check3 += microtime(true) - $time_1;
+				$time_check3 += microtime(true) - $time_1;
 				$time_check3N++;
 				continue;
 			}
@@ -1628,7 +1628,7 @@ 
 			
 			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
 			{
-			    $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+				$this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
 			}
 			$trapMib=$match[1];
 			
@@ -1636,17 +1636,17 @@ 
 			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
 			if (isset($snmptrans[$numLine]))
 			{
-			    $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+				$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
 
-			    while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-			    {
-			        $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-			        $numLine++;
-			    }
-			    if (isset($snmptrans[$numLine])) {
-			        $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-			        $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
-			    }
+				while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+				{
+					$trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+					$numLine++;
+				}
+				if (isset($snmptrans[$numLine])) {
+					$trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
+					$trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+				}
 
 			}
 			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
@@ -1654,23 +1654,23 @@ 
 			
 			if (($update==0) && ($check_change===false))
 			{ // Trapd didn't change & force check disabled
-			    $time_objects += microtime(true) - $time_1;
-			    if ($display_progress) echo "C";
-			    continue;
+				$time_objects += microtime(true) - $time_1;
+				if ($display_progress) echo "C";
+				continue;
 			}
 			
 			$synt=null;
 			foreach ($snmptrans as $line)
 			{	
-    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-    				{
-    					$synt=$match[1];
-    				}
+				if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+					{
+						$synt=$match[1];
+					}
 			}
 			if ($synt == null) 
 			{
 				//echo "No objects for $trapOID\n";
-			    $time_objects += microtime(true) - $time_1;
+				$time_objects += microtime(true) - $time_1;
 				continue;
 			}
 			//echo "$synt \n";
@@ -1689,18 +1689,18 @@ 
 		
 		if ($display_progress)
 		{
-    		echo "\nNumber of processed traps : $time_num_traps \n";
-    		echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-    		echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-    		echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+			echo "\nNumber of processed traps : $time_num_traps \n";
+			echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
+			echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
+			echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
+			echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
 		}
 		
 		// Timing ends
 		$timeTaken=microtime(true) - $timeTaken;
 		if ($display_progress)
 		{
-		    echo "Global time : ".round($timeTaken)." seconds\n";
+			echo "Global time : ".round($timeTaken)." seconds\n";
 		}
 		
 	}

Spacing +379 added lines, -379 removed lines

@@ -34,8 +34,8 @@ 
 	protected $api_password='';
 
 	// Logs 
-	protected $logging;    //< Logging class.
-	protected $logSetup;   //< bool true if log was setup in constructor
+	protected $logging; //< Logging class.
+	protected $logSetup; //< bool true if log was setup in constructor
 	
 	// Databases
 	public $trapsDB; //< Database class
@@ -55,7 +55,7 @@ 
 	private $objectsAll; //< output lines of snmptranslate list
 	private $trapObjectsIndex; //< array of traps objects (as OID)
 	
-	function __construct($etc_dir='/etc/icingaweb2',$baseLogLevel=null,$baseLogMode='syslog',$baseLogFile='')
+	function __construct($etc_dir='/etc/icingaweb2', $baseLogLevel=null, $baseLogMode='syslog', $baseLogFile='')
 	{
 	    // Paths of ini files
 		$this->icingaweb2_etc=$etc_dir;
@@ -63,10 +63,10 @@ 
 		$this->icingaweb2_ressources=$this->icingaweb2_etc."/resources.ini";
 
 		// Setup logging
-		$this->logging = new Logging();
+		$this->logging=new Logging();
 		if ($baseLogLevel != null)
 		{
-		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
+		    $this->logging->setLogging($baseLogLevel, $baseLogMode, $baseLogFile);
 		    $this->logSetup=true;
 		}
 		else 
@@ -74,10 +74,10 @@ 
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
-		$trapConfig=parse_ini_file($this->trap_module_config,true);
+		$trapConfig=parse_ini_file($this->trap_module_config, true);
 		if ($trapConfig == false)
 		{
-		    $this->logging->log("Error reading ini file : ".$this->trap_module_config,ERROR,'syslog');
+		    $this->logging->log("Error reading ini file : ".$this->trap_module_config, ERROR, 'syslog');
 		}
 		$this->getMainOptions($trapConfig); // Get main options from ini file
 		$this->setupDatabase($trapConfig); // Setup database class
@@ -85,7 +85,7 @@ 
 		$this->getDatabaseOptions(); // Get options in database
 		if ($this->api_use === true) $this->getAPI(); // Setup API
 		
-		$this->mibClass = new Mib($this->logging,$this->trapsDB); // Create Mib class
+		$this->mibClass=new Mib($this->logging, $this->trapsDB); // Create Mib class
 		
 		$this->trap_data=array(
 			'source_ip'	=> 'unknown',
@@ -107,15 +107,15 @@ 
 	 * @param string $message warning message if not found
 	 * @return boolean true if found, or false
 	 */
-	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = 2, $message = null)
+	protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=2, $message=null)
 	{
 	    if (!isset($option_array[$option_category][$option_name]))
 	    {
 	        if ($message === null)
 	        {
-	            $message='No ' . $option_name . ' in config file: '. $this->trap_module_config;
+	            $message='No '.$option_name.' in config file: '.$this->trap_module_config;
 	        }
-	        $this->logging->log($message,$log_level,'syslog');
+	        $this->logging->log($message, $log_level, 'syslog');
 	        return false;
 	    }
 	    else
@@ -133,24 +133,24 @@ 
 	{
 
 		// Snmptranslate binary path
-		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+		$this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
 
 		// mibs path
-		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+		$this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
 
 		// icinga2cmd path
-		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+		$this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
 		
 		// table prefix
-		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->db_prefix);
+		$this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->db_prefix);
 
 		// API options
-		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->api_hostname))
+		if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->api_hostname))
 		{
 		    $this->api_use=true;
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->api_port);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->api_username);
-		    $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->api_password);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->api_port);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->api_username);
+		    $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->api_password);
 		}
 	}
 	
@@ -161,40 +161,40 @@ 
 	protected function setupDatabase($trapConfig)
 	{
 	    // Trap database
-	    if (!array_key_exists('database',$trapConfig['config']))
+	    if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trap_module_config,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trap_module_config, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
 	    
-	   if ( ($dbConfig=parse_ini_file($this->icingaweb2_ressources,true)) === false)
+	   if (($dbConfig=parse_ini_file($this->icingaweb2_ressources, true)) === false)
 	    {
-	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("Error reading ini file : ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
-	    if (!array_key_exists($dbTrapName,$dbConfig))
+	    if (!array_key_exists($dbTrapName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
-	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
+	    $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->db_prefix);
 	    
 	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
         
 	    // IDO Database
-	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+	    if (!array_key_exists('IDOdatabase', $trapConfig['config']))
 	    {
-	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config,ERROR,'');
+	        $this->logging->log("No IDOdatabase in config file: ".$this->trap_module_config, ERROR, '');
 	    }
 	    $dbIdoName=$trapConfig['config']['IDOdatabase'];		
 
-	    $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+	    $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
 	    {
-	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources,ERROR,'');
+	        $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2_ressources, ERROR, '');
 	        return;
 	    }
 	    
@@ -209,13 +209,13 @@ 
 		// Database options
 		if ($this->logSetup === false) // Only if logging was no setup in constructor
 		{
-    		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
-    		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
-    		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
+    		$this->getDBConfigIfSet('log_level', $this->logging->debugLevel);
+    		$this->getDBConfigIfSet('log_destination', $this->logging->outputMode);
+    		$this->getDBConfigIfSet('log_file', $this->logging->outputFile);
 		}
 	}
 
-	protected function getDBConfigIfSet($element,&$variable)
+	protected function getDBConfigIfSet($element, &$variable)
 	{
 		$value=$this->getDBConfig($element);
 		if ($value != 'null') $variable=$value;
@@ -231,7 +231,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql='SELECT value from '.$this->db_prefix.'db_config WHERE ( name=\''.$element.'\' )';
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return null;
 		}
 		$value=$ret_code->fetch();
@@ -248,22 +248,22 @@ 
 	*	@param  string $destination file/syslog/display
 	*	@return void
 	**/	
-	public function trapLog( $message, $level, $destination ='') // OBSOLETE
+	public function trapLog($message, $level, $destination='') // OBSOLETE
 	{	
 		// TODO : replace ref with $this->logging->log 
 	    $this->logging->log($message, $level, $destination);
 	}
 	
-	public function setLogging($debugLvl,$outputType,$outputOption=null)  // OBSOLETE
+	public function setLogging($debugLvl, $outputType, $outputOption=null)  // OBSOLETE
 	{
-		$this->logging->setLogging($debugLvl, $outputType,$outputOption);
+		$this->logging->setLogging($debugLvl, $outputType, $outputOption);
 	}
 	
 	protected function getAPI()
 	{
 	    if ($this->icinga2api == null)
 	    {
-	        $this->icinga2api = new Icinga2API($this->api_hostname,$this->api_port);
+	        $this->icinga2api=new Icinga2API($this->api_hostname, $this->api_port);
 	    }
 	    return $this->icinga2api;
 	}
@@ -282,7 +282,7 @@ 
 		if ($input_stream === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Stdin)");
-			$this->logging->log("Error reading stdin !",ERROR,'');
+			$this->logging->log("Error reading stdin !", ERROR, '');
 			return null; // note : exception thrown by logging
 		}
 
@@ -291,21 +291,21 @@ 
 		if ($this->receivingHost === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line Host)");
-			$this->logging->log("Error reading Host !",ERROR,''); 
+			$this->logging->log("Error reading Host !", ERROR, ''); 
 		}
 		// line 2 IP:port=>IP:port
 		$IP=chop(fgets($input_stream));
 		if ($IP === false)
 		{
 		    $this->writeTrapErrorToDB("Error reading trap (code 1/Line IP)");
-			$this->logging->log("Error reading IP !",ERROR,''); 
+			$this->logging->log("Error reading IP !", ERROR, ''); 
 		}
 		$matches=array();
-		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/',$IP,$matches);
-		if ($ret_code===0 || $ret_code===false) 
+		$ret_code=preg_match('/.DP: \[(.*)\]:(.*)->\[(.*)\]:(.*)/', $IP, $matches);
+		if ($ret_code === 0 || $ret_code === false) 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
-			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
+			$this->logging->log('Error parsing IP : '.$IP, ERROR, '');
 		} 
 		else 
 		{		
@@ -315,34 +315,34 @@ 
 			$this->trap_data['destination_port']=$matches[4];
 		}
 
-		while (($vars=fgets($input_stream)) !==false)
+		while (($vars=fgets($input_stream)) !== false)
 		{
 			$vars=chop($vars);
-			$ret_code=preg_match('/^([^ ]+) (.*)$/',$vars,$matches);
-			if ($ret_code===0 || $ret_code===false) 
+			$ret_code=preg_match('/^([^ ]+) (.*)$/', $vars, $matches);
+			if ($ret_code === 0 || $ret_code === false) 
 			{
-				$this->logging->log('No match on trap data : '.$vars,WARN,'');
+				$this->logging->log('No match on trap data : '.$vars, WARN, '');
 			}
 			else 
 			{
-			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
+			    if (($matches[1] == '.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1] == '.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
 				}
 				else
 				{
-					$object= new stdClass;
-					$object->oid =$matches[1];
-					$object->value = $matches[2];
-					array_push($this->trap_data_ext,$object);
+					$object=new stdClass;
+					$object->oid=$matches[1];
+					$object->value=$matches[2];
+					array_push($this->trap_data_ext, $object);
 				}
 			}
 		}
 
-		if ($this->trap_data['trap_oid']=='unknown') 
+		if ($this->trap_data['trap_oid'] == 'unknown') 
 		{
-		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)",$this->trap_data['source_ip']);
-			$this->logging->log('no trap oid found',ERROR,'');
+		    $this->writeTrapErrorToDB("No trap oid found : check snmptrapd configuration (code 3/OID)", $this->trap_data['source_ip']);
+			$this->logging->log('no trap oid found', ERROR, '');
 		} 
 
 		// Translate oids.
@@ -364,7 +364,7 @@ 
 		}
 		
 
-		$this->trap_data['status']= 'waiting';
+		$this->trap_data['status']='waiting';
 		
 		return $this->trap_data;
 	}
@@ -380,40 +380,40 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Also check if it is an instance of OID
-		$oid_instance=preg_replace('/\.[0-9]+$/','',$oid);
+		$oid_instance=preg_replace('/\.[0-9]+$/', '', $oid);
 		
 		$sql='SELECT mib,name from '.$this->db_prefix.'mib_cache WHERE oid=\''.$oid_instance.'\';';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$name=$ret_code->fetch();
 		if ($name['name'] != null)
 		{
-			return array('trap_name_mib'=>$name['mib'],'trap_name'=>$name['name']);
+			return array('trap_name_mib'=>$name['mib'], 'trap_name'=>$name['name']);
 		}
 		
 		// Try to get oid name from snmptranslate
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
 		$matches=array();
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code === false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return NULL;
 		} else {
-			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid,INFO);
-			return array('trap_name_mib'=>$matches[1],'trap_name'=>$matches[2]);
+			$this->logging->log('Found name with snmptrapd and not in DB for oid='.$oid, INFO);
+			return array('trap_name_mib'=>$matches[1], 'trap_name'=>$matches[2]);
 		}	
 	}
 	
@@ -424,90 +424,90 @@ 
 	**/
 	public function eraseOldTraps($days=0)
 	{
-		if ($days==0)
+		if ($days == 0)
 		{
 			if (($days=$this->getDBConfig('db_remove_days')) == null)
 			{
-				$this->logging->log('No days specified & no db value : no tap erase' ,WARN,'');
+				$this->logging->log('No days specified & no db value : no tap erase', WARN, '');
 				return;
 			}
 		}
 		$db_conn=$this->trapsDB->db_connect_trap();
-		$daysago = strtotime("-".$days." day");
-		$sql= 'delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s",$daysago).'\';';
+		$daysago=strtotime("-".$days." day");
+		$sql='delete from '.$this->db_prefix.'received where date_received < \''.date("Y-m-d H:i:s", $daysago).'\';';
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error erasing traps : '.$sql,ERROR,'');
+			$this->logging->log('Error erasing traps : '.$sql, ERROR, '');
 		}
-		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql,INFO);
+		$this->logging->log('Erased traps older than '.$days.' day(s) : '.$sql, INFO);
 	}
 
 	/** Write error to received trap database
 	 */
-	public function writeTrapErrorToDB($message,$sourceIP=null,$trapoid=null)
+	public function writeTrapErrorToDB($message, $sourceIP=null, $trapoid=null)
 	{
 	    
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    
 	    // add date time
-	    $insert_col ='date_received,status';
-	    $insert_val = "'" . date("Y-m-d H:i:s")."','error'";
+	    $insert_col='date_received,status';
+	    $insert_val="'".date("Y-m-d H:i:s")."','error'";
         
-	    if ($sourceIP !=null)
+	    if ($sourceIP != null)
 	    {
-	        $insert_col .=',source_ip';
-	        $insert_val .=",'". $sourceIP ."'";
+	        $insert_col.=',source_ip';
+	        $insert_val.=",'".$sourceIP."'";
 	    }
-	    if ($trapoid !=null)
+	    if ($trapoid != null)
 	    {
-	        $insert_col .=',trap_oid';
-	        $insert_val .=",'". $trapoid ."'";
+	        $insert_col.=',trap_oid';
+	        $insert_val.=",'".$trapoid."'";
 	    }
-	    $insert_col .=',status_detail';
-	    $insert_val .=",'". $message ."'";
+	    $insert_col.=',status_detail';
+	    $insert_val.=",'".$message."'";
 	    
-	    $sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+	    $sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 	    
 	    switch ($this->trapsDB->trapDBType)
 	    {
 	        case 'pgsql':
-	            $sql .= ' RETURNING id;';
-	            $this->logging->log('sql : '.$sql,INFO);
+	            $sql.=' RETURNING id;';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 	                
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
-	            if (! isset($inserted_id_ret['id'])) {
-	                $this->logging->log('Error getting id',1,'');
+	            if (!isset($inserted_id_ret['id'])) {
+	                $this->logging->log('Error getting id', 1, '');
 	            }
 	            $this->trap_id=$inserted_id_ret['id'];
 	            break;
 	        case 'mysql':
-	            $sql .= ';';
-	            $this->logging->log('sql : '.$sql,INFO );
+	            $sql.=';';
+	            $this->logging->log('sql : '.$sql, INFO);
 	            if ($db_conn->query($sql) === false) {
-	                $this->logging->log('Error SQL insert : '.$sql,1,'');
+	                $this->logging->log('Error SQL insert : '.$sql, 1, '');
 	            }
-	            $this->logging->log('SQL insertion OK',INFO );
+	            $this->logging->log('SQL insertion OK', INFO);
 	            // Get last id to insert oid/values in secondary table
 	            $sql='SELECT LAST_INSERT_ID();';
 	            if (($ret_code=$db_conn->query($sql)) === false) {
-	                $this->logging->log('Erreur recuperation id',1,'');
+	                $this->logging->log('Erreur recuperation id', 1, '');
 	            }
 	            
 	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
 	            $this->trap_id=$inserted_id;
 	            break;
 	        default:
-	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType,1,'');
+	            $this->logging->log('Error SQL type unknown  : '.$this->trapsDB->trapDBType, 1, '');
 	    }
 	    
-	    $this->logging->log('id found: '. $this->trap_id,INFO );    
+	    $this->logging->log('id found: '.$this->trap_id, INFO);    
 	}
 	
 	/** Write trap data to trap database
@@ -524,86 +524,86 @@ 
 		$insert_col='';
 		$insert_val='';
 		// add date time
-		$this->trap_data['date_received'] = date("Y-m-d H:i:s");
+		$this->trap_data['date_received']=date("Y-m-d H:i:s");
 
 		$firstcol=1;
 		foreach ($this->trap_data as $col => $val)
 		{
-			if ($firstcol==0) 
+			if ($firstcol == 0) 
 			{
-				$insert_col .=',';
-				$insert_val .=',';
+				$insert_col.=',';
+				$insert_val.=',';
 			}
-			$insert_col .= $col ;
-			$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+			$insert_col.=$col;
+			$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 			$firstcol=0;
 		}
 		
-		$sql= 'INSERT INTO '.$this->db_prefix.'received (' . $insert_col . ') VALUES ('.$insert_val.')';
+		$sql='INSERT INTO '.$this->db_prefix.'received ('.$insert_col.') VALUES ('.$insert_val.')';
 		switch ($this->trapsDB->trapDBType)
 		{
 			case 'pgsql': 
-				$sql .= ' RETURNING id;';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=' RETURNING id;';
+				$this->logging->log('sql : '.$sql, INFO);
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				if (($inserted_id_ret=$ret_code->fetch(PDO::FETCH_ASSOC)) === false) {
 														   
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
-				if (! isset($inserted_id_ret['id'])) {
-					$this->logging->log('Error getting id',ERROR,'');
+				if (!isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id', ERROR, '');
 				}
 				$this->trap_id=$inserted_id_ret['id'];
 			break;
 			case 'mysql': 
-				$sql .= ';';
-				$this->logging->log('sql : '.$sql,INFO );
+				$sql.=';';
+				$this->logging->log('sql : '.$sql, INFO);
 				if ($db_conn->query($sql) === false) {
-					$this->logging->log('Error SQL insert : '.$sql,ERROR,'');
+					$this->logging->log('Error SQL insert : '.$sql, ERROR, '');
 				}
-				$this->logging->log('SQL insertion OK',INFO );
+				$this->logging->log('SQL insertion OK', INFO);
 				// Get last id to insert oid/values in secondary table
 				$sql='SELECT LAST_INSERT_ID();';
 				if (($ret_code=$db_conn->query($sql)) === false) {
-					$this->logging->log('Erreur recuperation id',ERROR,'');
+					$this->logging->log('Erreur recuperation id', ERROR, '');
 				}
 
 				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
 				$this->trap_id=$inserted_id;
 			break;
 			default: 
-				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType,ERROR,'');
+				$this->logging->log('Error SQL type unknown : '.$this->trapsDB->trapDBType, ERROR, '');
 		}
-		$this->logging->log('id found: '.$this->trap_id,INFO );
+		$this->logging->log('id found: '.$this->trap_id, INFO);
 		
 		// Fill trap extended data table
 		foreach ($this->trap_data_ext as $value) {			
 			// TODO : detect if trap value is encoded and decode it to UTF-8 for database
 			$firstcol=1;
-			$value->trap_id = $this->trap_id;
+			$value->trap_id=$this->trap_id;
 			$insert_col='';
 			$insert_val='';
 			foreach ($value as $col => $val)
 			{
-				if ($firstcol==0) 
+				if ($firstcol == 0) 
 				{
-					$insert_col .=',';
-					$insert_val .=',';
+					$insert_col.=',';
+					$insert_val.=',';
 				}
-				$insert_col .= $col;
-				$insert_val .= ($val==null)? 'NULL' : $db_conn->quote($val);
+				$insert_col.=$col;
+				$insert_val.=($val == null) ? 'NULL' : $db_conn->quote($val);
 				$firstcol=0;
 			}
 
-			$sql= 'INSERT INTO '.$this->db_prefix.'received_data (' . $insert_col . ') VALUES ('.$insert_val.');';			
+			$sql='INSERT INTO '.$this->db_prefix.'received_data ('.$insert_col.') VALUES ('.$insert_val.');';			
 
 			if ($db_conn->query($sql) === false) {
-				$this->logging->log('Erreur insertion data : ' . $sql,WARN,'');
+				$this->logging->log('Erreur insertion data : '.$sql, WARN, '');
 			}	
 		}	
 	}
@@ -613,14 +613,14 @@ 
 	*	@param $oid string oid in numeric
 	*	@return mixed : PDO object or false
 	*/	
-	protected function getRules($ip,$oid)
+	protected function getRules($ip, $oid)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
 		// fetch rules based on IP in rule and OID
 		$sql='SELECT * from '.$this->db_prefix.'rules WHERE trap_oid=\''.$oid.'\' ';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			$this->logging->log('No result in query : '.$sql, WARN, '');
 			return false;
 		}
 		$rules_all=$ret_code->fetchAll();
@@ -629,7 +629,7 @@ 
 		$rule_ret_key=0;
 		foreach ($rules_all as $key => $rule)
 		{
-			if ($rule['ip4']==$ip || $rule['ip6']==$ip)
+			if ($rule['ip4'] == $ip || $rule['ip6'] == $ip)
 			{
 				$rules_ret[$rule_ret_key]=$rules_all[$key];
 				//TODO : get host name by API (and check if correct in rule).
@@ -637,7 +637,7 @@ 
 				continue;
 			}
 			// TODO : get hosts IP by API
-			if (isset($rule['host_group_name']) && $rule['host_group_name']!=null)
+			if (isset($rule['host_group_name']) && $rule['host_group_name'] != null)
 			{ // get ips of group members by oid
 				$db_conn2=$this->trapsDB->db_connect_ido();
 				$sql="SELECT m.host_object_id, a.address as ip4, a.address6 as ip6, b.name1 as host_name
@@ -648,15 +648,15 @@ 
 						LEFT JOIN icinga_objects as b ON b.object_id = a.host_object_id
 						WHERE o.name1='".$rule['host_group_name']."';";
 				if (($ret_code2=$db_conn2->query($sql)) === false) {
-					$this->logging->log('No result in query : ' . $sql,WARN,'');
+					$this->logging->log('No result in query : '.$sql, WARN, '');
 					continue;
 				}
 				$grouphosts=$ret_code2->fetchAll();
 				//echo "rule grp :\n";print_r($grouphosts);echo "\n";
-				foreach ( $grouphosts as $host)
+				foreach ($grouphosts as $host)
 				{
 					//echo $host['ip4']."\n";
-					if ($host['ip4']==$ip || $host['ip6']==$ip)
+					if ($host['ip4'] == $ip || $host['ip6'] == $ip)
 					{
 						//echo "Rule added \n";
 						$rules_ret[$rule_ret_key]=$rules_all[$key];
@@ -679,7 +679,7 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$sql="UPDATE ".$this->db_prefix."rules SET num_match = '".$set."' WHERE (id = '".$id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -691,31 +691,31 @@ 
 	 * @param string $display
 	 * @returnn bool true is service check was sent without error
 	*/
-	public function serviceCheckResult($host,$service,$state,$display)
+	public function serviceCheckResult($host, $service, $state, $display)
 	{
 	    if ($this->api_use === false)
 	    {
-    		$send = '[' . date('U') .'] PROCESS_SERVICE_CHECK_RESULT;' .
-    			$host.';' .$service .';' . $state . ';'.$display;
-    		$this->logging->log( $send." : to : " .$this->icinga2cmd,INFO );
+    		$send='['.date('U').'] PROCESS_SERVICE_CHECK_RESULT;'.
+    			$host.';'.$service.';'.$state.';'.$display;
+    		$this->logging->log($send." : to : ".$this->icinga2cmd, INFO);
     		
     		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
-    		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
+    		exec('echo "'.$send.'" > '.$this->icinga2cmd);
     		return true;
 	    }
 	    else
 	    {
-	        $api = $this->getAPI();
+	        $api=$this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
-	        list($retcode,$retmessage)=$api->serviceCheckResult($host,$service,$state,$display);
+	        list($retcode, $retmessage)=$api->serviceCheckResult($host, $service, $state, $display);
 	        if ($retcode == false)
 	        {
-	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
+	            $this->logging->log("Error sending result : ".$retmessage, WARN, '');
 	            return false;
 	        }
 	        else 
 	        {
-	            $this->logging->log( "Sent result : " .$retmessage,INFO );
+	            $this->logging->log("Sent result : ".$retmessage, INFO);
 	            return true;
 	        }
 	    }
@@ -723,7 +723,7 @@ 
 	
 	public function getHostByIP($ip)
 	{
-	    $api = $this->getAPI();
+	    $api=$this->getAPI();
 	    $api->setCredentials($this->api_username, $this->api_password);
 	    return $api->getHostByIP($ip);
 	}
@@ -736,32 +736,32 @@ 
 	protected function applyDisplay($display)
 	{
 	    $matches=array();
-	    while (preg_match('/_OID\(([0-9\.]+)\)/',$display,$matches) == 1)
+	    while (preg_match('/_OID\(([0-9\.]+)\)/', $display, $matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
 				if ($oid == $val->oid)
 				{
-					$val->value=preg_replace('/"/','',$val->value);
+					$val->value=preg_replace('/"/', '', $val->value);
 					$rep=0;
-					$display=preg_replace('/_OID\('.$oid.'\)/',$val->value,$display,-1,$rep);
-					if ($rep==0)
+					$display=preg_replace('/_OID\('.$oid.'\)/', $val->value, $display, -1, $rep);
+					if ($rep == 0)
 					{
-						$this->logging->log("Error in display",WARN,'');
+						$this->logging->log("Error in display", WARN, '');
 						return $display;
 					}
 					$found=1;
 					break;
 				}
 			}
-			if ($found==0)
+			if ($found == 0)
 			{
-				$display=preg_replace('/_OID\('.$oid.'\)/','<not in trap>',$display,-1,$rep);
-				if ($rep==0)
+				$display=preg_replace('/_OID\('.$oid.'\)/', '<not in trap>', $display, -1, $rep);
+				if ($rep == 0)
 				{
-					$this->logging->log("Error in display",WARN,'');
+					$this->logging->log("Error in display", WARN, '');
 					return $display;
 				}				
 			}
@@ -771,27 +771,27 @@ 
 
 	
 	/***************** Eval & tokenizer functions ****************/
-	protected function eval_getElement($rule,&$item)
+	protected function eval_getElement($rule, &$item)
 	{
-		while ($rule[$item]==' ') $item++;
-		if (preg_match('/[0-9\.]/',$rule[$item]))
+		while ($rule[$item] == ' ') $item++;
+		if (preg_match('/[0-9\.]/', $rule[$item]))
 		{ // number
 	
-			$item2=$item+1; 
-			while (($item2!=strlen($rule)) && (preg_match('/[0-9\.]/',$rule[$item2]))) { $item2++ ;}
-			$val=substr($rule,$item,$item2-$item);
+			$item2=$item + 1; 
+			while (($item2 != strlen($rule)) && (preg_match('/[0-9\.]/', $rule[$item2]))) { $item2++; }
+			$val=substr($rule, $item, $item2 - $item);
 			$item=$item2;
 			//echo "number ".$val."\n";
-			return array(0,$val);
+			return array(0, $val);
 		}
 		if ($rule[$item] == '"')
 		{ // string
 			$item++;
-			$item2=$this->eval_getNext($rule,$item,'"');
-			$val=substr($rule,$item,$item2-$item-1);
+			$item2=$this->eval_getNext($rule, $item, '"');
+			$val=substr($rule, $item, $item2 - $item - 1);
 			$item=$item2;
 			//echo "string : ".$val."\n";
-			return array(1,$val);
+			return array(1, $val);
 		}
 		
 		if ($rule[$item] == '(')
@@ -800,14 +800,14 @@ 
 			$start=$item;
 			$parenthesis_count=0; 
 			while (($item < strlen($rule)) // Not end of string AND
-			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+			      && (($rule[$item] != ')') || $parenthesis_count > 0)) // Closing ')' or embeded ()
 			{ 
-				if ($rule[$item] == '"' )
+				if ($rule[$item] == '"')
 				{ // pass through string
 					$item++;
-					$item=$this->eval_getNext($rule,$item,'"');
+					$item=$this->eval_getNext($rule, $item, '"');
 				} 
-				else{
+				else {
 				    if ($rule[$item] == '(')
 				    {
 				        $parenthesis_count++;
@@ -820,49 +820,49 @@ 
 				}
 			}
 			
-			if ($item==strlen($rule)) {throw new Exception("no closing () in ".$rule ." at " .$item);}
-			$val=substr($rule,$start,$item-$start);
+			if ($item == strlen($rule)) {throw new Exception("no closing () in ".$rule." at ".$item); }
+			$val=substr($rule, $start, $item - $start);
 			$item++;
 			$start=0;
 			//echo "group : ".$val."\n";
 			// returns evaluation of group as type 2 (boolean)
-			return array(2,$this->evaluation($val,$start));		
+			return array(2, $this->evaluation($val, $start));		
 		}
-		throw new Exception("number/string not found in ".$rule ." at " .$item . ' : ' .$rule[$item]);
+		throw new Exception("number/string not found in ".$rule." at ".$item.' : '.$rule[$item]);
 		
 	}
 	
-	protected function eval_getNext($rule,$item,$tok)
+	protected function eval_getNext($rule, $item, $tok)
 	{
-		while (($rule[$item] != $tok ) && ($item < strlen($rule))) { $item++;}
-		if ($item==strlen($rule)) throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
-		return $item+1;
+		while (($rule[$item] != $tok) && ($item < strlen($rule))) { $item++; }
+		if ($item == strlen($rule)) throw new Exception("closing '".$tok."' not found in ".$rule." at ".$item);
+		return $item + 1;
 	}
 	
-	protected function eval_getOper($rule,&$item)
+	protected function eval_getOper($rule, &$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item] == ' ') $item++;
 		switch ($rule[$item])
 		{
 			case '<':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,"<=");}
-				$item++; return array(0,"<");
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, "<="); }
+				$item++; return array(0, "<");
 			case '>':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,">=");}
-				$item++; return array(0,">");
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, ">="); }
+				$item++; return array(0, ">");
 			case '=':
-				$item++; return array(0,"=");	
+				$item++; return array(0, "=");	
 			case '!':
-				if ($rule[$item+1]=='=') { $item+=2; return array(0,"!=");}
-				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule ." at " .$item);
+				if ($rule[$item + 1] == '=') { $item+=2; return array(0, "!="); }
+				throw new Exception("Erreur in expr - incorrect operator '!'  found in ".$rule." at ".$item);
 			case '~':
-				$item++; return array(0,"~");	
+				$item++; return array(0, "~");	
 			case '|':
-				$item++; return array(1,"|");	
+				$item++; return array(1, "|");	
 			case '&':
-				$item++; return array(1,"&");
+				$item++; return array(1, "&");
 			default	:
-				throw new Exception("Erreur in expr - operator not found in ".$rule ." at " .$item);
+				throw new Exception("Erreur in expr - operator not found in ".$rule." at ".$item);
 		}
 	}
 	
@@ -874,10 +874,10 @@ 
 	*   comparison int vs strings will return null (error)
 	*	return : bool or null on error
 	*/
-	public function evaluation($rule,&$item)
+	public function evaluation($rule, &$item)
 	{
 	    //echo "Evaluation of ".substr($rule,$item)."\n";
-		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		if ($rule[$item] == '!') // If '!' found, negate next expression.
 		{
 		    $negate=true;
 		    $item++;
@@ -887,63 +887,63 @@ 
 		    $negate=false;
 		}
 		// First element : number, string or ()
-		list($type1,$val1) = $this->eval_getElement($rule,$item);
+		list($type1, $val1)=$this->eval_getElement($rule, $item);
 		//echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
 		
-		if ($item==strlen($rule)) // If only element, return value, but only boolean
+		if ($item == strlen($rule)) // If only element, return value, but only boolean
 		{
 		  if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-		  if ($negate === true) $val1= ! $val1;
+		  if ($negate === true) $val1=!$val1;
 		  return $val1;
 		}  
 		
 		// Second element : operator
-		list($typec,$comp) = $this->eval_getOper($rule,$item);
+		list($typec, $comp)=$this->eval_getOper($rule, $item);
 		//echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
 		// Third element : number, string or ()
-		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+		if ($rule[$item] == '!') // starts with a ! so evaluate whats next
 		{
 		    $item++;
 		    if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
-		    $val2= ! $this->evaluation($rule,$item);
+		    $val2=!$this->evaluation($rule, $item);
 		    $type2=2; // result is a boolean 
 		}
 		else 
 		{
-		    list($type2,$val2) = $this->eval_getElement($rule,$item);
+		    list($type2, $val2)=$this->eval_getElement($rule, $item);
 		}
 		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
 		
-		if ($type1!=$type2)  // cannot compare different types
+		if ($type1 != $type2)  // cannot compare different types
 		{ 
 		    throw new Exception("Cannot compare string & number : ".$rule);
 		}
-		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+		if ($typec == 1 && $type1 != 2) // cannot use & or | with string/number
 		{
 		    throw new Exception("Cannot use boolean operators with string & number : ".$rule);
 		}
 		
-		switch ($comp){
-			case '<':	$retVal= ($val1 < $val2); break;
-			case '<=':	$retVal= ($val1 <= $val2); break;
-			case '>':	$retVal= ($val1 > $val2); break;
-			case '>=':	$retVal= ($val1 >= $val2); break;
-			case '=':	$retVal= ($val1 == $val2); break;
-			case '!=':	$retVal= ($val1 != $val2); break;
-			case '~':	$retVal= (preg_match('/'.preg_replace('/"/','',$val2).'/',$val1)); break;
-			case '|':	$retVal= ($val1 || $val2); break;
-			case '&':	$retVal= ($val1 && $val2); break;
+		switch ($comp) {
+			case '<':	$retVal=($val1 < $val2); break;
+			case '<=':	$retVal=($val1 <= $val2); break;
+			case '>':	$retVal=($val1 > $val2); break;
+			case '>=':	$retVal=($val1 >= $val2); break;
+			case '=':	$retVal=($val1 == $val2); break;
+			case '!=':	$retVal=($val1 != $val2); break;
+			case '~':	$retVal=(preg_match('/'.preg_replace('/"/', '', $val2).'/', $val1)); break;
+			case '|':	$retVal=($val1 || $val2); break;
+			case '&':	$retVal=($val1 && $val2); break;
 			default:  throw new Exception("Error in expression - unknown comp : ".$comp);
 		}
-		if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+		if ($negate === true) $retVal=!$retVal; // Inverse result if negate before expression
 		
-		if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+		if ($item == strlen($rule)) return $retVal; // End of string : return evaluation
 		// check for logical operator :
 		switch ($rule[$item])
 		{
-			case '|':	$item++; return ($retVal || $this->evaluation($rule,$item) );
-			case '&':	$item++; return ($retVal && $this->evaluation($rule,$item) );
+			case '|':	$item++; return ($retVal || $this->evaluation($rule, $item));
+			case '&':	$item++; return ($retVal && $this->evaluation($rule, $item));
 			
 			default:  throw new Exception("Erreur in expr - garbadge at end of expression : ".$rule[$item]);
 		}
@@ -955,17 +955,17 @@ 
 		$rule2='';
 		while ($item < strlen($rule))
 		{
-			if ($rule[$item]==' ') { $item++; continue; }
-			if ($rule[$item]=='"')
+			if ($rule[$item] == ' ') { $item++; continue; }
+			if ($rule[$item] == '"')
 			{
 				$rule2.=$rule[$item];
 				$item++;
-				while (($rule[$item]!='"') && ($item < strlen($rule)))
+				while (($rule[$item] != '"') && ($item < strlen($rule)))
 				{
 					$rule2.=$rule[$item];
 					$item++;
 				}
-				if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				if ($item == strlen($rule)) throw new Exception("closing '\"' not found in ".$rule." at ".$item);
 				$rule2.=$rule[$item];
 				$item++;
 				continue;
@@ -985,12 +985,12 @@ 
 	
 	protected function eval_rule($rule)
 	{
-		if ($rule==null || $rule == '') // Empty rule is always true
+		if ($rule == null || $rule == '') // Empty rule is always true
 		{
 			return true;
 		}
 		$matches=array();
-		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
+		while (preg_match('/_OID\(([0-9\.\*]+)\)/', $rule, $matches) == 1)
 		{
 			$oid=$matches[1];
 			$found=0;
@@ -1002,49 +1002,49 @@ 
 			// replace * with \* in oid for preg_replace
 			$oid=preg_replace('/\*/', '\*', $oid);
 			
-			$this->logging->log('OID in rule : '.$oid.' / '.$oidR,DEBUG );
+			$this->logging->log('OID in rule : '.$oid.' / '.$oidR, DEBUG);
 			
-			foreach($this->trap_data_ext as $val)
+			foreach ($this->trap_data_ext as $val)
 			{
-				if (preg_match("/^$oidR$/",$val->oid) == 1)
+				if (preg_match("/^$oidR$/", $val->oid) == 1)
 				{
-					if (!preg_match('/^[0-9]*\.?[0-9]+$/',$val->value))
+					if (!preg_match('/^[0-9]*\.?[0-9]+$/', $val->value))
 					{ // If not a number, change " to ' and put " around it
-						$val->value=preg_replace('/"/',"'",$val->value);
+						$val->value=preg_replace('/"/', "'", $val->value);
 						$val->value='"'.$val->value.'"';
 					}
 					$rep=0;
-					$rule=preg_replace('/_OID\('.$oid.'\)/',$val->value,$rule,-1,$rep);
-					if ($rep==0)
+					$rule=preg_replace('/_OID\('.$oid.'\)/', $val->value, $rule, -1, $rep);
+					if ($rep == 0)
 					{
-						$this->logging->log("Error in rule_eval",WARN,'');
+						$this->logging->log("Error in rule_eval", WARN, '');
 						return false;
 					}
 					$found=1;
 					break;
 				}
 			}
-			if ($found==0)
+			if ($found == 0)
 			{	// OID not found : throw error
 			    throw new Exception('OID '.$oid.' not found in trap');
 			}
 		}
 		$item=0;
 		$rule=$this->eval_cleanup($rule);
-		$this->logging->log('Rule after clenup: '.$rule,INFO );
+		$this->logging->log('Rule after clenup: '.$rule, INFO);
 		
-		return  $this->evaluation($rule,$item);
+		return  $this->evaluation($rule, $item);
 	}
 	
 	/** Match rules for current trap and do action
 	*/
 	public function applyRules()
 	{
-		$rules = $this->getRules($this->trap_data['source_ip'],$this->trap_data['trap_oid']);
+		$rules=$this->getRules($this->trap_data['source_ip'], $this->trap_data['trap_oid']);
 		
-		if ($rules===false || count($rules)==0)
+		if ($rules === false || count($rules) == 0)
 		{
-			$this->logging->log('No rules found for this trap',INFO );
+			$this->logging->log('No rules found for this trap', INFO);
 			$this->trap_data['status']='unknown';
 			$this->trap_to_db=true;
 			return;
@@ -1059,58 +1059,58 @@ 
 			$service_name=$rule['service_name'];
 			
 			$display=$this->applyDisplay($rule['display']);
-			$this->trap_action = ($this->trap_action==null)? '' : $this->trap_action . ', ';
+			$this->trap_action=($this->trap_action == null) ? '' : $this->trap_action.', ';
 			try
 			{
-				$this->logging->log('Rule to eval : '.$rule['rule'],INFO );
+				$this->logging->log('Rule to eval : '.$rule['rule'], INFO);
 				$evalr=$this->eval_rule($rule['rule']);
 				
 				if ($evalr == true)
 				{
 					//$this->logging->log('rules OOK: '.print_r($rule),INFO );
 					$action=$rule['action_match'];
-					$this->logging->log('action OK : '.$action,INFO );
+					$this->logging->log('action OK : '.$action, INFO);
 					if ($action >= 0)
 					{
-						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
+						if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
 						}
 						else
 						{
-						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
+						    $this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;
+					$this->trap_to_db=($action == -2) ?false:true;
 				}
 				else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
 					$action=$rule['action_nomatch'];
-					$this->logging->log('action NOK : '.$action,INFO );
+					$this->logging->log('action NOK : '.$action, INFO);
 					if ($action >= 0)
 					{
-					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
+					    if ($this->serviceCheckResult($host_name, $service_name, $action, $display) == false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
 					    }
 					    else
 					    {
-    						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+    						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
 					}
 					else
 					{
-						$this->add_rule_match($rule['id'],$rule['num_match']+1);
+						$this->add_rule_match($rule['id'], $rule['num_match'] + 1);
 					}
-					$this->trap_to_db=($action==-2)?false:true;					
+					$this->trap_to_db=($action == -2) ?false:true;					
 				}
 				// Put name in source_name
 				if (!isset($this->trap_data['source_name']))
@@ -1119,7 +1119,7 @@ 
 				}
 				else
 				{
-					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
+					if (!preg_match('/'.$rule['host_name'].'/', $this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
@@ -1127,13 +1127,13 @@ 
 			}
 			catch (Exception $e) 
 			{ 
-			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
+			    $this->logging->log('Error in rule eval : '.$e->getMessage(), WARN, '');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
 			    $this->trap_data['status']='error';
 			}
 			
 		}
-		if ($this->trap_data['status']=='error')
+		if ($this->trap_data['status'] == 'error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
 		}
@@ -1149,13 +1149,13 @@ 
 	public function add_rule_final($time)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
-		if ($this->trap_action==null) 
+		if ($this->trap_action == null) 
 		{
 			$this->trap_action='No action';
 		}
 		$sql="UPDATE ".$this->db_prefix."received SET process_time = '".$time."' , status_detail='".$this->trap_action."'  WHERE (id = '".$this->trap_id."');";
 		if ($db_conn->query($sql) === false) {
-			$this->logging->log('Error in update query : ' . $sql,WARN,'');
+			$this->logging->log('Error in update query : '.$sql, WARN, '');
 		}
 	}
 	
@@ -1178,7 +1178,7 @@ 
     WHERE s.current_state != 0;";
 		$db_conn=$this->trapsDB->db_connect_ido();
 		if (($services_db=$db_conn->query($sql_query)) === false) { // set err to 1 to throw exception.
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			$this->logging->log('No result in query : '.$sql_query, ERROR, '');
 			return 0;
 		}
 		$services=$services_db->fetchAll();
@@ -1187,7 +1187,7 @@ 
 		$sql_query="SELECT host_name, service_name, revert_ok FROM ".$this->db_prefix."rules where revert_ok != 0;";
 		$db_conn2=$this->trapsDB->db_connect_trap();
 		if (($rules_db=$db_conn2->query($sql_query)) === false) {
-			$this->logging->log('No result in query : ' . $sql_query,ERROR,'');
+			$this->logging->log('No result in query : '.$sql_query, ERROR, '');
 			return 0;
 		}
 		$rules=$rules_db->fetchAll();
@@ -1203,13 +1203,13 @@ 
 					$service['host_name'] == $rule['host_name'] &&
 					($service['last_check'] + $rule['revert_ok']) < $now)
 				{
-					$this->serviceCheckResult($service['host_name'],$service['service_name'],0,'Reset service to OK after '.$rule['revert_ok'].' seconds');
+					$this->serviceCheckResult($service['host_name'], $service['service_name'], 0, 'Reset service to OK after '.$rule['revert_ok'].' seconds');
 					$numreset++;
 				}
 			}
 		}
 		echo "\n";
-		echo $numreset . " service(s) reset to OK\n";
+		echo $numreset." service(s) reset to OK\n";
 		return 0;
 		
 	}
@@ -1230,7 +1230,7 @@ 
 	 * @param string $description
 	 * @return number : 0=unchanged, 1 = changed, 2=created
 	 */
-	public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
+	public function update_oid($oid, $mib, $name, $type, $textConv, $dispHint, $syntax, $type_enum, $description=NULL)
 	{
 		$db_conn=$this->trapsDB->db_connect_trap();
 		$description=$db_conn->quote($description);
@@ -1240,7 +1240,7 @@ 
 		    { // newly created.
 		        return 0;
 		    }
-			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
+			if ($name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
 			    $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
 			    $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
 			    //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
@@ -1260,23 +1260,23 @@ 
 			        ':name' => $name,
 			        ':type' => $type, 
 			        ':mib' => $mib, 
-			        ':tc' =>  ($textConv==null)?'null':$textConv , 
-			        ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-			        ':syntax' => ($syntax==null)?'null':$syntax,
-			        ':type_enum' => ($type_enum==null)?'null':$type_enum, 
-			        ':description' => ($description==null)?'null':$description,
+			        ':tc' =>  ($textConv == null) ? 'null' : $textConv, 
+			        ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+			        ':syntax' => ($syntax == null) ? 'null' : $syntax,
+			        ':type_enum' => ($type_enum == null) ? 'null' : $type_enum, 
+			        ':description' => ($description == null) ? 'null' : $description,
 			        ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
 			    );
 			    
 			    if ($sqlQuery->execute($sqlParam) === false) {
-			        $this->logging->log('Error in query : ' . $sql,ERROR,'');
+			        $this->logging->log('Error in query : '.$sql, ERROR, '');
 			    }
-			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+			    $this->logging->log('Trap updated : '.$name.' / OID : '.$oid, DEBUG);
 				return 1;
 			}
 			else
 			{
-			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+			    $this->logging->log('Trap unchanged : '.$name.' / OID : '.$oid, DEBUG);
 			    return 0;
 			}
 		}
@@ -1286,11 +1286,11 @@ 
 
 		$sql='INSERT INTO '.$this->db_prefix.'mib_cache '.
 		      '(oid, name, type , mib, textual_convention, display_hint '.
-              ', syntax, type_enum , description ) ' . 
+              ', syntax, type_enum , description ) '. 
               'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
               ', :syntax, :type_enum, :description )';
         
-		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->trapsDB->trapDBType == 'pgsql') $sql.='RETURNING id';
 		
 		$sqlQuery=$db_conn->prepare($sql);
 		
@@ -1299,15 +1299,15 @@ 
 		    ':name' => $name,
 		    ':type' => $type,
 		    ':mib' => $mib,
-		    ':tc' =>  ($textConv==null)?'null':$textConv ,
-		    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-		    ':syntax' => ($syntax==null)?'null':$syntax,
-		    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-		    ':description' => ($description==null)?'null':$description
+		    ':tc' =>  ($textConv == null) ? 'null' : $textConv,
+		    ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+		    ':syntax' => ($syntax == null) ? 'null' : $syntax,
+		    ':type_enum' => ($type_enum == null) ? 'null' : $type_enum,
+		    ':description' => ($description == null) ? 'null' : $description
 		);
 		
 		if ($sqlQuery->execute($sqlParam) === false) {
-		    $this->logging->log('Error in query : ' . $sql,1,'');
+		    $this->logging->log('Error in query : '.$sql, 1, '');
 		}
 		
 		switch ($this->trapsDB->trapDBType)
@@ -1315,10 +1315,10 @@ 
 		    case 'pgsql':
 		        // Get last id to insert oid/values in secondary table
 		        if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {		            
-		            $this->logging->log('Error getting id - pgsql - ',1,'');
+		            $this->logging->log('Error getting id - pgsql - ', 1, '');
 		        }
-		        if (! isset($inserted_id_ret['id'])) {
-		            $this->logging->log('Error getting id - pgsql - empty.',1,'');
+		        if (!isset($inserted_id_ret['id'])) {
+		            $this->logging->log('Error getting id - pgsql - empty.', 1, '');
 		        }
 		        $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
 		        break;
@@ -1326,15 +1326,15 @@ 
 		        // Get last id to insert oid/values in secondary table
 		        $sql='SELECT LAST_INSERT_ID();';
 		        if (($ret_code=$db_conn->query($sql)) === false) {
-		            $this->logging->log('Erreur getting id - mysql - ',1,'');
+		            $this->logging->log('Erreur getting id - mysql - ', 1, '');
 		        }
 		        
 		        $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-		        if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+		        if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
 		        $this->dbOidIndex[$oid]['id']=$inserted_id;
 		        break;
 		    default:
-		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+		        $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType, 1, '');
 		}
 
 		// Set as newly created.
@@ -1349,21 +1349,21 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
 	{
 	    $dbObjects=null; // cache of objects for trap in db
 	    $db_conn=$this->trapsDB->db_connect_trap();
 	    
 	    // Get id of trapmib.
 
-	    $trapId = $this->dbOidIndex[$trapOID]['id'];
+	    $trapId=$this->dbOidIndex[$trapOID]['id'];
 	    if ($check_existing === true)
 	    {
 	        // Get all objects
 	        $sql='SELECT * FROM '.$this->db_prefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-	        $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+	        $this->logging->log('SQL query get all traps: '.$sql, DEBUG);
 	        if (($ret_code=$db_conn->query($sql)) === false) {
-	            $this->logging->log('No result in query : ' . $sql,1,'');
+	            $this->logging->log('No result in query : '.$sql, 1, '');
 	        }
 	        $dbObjectsRaw=$ret_code->fetchAll();
 	        
@@ -1377,39 +1377,39 @@ 
 	        $match=$snmptrans=array();
 	        $retVal=0;
 	        $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-	        $tmpdesc='';$indesc=false;
+	        $tmpdesc=''; $indesc=false;
 	        
 	        $objMib=$trapmib;
-	        exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	            ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	        if ($retVal!=0)
+	        exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	            ' -On -Td '.$objMib.'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+	        if ($retVal != 0)
 	        {
 	            // Maybe not trap mib, search with IR
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+	            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	                ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+	            if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
 	            { // Not found -> continue with warning
-	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+	               $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
 	               continue;
 	            }
 	            $objMib=$match[1];
 	            
 	            // Do the snmptranslate again.
-	            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-	                ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-	            if ($retVal!=0) {
-	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+	            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+	                ' -On -Td '.$objMib.'::'.$object, $snmptrans, $retVal);
+	            if ($retVal != 0) {
+	                $this->logging->log('Error finding trap object : '.$objMib.'::'.$object, 2, '');
 	            }
 	            
 	        }
 	        foreach ($snmptrans as $line)
 	        {
-	            if ($indesc===true)
+	            if ($indesc === true)
 	            {
-	                $line=preg_replace('/[\t ]+/',' ',$line);
-	                if (preg_match('/(.*)"$/', $line,$match))
+	                $line=preg_replace('/[\t ]+/', ' ', $line);
+	                if (preg_match('/(.*)"$/', $line, $match))
 	                {
-	                    $objDesc = $tmpdesc . $match[1];
+	                    $objDesc=$tmpdesc.$match[1];
 	                    $indesc=false;
 	                }
 	                $tmpdesc.=$line;
@@ -1420,43 +1420,43 @@ 
 	                $objOid=$line;
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+	            if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
 	            {
 	                $objSyntax=$match[1];
                     $objEnum=$match[2];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
 	            {
 	                $objSyntax=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+	            if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
 	            {
 	                $objDispHint=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
 	            {
 	                $objDesc=$match[1];
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
 	            {
 	                $tmpdesc=$match[1];
 	                $indesc=true;
 	                continue;
 	            }
-	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+	            if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
 	            {
 	                $objTc=$match[1];
 	                continue;
 	            }
 	        }
-	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+	        $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc", DEBUG);
 	        //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
 	        // Update 
-	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+	        $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum, $objDesc);
             
 	        if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
 	        {   // if link exists, continue
@@ -1477,7 +1477,7 @@ 
 	        );
 	        
 	        if ($sqlQuery->execute($sqlParam) === false) {
-	            $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+	            $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$objOid]['id'], 1, '');
 	        }
 	    }
 	    if ($check_existing === true)
@@ -1494,19 +1494,19 @@ 
 	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
 	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
 	*/	
-	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
 	{
 		// Timing 
-		$timeTaken = microtime(true);
+		$timeTaken=microtime(true);
 		$retVal=0;
 		// Get all mib objects from all mibs
-		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
-		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		$snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
 		unset($this->objectsAll);
-		exec($snmpCommand,$this->objectsAll,$retVal);		
-		if ($retVal!=0)
+		exec($snmpCommand, $this->objectsAll, $retVal);		
+		if ($retVal != 0)
 		{
-			$this->logging->log('error executing snmptranslate',ERROR,'');
+			$this->logging->log('error executing snmptranslate', ERROR, '');
 		}
 		
 		// Get all mibs from databse to have a memory index
@@ -1514,14 +1514,14 @@ 
 		$db_conn=$this->trapsDB->db_connect_trap();
 		
 		$sql='SELECT * from '.$this->db_prefix.'mib_cache;';
-		$this->logging->log('SQL query : '.$sql,DEBUG );
+		$this->logging->log('SQL query : '.$sql, DEBUG);
 		if (($ret_code=$db_conn->query($sql)) === false) {
-			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+			$this->logging->log('No result in query : '.$sql, ERROR, '');
 		}
 		$this->dbOidAll=$ret_code->fetchAll();
 		$this->dbOidIndex=array();
 		// Create the index for db;
-		foreach($this->dbOidAll as $key=>$val)
+		foreach ($this->dbOidAll as $key=>$val)
 		{
 			$this->dbOidIndex[$val['oid']]['key']=$key;
 			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -1529,11 +1529,11 @@ 
 		
 		// Count elements to show progress
 		$numElements=count($this->objectsAll);
-		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
 		
-		$step=$basestep=$numElements/10; // output display of % done
+		$step=$basestep=$numElements / 10; // output display of % done
 		$num_step=0;
-		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
 		
 		// Create index for trap objects
 		$this->trapObjectsIndex=array();
@@ -1543,28 +1543,28 @@ 
 		$time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
 		$time_num_traps=0;
 		
-		for ($curElement=0;$curElement < $numElements;$curElement++)
+		for ($curElement=0; $curElement < $numElements; $curElement++)
 		{
-		    $time_1= microtime(true);
-			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
+		    $time_1=microtime(true);
+			if ((microtime(true) - $timeFiveSec) > 2 && $display_progress)
 			{ // echo a . every 2 sec
 				echo '.';
-				$timeFiveSec = microtime(true);
+				$timeFiveSec=microtime(true);
 			}
-			if ($curElement>$step) 
+			if ($curElement > $step) 
 			{ // display progress
 				$num_step++;
 				$step+=$basestep;
 				if ($display_progress)
 				{				
-					echo "\n" . ($num_step*10). '% : ';
+					echo "\n".($num_step * 10).'% : ';
 				}
 			}
 			// Get oid or pass if not found
-			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+			if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
 			{
-			    $time_parse1 += microtime(true) - $time_1;
-			    $time_parse1N ++;
+			    $time_parse1+=microtime(true) - $time_1;
+			    $time_parse1N++;
 				continue;
 			}
 			$oid=$this->objectsAll[$curElement];
@@ -1573,9 +1573,9 @@ 
 			$curElement++;
 			$match=$snmptrans=array();
 			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-						$this->objectsAll[$curElement],$match))
+						$this->objectsAll[$curElement], $match))
 			{
-			    $time_check1 += microtime(true) - $time_1;
+			    $time_check1+=microtime(true) - $time_1;
 				$time_check1N++;
 				continue;
 			}
@@ -1583,21 +1583,21 @@ 
 			$name=$match[1]; // Name 
 			$type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
 			
-			if ($type==0) // object type=0 : check if v1 trap
+			if ($type == 0) // object type=0 : check if v1 trap
 			{
 				// Check if next is suboid -> in that case is cannot be a trap
-				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
+				if (preg_match("/^$oid/", $this->objectsAll[$curElement + 1]))
 				{
-				    $time_check2 += microtime(true) - $time_1;
+				    $time_check2+=microtime(true) - $time_1;
 				    $time_check2N++;
 					continue;
 				}		
 				unset($snmptrans);
-				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
-				if ($retVal!=0)
+				exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid.' | grep OBJECTS ', $snmptrans, $retVal);
+				if ($retVal != 0)
 				{
-				    $time_check2 += microtime(true) - $time_1;
+				    $time_check2+=microtime(true) - $time_1;
 				    $time_check2N++;
 					continue;
 				}
@@ -1605,56 +1605,56 @@ 
 				// Force as trap.
 				$type=21;
 			}
-			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+			if ($onlyTraps === true && $type != 21) // if only traps and not a trap, continue
 			{
-			    $time_check3 += microtime(true) - $time_1;
+			    $time_check3+=microtime(true) - $time_1;
 				$time_check3N++;
 				continue;
 			}
 			
 			$time_num_traps++;
 			
-			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
+			$this->logging->log('Found trap : '.$match[1].' / OID : '.$oid, INFO);
 			if ($display_progress) echo '#'; // echo a # when trap found
 				
 			// get trap objects & source MIB
 			unset($snmptrans);
-			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-					' -Td '.$oid,$snmptrans,$retVal);
-			if ($retVal!=0)
+			exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid, $snmptrans, $retVal);
+			if ($retVal != 0)
 			{
-				$this->logging->log('error executing snmptranslate',ERROR,'');
+				$this->logging->log('error executing snmptranslate', ERROR, '');
 			}
 			
-			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+			if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
 			{
-			    $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+			    $this->logging->log('Error getting mib from trap '.$oid.' : '.$snmptrans[0], 1, '');
 			}
 			$trapMib=$match[1];
 			
-			$numLine=1;$trapDesc='';
-			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			$numLine=1; $trapDesc='';
+			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $snmptrans[$numLine], $match)) $numLine++;
 			if (isset($snmptrans[$numLine]))
 			{
-			    $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+			    $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
 
-			    while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+			    while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
 			    {
-			        $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+			        $trapDesc.=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
 			        $numLine++;
 			    }
 			    if (isset($snmptrans[$numLine])) {
-			        $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-			        $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+			        $trapDesc.=preg_replace('/".*/', '', $snmptrans[$numLine]);
+			        $trapDesc=preg_replace('/[\t ]+/', ' ', $trapDesc);
 			    }
 
 			}
-			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
-			$time_update += microtime(true) - $time_1; $time_1= microtime(true);
+			$update=$this->update_oid($oid, $trapMib, $name, $type, NULL, NULL, NULL, NULL, $trapDesc);
+			$time_update+=microtime(true) - $time_1; $time_1=microtime(true);
 			
-			if (($update==0) && ($check_change===false))
+			if (($update == 0) && ($check_change === false))
 			{ // Trapd didn't change & force check disabled
-			    $time_objects += microtime(true) - $time_1;
+			    $time_objects+=microtime(true) - $time_1;
 			    if ($display_progress) echo "C";
 			    continue;
 			}
@@ -1662,7 +1662,7 @@ 
 			$synt=null;
 			foreach ($snmptrans as $line)
 			{	
-    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+    			if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
     				{
     					$synt=$match[1];
     				}
@@ -1670,30 +1670,30 @@ 
 			if ($synt == null) 
 			{
 				//echo "No objects for $trapOID\n";
-			    $time_objects += microtime(true) - $time_1;
+			    $time_objects+=microtime(true) - $time_1;
 				continue;
 			}
 			//echo "$synt \n";
 			$trapObjects=array();
-			while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
+			while (preg_match('/ *([^ ,]+) *,* */', $synt, $match))
 			{
-				array_push($trapObjects,$match[1]);
-				$synt=preg_replace('/'.$match[0].'/','',$synt);
+				array_push($trapObjects, $match[1]);
+				$synt=preg_replace('/'.$match[0].'/', '', $synt);
 			}
 			
 			$this->trap_objects($oid, $trapMib, $trapObjects, false);
 			
-			$time_objects += microtime(true) - $time_1;
+			$time_objects+=microtime(true) - $time_1;
 			$time_objectsN++;
 		}
 		
 		if ($display_progress)
 		{
     		echo "\nNumber of processed traps : $time_num_traps \n";
-    		echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-    		echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-    		echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+    		echo "\nParsing : ".number_format($time_parse1 + $time_check1, 1)." sec / ".($time_parse1N + $time_check1N)." occurences\n";
+    		echo "Detecting traps : ".number_format($time_check2 + $time_check3, 1)." sec / ".($time_check2N + $time_check3N)." occurences\n";
+    		echo "Trap processing ($time_updateN): ".number_format($time_update, 1)." sec , ";
+    		echo "Objects processing ($time_objectsN) : ".number_format($time_objects, 1)." sec \n";
 		}
 		
 		// Timing ends

Braces +112 added lines, -67 removed lines

@@ -68,9 +68,9 @@ 
 		{
 		    $this->logging->setLogging($baseLogLevel, $baseLogMode,$baseLogFile);
 		    $this->logSetup=true;
+		} else {
+				    $this->logSetup=false;
 		}
-		else 
-		    $this->logSetup=false;
 		$this->logging->log('Loggin started', INFO);
 
 		// Get options from ini files
@@ -83,7 +83,10 @@ 
 		$this->setupDatabase($trapConfig); // Setup database class
 		
 		$this->getDatabaseOptions(); // Get options in database
-		if ($this->api_use === true) $this->getAPI(); // Setup API
+		if ($this->api_use === true) {
+			$this->getAPI();
+		}
+		// Setup API
 		
 		$this->mibClass = new Mib($this->logging,$this->trapsDB); // Create Mib class
 		
@@ -117,8 +120,7 @@ 
 	        }
 	        $this->logging->log($message,$log_level,'syslog');
 	        return false;
-	    }
-	    else
+	    } else
 	    {
 	        $option_var=$option_array[$option_category][$option_name];
 	        return true;
@@ -182,7 +184,10 @@ 
 	    
 	    $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->db_prefix);
 	    
-	    if ($this->api_use === true) return; // In case of API use, no IDO is necessary
+	    if ($this->api_use === true) {
+	    	return;
+	    }
+	    // In case of API use, no IDO is necessary
         
 	    // IDO Database
 	    if (!array_key_exists('IDOdatabase',$trapConfig['config']))
@@ -207,9 +212,11 @@ 
 	protected function getDatabaseOptions()
 	{
 		// Database options
-		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		if ($this->logSetup === false) {
+			// Only if logging was no setup in constructor
 		{
     		$this->getDBConfigIfSet('log_level',$this->logging->debugLevel);
+		}
     		$this->getDBConfigIfSet('log_destination',$this->logging->outputMode);
     		$this->getDBConfigIfSet('log_file',$this->logging->outputFile);
 		}
@@ -218,7 +225,9 @@ 
 	protected function getDBConfigIfSet($element,&$variable)
 	{
 		$value=$this->getDBConfig($element);
-		if ($value != 'null') $variable=$value;
+		if ($value != 'null') {
+			$variable=$value;
+		}
 	}
 	
 	/** 
@@ -306,8 +315,7 @@ 
 		{
 		    $this->writeTrapErrorToDB("Error parsing trap (code 2/IP)");
 			$this->logging->log('Error parsing IP : '.$IP,ERROR,'');
-		} 
-		else 
+		} else 
 		{		
 			$this->trap_data['source_ip']=$matches[1];
 			$this->trap_data['destination_ip']=$matches[3];
@@ -322,14 +330,12 @@ 
 			if ($ret_code===0 || $ret_code===false) 
 			{
 				$this->logging->log('No match on trap data : '.$vars,WARN,'');
-			}
-			else 
+			} else 
 			{
 			    if (($matches[1]=='.1.3.6.1.6.3.1.1.4.1.0') || ($matches[1]=='.1.3.6.1.6.3.1.1.4.1'))
 				{
 					$this->trap_data['trap_oid']=$matches[2];				
-				}
-				else
+				} else
 				{
 					$object= new stdClass;
 					$object->oid =$matches[1];
@@ -500,7 +506,9 @@ 
 	            }
 	            
 	            $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-	            if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            if ($inserted_id==false) {
+	            	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+	            }
 	            $this->trap_id=$inserted_id;
 	            break;
 	        default:
@@ -516,7 +524,9 @@ 
 	{
 		
 		// If action is ignore -> don't send t DB
-		if ($this->trap_to_db === false) return;
+		if ($this->trap_to_db === false) {
+			return;
+		}
 		
 		
 		$db_conn=$this->trapsDB->db_connect_trap();
@@ -573,7 +583,9 @@ 
 				}
 
 				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				if ($inserted_id==false) {
+					throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				}
 				$this->trap_id=$inserted_id;
 			break;
 			default: 
@@ -702,8 +714,7 @@ 
     		// TODO : file_put_contents & fopen (,'w' or 'a') does not work. See why. Or not as using API will be by default....
     		exec('echo "'.$send.'" > ' .$this->icinga2cmd);
     		return true;
-	    }
-	    else
+	    } else
 	    {
 	        $api = $this->getAPI();
 	        $api->setCredentials($this->api_username, $this->api_password);
@@ -712,8 +723,7 @@ 
 	        {
 	            $this->logging->log( "Error sending result : " .$retmessage,WARN,'');
 	            return false;
-	        }
-	        else 
+	        } else 
 	        {
 	            $this->logging->log( "Sent result : " .$retmessage,INFO );
 	            return true;
@@ -773,7 +783,9 @@ 
 	/***************** Eval & tokenizer functions ****************/
 	protected function eval_getElement($rule,&$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item]==' ') {
+			$item++;
+		}
 		if (preg_match('/[0-9\.]/',$rule[$item]))
 		{ // number
 	
@@ -800,14 +812,15 @@ 
 			$start=$item;
 			$parenthesis_count=0; 
 			while (($item < strlen($rule)) // Not end of string AND
-			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) // Closing ')' or embeded ()
+			      && ( ($rule[$item] != ')' ) || $parenthesis_count > 0) ) {
+				// Closing ')' or embeded ()
 			{ 
 				if ($rule[$item] == '"' )
 				{ // pass through string
 					$item++;
+			}
 					$item=$this->eval_getNext($rule,$item,'"');
-				} 
-				else{
+				} else{
 				    if ($rule[$item] == '(')
 				    {
 				        $parenthesis_count++;
@@ -835,13 +848,17 @@ 
 	protected function eval_getNext($rule,$item,$tok)
 	{
 		while (($rule[$item] != $tok ) && ($item < strlen($rule))) { $item++;}
-		if ($item==strlen($rule)) throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		if ($item==strlen($rule)) {
+			throw new Exception("closing '".$tok."' not found in ".$rule ." at " .$item);
+		}
 		return $item+1;
 	}
 	
 	protected function eval_getOper($rule,&$item)
 	{
-		while ($rule[$item]==' ') $item++;
+		while ($rule[$item]==' ') {
+			$item++;
+		}
 		switch ($rule[$item])
 		{
 			case '<':
@@ -877,12 +894,13 @@ 
 	public function evaluation($rule,&$item)
 	{
 	    //echo "Evaluation of ".substr($rule,$item)."\n";
-		if ( $rule[$item] == '!') // If '!' found, negate next expression.
+		if ( $rule[$item] == '!') {
+			// If '!' found, negate next expression.
 		{
 		    $negate=true;
-		    $item++;
 		}
-		else
+		    $item++;
+		} else
 		{
 		    $negate=false;
 		}
@@ -890,10 +908,14 @@ 
 		list($type1,$val1) = $this->eval_getElement($rule,$item);
 		//echo "Elmt1: ".$val1."/".$type1." : ".substr($rule,$item)."\n";
 		
-		if ($item==strlen($rule)) // If only element, return value, but only boolean
+		if ($item==strlen($rule)) {
+			// If only element, return value, but only boolean
 		{
 		  if ($type1 != 2) throw new Exception("Cannot use num/string as boolean : ".$rule);
-		  if ($negate === true) $val1= ! $val1;
+		}
+		  if ($negate === true) {
+		  	$val1= ! $val1;
+		  }
 		  return $val1;
 		}  
 		
@@ -902,27 +924,34 @@ 
 		//echo "Comp : ".$comp." : ".substr($rule,$item)."\n";
         
 		// Third element : number, string or ()
-		if ( $rule[$item] == '!') // starts with a ! so evaluate whats next
+		if ( $rule[$item] == '!') {
+			// starts with a ! so evaluate whats next
 		{
 		    $item++;
-		    if ($typec != 1) throw new Exception("Mixing boolean and comparison : ".$rule);
+		}
+		    if ($typec != 1) {
+		    	throw new Exception("Mixing boolean and comparison : ".$rule);
+		    }
 		    $val2= ! $this->evaluation($rule,$item);
 		    $type2=2; // result is a boolean 
-		}
-		else 
+		} else 
 		{
 		    list($type2,$val2) = $this->eval_getElement($rule,$item);
 		}
 		//echo "Elmt2: ".$val2."/".$type2." : ".substr($rule,$item)."\n";
 		
-		if ($type1!=$type2)  // cannot compare different types
+		if ($type1!=$type2) {
+			// cannot compare different types
 		{ 
 		    throw new Exception("Cannot compare string & number : ".$rule);
 		}
-		if ($typec==1 && $type1 !=2) // cannot use & or | with string/number
+		}
+		if ($typec==1 && $type1 !=2) {
+			// cannot use & or | with string/number
 		{
 		    throw new Exception("Cannot use boolean operators with string & number : ".$rule);
 		}
+		}
 		
 		switch ($comp){
 			case '<':	$retVal= ($val1 < $val2); break;
@@ -936,9 +965,15 @@ 
 			case '&':	$retVal= ($val1 && $val2); break;
 			default:  throw new Exception("Error in expression - unknown comp : ".$comp);
 		}
-		if ($negate === true) $retVal = ! $retVal; // Inverse result if negate before expression
+		if ($negate === true) {
+			$retVal = ! $retVal;
+		}
+		// Inverse result if negate before expression
 		
-		if ($item==strlen($rule)) return $retVal; // End of string : return evaluation
+		if ($item==strlen($rule)) {
+			return $retVal;
+		}
+		// End of string : return evaluation
 		// check for logical operator :
 		switch ($rule[$item])
 		{
@@ -965,7 +1000,9 @@ 
 					$rule2.=$rule[$item];
 					$item++;
 				}
-				if ($item == strlen ($rule)) throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				if ($item == strlen ($rule)) {
+					throw new Exception("closing '\"' not found in ".$rule ." at " .$item);
+				}
 				$rule2.=$rule[$item];
 				$item++;
 				continue;
@@ -985,10 +1022,12 @@ 
 	
 	protected function eval_rule($rule)
 	{
-		if ($rule==null || $rule == '') // Empty rule is always true
+		if ($rule==null || $rule == '') {
+			// Empty rule is always true
 		{
 			return true;
 		}
+		}
 		$matches=array();
 		while (preg_match('/_OID\(([0-9\.\*]+)\)/',$rule,$matches) == 1)
 		{
@@ -1075,20 +1114,17 @@ 
 						if ($this->serviceCheckResult($host_name,$service_name,$action,$display) == false)
 						{
 						    $this->trap_action.='Error sending status : check cmd/API';
-						}
-						else
+						} else
 						{
 						    $this->add_rule_match($rule['id'],$rule['num_match']+1);
 						    $this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 						}
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
 					$this->trap_to_db=($action==-2)?false:true;
-				}
-				else
+				} else
 				{
 					//$this->logging->log('rules KOO : '.print_r($rule),INFO );
 					
@@ -1099,14 +1135,12 @@ 
 					    if ($this->serviceCheckResult($host_name,$service_name,$action,$display)==false)
 					    {
 					        $this->trap_action.='Error sending status : check cmd/API';
-					    }
-					    else
+					    } else
 					    {
     						$this->add_rule_match($rule['id'],$rule['num_match']+1);
     						$this->trap_action.='Status '.$action.' to '.$host_name.'/'.$service_name;
 					    }
-					}
-					else
+					} else
 					{
 						$this->add_rule_match($rule['id'],$rule['num_match']+1);
 					}
@@ -1116,16 +1150,14 @@ 
 				if (!isset($this->trap_data['source_name']))
 				{
 					$this->trap_data['source_name']=$rule['host_name'];
-				}
-				else
+				} else
 				{
 					if (!preg_match('/'.$rule['host_name'].'/',$this->trap_data['source_name']))
 					{ // only add if not present
 						$this->trap_data['source_name'].=','.$rule['host_name'];
 					}
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{ 
 			    $this->logging->log('Error in rule eval : '.$e->getMessage(),WARN,'');
 			    $this->trap_action.=' ERR : '.$e->getMessage();
@@ -1136,8 +1168,7 @@ 
 		if ($this->trap_data['status']=='error')
 		{
 		  $this->trap_to_db=true; // Always put errors in DB for the use can see
-		}
-		else
+		} else
 		{
 		  $this->trap_data['status']='done';
 		}
@@ -1273,8 +1304,7 @@ 
 			    }
 			    $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
 				return 1;
-			}
-			else
+			} else
 			{
 			    $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
 			    return 0;
@@ -1290,7 +1320,9 @@ 
               'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
               ', :syntax, :type_enum, :description )';
         
-		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->trapsDB->trapDBType == 'pgsql') {
+			$sql .= 'RETURNING id';
+		}
 		
 		$sqlQuery=$db_conn->prepare($sql);
 		
@@ -1330,7 +1362,9 @@ 
 		        }
 		        
 		        $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-		        if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+		        if ($inserted_id==false) {
+		        	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+		        }
 		        $this->dbOidIndex[$oid]['id']=$inserted_id;
 		        break;
 		    default:
@@ -1583,12 +1617,14 @@ 
 			$name=$match[1]; // Name 
 			$type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
 			
-			if ($type==0) // object type=0 : check if v1 trap
+			if ($type==0) {
+				// object type=0 : check if v1 trap
 			{
 				// Check if next is suboid -> in that case is cannot be a trap
 				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
 				{
 				    $time_check2 += microtime(true) - $time_1;
+			}
 				    $time_check2N++;
 					continue;
 				}		
@@ -1605,9 +1641,11 @@ 
 				// Force as trap.
 				$type=21;
 			}
-			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+			if ($onlyTraps===true && $type!=21) {
+				// if only traps and not a trap, continue
 			{
 			    $time_check3 += microtime(true) - $time_1;
+			}
 				$time_check3N++;
 				continue;
 			}
@@ -1615,7 +1653,10 @@ 
 			$time_num_traps++;
 			
 			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
-			if ($display_progress) echo '#'; // echo a # when trap found
+			if ($display_progress) {
+				echo '#';
+			}
+			// echo a # when trap found
 				
 			// get trap objects & source MIB
 			unset($snmptrans);
@@ -1633,7 +1674,9 @@ 
 			$trapMib=$match[1];
 			
 			$numLine=1;$trapDesc='';
-			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+				$numLine++;
+			}
 			if (isset($snmptrans[$numLine]))
 			{
 			    $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -1655,7 +1698,9 @@ 
 			if (($update==0) && ($check_change===false))
 			{ // Trapd didn't change & force check disabled
 			    $time_objects += microtime(true) - $time_1;
-			    if ($display_progress) echo "C";
+			    if ($display_progress) {
+			    	echo "C";
+			    }
 			    continue;
 			}
 			

library/Trapdirector/TrapsProcess/Database.php

Indentation +268 added lines, -268 removed lines

@@ -11,299 +11,299 @@
 class Database
 {
 
-    // Databases
-    protected $trapDB=null; //< trap database
-    protected $idoDB=null; //< ido database
-    public $trapDBType; //< Type of database for traps (mysql, pgsql)
-    public $idoDBType; //< Type of database for ido (mysql, pgsql)
+	// Databases
+	protected $trapDB=null; //< trap database
+	protected $idoDB=null; //< ido database
+	public $trapDBType; //< Type of database for traps (mysql, pgsql)
+	public $idoDBType; //< Type of database for ido (mysql, pgsql)
     
-    protected $trapDSN; //< trap database connection params
-    protected $trapUsername; //< trap database connection params
-    protected $trapPass; //< trap database connection params
-    public $dbPrefix; //< database tables prefix
+	protected $trapDSN; //< trap database connection params
+	protected $trapUsername; //< trap database connection params
+	protected $trapPass; //< trap database connection params
+	public $dbPrefix; //< database tables prefix
     
-    protected $idoSet; //< bool true is ido database set
-    protected $idoDSN; //< trap database connection params
-    protected $idoUsername; //< trap database connection params
-    protected $idoPass; //< trap database connection params
+	protected $idoSet; //< bool true is ido database set
+	protected $idoDSN; //< trap database connection params
+	protected $idoUsername; //< trap database connection params
+	protected $idoPass; //< trap database connection params
     
-    // Logging function
+	// Logging function
     
-    protected $logging; //< logging class
+	protected $logging; //< logging class
     
-    /**
-     * @param Logging $logClass : where to log
-     * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
-     */
-    function __construct($logClass,$dbParam,$dbPrefix)
-    {
-        $this->logging=$logClass;
-        $this->dbPrefix=$dbPrefix;
+	/**
+	 * @param Logging $logClass : where to log
+	 * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
+	 */
+	function __construct($logClass,$dbParam,$dbPrefix)
+	{
+		$this->logging=$logClass;
+		$this->dbPrefix=$dbPrefix;
         
-        $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
-        $this->db_connect_trap();
+		$this->trapDSN=$this->setupDSN($dbParam);
+		$this->trapUsername = $dbParam['username'];
+		$this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->trapDBType=$dbParam['db'];
+		$this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+		$this->db_connect_trap();
         
-    }
+	}
     
-    /**
-     * Setup and connect to IDO database
-     * @param array $dbParam : array of named params
-     */
-    public function setupIDO($dbParam)
-    {
-        $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
-        $this->idoDBType=$dbParam['db'];
-        $this->db_connect_ido();
-    }
+	/**
+	 * Setup and connect to IDO database
+	 * @param array $dbParam : array of named params
+	 */
+	public function setupIDO($dbParam)
+	{
+		$this->idoDSN=$this->setupDSN($dbParam);
+		$this->idoUsername = $dbParam['username'];
+		$this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+		$this->idoDBType=$dbParam['db'];
+		$this->db_connect_ido();
+	}
     
-    /**
-     * Connect to IDO database
-     * @return \PDO
-     */
-    public function db_connect_ido()
-    {
-        if ($this->idoDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->idoDB->query('select 1')->fetchColumn();
-                return $this->idoDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
-            }
-        }
-        try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->idoDB;
-    }
+	/**
+	 * Connect to IDO database
+	 * @return \PDO
+	 */
+	public function db_connect_ido()
+	{
+		if ($this->idoDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->idoDB->query('select 1')->fetchColumn();
+				return $this->idoDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database IDO connection lost, reconnecting',WARN);
+			}
+		}
+		try {
+			$this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->idoDB;
+	}
     
-    /**
-     * Connect to Trap database
-     * @return \PDO
-     */
-    public function db_connect_trap()
-    {
+	/**
+	 * Connect to Trap database
+	 * @return \PDO
+	 */
+	public function db_connect_trap()
+	{
         
-        if ($this->trapDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->trapDB->query('select 1')->fetchColumn();
-                return $this->trapDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
-            }           
-        }       
-        try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->trapDB;
-    }
+		if ($this->trapDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->trapDB->query('select 1')->fetchColumn();
+				return $this->trapDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database connection lost, reconnecting',WARN);
+			}           
+		}       
+		try {
+			$this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->trapDB;
+	}
     
-    /**
-     * Setup dsn and check parameters
-     * @param array $configElmt
-     * @return string
-     */
-    protected function setupDSN($configElmt)  
-    {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
-        {
-            $this->logging->log('Missing DB params',ERROR);
-            return ''; 
-        }
+	/**
+	 * Setup dsn and check parameters
+	 * @param array $configElmt
+	 * @return string
+	 */
+	protected function setupDSN($configElmt)  
+	{
+		if (!array_key_exists('db',$configElmt) ||
+			!array_key_exists('host',$configElmt) ||
+			!array_key_exists('dbname',$configElmt) ||
+			!array_key_exists('username',$configElmt))
+		{
+			$this->logging->log('Missing DB params',ERROR);
+			return ''; 
+		}
         
-        //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+		//	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
+		$dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
-        if (array_key_exists('port', $configElmt))
-        {
-            $dsn .= ';port='.$configElmt['port'];
-        }
-        return $dsn;
-    }
+		if (array_key_exists('port', $configElmt))
+		{
+			$dsn .= ';port='.$configElmt['port'];
+		}
+		return $dsn;
+	}
 
     
-    /** Create database schema
-     *	@param $schema_file	string File to read schema from
-     *	@param $table_prefix string to replace #PREFIX# in schema file by this
-     */
-    public function create_schema($schema_file,$table_prefix)
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($schema_file, 'r');
+	/** Create database schema
+	 *	@param $schema_file	string File to read schema from
+	 *	@param $table_prefix string to replace #PREFIX# in schema file by this
+	 */
+	public function create_schema($schema_file,$table_prefix)
+	{
+		//Read data from snmptrapd from stdin
+		$input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
-        {
-            $this->logging->log("Error reading schema !",ERROR,'');
-            return;
-        }
-        $newline='';
-        $cur_table='';
-        $cur_table_array=array();
-        $db_conn=$this->db_connect_trap();
+		if ($input_stream=== false)
+		{
+			$this->logging->log("Error reading schema !",ERROR,'');
+			return;
+		}
+		$newline='';
+		$cur_table='';
+		$cur_table_array=array();
+		$db_conn=$this->db_connect_trap();
         
-        while (($line=fgets($input_stream)) !== false)
-        {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-            if (preg_match('/; *$/', $newline))
-            {
-                $sql= $newline;
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                    return;
-                }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
-                {
-                    $cur_table='table '.$cur_table_array[1];
-                }
-                else
-                {
-                    $cur_table='secret SQL stuff :-)';
-                }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
-                $newline='';
-            }
-        }
+		while (($line=fgets($input_stream)) !== false)
+		{
+			$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+			if (preg_match('/; *$/', $newline))
+			{
+				$sql= $newline;
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error create schema : '.$sql,ERROR,'');
+					return;
+				}
+				if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+				{
+					$cur_table='table '.$cur_table_array[1];
+				}
+				else
+				{
+					$cur_table='secret SQL stuff :-)';
+				}
+				$this->logging->log('Creating : ' . $cur_table,INFO );
+				$newline='';
+			}
+		}
         
-        $sql= $newline;
-        if ($sql != '' )
-        {
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                return;
-            }
-        }
-        $this->logging->log('Schema created',INFO);
-    }
+		$sql= $newline;
+		if ($sql != '' )
+		{
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Error create schema : '.$sql,ERROR,'');
+				return;
+			}
+		}
+		$this->logging->log('Schema created',INFO);
+	}
     
-    /**
-     * Update database schema from current (as set in db) to $target_version
-     *     @param $prefix string file prefix of sql update File
-     *     @param $target_version int target db version number
-     *     @param $table_prefix string to replace #PREFIX# in schema file by this
-     *     @param bool $getmsg : only get messages from version upgrades
-     *     @return string : if $getmsg=true, return messages.
-     */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
-    {
-        // Get current db number
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT id,value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
-            return 'ERROR';
-        }
-        $version=$ret_code->fetchAll();
-        $cur_version=$version[0]['value'];
-        $db_version_id=$version[0]['id'];
+	/**
+	 * Update database schema from current (as set in db) to $target_version
+	 *     @param $prefix string file prefix of sql update File
+	 *     @param $target_version int target db version number
+	 *     @param $table_prefix string to replace #PREFIX# in schema file by this
+	 *     @param bool $getmsg : only get messages from version upgrades
+	 *     @return string : if $getmsg=true, return messages.
+	 */
+	public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+	{
+		// Get current db number
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT id,value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+			return 'ERROR';
+		}
+		$version=$ret_code->fetchAll();
+		$cur_version=$version[0]['value'];
+		$db_version_id=$version[0]['id'];
         
-        if ($this->trapDBType == 'pgsql')
-        {
-            $prefix .= 'update_pgsql/schema_';
-        }
-        else
-        {
-            $prefix .= 'update_sql/schema_';
-        }
-        //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
-        if ($getmsg === true)
-        {
-            $message='';
-            $this->logging->log('getting message for upgrade',DEBUG );
-            while($cur_version<$target_version)
-            {
-                $cur_version++;
-                $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-                $input_stream=fopen($updateFile, 'r');
-                if ($input_stream=== false)
-                {
-                    $this->logging->log("Error reading update file ". $updateFile,2,'');
-                    return 'ERROR';
-                }
-                do { $line=fgets($input_stream); }
-                while ($line !== false && !preg_match('/#MESSAGE/',$line));
-                if ($line === false)
-                {
-                    $this->logging->log("No message in file ". $updateFile,2,'');
-                    return 'ERROR';
-                }
-                $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
-            }
-            return $message;
-        }
-        while($cur_version<$target_version)
-        { // tODO : execute pre & post scripts
-            $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-            $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
-            {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
-                return 'ERROR';
-            }
-            $newline='';
-            $db_conn=$this->db_connect_trap();
-            $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            while (($line=fgets($input_stream)) !== false)
-            {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-                if (preg_match('/; *$/', $newline))
-                {
-                    $sql_req=$db_conn->prepare($newline);
-                    if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,1,'');
-                    }
-                    $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
-                    {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
-                    {
-                        $cur_table='secret SQL stuff :-)';
-                        //$cur_table=$newline;
-                    }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+		if ($this->trapDBType == 'pgsql')
+		{
+			$prefix .= 'update_pgsql/schema_';
+		}
+		else
+		{
+			$prefix .= 'update_sql/schema_';
+		}
+		//echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
+		if ($getmsg === true)
+		{
+			$message='';
+			$this->logging->log('getting message for upgrade',DEBUG );
+			while($cur_version<$target_version)
+			{
+				$cur_version++;
+				$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+				$input_stream=fopen($updateFile, 'r');
+				if ($input_stream=== false)
+				{
+					$this->logging->log("Error reading update file ". $updateFile,2,'');
+					return 'ERROR';
+				}
+				do { $line=fgets($input_stream); }
+				while ($line !== false && !preg_match('/#MESSAGE/',$line));
+				if ($line === false)
+				{
+					$this->logging->log("No message in file ". $updateFile,2,'');
+					return 'ERROR';
+				}
+				$message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+			}
+			return $message;
+		}
+		while($cur_version<$target_version)
+		{ // tODO : execute pre & post scripts
+			$cur_version++;
+			$this->logging->log('Updating to version : ' .$cur_version ,INFO );
+			$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+			$input_stream=fopen($updateFile, 'r');
+			if ($input_stream=== false)
+			{
+				$this->logging->log("Error reading update file ". $updateFile,2,'');
+				return 'ERROR';
+			}
+			$newline='';
+			$db_conn=$this->db_connect_trap();
+			$db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			while (($line=fgets($input_stream)) !== false)
+			{
+				if (preg_match('/^#/', $line)) continue; // ignore comment lines
+				$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+				if (preg_match('/; *$/', $newline))
+				{
+					$sql_req=$db_conn->prepare($newline);
+					if ($sql_req->execute() === false) {
+						$this->logging->log('Error create schema : '.$newline,1,'');
+					}
+					$cur_table_array=array();
+					if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+					{
+						$cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+					}
+					else
+					{
+						$cur_table='secret SQL stuff :-)';
+						//$cur_table=$newline;
+					}
+					$this->logging->log('Doing : ' . $cur_table,INFO );
                     
-                    $newline='';
-                }
-            }
-            fclose($input_stream);
+					$newline='';
+				}
+			}
+			fclose($input_stream);
             
-            //$sql= $newline;
-            //if ($db_conn->query($sql) === false) {
-            //    $this->logging->log('Error updating schema : '.$sql,1,'');
-            //}
+			//$sql= $newline;
+			//if ($db_conn->query($sql) === false) {
+			//    $this->logging->log('Error updating schema : '.$sql,1,'');
+			//}
             
-            $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,2);
-                return 'ERROR';
-            }
+			$sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
+			$this->logging->log('SQL query : '.$sql,DEBUG );
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Cannot update db version. Query : ' . $sql,2);
+				return 'ERROR';
+			}
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
-        }
-    }
+			$this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+		}
+	}
     
     
 }
\ No newline at end of file

Spacing +58 added lines, -58 removed lines

@@ -35,16 +35,16 @@ 
      * @param Logging $logClass : where to log
      * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
      */
-    function __construct($logClass,$dbParam,$dbPrefix)
+    function __construct($logClass, $dbParam, $dbPrefix)
     {
         $this->logging=$logClass;
         $this->dbPrefix=$dbPrefix;
         
         $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+        $this->trapUsername=$dbParam['username'];
+        $this->trapPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
         $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+        $this->logging->log('DSN : '.$this->trapDSN.';user '.$this->trapUsername.' / prefix : '.$this->dbPrefix, INFO);
         $this->db_connect_trap();
         
     }
@@ -56,9 +56,9 @@ 
     public function setupIDO($dbParam)
     {
         $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+        $this->idoUsername=$dbParam['username'];
+        $this->idoPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
+        $this->logging->log('DSN : '.$this->idoDSN.';user '.$this->idoUsername, INFO);
         $this->idoDBType=$dbParam['db'];
         $this->db_connect_ido();
     }
@@ -76,13 +76,13 @@ 
                 return $this->idoDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
+                $this->logging->log('Database IDO connection lost, reconnecting', WARN);
             }
         }
         try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+            $this->idoDB=new PDO($this->idoDSN, $this->idoUsername, $this->idoPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed to IDO : '.$e->getMessage(), ERROR, '');
         }
         return $this->idoDB;
     }
@@ -101,13 +101,13 @@ 
                 return $this->trapDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
+                $this->logging->log('Database connection lost, reconnecting', WARN);
             }           
         }       
         try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+            $this->trapDB=new PDO($this->trapDSN, $this->trapUsername, $this->trapPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed : '.$e->getMessage(), ERROR, '');
         }
         return $this->trapDB;
     }
@@ -119,21 +119,21 @@ 
      */
     protected function setupDSN($configElmt)  
     {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
+        if (!array_key_exists('db', $configElmt) ||
+            !array_key_exists('host', $configElmt) ||
+            !array_key_exists('dbname', $configElmt) ||
+            !array_key_exists('username', $configElmt))
         {
-            $this->logging->log('Missing DB params',ERROR);
+            $this->logging->log('Missing DB params', ERROR);
             return ''; 
         }
         
         //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+        $dsn=$configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
         if (array_key_exists('port', $configElmt))
         {
-            $dsn .= ';port='.$configElmt['port'];
+            $dsn.=';port='.$configElmt['port'];
         }
         return $dsn;
     }
@@ -143,14 +143,14 @@ 
      *	@param $schema_file	string File to read schema from
      *	@param $table_prefix string to replace #PREFIX# in schema file by this
      */
-    public function create_schema($schema_file,$table_prefix)
+    public function create_schema($schema_file, $table_prefix)
     {
         //Read data from snmptrapd from stdin
         $input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
+        if ($input_stream === false)
         {
-            $this->logging->log("Error reading schema !",ERROR,'');
+            $this->logging->log("Error reading schema !", ERROR, '');
             return;
         }
         $newline='';
@@ -160,15 +160,15 @@ 
         
         while (($line=fgets($input_stream)) !== false)
         {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+            $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
             if (preg_match('/; *$/', $newline))
             {
-                $sql= $newline;
+                $sql=$newline;
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                    $this->logging->log('Error create schema : '.$sql, ERROR, '');
                     return;
                 }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+                if (preg_match('/^ *CREATE TABLE ([^ ]+)/', $newline, $cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
                 }
@@ -176,20 +176,20 @@ 
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
+                $this->logging->log('Creating : '.$cur_table, INFO);
                 $newline='';
             }
         }
         
-        $sql= $newline;
-        if ($sql != '' )
+        $sql=$newline;
+        if ($sql != '')
         {
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                $this->logging->log('Error create schema : '.$sql, ERROR, '');
                 return;
             }
         }
-        $this->logging->log('Schema created',INFO);
+        $this->logging->log('Schema created', INFO);
     }
     
     /**
@@ -200,14 +200,14 @@ 
      *     @param bool $getmsg : only get messages from version upgrades
      *     @return string : if $getmsg=true, return messages.
      */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+    public function update_schema($prefix, $target_version, $table_prefix, $getmsg=false)
     {
         // Get current db number
         $db_conn=$this->db_connect_trap();
         $sql='SELECT id,value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
+        $this->logging->log('SQL query : '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+            $this->logging->log('Cannot get db version. Query : '.$sql, 2, '');
             return 'ERROR';
         }
         $version=$ret_code->fetchAll();
@@ -216,47 +216,47 @@ 
         
         if ($this->trapDBType == 'pgsql')
         {
-            $prefix .= 'update_pgsql/schema_';
+            $prefix.='update_pgsql/schema_';
         }
         else
         {
-            $prefix .= 'update_sql/schema_';
+            $prefix.='update_sql/schema_';
         }
         //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
         if ($getmsg === true)
         {
             $message='';
-            $this->logging->log('getting message for upgrade',DEBUG );
-            while($cur_version<$target_version)
+            $this->logging->log('getting message for upgrade', DEBUG);
+            while ($cur_version < $target_version)
             {
                 $cur_version++;
-                $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+                $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
                 $input_stream=fopen($updateFile, 'r');
-                if ($input_stream=== false)
+                if ($input_stream === false)
                 {
-                    $this->logging->log("Error reading update file ". $updateFile,2,'');
+                    $this->logging->log("Error reading update file ".$updateFile, 2, '');
                     return 'ERROR';
                 }
                 do { $line=fgets($input_stream); }
-                while ($line !== false && !preg_match('/#MESSAGE/',$line));
+                while ($line !== false && !preg_match('/#MESSAGE/', $line));
                 if ($line === false)
                 {
-                    $this->logging->log("No message in file ". $updateFile,2,'');
+                    $this->logging->log("No message in file ".$updateFile, 2, '');
                     return 'ERROR';
                 }
-                $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+                $message.=($cur_version - 1).'->'.$cur_version.' : '.preg_replace('/#MESSAGE : /', '', $line)."\n";
             }
             return $message;
         }
-        while($cur_version<$target_version)
+        while ($cur_version < $target_version)
         { // tODO : execute pre & post scripts
             $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+            $this->logging->log('Updating to version : '.$cur_version, INFO);
+            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
             $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
+            if ($input_stream === false)
             {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
+                $this->logging->log("Error reading update file ".$updateFile, 2, '');
                 return 'ERROR';
             }
             $newline='';
@@ -265,24 +265,24 @@ 
             while (($line=fgets($input_stream)) !== false)
             {
                 if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+                $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
                 if (preg_match('/; *$/', $newline))
                 {
                     $sql_req=$db_conn->prepare($newline);
                     if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,1,'');
+                        $this->logging->log('Error create schema : '.$newline, 1, '');
                     }
                     $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/', $newline, $cur_table_array))
                     {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+                        $cur_table=$cur_table_array[1].' SQL table '.$cur_table_array[2];
                     }
                     else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;
                     }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+                    $this->logging->log('Doing : '.$cur_table, INFO);
                     
                     $newline='';
                 }
@@ -295,13 +295,13 @@ 
             //}
             
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( id = '.$db_version_id.' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
+            $this->logging->log('SQL query : '.$sql, DEBUG);
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,2);
+                $this->logging->log('Cannot update db version. Query : '.$sql, 2);
                 return 'ERROR';
             }
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+            $this->logging->log('Schema updated to version : '.$cur_version, INFO);
         }
     }
     

Braces +7 added lines, -7 removed lines

@@ -171,8 +171,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -217,8 +216,7 @@ 
         if ($this->trapDBType == 'pgsql')
         {
             $prefix .= 'update_pgsql/schema_';
-        }
-        else
+        } else
         {
             $prefix .= 'update_sql/schema_';
         }
@@ -264,7 +262,10 @@ 
             $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             while (($line=fgets($input_stream)) !== false)
             {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
+                if (preg_match('/^#/', $line)) {
+                	continue;
+                }
+                // ignore comment lines
                 $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
                 if (preg_match('/; *$/', $newline))
                 {
@@ -276,8 +277,7 @@ 
                     if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
                     {
                         $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
+                    } else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;

library/Trapdirector/TrapsProcess/Mib.php

Indentation +452 added lines, -452 removed lines

@@ -10,509 +10,509 @@
 class Mib
 {
     
-    protected $logging; //< logging class
-    protected $trapsDB; //< Database class
+	protected $logging; //< logging class
+	protected $trapsDB; //< Database class
     
     
-    /**
-     * Setup Mib Class
-     * @param Logging $logClass : where to log
-     * @param Database $dbClass : Database
-     */
-    function __construct($logClass,$dbClass)
-    {
-        $this->logging=$logClass;
-        $this->trapsDB=$dbClass;       
-    }
+	/**
+	 * Setup Mib Class
+	 * @param Logging $logClass : where to log
+	 * @param Database $dbClass : Database
+	 */
+	function __construct($logClass,$dbClass)
+	{
+		$this->logging=$logClass;
+		$this->trapsDB=$dbClass;       
+	}
     
     
-    /**
-     * Update or add an OID to database uses $this->dbOidIndex for mem cache
-     * @param string $oid
-     * @param string $mib
-     * @param string $name
-     * @param string $type
-     * @param string $textConv
-     * @param string $dispHint
-     * @param string $syntax
-     * @param string $type_enum
-     * @param string $description
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $description=$db_conn->quote($description);
-        if (isset($this->dbOidIndex[$oid]))
-        {
-            if ($this->dbOidIndex[$oid]['key'] == -1)
-            { // newly created.
-                return 0;
-            }
-            if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
-                $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
-                $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
-                //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
-                //$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
-                //$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
-                //$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
-                //$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
-                )
-            { // Do update
-                $sql='UPDATE '.$this->trapsDB->dbPrefix.'mib_cache SET '.
-                    'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
-                    ', syntax = :syntax, type_enum = :type_enum, description = :description '.
-                    ' WHERE id= :id';
-                $sqlQuery=$db_conn->prepare($sql);
+	/**
+	 * Update or add an OID to database uses $this->dbOidIndex for mem cache
+	 * @param string $oid
+	 * @param string $mib
+	 * @param string $name
+	 * @param string $type
+	 * @param string $textConv
+	 * @param string $dispHint
+	 * @param string $syntax
+	 * @param string $type_enum
+	 * @param string $description
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$description=$db_conn->quote($description);
+		if (isset($this->dbOidIndex[$oid]))
+		{
+			if ($this->dbOidIndex[$oid]['key'] == -1)
+			{ // newly created.
+				return 0;
+			}
+			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
+				$mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
+				$type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
+				//$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
+				//$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
+				//$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
+				//$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
+				//$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
+				)
+			{ // Do update
+				$sql='UPDATE '.$this->trapsDB->dbPrefix.'mib_cache SET '.
+					'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
+					', syntax = :syntax, type_enum = :type_enum, description = :description '.
+					' WHERE id= :id';
+				$sqlQuery=$db_conn->prepare($sql);
                 
-                $sqlParam=array(
-                    ':name' => $name,
-                    ':type' => $type,
-                    ':mib' => $mib,
-                    ':tc' =>  ($textConv==null)?'null':$textConv ,
-                    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-                    ':syntax' => ($syntax==null)?'null':$syntax,
-                    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-                    ':description' => ($description==null)?'null':$description,
-                    ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
-                );
+				$sqlParam=array(
+					':name' => $name,
+					':type' => $type,
+					':mib' => $mib,
+					':tc' =>  ($textConv==null)?'null':$textConv ,
+					':display_hint' => ($dispHint==null)?'null':$dispHint ,
+					':syntax' => ($syntax==null)?'null':$syntax,
+					':type_enum' => ($type_enum==null)?'null':$type_enum,
+					':description' => ($description==null)?'null':$description,
+					':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
+				);
                 
-                if ($sqlQuery->execute($sqlParam) === false) {
-                    $this->logging->log('Error in query : ' . $sql,ERROR,'');
-                }
-                $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
-                return 1;
-            }
-            else
-            {
-                $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
-                return 0;
-            }
-        }
-        // create new OID.
+				if ($sqlQuery->execute($sqlParam) === false) {
+					$this->logging->log('Error in query : ' . $sql,ERROR,'');
+				}
+				$this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+				return 1;
+			}
+			else
+			{
+				$this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+				return 0;
+			}
+		}
+		// create new OID.
         
-        // Insert data
+		// Insert data
         
-        $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache '.
-            '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
-            'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-            ', :syntax, :type_enum, :description )';
+		$sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache '.
+			'(oid, name, type , mib, textual_convention, display_hint '.
+			', syntax, type_enum , description ) ' .
+			'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			', :syntax, :type_enum, :description )';
         
-        if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
         
-        $sqlQuery=$db_conn->prepare($sql);
+		$sqlQuery=$db_conn->prepare($sql);
         
-        $sqlParam=array(
-            ':oid' => $oid,
-            ':name' => $name,
-            ':type' => $type,
-            ':mib' => $mib,
-            ':tc' =>  ($textConv==null)?'null':$textConv ,
-            ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-            ':syntax' => ($syntax==null)?'null':$syntax,
-            ':type_enum' => ($type_enum==null)?'null':$type_enum,
-            ':description' => ($description==null)?'null':$description
-        );
+		$sqlParam=array(
+			':oid' => $oid,
+			':name' => $name,
+			':type' => $type,
+			':mib' => $mib,
+			':tc' =>  ($textConv==null)?'null':$textConv ,
+			':display_hint' => ($dispHint==null)?'null':$dispHint ,
+			':syntax' => ($syntax==null)?'null':$syntax,
+			':type_enum' => ($type_enum==null)?'null':$type_enum,
+			':description' => ($description==null)?'null':$description
+		);
         
-        if ($sqlQuery->execute($sqlParam) === false) {
-            $this->logging->log('Error in query : ' . $sql,1,'');
-        }
+		if ($sqlQuery->execute($sqlParam) === false) {
+			$this->logging->log('Error in query : ' . $sql,1,'');
+		}
         
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->logging->log('Error getting id - pgsql - ',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id - pgsql - empty.',1,'');
-                }
-                $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur getting id - mysql - ',1,'');
-                }
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
+					$this->logging->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id - pgsql - empty.',1,'');
+				}
+				$this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->logging->log('Erreur getting id - mysql - ',1,'');
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->dbOidIndex[$oid]['id']=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
-        }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->dbOidIndex[$oid]['id']=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+		}
         
-        // Set as newly created.
-        $this->dbOidIndex[$oid]['key']=-1;
-        return 2;
-    }
+		// Set as newly created.
+		$this->dbOidIndex[$oid]['key']=-1;
+		return 2;
+	}
     
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
-    {
-        $dbObjects=null; // cache of objects for trap in db
-        $db_conn=$this->trapsDB->db_connect_trap();
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
+	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	{
+		$dbObjects=null; // cache of objects for trap in db
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        // Get id of trapmib.
+		// Get id of trapmib.
         
-        $trapId = $this->dbOidIndex[$trapOID]['id'];
-        if ($check_existing === true)
-        {
-            // Get all objects
-            $sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-            $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
-            if (($ret_code=$db_conn->query($sql)) === false) {
-                $this->logging->log('No result in query : ' . $sql,1,'');
-            }
-            $dbObjectsRaw=$ret_code->fetchAll();
+		$trapId = $this->dbOidIndex[$trapOID]['id'];
+		if ($check_existing === true)
+		{
+			// Get all objects
+			$sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+			$this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+			if (($ret_code=$db_conn->query($sql)) === false) {
+				$this->logging->log('No result in query : ' . $sql,1,'');
+			}
+			$dbObjectsRaw=$ret_code->fetchAll();
             
-            foreach ($dbObjectsRaw as $val)
-            {
-                $dbObjects[$val['object_id']]=1;
-            }
-        }
-        foreach ($objects as $object)
-        {
-            $match=$snmptrans=array();
-            $retVal=0;
-            $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-            $tmpdesc='';$indesc=false;
+			foreach ($dbObjectsRaw as $val)
+			{
+				$dbObjects[$val['object_id']]=1;
+			}
+		}
+		foreach ($objects as $object)
+		{
+			$match=$snmptrans=array();
+			$retVal=0;
+			$objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
+			$tmpdesc='';$indesc=false;
             
-            $objMib=$trapmib;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                // Maybe not trap mib, search with IR
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-                if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-                { // Not found -> continue with warning
-                    $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-                    continue;
-                }
-                $objMib=$match[1];
+			$objMib=$trapmib;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				// Maybe not trap mib, search with IR
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+				if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+				{ // Not found -> continue with warning
+					$this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+					continue;
+				}
+				$objMib=$match[1];
                 
-                // Do the snmptranslate again.
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-                if ($retVal!=0) {
-                    $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
-                }
+				// Do the snmptranslate again.
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
+				if ($retVal!=0) {
+					$this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+				}
                 
-            }
-            foreach ($snmptrans as $line)
-            {
-                if ($indesc===true)
-                {
-                    $line=preg_replace('/[\t ]+/',' ',$line);
-                    if (preg_match('/(.*)"$/', $line,$match))
-                    {
-                        $objDesc = $tmpdesc . $match[1];
-                        $indesc=false;
-                    }
-                    $tmpdesc.=$line;
-                    continue;
-                }
-                if (preg_match('/^\.[0-9\.]+$/', $line))
-                {
-                    $objOid=$line;
-                    continue;
-                }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-                {
-                    $objSyntax=$match[1];
-                    $objEnum=$match[2];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-                {
-                    $objSyntax=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-                {
-                    $objDispHint=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-                {
-                    $objDesc=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-                {
-                    $tmpdesc=$match[1];
-                    $indesc=true;
-                    continue;
-                }
-                if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-                {
-                    $objTc=$match[1];
-                    continue;
-                }
-            }
-            $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
-            //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
-            // Update
-            $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+			}
+			foreach ($snmptrans as $line)
+			{
+				if ($indesc===true)
+				{
+					$line=preg_replace('/[\t ]+/',' ',$line);
+					if (preg_match('/(.*)"$/', $line,$match))
+					{
+						$objDesc = $tmpdesc . $match[1];
+						$indesc=false;
+					}
+					$tmpdesc.=$line;
+					continue;
+				}
+				if (preg_match('/^\.[0-9\.]+$/', $line))
+				{
+					$objOid=$line;
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					$objEnum=$match[2];
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDispHint=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDesc=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+				{
+					$tmpdesc=$match[1];
+					$indesc=true;
+					continue;
+				}
+				if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+				{
+					$objTc=$match[1];
+					continue;
+				}
+			}
+			$this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+			//echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
+			// Update
+			$this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
             
-            if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
-            {   // if link exists, continue
-                $dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
-                continue;
-            }
-            if ($check_existing === true)
-            {
-                // TODO : check link trap - objects exists, mark them.
-            }
-            // Associate in object table
-            $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
-                'values (:trap_id, :object_id)';
-            $sqlQuery=$db_conn->prepare($sql);
-            $sqlParam=array(
-                ':trap_id' => $trapId,
-                ':object_id' => $this->dbOidIndex[$objOid]['id'],
-            );
+			if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true)
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
+				'values (:trap_id, :object_id)';
+			$sqlQuery=$db_conn->prepare($sql);
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$objOid]['id'],
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
-            }
-        }
-        if ($check_existing === true)
-        {
-            // TODO : remove link trap - objects that wasn't marked.
-        }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
         
-    }
+	}
     
-    /**
-     * Cache mib in database
-     * @param boolean $display_progress : Display progress on standard output
-     * @param boolean $check_change : Force check of trap params & objects
-     * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
-     * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-     */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
-    {
-        // Timing
-        $timeTaken = microtime(true);
-        $retVal=0;
-        // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
-        unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
-        }
+	/**
+	 * Cache mib in database
+	 * @param boolean $display_progress : Display progress on standard output
+	 * @param boolean $check_change : Force check of trap params & objects
+	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
+	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
+	 */
+	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	{
+		// Timing
+		$timeTaken = microtime(true);
+		$retVal=0;
+		// Get all mib objects from all mibs
+		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		unset($this->objectsAll);
+		exec($snmpCommand,$this->objectsAll,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR,'');
+		}
         
-        // Get all mibs from databse to have a memory index
+		// Get all mibs from databse to have a memory index
         
-        $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $this->dbOidAll=$ret_code->fetchAll();
-        $this->dbOidIndex=array();
-        // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
-        {
-            $this->dbOidIndex[$val['oid']]['key']=$key;
-            $this->dbOidIndex[$val['oid']]['id']=$val['id'];
-        }
+		$sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$this->dbOidAll=$ret_code->fetchAll();
+		$this->dbOidIndex=array();
+		// Create the index for db;
+		foreach($this->dbOidAll as $key=>$val)
+		{
+			$this->dbOidIndex[$val['oid']]['key']=$key;
+			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
+		}
         
-        // Count elements to show progress
-        $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		// Count elements to show progress
+		$numElements=count($this->objectsAll);
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
         
-        $step=$basestep=$numElements/10; // output display of % done
-        $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$step=$basestep=$numElements/10; // output display of % done
+		$num_step=0;
+		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
         
-        // Create index for trap objects
-        $this->trapObjectsIndex=array();
+		// Create index for trap objects
+		$this->trapObjectsIndex=array();
         
-        // detailed timing (time_* vars)
-        $time_parse1=$time_check1=$time_check2=$time_check3=$time_update=$time_objects=0;
-        $time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
-        $time_num_traps=0;
+		// detailed timing (time_* vars)
+		$time_parse1=$time_check1=$time_check2=$time_check3=$time_update=$time_objects=0;
+		$time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
+		$time_num_traps=0;
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
-        {
-            $time_1= microtime(true);
-            if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
-            { // echo a . every 2 sec
-                echo '.';
-                $timeFiveSec = microtime(true);
-            }
-            if ($curElement>$step)
-            { // display progress
-                $num_step++;
-                $step+=$basestep;
-                if ($display_progress)
-                {
-                    echo "\n" . ($num_step*10). '% : ';
-                }
-            }
-            // Get oid or pass if not found
-            if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
-            {
-                $time_parse1 += microtime(true) - $time_1;
-                $time_parse1N ++;
-                continue;
-            }
-            $oid=$this->objectsAll[$curElement];
+		for ($curElement=0;$curElement < $numElements;$curElement++)
+		{
+			$time_1= microtime(true);
+			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
+			{ // echo a . every 2 sec
+				echo '.';
+				$timeFiveSec = microtime(true);
+			}
+			if ($curElement>$step)
+			{ // display progress
+				$num_step++;
+				$step+=$basestep;
+				if ($display_progress)
+				{
+					echo "\n" . ($num_step*10). '% : ';
+				}
+			}
+			// Get oid or pass if not found
+			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+			{
+				$time_parse1 += microtime(true) - $time_1;
+				$time_parse1N ++;
+				continue;
+			}
+			$oid=$this->objectsAll[$curElement];
             
-            // get next line
-            $curElement++;
-            $match=$snmptrans=array();
-            if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-                $this->objectsAll[$curElement],$match))
-            {
-                $time_check1 += microtime(true) - $time_1;
-                $time_check1N++;
-                continue;
-            }
+			// get next line
+			$curElement++;
+			$match=$snmptrans=array();
+			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
+				$this->objectsAll[$curElement],$match))
+			{
+				$time_check1 += microtime(true) - $time_1;
+				$time_check1N++;
+				continue;
+			}
             
-            $name=$match[1]; // Name
-            $type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
+			$name=$match[1]; // Name
+			$type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
             
-            if ($type==0) // object type=0 : check if v1 trap
-            {
-                // Check if next is suboid -> in that case is cannot be a trap
-                if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
-                {
-                    $time_check2 += microtime(true) - $time_1;
-                    $time_check2N++;
-                    continue;
-                }
-                unset($snmptrans);
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
-                if ($retVal!=0)
-                {
-                    $time_check2 += microtime(true) - $time_1;
-                    $time_check2N++;
-                    continue;
-                }
-                //echo "\n v1 trap found : $oid \n";
-                // Force as trap.
-                $type=21;
-            }
-            if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
-            {
-                $time_check3 += microtime(true) - $time_1;
-                $time_check3N++;
-                continue;
-            }
+			if ($type==0) // object type=0 : check if v1 trap
+			{
+				// Check if next is suboid -> in that case is cannot be a trap
+				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
+				{
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
+					continue;
+				}
+				unset($snmptrans);
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
+				if ($retVal!=0)
+				{
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
+					continue;
+				}
+				//echo "\n v1 trap found : $oid \n";
+				// Force as trap.
+				$type=21;
+			}
+			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+			{
+				$time_check3 += microtime(true) - $time_1;
+				$time_check3N++;
+				continue;
+			}
             
-            $time_num_traps++;
+			$time_num_traps++;
             
-            $this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
+			if ($display_progress) echo '#'; // echo a # when trap found
             
-            // get trap objects & source MIB
-            unset($snmptrans);
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -Td '.$oid,$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                $this->logging->log('error executing snmptranslate',ERROR,'');
-            }
+			// get trap objects & source MIB
+			unset($snmptrans);
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -Td '.$oid,$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				$this->logging->log('error executing snmptranslate',ERROR,'');
+			}
             
-            if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
-            {
-                $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
-            }
-            $trapMib=$match[1];
+			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+			{
+				$this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+			}
+			$trapMib=$match[1];
             
-            $numLine=1;$trapDesc='';
-            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
-            if (isset($snmptrans[$numLine]))
-            {
-                $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+			$numLine=1;$trapDesc='';
+			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			if (isset($snmptrans[$numLine]))
+			{
+				$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
                 
-                while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-                {
-                    $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-                    $numLine++;
-                }
-                if (isset($snmptrans[$numLine])) {
-                    $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-                    $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
-                }
+				while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+				{
+					$trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+					$numLine++;
+				}
+				if (isset($snmptrans[$numLine])) {
+					$trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
+					$trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+				}
                 
-            }
-            $update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
-            $time_update += microtime(true) - $time_1; $time_1= microtime(true);
+			}
+			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
+			$time_update += microtime(true) - $time_1; $time_1= microtime(true);
             
-            if (($update==0) && ($check_change===false))
-            { // Trapd didn't change & force check disabled
-                $time_objects += microtime(true) - $time_1;
-                if ($display_progress) echo "C";
-                continue;
-            }
+			if (($update==0) && ($check_change===false))
+			{ // Trapd didn't change & force check disabled
+				$time_objects += microtime(true) - $time_1;
+				if ($display_progress) echo "C";
+				continue;
+			}
             
-            $synt=null;
-            foreach ($snmptrans as $line)
-            {
-                if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-                {
-                    $synt=$match[1];
-                }
-            }
-            if ($synt == null)
-            {
-                //echo "No objects for $trapOID\n";
-                $time_objects += microtime(true) - $time_1;
-                continue;
-            }
-            //echo "$synt \n";
-            $trapObjects=array();
-            while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
-            {
-                array_push($trapObjects,$match[1]);
-                $synt=preg_replace('/'.$match[0].'/','',$synt);
-            }
+			$synt=null;
+			foreach ($snmptrans as $line)
+			{
+				if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+				{
+					$synt=$match[1];
+				}
+			}
+			if ($synt == null)
+			{
+				//echo "No objects for $trapOID\n";
+				$time_objects += microtime(true) - $time_1;
+				continue;
+			}
+			//echo "$synt \n";
+			$trapObjects=array();
+			while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
+			{
+				array_push($trapObjects,$match[1]);
+				$synt=preg_replace('/'.$match[0].'/','',$synt);
+			}
             
-            $this->trap_objects($oid, $trapMib, $trapObjects, false);
+			$this->trap_objects($oid, $trapMib, $trapObjects, false);
             
-            $time_objects += microtime(true) - $time_1;
-            $time_objectsN++;
-        }
+			$time_objects += microtime(true) - $time_1;
+			$time_objectsN++;
+		}
         
-        if ($display_progress)
-        {
-            echo "\nNumber of processed traps : $time_num_traps \n";
-            echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-            echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-            echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-            echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
-        }
+		if ($display_progress)
+		{
+			echo "\nNumber of processed traps : $time_num_traps \n";
+			echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
+			echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
+			echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
+			echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+		}
         
-        // Timing ends
-        $timeTaken=microtime(true) - $timeTaken;
-        if ($display_progress)
-        {
-            echo "Global time : ".round($timeTaken)." seconds\n";
-        }
+		// Timing ends
+		$timeTaken=microtime(true) - $timeTaken;
+		if ($display_progress)
+		{
+			echo "Global time : ".round($timeTaken)." seconds\n";
+		}
         
-    }
+	}
     
     
 }
\ No newline at end of file

Spacing +115 added lines, -115 removed lines

@@ -19,7 +19,7 @@ 
      * @param Logging $logClass : where to log
      * @param Database $dbClass : Database
      */
-    function __construct($logClass,$dbClass)
+    function __construct($logClass, $dbClass)
     {
         $this->logging=$logClass;
         $this->trapsDB=$dbClass;       
@@ -39,7 +39,7 @@ 
      * @param string $description
      * @return number : 0=unchanged, 1 = changed, 2=created
      */
-    public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
+    public function update_oid($oid, $mib, $name, $type, $textConv, $dispHint, $syntax, $type_enum, $description=NULL)
     {
         $db_conn=$this->trapsDB->db_connect_trap();
         $description=$db_conn->quote($description);
@@ -49,7 +49,7 @@ 
             { // newly created.
                 return 0;
             }
-            if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
+            if ($name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
                 $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
                 $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
                 //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
@@ -69,23 +69,23 @@ 
                     ':name' => $name,
                     ':type' => $type,
                     ':mib' => $mib,
-                    ':tc' =>  ($textConv==null)?'null':$textConv ,
-                    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-                    ':syntax' => ($syntax==null)?'null':$syntax,
-                    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-                    ':description' => ($description==null)?'null':$description,
+                    ':tc' =>  ($textConv == null) ? 'null' : $textConv,
+                    ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+                    ':syntax' => ($syntax == null) ? 'null' : $syntax,
+                    ':type_enum' => ($type_enum == null) ? 'null' : $type_enum,
+                    ':description' => ($description == null) ? 'null' : $description,
                     ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
                 );
                 
                 if ($sqlQuery->execute($sqlParam) === false) {
-                    $this->logging->log('Error in query : ' . $sql,ERROR,'');
+                    $this->logging->log('Error in query : '.$sql, ERROR, '');
                 }
-                $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+                $this->logging->log('Trap updated : '.$name.' / OID : '.$oid, DEBUG);
                 return 1;
             }
             else
             {
-                $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+                $this->logging->log('Trap unchanged : '.$name.' / OID : '.$oid, DEBUG);
                 return 0;
             }
         }
@@ -95,11 +95,11 @@ 
         
         $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache '.
             '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
+            ', syntax, type_enum , description ) '.
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->trapsDB->trapDBType == 'pgsql') $sql.='RETURNING id';
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -108,15 +108,15 @@ 
             ':name' => $name,
             ':type' => $type,
             ':mib' => $mib,
-            ':tc' =>  ($textConv==null)?'null':$textConv ,
-            ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-            ':syntax' => ($syntax==null)?'null':$syntax,
-            ':type_enum' => ($type_enum==null)?'null':$type_enum,
-            ':description' => ($description==null)?'null':$description
+            ':tc' =>  ($textConv == null) ? 'null' : $textConv,
+            ':display_hint' => ($dispHint == null) ? 'null' : $dispHint,
+            ':syntax' => ($syntax == null) ? 'null' : $syntax,
+            ':type_enum' => ($type_enum == null) ? 'null' : $type_enum,
+            ':description' => ($description == null) ? 'null' : $description
         );
         
         if ($sqlQuery->execute($sqlParam) === false) {
-            $this->logging->log('Error in query : ' . $sql,1,'');
+            $this->logging->log('Error in query : '.$sql, 1, '');
         }
         
         switch ($this->trapsDB->trapDBType)
@@ -124,10 +124,10 @@ 
             case 'pgsql':
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->logging->log('Error getting id - pgsql - ',1,'');
+                    $this->logging->log('Error getting id - pgsql - ', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id - pgsql - empty.',1,'');
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->logging->log('Error getting id - pgsql - empty.', 1, '');
                 }
                 $this->dbOidIndex[$oid]['id']=$inserted_id_ret['id'];
                 break;
@@ -135,15 +135,15 @@ 
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->logging->log('Erreur getting id - mysql - ',1,'');
+                    $this->logging->log('Erreur getting id - mysql - ', 1, '');
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
                 $this->dbOidIndex[$oid]['id']=$inserted_id;
                 break;
             default:
-                $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+                $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType, 1, '');
         }
         
         // Set as newly created.
@@ -158,21 +158,21 @@ 
      * @param array $objects : array of objects name (without MIB)
      * @param bool $check_existing : check instead of create
      */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+    public function trap_objects($trapOID, $trapmib, $objects, $check_existing)
     {
         $dbObjects=null; // cache of objects for trap in db
         $db_conn=$this->trapsDB->db_connect_trap();
         
         // Get id of trapmib.
         
-        $trapId = $this->dbOidIndex[$trapOID]['id'];
+        $trapId=$this->dbOidIndex[$trapOID]['id'];
         if ($check_existing === true)
         {
             // Get all objects
             $sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-            $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+            $this->logging->log('SQL query get all traps: '.$sql, DEBUG);
             if (($ret_code=$db_conn->query($sql)) === false) {
-                $this->logging->log('No result in query : ' . $sql,1,'');
+                $this->logging->log('No result in query : '.$sql, 1, '');
             }
             $dbObjectsRaw=$ret_code->fetchAll();
             
@@ -186,39 +186,39 @@ 
             $match=$snmptrans=array();
             $retVal=0;
             $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-            $tmpdesc='';$indesc=false;
+            $tmpdesc=''; $indesc=false;
             
             $objMib=$trapmib;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal!=0)
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+                ' -On -Td '.$objMib.'::'.$object.' 2>/dev/null', $snmptrans, $retVal);
+            if ($retVal != 0)
             {
                 // Maybe not trap mib, search with IR
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-                if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+                exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+                    ' -IR '.$object.' 2>/dev/null', $snmptrans, $retVal);
+                if ($retVal != 0 || !preg_match('/(.*)::(.*)/', $snmptrans[0], $match))
                 { // Not found -> continue with warning
-                    $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+                    $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object, 2, '');
                     continue;
                 }
                 $objMib=$match[1];
                 
                 // Do the snmptranslate again.
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-                if ($retVal!=0) {
-                    $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+                exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+                    ' -On -Td '.$objMib.'::'.$object, $snmptrans, $retVal);
+                if ($retVal != 0) {
+                    $this->logging->log('Error finding trap object : '.$objMib.'::'.$object, 2, '');
                 }
                 
             }
             foreach ($snmptrans as $line)
             {
-                if ($indesc===true)
+                if ($indesc === true)
                 {
-                    $line=preg_replace('/[\t ]+/',' ',$line);
-                    if (preg_match('/(.*)"$/', $line,$match))
+                    $line=preg_replace('/[\t ]+/', ' ', $line);
+                    if (preg_match('/(.*)"$/', $line, $match))
                     {
-                        $objDesc = $tmpdesc . $match[1];
+                        $objDesc=$tmpdesc.$match[1];
                         $indesc=false;
                     }
                     $tmpdesc.=$line;
@@ -229,43 +229,43 @@ 
                     $objOid=$line;
                     continue;
                 }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+                if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/', $line, $match))
                 {
                     $objSyntax=$match[1];
                     $objEnum=$match[2];
                     continue;
                 }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+                if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/', $line, $match))
                 {
                     $objSyntax=$match[1];
                     continue;
                 }
-                if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+                if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/', $line, $match))
                 {
                     $objDispHint=$match[1];
                     continue;
                 }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/', $line, $match))
                 {
                     $objDesc=$match[1];
                     continue;
                 }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $line, $match))
                 {
                     $tmpdesc=$match[1];
                     $indesc=true;
                     continue;
                 }
-                if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+                if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/', $line, $match))
                 {
                     $objTc=$match[1];
                     continue;
                 }
             }
-            $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+            $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc", DEBUG);
             //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
             // Update
-            $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+            $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum, $objDesc);
             
             if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
             {   // if link exists, continue
@@ -286,7 +286,7 @@ 
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+                $this->logging->log('Error adding trap object : '.$sql.' / '.$trapId.'/'.$this->dbOidIndex[$objOid]['id'], 1, '');
             }
         }
         if ($check_existing === true)
@@ -303,19 +303,19 @@ 
      * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
      * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
      */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+    public function update_mib_database($display_progress=false, $check_change=false, $onlyTraps=true, $startOID='.1')
     {
         // Timing
-        $timeTaken = microtime(true);
+        $timeTaken=microtime(true);
         $retVal=0;
         // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+        $snmpCommand=$this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
+        $this->logging->log('Getting all traps : '.$snmpCommand, DEBUG);
         unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
+        exec($snmpCommand, $this->objectsAll, $retVal);
+        if ($retVal != 0)
         {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
+            $this->logging->log('error executing snmptranslate', ERROR, '');
         }
         
         // Get all mibs from databse to have a memory index
@@ -323,14 +323,14 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         
         $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
+        $this->logging->log('SQL query : '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
+            $this->logging->log('No result in query : '.$sql, ERROR, '');
         }
         $this->dbOidAll=$ret_code->fetchAll();
         $this->dbOidIndex=array();
         // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
+        foreach ($this->dbOidAll as $key=>$val)
         {
             $this->dbOidIndex[$val['oid']]['key']=$key;
             $this->dbOidIndex[$val['oid']]['id']=$val['id'];
@@ -338,11 +338,11 @@ 
         
         // Count elements to show progress
         $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements, INFO);
         
-        $step=$basestep=$numElements/10; // output display of % done
+        $step=$basestep=$numElements / 10; // output display of % done
         $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+        $timeFiveSec=microtime(true); // Used for display a '.' every <n> seconds
         
         // Create index for trap objects
         $this->trapObjectsIndex=array();
@@ -352,28 +352,28 @@ 
         $time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
         $time_num_traps=0;
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
+        for ($curElement=0; $curElement < $numElements; $curElement++)
         {
-            $time_1= microtime(true);
-            if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
+            $time_1=microtime(true);
+            if ((microtime(true) - $timeFiveSec) > 2 && $display_progress)
             { // echo a . every 2 sec
                 echo '.';
-                $timeFiveSec = microtime(true);
+                $timeFiveSec=microtime(true);
             }
-            if ($curElement>$step)
+            if ($curElement > $step)
             { // display progress
                 $num_step++;
                 $step+=$basestep;
                 if ($display_progress)
                 {
-                    echo "\n" . ($num_step*10). '% : ';
+                    echo "\n".($num_step * 10).'% : ';
                 }
             }
             // Get oid or pass if not found
-            if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+            if (!preg_match('/^\.[0-9\.]+$/', $this->objectsAll[$curElement]))
             {
-                $time_parse1 += microtime(true) - $time_1;
-                $time_parse1N ++;
+                $time_parse1+=microtime(true) - $time_1;
+                $time_parse1N++;
                 continue;
             }
             $oid=$this->objectsAll[$curElement];
@@ -382,9 +382,9 @@ 
             $curElement++;
             $match=$snmptrans=array();
             if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-                $this->objectsAll[$curElement],$match))
+                $this->objectsAll[$curElement], $match))
             {
-                $time_check1 += microtime(true) - $time_1;
+                $time_check1+=microtime(true) - $time_1;
                 $time_check1N++;
                 continue;
             }
@@ -392,21 +392,21 @@ 
             $name=$match[1]; // Name
             $type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
             
-            if ($type==0) // object type=0 : check if v1 trap
+            if ($type == 0) // object type=0 : check if v1 trap
             {
                 // Check if next is suboid -> in that case is cannot be a trap
-                if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
+                if (preg_match("/^$oid/", $this->objectsAll[$curElement + 1]))
                 {
-                    $time_check2 += microtime(true) - $time_1;
+                    $time_check2+=microtime(true) - $time_1;
                     $time_check2N++;
                     continue;
                 }
                 unset($snmptrans);
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
-                if ($retVal!=0)
+                exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+                    ' -Td '.$oid.' | grep OBJECTS ', $snmptrans, $retVal);
+                if ($retVal != 0)
                 {
-                    $time_check2 += microtime(true) - $time_1;
+                    $time_check2+=microtime(true) - $time_1;
                     $time_check2N++;
                     continue;
                 }
@@ -414,56 +414,56 @@ 
                 // Force as trap.
                 $type=21;
             }
-            if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+            if ($onlyTraps === true && $type != 21) // if only traps and not a trap, continue
             {
-                $time_check3 += microtime(true) - $time_1;
+                $time_check3+=microtime(true) - $time_1;
                 $time_check3N++;
                 continue;
             }
             
             $time_num_traps++;
             
-            $this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
+            $this->logging->log('Found trap : '.$match[1].' / OID : '.$oid, INFO);
             if ($display_progress) echo '#'; // echo a # when trap found
             
             // get trap objects & source MIB
             unset($snmptrans);
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -Td '.$oid,$snmptrans,$retVal);
-            if ($retVal!=0)
+            exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
+                ' -Td '.$oid, $snmptrans, $retVal);
+            if ($retVal != 0)
             {
-                $this->logging->log('error executing snmptranslate',ERROR,'');
+                $this->logging->log('error executing snmptranslate', ERROR, '');
             }
             
-            if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+            if (!preg_match('/^(.*)::/', $snmptrans[0], $match))
             {
-                $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+                $this->logging->log('Error getting mib from trap '.$oid.' : '.$snmptrans[0], 1, '');
             }
             $trapMib=$match[1];
             
-            $numLine=1;$trapDesc='';
-            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+            $numLine=1; $trapDesc='';
+            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/', $snmptrans[$numLine], $match)) $numLine++;
             if (isset($snmptrans[$numLine]))
             {
-                $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+                $snmptrans[$numLine]=preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/', '', $snmptrans[$numLine]);
                 
-                while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+                while (isset($snmptrans[$numLine]) && !preg_match('/"/', $snmptrans[$numLine]))
                 {
-                    $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+                    $trapDesc.=preg_replace('/[\t ]+/', ' ', $snmptrans[$numLine]);
                     $numLine++;
                 }
                 if (isset($snmptrans[$numLine])) {
-                    $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-                    $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+                    $trapDesc.=preg_replace('/".*/', '', $snmptrans[$numLine]);
+                    $trapDesc=preg_replace('/[\t ]+/', ' ', $trapDesc);
                 }
                 
             }
-            $update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
-            $time_update += microtime(true) - $time_1; $time_1= microtime(true);
+            $update=$this->update_oid($oid, $trapMib, $name, $type, NULL, NULL, NULL, NULL, $trapDesc);
+            $time_update+=microtime(true) - $time_1; $time_1=microtime(true);
             
-            if (($update==0) && ($check_change===false))
+            if (($update == 0) && ($check_change === false))
             { // Trapd didn't change & force check disabled
-                $time_objects += microtime(true) - $time_1;
+                $time_objects+=microtime(true) - $time_1;
                 if ($display_progress) echo "C";
                 continue;
             }
@@ -471,7 +471,7 @@ 
             $synt=null;
             foreach ($snmptrans as $line)
             {
-                if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+                if (preg_match('/OBJECTS.*\{([^\}]+)\}/', $line, $match))
                 {
                     $synt=$match[1];
                 }
@@ -479,30 +479,30 @@ 
             if ($synt == null)
             {
                 //echo "No objects for $trapOID\n";
-                $time_objects += microtime(true) - $time_1;
+                $time_objects+=microtime(true) - $time_1;
                 continue;
             }
             //echo "$synt \n";
             $trapObjects=array();
-            while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
+            while (preg_match('/ *([^ ,]+) *,* */', $synt, $match))
             {
-                array_push($trapObjects,$match[1]);
-                $synt=preg_replace('/'.$match[0].'/','',$synt);
+                array_push($trapObjects, $match[1]);
+                $synt=preg_replace('/'.$match[0].'/', '', $synt);
             }
             
             $this->trap_objects($oid, $trapMib, $trapObjects, false);
             
-            $time_objects += microtime(true) - $time_1;
+            $time_objects+=microtime(true) - $time_1;
             $time_objectsN++;
         }
         
         if ($display_progress)
         {
             echo "\nNumber of processed traps : $time_num_traps \n";
-            echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-            echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-            echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-            echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+            echo "\nParsing : ".number_format($time_parse1 + $time_check1, 1)." sec / ".($time_parse1N + $time_check1N)." occurences\n";
+            echo "Detecting traps : ".number_format($time_check2 + $time_check3, 1)." sec / ".($time_check2N + $time_check3N)." occurences\n";
+            echo "Trap processing ($time_updateN): ".number_format($time_update, 1)." sec , ";
+            echo "Objects processing ($time_objectsN) : ".number_format($time_objects, 1)." sec \n";
         }
         
         // Timing ends

Braces +23 added lines, -9 removed lines

@@ -82,8 +82,7 @@ 
                 }
                 $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
                 return 1;
-            }
-            else
+            } else
             {
                 $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
                 return 0;
@@ -99,7 +98,9 @@ 
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->trapsDB->trapDBType == 'pgsql') {
+        	$sql .= 'RETURNING id';
+        }
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -139,7 +140,9 @@ 
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id==false) {
+                	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                }
                 $this->dbOidIndex[$oid]['id']=$inserted_id;
                 break;
             default:
@@ -392,12 +395,14 @@ 
             $name=$match[1]; // Name
             $type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
             
-            if ($type==0) // object type=0 : check if v1 trap
+            if ($type==0) {
+            	// object type=0 : check if v1 trap
             {
                 // Check if next is suboid -> in that case is cannot be a trap
                 if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
                 {
                     $time_check2 += microtime(true) - $time_1;
+            }
                     $time_check2N++;
                     continue;
                 }
@@ -414,9 +419,11 @@ 
                 // Force as trap.
                 $type=21;
             }
-            if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+            if ($onlyTraps===true && $type!=21) {
+            	// if only traps and not a trap, continue
             {
                 $time_check3 += microtime(true) - $time_1;
+            }
                 $time_check3N++;
                 continue;
             }
@@ -424,7 +431,10 @@ 
             $time_num_traps++;
             
             $this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+            if ($display_progress) {
+            	echo '#';
+            }
+            // echo a # when trap found
             
             // get trap objects & source MIB
             unset($snmptrans);
@@ -442,7 +452,9 @@ 
             $trapMib=$match[1];
             
             $numLine=1;$trapDesc='';
-            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) {
+            	$numLine++;
+            }
             if (isset($snmptrans[$numLine]))
             {
                 $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
@@ -464,7 +476,9 @@ 
             if (($update==0) && ($check_change===false))
             { // Trapd didn't change & force check disabled
                 $time_objects += microtime(true) - $time_1;
-                if ($display_progress) echo "C";
+                if ($display_progress) {
+                	echo "C";
+                }
                 continue;
             }