From 6f9d69a8f7bb4c7c9c1057a27f1211290fe34815 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 11 Oct 2013 11:59:27 +0000 Subject: [PATCH] 2013-10-11 Ramon Novoa * extensions/ssh_gateway.php: Added a help tip to show invalid characters. * extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql, extras/pandoradb_migrate_4.1_to_5.0.oracle.sql, extras/pandoradb_migrate_4.1_to_5.0.mysql.sql, extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql, extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: Removed duplicated columns. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8893 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 ++++++++++++ pandora_console/extensions/ssh_gateway.php | 2 +- .../extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql | 1 - .../extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql | 12 ------------ .../pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql | 1 - .../extras/pandoradb_migrate_4.1_to_5.0.mysql.sql | 12 ------------ .../extras/pandoradb_migrate_4.1_to_5.0.oracle.sql | 12 ------------ .../pandoradb_migrate_4.1_to_5.0.postgreSQL.sql | 12 ------------ 8 files changed, 13 insertions(+), 51 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index db48400a3f..2b8d1fce73 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-10-11 Ramon Novoa + + * extensions/ssh_gateway.php: Added a help tip to show invalid + characters. + + * extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql, + extras/pandoradb_migrate_4.1_to_5.0.oracle.sql, + extras/pandoradb_migrate_4.1_to_5.0.mysql.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql, + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: Removed duplicated columns. + 2013-10-11 Miguel de Dios * include/functions_agents.php, include/functions_graph.php, diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php index 296b2af090..5377e27456 100644 --- a/pandora_console/extensions/ssh_gateway.php +++ b/pandora_console/extensions/ssh_gateway.php @@ -56,7 +56,7 @@ function ssh_gateway () { echo ""; echo ""; - echo ""; echo "
".__("Host address").""; echo "
".__("User").""; + echo "".__("User")."" . ui_print_help_tip(__('For security reasons the following characters are not allowed: %s', '< > | ` $ ; &'), true); echo "
".__("Port (use 0 for default)").""; echo "
"; diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index e9fae075b5..75f79864e9 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -362,7 +362,6 @@ ALTER TABLE tnetwork_map ADD `show_modulegroup` TINYINT(1) UNSIGNED NOT NULL DEF -- Table `tagente_estado` -- ---------------------------------------------------------------------- ALTER TABLE `tagente_estado` ADD COLUMN `last_known_status` tinyint(4) NOT NULL DEFAULT 0; -ALTER TABLE `tagente_estado` ADD COLUMN `last_error` int(4) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tevent_response` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index afaa14174e..309fc78ddc 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -395,7 +395,6 @@ ALTER TABLE tnetwork_map ADD (show_modulegroup NUMBER(10, 0) default 0 NOT NULL) -- Table tagente_estado ------------------------------------------------------------------------ ALTER TABLE tagente_estado ADD (last_known_status NUMBER(10, 0) default 0 NOT NULL); -ALTER TABLE tagente_estado ADD (last_error NUMBER(10, 0) default 0 NOT NULL); -- ----------------------------------------------------- -- Table tevent_response @@ -485,17 +484,6 @@ ALTER TABLE tusuario_perfil ADD (tags CLOB NOT NULL default ''); ALTER TABLE ttag ADD (email CLOB NULL); ALTER TABLE ttag ADD (phone CLOB NULL); --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field6 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field7 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field8 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field9 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field10 CLOB NOT NULL default ''); - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index cd578fd83d..ce70abeceb 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -382,7 +382,6 @@ ALTER TABLE "tnetwork_map" ADD COLUMN "show_modulegroup" INTEGER NOT NULL defaul -- Table "tagente_estado" ------------------------------------------------------------------------ ALTER TABLE "tagente_estado" ADD COLUMN "last_known_status" INTEGER default 0; -ALTER TABLE "tagente_estado" ADD COLUMN "last_error" INTEGER default 0; -- ----------------------------------------------------- -- Table "tevent_response" diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql index 0cf7e1d549..9655558867 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql @@ -360,7 +360,6 @@ ALTER TABLE tnetwork_map ADD `show_modulegroup` TINYINT(1) UNSIGNED NOT NULL DEF -- Table `tagente_estado` -- ---------------------------------------------------------------------- ALTER TABLE `tagente_estado` ADD COLUMN `last_known_status` tinyint(4) NOT NULL DEFAULT 0; -ALTER TABLE `tagente_estado` ADD COLUMN `last_error` int(4) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tevent_response` @@ -451,17 +450,6 @@ ALTER TABLE `tusuario_perfil` ADD COLUMN `tags` TEXT NOT NULL; ALTER TABLE `ttag` ADD COLUMN `email` text NULL; ALTER TABLE `ttag` ADD COLUMN `phone` text NULL; --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE `talert_snmp` ADD COLUMN `al_field4` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field5` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field6` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field7` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field8` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field9` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field10` text; - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql index f2f7eeac34..a586e8f0cb 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql @@ -393,7 +393,6 @@ ALTER TABLE tnetwork_map ADD (show_modulegroup NUMBER(10, 0) default 0 NOT NULL) -- Table tagente_estado ------------------------------------------------------------------------ ALTER TABLE tagente_estado ADD (last_known_status NUMBER(10, 0) default 0 NOT NULL); -ALTER TABLE tagente_estado ADD (last_error NUMBER(10, 0) default 0 NOT NULL); -- ----------------------------------------------------- -- Table tevent_response @@ -483,17 +482,6 @@ ALTER TABLE tusuario_perfil ADD (tags CLOB NOT NULL default ''); ALTER TABLE ttag ADD (email CLOB NULL); ALTER TABLE ttag ADD (phone CLOB NULL); --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field6 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field7 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field8 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field9 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field10 CLOB NOT NULL default ''); - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql index 5a1b163b77..1d8486778e 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql @@ -380,7 +380,6 @@ ALTER TABLE "tnetwork_map" ADD COLUMN "show_modulegroup" INTEGER NOT NULL defaul -- Table "tagente_estado" ------------------------------------------------------------------------ ALTER TABLE "tagente_estado" ADD COLUMN "last_known_status" INTEGER default 0; -ALTER TABLE "tagente_estado" ADD COLUMN "last_error" INTEGER default 0; -- ----------------------------------------------------- -- Table "tevent_response" @@ -469,17 +468,6 @@ ALTER TABLE "tusuario_perfil" ADD COLUMN "tags" text default ''; ALTER TABLE "ttag" ADD COLUMN "email" TEXT NULL; ALTER TABLE "ttag" ADD COLUMN "phone" TEXT NULL; --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE "talert_snmp" ADD COLUMN "al_field4" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field5" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field6" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field7" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field8" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field9" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field10" TEXT; - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- ---------------------------------------------------------------------