2009-09-04 Sancho Lerena <slerena@artica.es>

* pandoradb.sql: Commented server type codes.

	* godmode/servers/manage_export_form.php: Fixed problem assigning 
	export server because wasn't using the new server_type field.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1917 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,10 @@
+2009-09-04  Sancho Lerena <slerena@artica.es>
+
+	* pandoradb.sql: Commented server type codes.
+
+	* godmode/servers/manage_export_form.php: Fixed problem assigning 
+	export server because wasn't using the new server_type field.
+
 2009-09-04  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/config_process.php: Update build after last changes.

pandora_console/godmode/servers/manage_export_form.php

@@ -72,7 +72,7 @@ $table->data[0][1] = print_input_text ('name', $name, '', 25, 0, true);
 
 // Export server
 $table->data[1][0] = __('Export server');
-$table->data[1][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE export_server = 1 ORDER BY name',
+$table->data[1][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE server_type = 1 ORDER BY name',
 			'export_server', $export_server, '', __('None'), 0, true);
 
 // Preffix

pandora_console/pandoradb.sql

@@ -596,6 +596,19 @@ CREATE TABLE IF NOT EXISTS `tserver` (
 	KEY `status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--server types:
+--0 data
+--1 network
+--2 snmp trap console
+--3 recon
+--4 plugin
+--5 prediction
+--6 wmi
+--7 export
+--8 inventory
+--9 web
+-- TODO: drop 2.x xxxx_server fields, unused since server_type exists.
+
 CREATE TABLE IF NOT EXISTS `tsesion` (
   `ID_sesion` bigint(4) unsigned NOT NULL auto_increment,
   `ID_usuario` varchar(60) NOT NULL default '0',