From b8fd0e493bd0f4066c019a475033e545f06641af Mon Sep 17 00:00:00 2001 From: vgilc Date: Tue, 3 Apr 2012 09:08:42 +0000 Subject: [PATCH] 2012-04-03 Vanessa Gil * pandoradb.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, include/functions_groups.php: : removed 'created_by' to tusuario table and modify select users. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ .../extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql | 5 ----- .../pandoradb_migrate_4.0.x_to_4.1.oracle.sql | 5 ----- .../pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql | 5 ----- pandora_console/include/functions_groups.php | 13 ------------- pandora_console/pandoradb.sql | 1 - 6 files changed, 9 insertions(+), 29 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b206f45dc3..52d489be5a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2012-04-03 Vanessa Gil + + * pandoradb.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, + include/functions_groups.php: : removed 'created_by' + to tusuario table and modify select users. + 2012-04-02 Dario Rodriguez * operation/menu.php, 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 5fe218cb0c..d8f9b5c662 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 @@ -193,11 +193,6 @@ ALTER TABLE `tusuario` ADD COLUMN `data_section` TEXT NOT NULL; -- ----------------------------------------------------- ALTER TABLE `treport_content_item` ADD COLUMN `operation` TEXT DEFAULT ''; --- ----------------------------------------------------- --- Table `tusuario` --- ----------------------------------------------------- -ALTER TABLE `tusuario` ADD COLUMN `created_by` TEXT NOT NULL DEFAULT ''; - -- ----------------------------------------------------- -- Table `tmensajes` -- ----------------------------------------------------- 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 546271d764..ffc9092efd 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 @@ -189,11 +189,6 @@ ALTER TABLE tusuario ADD (data_section VARCHAR2(255) NOT NULL); -- ----------------------------------------------------- ALTER TABLE treport_content_item ADD (operation CLOB default ''); --- ----------------------------------------------------- --- Table `tusuario` --- ----------------------------------------------------- -ALTER TABLE tusuario ADD (created_by VARCHAR2(255) NOT NULL DEFAULT ''; - -- ----------------------------------------------------- -- Table `tmensajes` -- ----------------------------------------------------- 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 db49d875cf..4662e10683 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 @@ -181,11 +181,6 @@ ALTER TABLE "tusuario" ADD COLUMN "data_section" varchar(255) NOT NULL DEFAULT ' -- ----------------------------------------------------- ALTER TABLE "treport_content_item" ADD COLUMN "operation" text default ''; --- ----------------------------------------------------- --- Table `tusuario` --- ----------------------------------------------------- -ALTER TABLE "tusuario" ADD COLUMN "created_by" varchar(255) NOT NULL DEFAULT ''; - -- ----------------------------------------------------- -- Table `tmensajes` -- ----------------------------------------------------- diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 5d5ddecd2a..71796bba43 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -570,11 +570,6 @@ function groups_get_users ($id_group, $filter = false) { if (! is_array ($filter)) $filter = array (); - //Users created by user - $filter['created_by'] = $config['id_user']; - $users_created = db_get_all_rows_filter ("tusuario", $filter); - unset($filter['created_by']); - $filter['id_grupo'] = $id_group; $resulta = array(); @@ -594,14 +589,6 @@ function groups_get_users ($id_group, $filter = false) { else $result = array_merge($resulta,$resultb); - if ($result === false) - return array (); - else { - if ($users_created !== false) { - $result = array_merge($result, $users_created); - } - } - //This removes stale users from the list. This can happen if switched to another auth scheme //(internal users still exist) or external auth has users removed/inactivated from the list (eg. LDAP) $retval = array (); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 44ec66295e..927dcb994f 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -777,7 +777,6 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `shortcut_data` text default '', `section` TEXT NOT NULL, `data_section` TEXT NOT NULL, - `created_by` TEXT NOT NULL, UNIQUE KEY `id_user` (`id_user`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;