From 9a71dc64c0b10f4a6ac764eda8185a0e1d2ed940 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 6 Jul 2012 10:58:00 +0000 Subject: [PATCH] 2012-07-06 Sergio Martin * pandoradb.sql pandoradb.postgreSQL.sql pandoradb.oracle.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 godmode/users/configure_user.php: Changed some last fields of the wizard level, metaconsole access etc. And interface strings for metaconsole access in user edition git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 +++++++++++ .../pandoradb_migrate_4.0.x_to_5.0.mysql.sql | 6 +++--- .../pandoradb_migrate_4.0.x_to_5.0.oracle.sql | 10 +++++----- ...doradb_migrate_4.0.x_to_5.0.postgreSQL.sql | 12 +++++------ .../godmode/users/configure_user.php | 20 +++++++++---------- pandora_console/pandoradb.oracle.sql | 12 +++++------ pandora_console/pandoradb.postgreSQL.sql | 12 +++++------ pandora_console/pandoradb.sql | 6 +++--- 8 files changed, 51 insertions(+), 39 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e498c9e424..34e33cd06b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-07-06 Sergio Martin + + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.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 + godmode/users/configure_user.php: Changed some last fields + of the wizard level, metaconsole access etc. And interface + strings for metaconsole access in user edition + 2012-07-06 Sergio Martin * godmode/users/configure_user.php: Added wizard access 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 196304ceae..ec8b1bddfc 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 @@ -272,7 +272,7 @@ WHERE `token`= 'prominent_time' -- Table `tnetwork_component` -- ----------------------------------------------------- -ALTER TABLE tnetwork_component ADD `wizard_level` enum('basic','advanced','custom') default 'custom'; +ALTER TABLE tnetwork_component ADD `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard'; ALTER TABLE tnetwork_component ADD `only_wizard` tinyint(1) unsigned default '0'; ALTER TABLE tnetwork_component ADD `field1_desc` text; ALTER TABLE tnetwork_component ADD `field1_help` text; @@ -291,10 +291,10 @@ ALTER TABLE tnetwork_component ADD `field6_help` text; -- Table `tagente_modulo` -- ----------------------------------------------------- -ALTER TABLE tagente_modulo ADD `wizard_level` enum('basic','advanced','custom') default 'custom'; +ALTER TABLE tagente_modulo ADD `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard'; -- ----------------------------------------------------- -- Table `tusuario` -- ----------------------------------------------------- -ALTER TABLE tusuario ADD `wizard_access` enum('basic','advanced','custom','all','only_console') default 'only_console'; +ALTER TABLE tusuario ADD `metaconsole_access` enum('basic','advanced','custom','all','only_console') default 'only_console'; 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 d245787ddc..8eca82c221 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 @@ -275,7 +275,7 @@ WHERE token='prominent_time' -- ----------------------------------------------------- ALTER TABLE tnetwork_component ADD (wizard_level VARCHAR2(100) default 'custom' NOT NULL); -ALTER TABLE tnetwork_component ADD CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom')); +ALTER TABLE tnetwork_component ADD CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')); ALTER TABLE tnetwork_component ADD (only_wizard NUMBER(5, 0) default 0 NOT NULL); ALTER TABLE tnetwork_component ADD (field1_desc CLOB default ''); ALTER TABLE tnetwork_component ADD (field1_help CLOB default ''); @@ -294,13 +294,13 @@ ALTER TABLE tnetwork_component ADD (field6_help CLOB default ''); -- Table `tagente_modulo` -- ----------------------------------------------------- -ALTER TABLE tagente_modulo ADD (wizard_level VARCHAR2(100) default 'custom' NOT NULL); -ALTER TABLE tagente_modulo ADD CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom')); +ALTER TABLE tagente_modulo ADD (wizard_level VARCHAR2(100) default 'nowizard' NOT NULL); +ALTER TABLE tagente_modulo ADD CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')); -- ----------------------------------------------------- -- Table `tusuario` -- ----------------------------------------------------- -ALTER TABLE tusuario ADD (wizard_access VARCHAR2(100) default 'only_console' NOT NULL); -ALTER TABLE tusuario ADD CONSTRAINT t_usuario_wizard_access_cons CHECK (wizard_access IN ('basic','advanced','custom','all','only_console')); +ALTER TABLE tusuario ADD (metaconsole_access VARCHAR2(100) default 'only_console' NOT NULL); +ALTER TABLE tusuario ADD CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced','custom','all','only_console')); 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 4647049171..b74c6513ab 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 @@ -263,8 +263,8 @@ WHERE "token"='prominent_time' -- Table `tnetwork_component` -- ----------------------------------------------------- -CREATE TYPE type_tnetwork_component_wizard_level AS ENUM ('basic','advanced','custom'); -ALTER TABLE "tnetwork_component" ADD COLUMN "wizard_level" type_tnetwork_component_wizard_level default 'custom'; +CREATE TYPE type_tnetwork_component_wizard_level AS ENUM ('basic','advanced','custom','nowizard'); +ALTER TABLE "tnetwork_component" ADD COLUMN "wizard_level" type_tnetwork_component_wizard_level default 'nowizard'; ALTER TABLE "tnetwork_component" ADD COLUMN "only_wizard" INTEGER default '0'; ALTER TABLE "tnetwork_component" ADD COLUMN "field1_desc" TEXT default ''; ALTER TABLE "tnetwork_component" ADD COLUMN "field1_help" TEXT default ''; @@ -283,12 +283,12 @@ ALTER TABLE "tnetwork_component" ADD COLUMN "field6_help" TEXT default ''; -- Table `tagente_modulo` -- ----------------------------------------------------- -CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom'); -ALTER TABLE "tagente_modulo" ADD COLUMN "wizard_level" type_tagente_modulo_wizard_level default 'custom'; +CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom','nowizard'); +ALTER TABLE "tagente_modulo" ADD COLUMN "wizard_level" type_tagente_modulo_wizard_level default 'nowizard'; -- ----------------------------------------------------- -- Table `tusuario` -- ----------------------------------------------------- -CREATE TYPE type_tusuario_wizard_access AS ENUM ('basic','advanced','custom','all','only_console'); -ALTER TABLE "tusuario" ADD COLUMN "wizard_access" type_tusuario_wizard_access default 'only_console'; +CREATE TYPE type_tusuario_metaconsole_access AS ENUM ('basic','advanced','custom','all','only_console'); +ALTER TABLE "tusuario" ADD COLUMN "metaconsole_access" type_tusuario_metaconsole_access default 'only_console'; diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index f60e9cf101..4b80f0d43c 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -133,7 +133,7 @@ if ($create_user) { if (enterprise_installed()) { $values['force_change_pass'] = 1; $values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time()); - $values['wizard_access'] = get_parameter ('wizard_access'); + $values['metaconsole_access'] = get_parameter ('metaconsole_access'); } if ($id == '') { @@ -226,7 +226,7 @@ if ($update_user) { $values['flash_chart'] = get_parameter ('flash_charts', $config["flash_charts"]); if(enterprise_installed()) { - $values['wizard_access'] = get_parameter ('wizard_access'); + $values['metaconsole_access'] = get_parameter ('metaconsole_access'); } $res1 = update_user ($id, $values); @@ -276,7 +276,7 @@ if ($update_user) { } if(enterprise_installed()) { - $info .= ' Wizard access: ' . $values['wizard_access']; + $info .= ' Wizard access: ' . $values['metaconsole_access']; } db_pandora_audit("User management", "Updated user ".io_safe_input($id), @@ -424,13 +424,13 @@ if($id == $config['id_user']) { } if(enterprise_installed()) { - $table->data[12][0] = __('Wizard access'); - $wizard_accesses = array('only_console' => __('No wizard access (Only normal console)'), - 'basic' => __('Basic wizard'), - 'advanced' => __('Advanced wizard'), - 'custom' => __('Custom wizard'), - 'all' => __('Full access (Custom wizard and normal console)')); - $table->data[12][1] = html_print_select($wizard_accesses,'wizard_access',$user_info["wizard_access"],'','',-1,true, false, false); + $table->data[12][0] = __('Metaconsole access'); + $metaconsole_accesses = array('only_console' => __('No access'), + 'basic' => __('Basic (Only Metaconsole)'), + 'advanced' => __('Advanced (Only Metaconsole)'), + //'custom' => __('Custom access (Only Metaconsole)'), + 'all' => __('Full (Metaconsole and normal console)')); + $table->data[12][1] = html_print_select($metaconsole_accesses,'metaconsole_access',$user_info["metaconsole_access"],'','',-1,true, false, false); } echo '
'; diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 2a0f8471e0..9e31c373c6 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -208,8 +208,8 @@ CREATE TABLE tagente_modulo ( custom_string_3 CLOB default '', custom_integer_1 NUMBER(10, 0) default 0, custom_integer_2 NUMBER(10, 0) default 0, - wizard_level VARCHAR2(100) default 'custom' NOT NULL, - CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom')) + wizard_level VARCHAR2(100) default 'nowizard' NOT NULL, + CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')) ); CREATE INDEX tagente_modulo_id_agente_idx ON tagente_modulo(id_agente); CREATE INDEX tagente_modulo_id_t_mod_idx ON tagente_modulo(id_tipo_modulo); @@ -649,7 +649,7 @@ CREATE TABLE tnetwork_component ( custom_integer_2 INTEGER default 0, post_process BINARY_DOUBLE default 0. unit CLOB default '', - wizard_level VARCHAR2(100) default 'custom' NOT NULL, + wizard_level VARCHAR2(100) default 'nowizard' NOT NULL, only_wizard NUMBER(5, 0) default 0 NOT NULL, field1_desc CLOB default '', field1_help CLOB default '', @@ -663,7 +663,7 @@ CREATE TABLE tnetwork_component ( field5_help CLOB default '', field6_desc CLOB default '', field6_help CLOB default '', - CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom')) + CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')) ); CREATE SEQUENCE tnetwork_component_s INCREMENT BY 1 START WITH 1; @@ -896,8 +896,8 @@ CREATE TABLE tusuario ( last_failed_login TIMESTAMP default 0, failed_attempt NUMBER(5,0) default 0 NOT NULL, login_blocked NUMBER(5,0) default 0 NOT NULL, - wizard_access VARCHAR2(100) default 'only_console' NOT NULL, - CONSTRAINT t_usuario_wizard_access_cons CHECK (wizard_access IN ('basic','advanced','custom','all','only_console')) + metaconsole_access VARCHAR2(100) default 'only_console' NOT NULL, + CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced','custom','all','only_console')) ); CREATE TABLE tusuario_perfil ( diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 5ab470f323..c90aa2ba92 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -139,7 +139,7 @@ CREATE INDEX "tagente_estado_last_execution_try_idx" ON "tagente_estado"("last_e -- 6 - WMI server -- 7 - WEB Server (enteprise) -CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom'); +CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom','nowizard'); CREATE TABLE "tagente_modulo" ( "id_agente_modulo" SERIAL NOT NULL PRIMARY KEY, "id_agente" INTEGER NOT NULL default 0, @@ -188,7 +188,7 @@ CREATE TABLE "tagente_modulo" ( "custom_string_3" text default '', "custom_integer_1" INTEGER default 0, "custom_integer_2" INTEGER default 0, - "wizard_level" type_tagente_modulo_wizard_level default 'custom' + "wizard_level" type_tagente_modulo_wizard_level default 'nowizard' ); CREATE INDEX "tagente_modulo_id_agente_idx" ON "tagente_modulo"("id_agente"); CREATE INDEX "tagente_modulo_id_tipo_modulo_idx" ON "tagente_modulo"("id_tipo_modulo"); @@ -480,7 +480,7 @@ CREATE TABLE "tmodule_group" ( "name" varchar(150) NOT NULL default '' ); -CREATE TYPE type_tlocal_component_wizard_level AS ENUM ('basic','advanced','custom'); +CREATE TYPE type_tlocal_component_wizard_level AS ENUM ('basic','advanced','custom','nowizard'); CREATE TABLE "tnetwork_component" ( "id_nc" SERIAL NOT NULL PRIMARY KEY, "name" varchar(80) NOT NULL, @@ -517,7 +517,7 @@ CREATE TABLE "tnetwork_component" ( "custom_integer_2" INTEGER default 0, "post_process" DOUBLE PRECISION default 0, "unit" TEXT default '', - "wizard_level" type_tlocal_component_wizard_level default 'custom', + "wizard_level" type_tlocal_component_wizard_level default 'nowizard', "only_wizard" INTEGER default '0', "field1_desc" TEXT default '', "field1_help" TEXT default '', @@ -698,7 +698,7 @@ CREATE TABLE "ttrap" ( "severity" INTEGER NOT NULL default 2 ); -CREATE TYPE type_tusuario_wizard_access AS ENUM ('basic','advanced','custom','all','only_console'); +CREATE TYPE type_tusuario_metaconsole_access AS ENUM ('basic','advanced','custom','all','only_console'); CREATE TABLE "tusuario" ( "id_user" varchar(60) NOT NULL PRIMARY KEY, "fullname" varchar(255) NOT NULL, @@ -727,7 +727,7 @@ CREATE TABLE "tusuario" ( "last_failed_login" BIGINT NOT NULL default 0, "failed_attempt" INTEGER NOT NULL DEFAULT 0, "login_blocked" SMALLINT NOT NULL default 0, - "wizard_access" type_tusuario_wizard_access default 'only_console' + "metaconsole_access" type_tusuario_metaconsole_access default 'only_console' ); CREATE TABLE "tusuario_perfil" ( diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index e8e19d8481..501da77094 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -189,7 +189,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `custom_string_3` text, `custom_integer_1` int(10) default 0, `custom_integer_2` int(10) default 0, - `wizard_level` enum('basic','advanced','custom') default 'custom', + `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard', PRIMARY KEY (`id_agente_modulo`), KEY `main_idx` (`id_agente_modulo`,`id_agente`), KEY `tam_agente` (`id_agente`), @@ -569,7 +569,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` ( `custom_integer_2` int(10) default 0, `post_process` double(18,5) default 0, `unit` text, - `wizard_level` enum('basic','advanced','custom') default 'custom', + `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard', `only_wizard` tinyint(1) unsigned default '0', `field1_desc` text, `field1_help` text, @@ -799,7 +799,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `last_failed_login` DATETIME NOT NULL DEFAULT 0, `failed_attempt` int(4) NOT NULL DEFAULT 0, `login_blocked` tinyint(1) unsigned NOT NULL default 0, - `wizard_access` enum('basic','advanced','custom','all','only_console') default 'only_console', + `metaconsole_access` enum('basic','advanced','custom','all','only_console') default 'only_console', UNIQUE KEY `id_user` (`id_user`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;