diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9d0411cd2b..ef4909c737 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-01  Ramon Novoa  <rnovoa@artica.es>
+
+	* godmode/agentes/module_manager_editor_network.php: Added support for
+	  different SNMP versions.
+
+	* godmode/agentes/configurar_agente.php: Removed debugging code.
+
 2008-10-01  Ramon Novoa  <rnovoa@artica.es>
 
 	* extensions/update_manager/lib/libupdate_manager_client.php: Added a
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index a7548e027b..c072ed6080 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -785,7 +785,7 @@ if (((!isset ($_POST["nc"]) OR ($_POST["nc"] == -1))) && (!isset ($_POST["oid"])
 			$form_id_module_group, $form_interval, $form_ip_target, $form_tcp_port, $form_tcp_rcv, $form_tcp_send, $form_id_export, $form_plugin_user, $form_plugin_pass, 
 			$form_plugin_parameter, $form_id_plugin, $form_post_process, $form_id_prediction_module, $form_max_timeout, $form_disabled, $form_id_modulo);
 	$id_agente_modulo = process_sql ($sql, 'insert_id');
-	echo $sql;	
+
 	if ($id_agente_modulo === false){
 		echo '<h3 class="error">'.__('There was a problem adding module').'</h3>';
 	} else {
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 283bd5e9f4..d6283c5dee 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -215,6 +215,24 @@ echo '<td class="datos">'.__('SNMP Community')."</td>";
 echo '<td class="datos"><input type="text" name="form_snmp_community" size="12" value="'.$form_snmp_community.'"></td>';
 echo '</tr>';
 
+// SNMP version
+echo '<tr>';
+echo '<td class="datos">'.__('SNMP version');
+$snmp_versions["1"] = "1";
+$snmp_versions["2"] = "2";
+$snmp_versions["2c"] = "2c";
+$snmp_versions["3"] = "3";
+echo '</td>';
+echo '<td>';
+// SNMP module, tcp_send contains the snmp version
+if ($form_id_tipo_modulo >= 15 && $form_id_tipo_modulo <= 18) {
+	print_select ($snmp_versions, 'form_tcp_send', $form_tcp_send, '', '', '', false, false);
+} else {
+	print_select ($snmp_versions, 'form_tcp_send_void', 0, '', '', '', false, false);
+}
+echo '</td>';
+echo '</tr>';
+
 // Max / min value
 echo '<tr>';
 echo '<td class="datos2">'.__('Min. Value')."</td>";
@@ -248,7 +266,13 @@ echo '<tr>';
 echo '<td class="datos2" valign="top">'.__('TCP send');
 pandora_help ("tcp_send");
 echo "</td>";
-echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
+
+// SNMP module, tcp_send contains the SNMP version
+if ($form_id_tipo_modulo >= 15 && $form_id_tipo_modulo <= 18) {
+	echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_send_void"></textarea>';
+} else {
+	echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_send">'.$form_tcp_send.'</textarea>';
+}
 echo '<td class="datos2" valign="top">'.__('TCP receive')."</td>";
 echo '<td class="datos2"><textarea cols=20 style="height:55px;" name="form_tcp_rcv">'.$form_tcp_rcv.'</textarea>';
 echo '</tr>';