diff --git a/modules/basket/class/class_admin_basket_Abstract.php b/modules/basket/class/class_admin_basket_Abstract.php index ffabca77cf8300d4afe1c8113455c097b6d4627d..44129413a7945e4a29cc1e833f2792b090f110ff 100755 --- a/modules/basket/class/class_admin_basket_Abstract.php +++ b/modules/basket/class/class_admin_basket_Abstract.php @@ -45,7 +45,7 @@ abstract class admin_basket_Abstract extends Database $default_action_list = ''; $db = new Database(); - $stmt = $db->query("select gb.group_id, gb.result_page, gb.list_lock_clause, gb.sublist_lock_clause, u.group_desc from " + $stmt = $db->query("select gb.group_id, gb.result_page, u.group_desc from " .$_SESSION['tablename']['bask_groupbasket']." gb, ".$_SESSION['tablename']['usergroups'] ." u where gb.basket_id = ? and gb.group_id = u.group_id order by u.group_desc",array($id)); while($line2 = $stmt->fetchObject()) @@ -70,8 +70,8 @@ abstract class admin_basket_Abstract extends Database "GROUP_ID" => $line2->group_id , "GROUP_LABEL" => functions::show_string($line2->group_desc), "RESULT_PAGE" => $line2->result_page, - "LOCK_LIST" => $line2->list_lock_clause, - "LOCK_SUBLIST" => $line2->sublist_lock_clause, + "LOCK_LIST" => '', + "LOCK_SUBLIST" => '', "DEFAULT_ACTION" => $default_action_list, "ACTIONS" => $actions); $i++; @@ -743,8 +743,8 @@ abstract class admin_basket_Abstract extends Database for($i=0; $i < count($_SESSION['m_admin']['basket']['groups'] ); $i++) { // Update groupbasket table - $db->query("INSERT INTO ".$_SESSION['tablename']['bask_groupbasket']." (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) - VALUES (?,?,?,?,?)",array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['groups'][$i]['RESULT_PAGE'],$_SESSION['m_admin']['basket']['groups'][$i]['LOCK_LIST'],$_SESSION['m_admin']['basket']['groups'][$i]['LOCK_SUBLIST'])); + $db->query("INSERT INTO ".$_SESSION['tablename']['bask_groupbasket']." (group_id, basket_id, result_page) + VALUES (?,?,?)",array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['groups'][$i]['RESULT_PAGE'])); // Browses the actions array for the current basket - group couple and inserts the action in actions_groupbasket table if needed for($j=0; $j < count($_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS']); $j++) diff --git a/modules/basket/class/class_modules_tools_Abstract.php b/modules/basket/class/class_modules_tools_Abstract.php index ce2c5b6853fcd919b8824ad910102499ed0923c3..a1c0ca05ff1fc0609806a3a5c9aceb5109dec429 100755 --- a/modules/basket/class/class_modules_tools_Abstract.php +++ b/modules/basket/class/class_modules_tools_Abstract.php @@ -810,7 +810,7 @@ abstract class basket_Abstract extends Database $groupId = $res->group_id; } $stmt = $db->query( - "select result_page, list_lock_clause, sublist_lock_clause from " + "select result_page from " . GROUPBASKET_TABLE . " where group_id = ? and basket_id = ?",array($groupId,$basketId)); $res = $stmt->fetchObject(); @@ -846,16 +846,9 @@ abstract class basket_Abstract extends Database ); $tab['clause'] = str_replace('where', '', $tab['clause']); - $tab['lock_list'] = $secCtrl->process_security_where_clause( - $res->list_lock_clause, $userId - ); - $tab['lock_list'] = str_replace('where', '', $tab['lock_list']); - - $tab['lock_sublist'] = $secCtrl->process_security_where_clause( - $res->sublist_lock_clause, $userId - ); + $tab['lock_list'] = ''; + $tab['lock_sublist'] = ''; - $tab['lock_sublist'] = str_replace('where', '', $tab['lock_sublist']); $db = new Database(); $stmt = $db->query( @@ -956,10 +949,7 @@ abstract class basket_Abstract extends Database } else { $primaryGroup = $_SESSION['user']['primarygroup']; } - $stmt = $db->query( - "select result_page, list_lock_clause, " - ."sublist_lock_clause from " - . GROUPBASKET_TABLE . " where group_id = ? and basket_id = ? ",array($primaryGroup,$basketId)); + $stmt = $db->query("select result_page from groupbasket where group_id = ? and basket_id = ?", array($primaryGroup,$basketId)); $res = $stmt->fetchObject(); @@ -995,12 +985,8 @@ abstract class basket_Abstract extends Database ); $tab['clause'] = str_replace('where', '', $tab['clause']); - $tab['lock_list'] = $secCtrl->process_security_where_clause( - $res->list_lock_clause, $userId - ); - $tab['lock_sublist'] = $secCtrl->process_security_where_clause( - $res->sublist_lock_clause, $userId - ); + $tab['lock_list'] = ''; + $tab['lock_sublist'] = ''; return $tab; } diff --git a/sql/17_xx.sql b/sql/17_xx.sql index 1249d3157c3b365f6703d570edfbc7ab169ed667..c1686c6c64e2b236dcc55d35bf9499776f24a497 100755 --- a/sql/17_xx.sql +++ b/sql/17_xx.sql @@ -363,6 +363,8 @@ ALTER TABLE groupbasket DROP COLUMN IF EXISTS redirect_grouplist; ALTER TABLE groupbasket DROP COLUMN IF EXISTS can_redirect; ALTER TABLE groupbasket DROP COLUMN IF EXISTS can_delete; ALTER TABLE groupbasket DROP COLUMN IF EXISTS can_insert; +ALTER TABLE groupbasket DROP COLUMN IF EXISTS list_lock_clause; +ALTER TABLE groupbasket DROP COLUMN IF EXISTS sublist_lock_clause; DROP TABLE IF EXISTS groupbasket_difflist_types; DROP TABLE IF EXISTS groupbasket_difflist_roles; diff --git a/sql/data_fr.sql b/sql/data_fr.sql index f3beaa9022e27e286e057ea2a5b9e102d9e62e7d..7efde38c408f570041ea530ad56e60ddd610dfeb 100755 --- a/sql/data_fr.sql +++ b/sql/data_fr.sql @@ -894,65 +894,65 @@ INSERT INTO baskets (basket_id, basket_name, basket_desc, basket_clause, coll_id -- Create GROUPBASKET TRUNCATE TABLE groupbasket; DELETE FROM groupbasket WHERE basket_id = 'QualificationBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('COURRIER', 'QualificationBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('COURRIER', 'QualificationBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'IndexingBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('COURRIER', 'IndexingBasket', 'redirect_to_action', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'IndexingBasket', 'redirect_to_action', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'IndexingBasket', 'redirect_to_action', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'IndexingBasket', 'redirect_to_action', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ELU', 'IndexingBasket', 'redirect_to_action', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('COURRIER', 'IndexingBasket', 'redirect_to_action'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'IndexingBasket', 'redirect_to_action'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'IndexingBasket', 'redirect_to_action'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'IndexingBasket', 'redirect_to_action'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ELU', 'IndexingBasket', 'redirect_to_action'); DELETE FROM groupbasket WHERE basket_id = 'CopyMailBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'CopyMailBasket', 'list_copies', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'CopyMailBasket', 'list_copies', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'CopyMailBasket', 'list_copies', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ELU', 'CopyMailBasket', 'list_copies', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'CopyMailBasket', 'list_copies'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'CopyMailBasket', 'list_copies'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'CopyMailBasket', 'list_copies'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ELU', 'CopyMailBasket', 'list_copies'); DELETE FROM groupbasket WHERE basket_id = 'RetourCourrier'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('COURRIER', 'RetourCourrier', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'RetourCourrier', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('COURRIER', 'RetourCourrier', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'RetourCourrier', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'DdeAvisBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'DdeAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'DdeAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'DdeAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ELU', 'DdeAvisBasket', 'list_with_avis', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'DdeAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'DdeAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'DdeAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ELU', 'DdeAvisBasket', 'list_with_avis'); DELETE FROM groupbasket WHERE basket_id = 'SupAvisBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'SupAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'SupAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'SupAvisBasket', 'list_with_avis', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'SupAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'SupAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'SupAvisBasket', 'list_with_avis'); DELETE FROM groupbasket WHERE basket_id = 'RetAvisBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'RetAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'RetAvisBasket', 'list_with_avis', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'RetAvisBasket', 'list_with_avis', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'RetAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'RetAvisBasket', 'list_with_avis'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'RetAvisBasket', 'list_with_avis'); DELETE FROM groupbasket WHERE basket_id = 'ValidationBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'ValidationBasket', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('DIRECTEUR', 'ValidationBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'ValidationBasket', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('DIRECTEUR', 'ValidationBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'InValidationBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'InValidationBasket', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'InValidationBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'InValidationBasket', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'InValidationBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'MyBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'MyBasket', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESP_COURRIER', 'MyBasket', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'MyBasket', 'list_with_attachments', NULL, NULL); -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ELU', 'MyBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'MyBasket', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESP_COURRIER', 'MyBasket', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'MyBasket', 'list_with_attachments'); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ELU', 'MyBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'LateMailBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'LateMailBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'LateMailBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'DepartmentBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'DepartmentBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'DepartmentBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'EvisBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'EvisBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'EvisBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'EsigBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'EsigBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'EsigBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'EsigARBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('RESPONSABLE', 'EsigARBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('RESPONSABLE', 'EsigARBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'EenvBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'EenvBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'EenvBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'EenvARBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('AGENT', 'EenvARBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('AGENT', 'EenvARBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'ToArcBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ARCHIVISTE', 'ToArcBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ARCHIVISTE', 'ToArcBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'SentArcBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ARCHIVISTE', 'SentArcBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ARCHIVISTE', 'SentArcBasket', 'list_with_attachments'); DELETE FROM groupbasket WHERE basket_id = 'AckArcBasket'; -INSERT INTO groupbasket (group_id, basket_id, result_page, list_lock_clause, sublist_lock_clause) VALUES ('ARCHIVISTE', 'AckArcBasket', 'list_with_attachments', NULL, NULL); +INSERT INTO groupbasket (group_id, basket_id, result_page) VALUES ('ARCHIVISTE', 'AckArcBasket', 'list_with_attachments'); -- Create Security diff --git a/sql/structure.sql b/sql/structure.sql index b577dbbd943c74a147e4c16eac225c770f1ec3d0..e7b5e99ff8cf5bffe232fb0e2d66641756558576 100755 --- a/sql/structure.sql +++ b/sql/structure.sql @@ -559,8 +559,6 @@ CREATE TABLE groupbasket group_id character varying(32) NOT NULL, basket_id character varying(32) NOT NULL, result_page character varying(255) DEFAULT 'show_list1.php'::character varying, - list_lock_clause text, - sublist_lock_clause text, CONSTRAINT groupbasket_pkey PRIMARY KEY (group_id, basket_id) ) WITH (OIDS=FALSE);