2012-08-16 Vanessa Gil <vanessa.gil@artica.es>

* pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.sql
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Changed
	type 'subnet' and 'field1' to trecon_task table.

	* godmode/servers/manage_recontask_form.php: Added help tip:
	several networks to recon task.


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

pandora_console/ChangeLog

@@ -1,3 +1,16 @@
+2012-08-16  Vanessa Gil <vanessa.gil@artica.es>
+
+	* pandoradb.oracle.sql
+	  pandoradb.postgreSQL.sql
+	  pandoradb.sql
+	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
+	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
+	  extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Changed
+	type 'subnet' and 'field1' to trecon_task table.
+
+	* godmode/servers/manage_recontask_form.php: Added help tip:
+	several networks to recon task.
+
 2012-08-16  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_ui.php: Improve help tip centering the text

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql

@@ -291,3 +291,9 @@ ALTER TABLE tplugin ADD `parameters` text;
 
 UPDATE trecon_script SET `description`='This script is used to automatically detect SNMP Interfaces on devices, used as Recon Custom Script in the recon task. Parameters used are:

* custom_field1 = network. i.e.: 192.168.100.0/24
* custom_field2 = several communities separated by comma. For example: snmp_community,public,private 
* custom_field3 = optative parameter to force process downed interfaces (use: '-a'). Only up interfaces are processed by default 

See documentation for more information.'
 WHERE id_recon_script=1;
+
+-- -----------------------------------------------------
+-- Table `trecon_task
+-- -----------------------------------------------------
+ALTER TABLE trecon_task MODIFY subnet TEXT NOT NULL DEFAULT '';
+ALTER TABLE trecon_task MODIFY field1 TEXT NOT NULL DEFAULT '';

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql

@@ -288,3 +288,9 @@ ALTER TABLE tusuario ADD CONSTRAINT t_usuario_metaconsole_access_cons CHECK (met
 
 ALTER TABLE tplugin ADD (macros CLOB default '');
 ALTER TABLE tplugin ADD (parameters CLOB default '');
+
+-- -----------------------------------------------------
+-- Table `trecon_task`
+-- -----------------------------------------------------
+ALTER TABLE trecon_task MODIFY subnet TEXT NOT NULL;
+ALTER TABLE trecon_task MODIFY field1 TEXT NOT NULL;

pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql

@@ -278,3 +278,9 @@ ALTER TABLE "tusuario" ADD COLUMN "metaconsole_access" type_tusuario_metaconsole
 
 ALTER TABLE "tplugin" ADD COLUMN "macros" TEXT default '';
 ALTER TABLE "tplugin" ADD COLUMN "parameters" TEXT default '';
+
+-- -----------------------------------------------------
+-- Table `trecon_task`
+-- -----------------------------------------------------
+ALTER TABLE "trecon_task" ALTER COLUMN "subnet" TYPE TEXT;
+ALTER TABLE "trecon_task" ALTER COLUMN "field1" TYPE TEXT;

pandora_console/godmode/servers/manage_recontask_form.php

@@ -232,11 +232,11 @@ $table->data[12][1] = "<span id='spinner_layour' style='display: none;'>" . html
 
 
 // Field1
-$table->data[13][0] = "<b>".__('Script field #1');
+$table->data[13][0] = "<b>".__('Script field #1').ui_print_help_tip(__("several networks separated by comma. For example: 192.168.100.0/24,192.168.50.0/24"), true);
 $table->data[13][1] =  html_print_input_text ('field1', $field1, '', 40, 0, true);
 
 // Field2
-$table->data[14][0] = "<b>".__('Script field #2');
+$table->data[14][0] = "<b>".__('Script field #2').ui_print_help_tip(__("several communities separated by comma. For example: snmp_community,public,private "), true);
 $table->data[14][1] =  html_print_input_text ('field2', $field2, '', 40, 0, true);
 
 // Field3

pandora_console/pandoradb.oracle.sql

@@ -730,7 +730,7 @@ CREATE TABLE trecon_task (
 	id_rt NUMBER(10, 0) NOT NULL PRIMARY KEY,
 	name VARCHAR2(100) default '',
 	description VARCHAR2(250) default '',
-	subnet VARCHAR2(64) default '',
+	subnet CLOB default NULL,
 	id_network_profile NUMBER(10, 0) default 0 NOT NULL,
 	create_incident NUMBER(10, 0) default 0 NOT NULL,
 	id_group NUMBER(10, 0) default 1 NOT NULL,
@@ -742,7 +742,7 @@ CREATE TABLE trecon_task (
 	recon_ports VARCHAR2(250) default '',
 	snmp_community VARCHAR2(64) default 'public' NOT NULL,
 	id_recon_script NUMBER(10, 0),
-	field1 VARCHAR2(250) default '',
+	field1 CLOB default NULL,
 	field2 VARCHAR2(250) default '',
 	field3 VARCHAR2(250) default '',
 	field4 VARCHAR2(250) default '',

pandora_console/pandoradb.postgreSQL.sql

@@ -580,7 +580,7 @@ CREATE TABLE "trecon_task" (
 	"id_rt" SERIAL NOT NULL PRIMARY KEY,
 	"name" varchar(100) NOT NULL default '',
 	"description" varchar(250) NOT NULL default '',
-	"subnet" varchar(64) NOT NULL default '',
+	"subnet" TEXT default NULL,
 	"id_network_profile" INTEGER NOT NULL default 0,
 	"create_incident" INTEGER NOT NULL default 0,
 	"id_group" INTEGER NOT NULL default 1,
@@ -592,7 +592,7 @@ CREATE TABLE "trecon_task" (
 	"recon_ports" varchar(250) NOT NULL default '',
 	"snmp_community" varchar(64) NOT NULL default 'public',
 	"id_recon_script" INTEGER,
-	"field1" varchar(250) NOT NULL default '',
+	"field1" TEXT default NULL,
 	"field2" varchar(250) NOT NULL default '',
 	"field3" varchar(250) NOT NULL default '',
 	"field4" varchar(250) NOT NULL default '',

pandora_console/pandoradb.sql

@@ -659,7 +659,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
   `id_rt` int(10) unsigned NOT NULL auto_increment,
   `name` varchar(100) NOT NULL default '',
   `description` varchar(250) NOT NULL default '',
-  `subnet` varchar(64) NOT NULL default '',
+  `subnet` text NOT NULL default '',
   `id_network_profile` int(10) unsigned NOT NULL default '0',
   `create_incident` tinyint(3) unsigned NOT NULL default '0',
   `id_group` int(10) unsigned NOT NULL default '1',
@@ -671,7 +671,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
   `recon_ports` varchar(250) NOT NULL default '',
   `snmp_community` varchar(64) NOT NULL default 'public',
   `id_recon_script` int(10),
-  `field1` varchar(250) NOT NULL default '',
+  `field1` text NOT NULL default '',
   `field2` varchar(250) NOT NULL default '',
   `field3` varchar(250) NOT NULL default '',
   `field4` varchar(250) NOT NULL default '',