diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b5e220943c..7cae014c28 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2012-05-21 Vanessa Gil + + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.sql + pandoradb_data.sql + pandoradb.data.oracle.sql + pandoradb.data.postgreSQL.sql + extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql + extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql + extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Added column 'login_blocked' + to 'tusuario'. + 2012-05-21 Sergio Martin * pandoradb_data.sql diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql index 4c5854b95f..cbfe73a704 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql @@ -224,6 +224,7 @@ ALTER TABLE `tusuario` ADD COLUMN `force_change_pass` tinyint(1) DEFAULT 0; ALTER TABLE `tusuario` ADD COLUMN `last_pass_change` DATETIME NOT NULL DEFAULT 0; ALTER TABLE `tusuario` ADD COLUMN `last_failed_login` DATETIME NOT NULL DEFAULT 0; ALTER TABLE `tusuario` ADD COLUMN `failed_attempt` int(4) NOT NULL DEFAULT 0; +ALTER TABLE `tusuario` ADD COLUMN `login_blocked` tinyint(1) DEFAULT 0; -- ----------------------------------------------------- -- Table `talert_commands` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql index bb8a056977..c88ad605e2 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql @@ -227,6 +227,7 @@ alter table tusuario add (force_change_pass NUMBER(5,0) default 0 NOT NULL); alter table tusuario add (last_pass_change TIMESTAMP default 0); alter table tusuario add (last_failed_login TIMESTAMP default 0); alter table tusuario add (failed_attempt NUMBER(5,0) default 0 NOT NULL); +alter table tusuario add (login_blocked NUMBER(5,0) default 0 NOT NULL); -- ----------------------------------------------------- -- Table `talert_commands` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql index ea9051456b..4f6bba1e0f 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql @@ -216,6 +216,7 @@ ALTER TABLE "tusuario" ADD COLUMN "force_change_pass" SMALLINT NOT NULL default ALTER TABLE "tusuario" ADD COLUMN "last_pass_change" BIGINT NOT NULL default 0; ALTER TABLE "tusuario" ADD COLUMN "last_failed_login" BIGINT NOT NULL default 0; ALTER TABLE "tusuario" ADD COLUMN "failed_attempt" INTEGER NOT NULL DEFAULT 0; +ALTER TABLE "tusuario" ADD COLUMN "login_blocked" SMALLINT NOT NULL default 0; -- ----------------------------------------------------- -- Table `talert_commands` diff --git a/pandora_console/index.php b/pandora_console/index.php index 308c287e98..12f36f805c 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -62,8 +62,6 @@ if ((! file_exists ("include/config.php")) || (! is_readable ("include/config.ph session_start (); require_once ("include/config.php"); -$fails = get_parameter('fails', 0); - /* Enterprise support */ if (file_exists (ENTERPRISE_DIR."/load_enterprise.php")) { include_once (ENTERPRISE_DIR."/load_enterprise.php"); diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 6a5f78092b..56ec62c2c2 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -877,7 +877,8 @@ CREATE TABLE tusuario ( force_change_pass NUMBER(5,0) default 0 NOT NULL, last_pass_change TIMESTAMP default 0, last_failed_login TIMESTAMP default 0, - failed_attempt NUMBER(5,0) default 0 NOT NULL + failed_attempt NUMBER(5,0) default 0 NOT NULL, + login_blocked NUMBER(5,0) default 0 NOT NULL ); CREATE TABLE tusuario_perfil ( diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 33cdde5084..d2f4ee911b 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -707,7 +707,8 @@ CREATE TABLE "tusuario" ( "force_change_pass" SMALLINT NOT NULL default 0, "last_pass_change" BIGINT NOT NULL default 0, "last_failed_login" BIGINT NOT NULL default 0, - "failed_attempt" INTEGER NOT NULL DEFAULT 0 + "failed_attempt" INTEGER NOT NULL DEFAULT 0, + "login_blocked" SMALLINT NOT NULL default 0 ); CREATE TABLE "tusuario_perfil" ( diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 82c73243dc..4e22828555 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -783,6 +783,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `last_pass_change` DATETIME NOT NULL DEFAULT 0, `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, UNIQUE KEY `id_user` (`id_user`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;