diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql
index 28f2ddb9200281532b80fa1f4e9e8ba2140a7c70..4664bd77a0e6201fd349d0ecc89490635479e43a 100755
--- a/migration/20.10/2010.sql
+++ b/migration/20.10/2010.sql
@@ -33,6 +33,7 @@ ALTER TABLE users DROP COLUMN IF EXISTS mode;
ALTER TABLE users ADD COLUMN mode users_modes NOT NULL DEFAULT 'standard';
UPDATE users set mode = 'root_invisible' WHERE user_id = 'superadmin';
UPDATE users set mode = 'rest' WHERE loginmode = 'restMode';
+ALTER TABLE users DROP COLUMN IF EXISTS loginmode;
/* CONTACTS GROUPS */
ALTER TABLE contacts_groups DROP COLUMN IF EXISTS entity_owner;
diff --git a/sql/data_en.sql b/sql/data_en.sql
index 9d3d1eb0f2fe4fe05fd774f8deda15d5e7b28abf..f0fa95db5aac8a52d29d4dee3207f199bb3a3781 100755
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -280,91 +280,91 @@ DELETE FROM users WHERE user_id <> 'superadmin';
TRUNCATE TABLE users_entities;
DELETE FROM users WHERE user_id = 'rrenaud';
DELETE FROM users_entities WHERE user_id = 'rrenaud';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (1, 'rrenaud', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Robert', 'RENAUD', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (1, 'rrenaud', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Robert', 'RENAUD', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('rrenaud', 'DGS', '', 'Y');
DELETE FROM users WHERE user_id = 'ccordy';
DELETE FROM users_entities WHERE user_id = 'ccordy';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (2, 'ccordy', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Chloé', 'CORDY', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (2, 'ccordy', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Chloé', 'CORDY', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ccordy', 'DSI', '', 'Y');
DELETE FROM users WHERE user_id = 'ssissoko';
DELETE FROM users_entities WHERE user_id = 'ssissoko';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (3, 'ssissoko', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sylvain', 'SISSOKO', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (3, 'ssissoko', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sylvain', 'SISSOKO', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ssissoko', 'DSI', '', 'Y');
DELETE FROM users WHERE user_id = 'nnataly';
DELETE FROM users_entities WHERE user_id = 'nnataly';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (4, 'nnataly', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Nancy', 'NATALY', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (4, 'nnataly', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Nancy', 'NATALY', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('nnataly', 'PSO', '', 'Y');
DELETE FROM users WHERE user_id = 'ddur';
DELETE FROM users_entities WHERE user_id = 'ddur';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (5, 'ddur', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Dominique', 'DUR', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (5, 'ddur', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Dominique', 'DUR', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ddur', 'ELUS', '', 'Y');
DELETE FROM users WHERE user_id = 'jjane';
DELETE FROM users_entities WHERE user_id = 'jjane';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (6, 'jjane', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jenny', 'JANE', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (6, 'jjane', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jenny', 'JANE', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('jjane', 'CCAS', '', 'Y');
DELETE FROM users WHERE user_id = 'eerina';
DELETE FROM users_entities WHERE user_id = 'eerina';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (7, 'eerina', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Edith', 'ERINA', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (7, 'eerina', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Edith', 'ERINA', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('eerina', 'CAB', '', 'Y');
DELETE FROM users WHERE user_id = 'kkaar';
DELETE FROM users_entities WHERE user_id = 'kkaar';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (8, 'kkaar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Katy', 'KAAR', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (8, 'kkaar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Katy', 'KAAR', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('kkaar', 'DGA', '', 'Y');
DELETE FROM users WHERE user_id = 'bboule';
DELETE FROM users_entities WHERE user_id = 'bboule';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (9, 'bboule', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bruno', 'BOULE', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (9, 'bboule', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bruno', 'BOULE', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('bboule', 'PCU', '', 'Y');
DELETE FROM users WHERE user_id = 'ppetit';
DELETE FROM users_entities WHERE user_id = 'ppetit';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (10, 'ppetit', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Patricia', 'PETIT', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (10, 'ppetit', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Patricia', 'PETIT', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ppetit', 'VILLE', '', 'Y');
DELETE FROM users WHERE user_id = 'aackermann';
DELETE FROM users_entities WHERE user_id = 'aackermann';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (11, 'aackermann', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Amanda', 'ACKERMANN', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (11, 'aackermann', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Amanda', 'ACKERMANN', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('aackermann', 'PSF', '', 'Y');
DELETE FROM users WHERE user_id = 'ppruvost';
DELETE FROM users_entities WHERE user_id = 'ppruvost';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (12, 'ppruvost', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Pierre', 'PRUVOST', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (12, 'ppruvost', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Pierre', 'PRUVOST', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ppruvost', 'DRH', '', 'Y');
DELETE FROM users WHERE user_id = 'ttong';
DELETE FROM users_entities WHERE user_id = 'ttong';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (13, 'ttong', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Tony', 'TONG', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (13, 'ttong', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Tony', 'TONG', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ttong', 'SP', '', 'Y');
DELETE FROM users WHERE user_id = 'sstar';
DELETE FROM users_entities WHERE user_id = 'sstar';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (14, 'sstar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Suzanne', 'STAR', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (14, 'sstar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Suzanne', 'STAR', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('sstar', 'FIN', '', 'Y');
DELETE FROM users WHERE user_id = 'ssaporta';
DELETE FROM users_entities WHERE user_id = 'ssaporta';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (15, 'ssaporta', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sabrina', 'SAPORTA', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (15, 'ssaporta', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sabrina', 'SAPORTA', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ssaporta', 'PE', '', 'Y');
DELETE FROM users WHERE user_id = 'ccharles';
DELETE FROM users_entities WHERE user_id = 'ccharles';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (16, 'ccharles', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlotte', 'CHARLES', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (16, 'ccharles', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlotte', 'CHARLES', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ccharles', 'PTE', '', 'Y');
DELETE FROM users WHERE user_id = 'mmanfred';
DELETE FROM users_entities WHERE user_id = 'mmanfred';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (17, 'mmanfred', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Martin', 'MANFRED', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (17, 'mmanfred', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Martin', 'MANFRED', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('mmanfred', 'DGA', '', 'Y');
DELETE FROM users WHERE user_id = 'ddaull';
DELETE FROM users_entities WHERE user_id = 'ddaull';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (18, 'ddaull', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Denis', 'DAULL', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (18, 'ddaull', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Denis', 'DAULL', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ddaull', 'DSG', '', 'Y');
DELETE FROM users WHERE user_id = 'bbain';
DELETE FROM users_entities WHERE user_id = 'bbain';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (19, 'bbain', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Barbara', 'BAIN', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (19, 'bbain', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Barbara', 'BAIN', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('bbain', 'PJS', '', 'Y');
DELETE FROM users WHERE user_id = 'jjonasz';
DELETE FROM users_entities WHERE user_id = 'jjonasz';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (20, 'jjonasz', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jean', 'JONASZ', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (20, 'jjonasz', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jean', 'JONASZ', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('jjonasz', 'PJU', '', 'Y');
DELETE FROM users WHERE user_id = 'bblier';
DELETE FROM users_entities WHERE user_id = 'bblier';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (21, 'bblier', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bernard', 'BLIER', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (21, 'bblier', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bernard', 'BLIER', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('bblier', 'COU', '', 'Y');
DELETE FROM users WHERE user_id = 'ggrand';
DELETE FROM users_entities WHERE user_id = 'ggrand';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES (22, 'ggrand', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Georges', 'GRAND', 'info@maarch.org', 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, enabled, change_password, status) VALUES (22, 'ggrand', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Georges', 'GRAND', 'info@maarch.org', 'Y', 'N', 'OK');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES ('ggrand', 'COR', '', 'Y');
select setval('users_id_seq', (select max(id)+1 from users), false);
@@ -739,10 +739,10 @@ VALUES ('ACKNOWLEDGEMENT_RECEIPTS', 'ACKNOWLEDGEMENT_RECEIPTS', 'Dépôt des AR'
--SUPERADMIN USER
------------
DELETE FROM users WHERE user_id='superadmin';
-INSERT INTO users (user_id, password, firstname, lastname, phone, mail, custom_t2, custom_t3, enabled, change_password, status, loginmode) VALUES ('superadmin', '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.', 'Super', 'ADMIN', '0147245159', 'info@maarch.org', NULL, NULL, 'Y', 'N', 'OK', 'standard');
+INSERT INTO users (user_id, password, firstname, lastname, phone, mail, custom_t2, custom_t3, enabled, change_password, status) VALUES ('superadmin', '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.', 'Super', 'ADMIN', '0147245159', 'info@maarch.org', NULL, NULL, 'Y', 'N', 'OK');
--MAARCH2GEC USER
DELETE FROM users WHERE user_id = 'cchaplin';
-INSERT INTO users (user_id, password, firstname, lastname, mail, enabled, change_password, status, loginmode) VALUES ('cchaplin', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlie', 'CHAPLIN', 'info@maarch.org', 'Y', 'N', 'OK', 'restMode');
+INSERT INTO users (user_id, password, firstname, lastname, mail, enabled, change_password, status, mode) VALUES ('cchaplin', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlie', 'CHAPLIN', 'info@maarch.org', 'Y', 'N', 'OK', 'rest');
DELETE FROM usergroup_content WHERE user_id = 24;
INSERT INTO usergroup_content (user_id, group_id, role) VALUES (24, 11,'');
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 771a2e93eb0ae54bd1d3947ae5de5d04f3e586d5..d772812bfba05d2de03f520fc3b308810638fd1b 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -337,70 +337,70 @@ select setval('doctypes_type_id_seq', (select max(type_id)+1 from doctypes), fal
DELETE FROM users WHERE user_id <> 'superadmin';
TRUNCATE TABLE users_entities;
DELETE FROM users WHERE user_id = 'rrenaud';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (1, 'rrenaud', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Robert', 'RENAUD', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (1, 'rrenaud', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Robert', 'RENAUD', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (1, 'DGS', '', 'Y');
DELETE FROM users WHERE user_id = 'ccordy';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (2, 'ccordy', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Chloé', 'CORDY', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (2, 'ccordy', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Chloé', 'CORDY', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (2, 'DSI', '', 'Y');
DELETE FROM users WHERE user_id = 'ssissoko';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (3, 'ssissoko', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sylvain', 'SISSOKO', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (3, 'ssissoko', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sylvain', 'SISSOKO', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (3, 'DSI', '', 'Y');
DELETE FROM users WHERE user_id = 'nnataly';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (4, 'nnataly', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Nancy', 'NATALY', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (4, 'nnataly', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Nancy', 'NATALY', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (4, 'PSO', '', 'Y');
DELETE FROM users WHERE user_id = 'ddur';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (5, 'ddur', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Dominique', 'DUR', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (5, 'ddur', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Dominique', 'DUR', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (5, 'ELUS', '', 'Y');
DELETE FROM users WHERE user_id = 'jjane';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (6, 'jjane', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jenny', 'JANE', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (6, 'jjane', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jenny', 'JANE', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (6, 'CCAS', '', 'Y');
DELETE FROM users WHERE user_id = 'eerina';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (7, 'eerina', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Edith', 'ERINA', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (7, 'eerina', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Edith', 'ERINA', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (7, 'CAB', '', 'Y');
DELETE FROM users WHERE user_id = 'kkaar';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (8, 'kkaar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Katy', 'KAAR', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (8, 'kkaar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Katy', 'KAAR', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (8, 'DGA', '', 'Y');
DELETE FROM users WHERE user_id = 'bboule';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (9, 'bboule', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bruno', 'BOULE', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (9, 'bboule', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bruno', 'BOULE', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (9, 'PCU', '', 'Y');
DELETE FROM users WHERE user_id = 'ppetit';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (10, 'ppetit', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Patricia', 'PETIT', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (10, 'ppetit', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Patricia', 'PETIT', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (10, 'VILLE', '', 'Y');
DELETE FROM users WHERE user_id = 'aackermann';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (11, 'aackermann', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Amanda', 'ACKERMANN', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (11, 'aackermann', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Amanda', 'ACKERMANN', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (11, 'PSF', '', 'Y');
DELETE FROM users WHERE user_id = 'ppruvost';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (12, 'ppruvost', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Pierre', 'PRUVOST', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (12, 'ppruvost', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Pierre', 'PRUVOST', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (12, 'DRH', '', 'Y');
DELETE FROM users WHERE user_id = 'ttong';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (13, 'ttong', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Tony', 'TONG', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (13, 'ttong', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Tony', 'TONG', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (13, 'SP', '', 'Y');
DELETE FROM users WHERE user_id = 'sstar';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (14, 'sstar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Suzanne', 'STAR', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (14, 'sstar', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Suzanne', 'STAR', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (14, 'FIN', '', 'Y');
DELETE FROM users WHERE user_id = 'ssaporta';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (15, 'ssaporta', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sabrina', 'SAPORTA', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (15, 'ssaporta', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Sabrina', 'SAPORTA', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (15, 'PE', '', 'Y');
DELETE FROM users WHERE user_id = 'ccharles';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (16, 'ccharles', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlotte', 'CHARLES', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (16, 'ccharles', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlotte', 'CHARLES', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (16, 'PTE', '', 'Y');
DELETE FROM users WHERE user_id = 'mmanfred';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (17, 'mmanfred', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Martin', 'MANFRED', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (17, 'mmanfred', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Martin', 'MANFRED', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (17, 'DGA', '', 'Y');
DELETE FROM users WHERE user_id = 'ddaull';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (18, 'ddaull', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Denis', 'DAULL', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (18, 'ddaull', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Denis', 'DAULL', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (18, 'DSG', '', 'Y');
DELETE FROM users WHERE user_id = 'bbain';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (19, 'bbain', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Barbara', 'BAIN', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (19, 'bbain', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Barbara', 'BAIN', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (19, 'PJS', '', 'Y');
DELETE FROM users WHERE user_id = 'jjonasz';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (20, 'jjonasz', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jean', 'JONASZ', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (20, 'jjonasz', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Jean', 'JONASZ', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (20, 'PJU', '', 'Y');
DELETE FROM users WHERE user_id = 'bblier';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (21, 'bblier', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bernard', 'BLIER', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (21, 'bblier', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Bernard', 'BLIER', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (21, 'COU', '', 'Y');
DELETE FROM users WHERE user_id = 'ggrand';
-INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, loginmode, preferences) VALUES (22, 'ggrand', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Georges', 'GRAND', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}');
+INSERT INTO users (id, user_id, password, firstname, lastname, mail, status, preferences) VALUES (22, 'ggrand', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Georges', 'GRAND', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}');
INSERT INTO users_entities (user_id, entity_id, user_role, primary_entity) VALUES (22, 'COR', '', 'Y');
select setval('users_id_seq', (select max(id)+1 from users), false);
@@ -865,10 +865,10 @@ VALUES ('ACKNOWLEDGEMENT_RECEIPTS', 'ACKNOWLEDGEMENT_RECEIPTS', 'Dépôt des AR'
--SUPERADMIN USER
------------
DELETE FROM users WHERE user_id='superadmin';
-INSERT INTO users (user_id, password, firstname, lastname, phone, mail, status, loginmode, preferences, mode) VALUES ('superadmin', '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.', 'Super', 'ADMIN', '0147245159', 'support@maarch.fr', 'OK', 'standard', '{"documentEdition" : "onlyoffice"}', 'root_invisible');
+INSERT INTO users (user_id, password, firstname, lastname, phone, mail, status, preferences, mode) VALUES ('superadmin', '$2y$10$Vq244c5s2zmldjblmMXEN./Q2qZrqtGVgrbz/l1WfsUJbLco4E.e.', 'Super', 'ADMIN', '0147245159', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}', 'root_invisible');
--MAARCH2GEC USER
DELETE FROM users WHERE user_id = 'cchaplin';
-INSERT INTO users (user_id, password, firstname, lastname, mail, status, loginmode, preferences, mode) VALUES ('cchaplin', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlie', 'CHAPLIN', 'support@maarch.fr', 'OK', 'restMode', '{"documentEdition" : "onlyoffice"}', 'rest');
+INSERT INTO users (user_id, password, firstname, lastname, mail, status, preferences, mode) VALUES ('cchaplin', '$2y$10$C.QSslBKD3yNMfRPuZfcaubFwPKiCkqqOUyAdOr5FSGKPaePwuEjG', 'Charlie', 'CHAPLIN', 'support@maarch.fr', 'OK', '{"documentEdition" : "onlyoffice"}', 'rest');
DELETE FROM usergroup_content WHERE user_id = 24;
INSERT INTO usergroup_content (user_id, group_id, role) VALUES (24, 11, '');
INSERT INTO usergroup_content (user_id, group_id, role) VALUES (24, 13, '');
diff --git a/sql/structure.sql b/sql/structure.sql
index 1c91c82f73f009a1ae1f241bf7dac09ddf7c599d..3f96b2cd0e5924dc0a94cda33e01684e741b9c5c 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -221,7 +221,6 @@ CREATE TABLE users
preferences jsonb NOT NULL DEFAULT '{"documentEdition" : "java"}',
status character varying(10) NOT NULL DEFAULT 'OK'::character varying,
password_modification_date timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
- loginmode character varying(50) DEFAULT NULL::character varying,
mode users_modes NOT NULL DEFAULT 'standard',
refresh_token jsonb NOT NULL DEFAULT '[]',
reset_token text,
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index 5d7f28bc7cdf5d3a9a42a5b2180bb597817cf6c4..5ee94b57ae5a54cf915b968f0b01ab4739da98e4 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -77,7 +77,7 @@ class UserController
$users = [];
if (!empty($entities)) {
$users = UserEntityModel::getWithUsers([
- 'select' => ['DISTINCT users.id', 'users.user_id', 'firstname', 'lastname', 'status', 'mail', 'loginmode', 'mode'],
+ 'select' => ['DISTINCT users.id', 'users.user_id', 'firstname', 'lastname', 'status', 'mail', 'mode'],
'where' => ['users_entities.entity_id in (?)', 'status != ?'],
'data' => [$entities, 'DEL']
]);
diff --git a/src/frontend/app/signature-book.component.html b/src/frontend/app/signature-book.component.html
index 29d55b1da29ea1698c6842c63c0d8d5860630b8b..f359ed9de899d2b9f8915c67589d6582d87ba8f4 100755
--- a/src/frontend/app/signature-book.component.html
+++ b/src/frontend/app/signature-book.component.html
@@ -225,8 +225,7 @@
[hideTools]="true"
[mode]="signatureBook.attachments[rightSelectedThumbnail].isResource ? 'mainDocument' : 'attachment'"
[resId]="signatureBook.attachments[rightSelectedThumbnail].res_id"
- [title]="signatureBook.attachments[rightSelectedThumbnail].identifier"
- [inSignatureBook]="true">
+ [title]="signatureBook.attachments[rightSelectedThumbnail].identifier">
</app-document-viewer>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && signatureBook.attachments[rightSelectedThumbnail].status != 'TMP' && !signatureBook.attachments[rightSelectedThumbnail].isConverted"
[ngStyle]="{'height': showTopRightPanel ? '79%' : '96%'}" class="visaNoPdfWarning">
diff --git a/src/frontend/app/viewer/document-viewer.component.html b/src/frontend/app/viewer/document-viewer.component.html
index 29104f76c3d30824570a9b7891afa221cb19cf36..e7f879f3b8cda7e1b63795f06d8494dc6469aafb 100644
--- a/src/frontend/app/viewer/document-viewer.component.html
+++ b/src/frontend/app/viewer/document-viewer.component.html
@@ -111,12 +111,12 @@
<ng-container *ngIf="editInProgress && editor.mode === 'onlyoffice'">
<onlyoffice-viewer #onlyofficeViewer style="height:100%;width:100%;" [params]="editor.options" [file]="file"
[editMode]="true" (triggerAfterUpdatedDoc)="triggerEvent.emit()"
- (triggerCloseEditor)="closeEditor()" (triggerModifiedDocument)="isDocModified = true" [inSignatureBook]="inSignatureBook"></onlyoffice-viewer>
+ (triggerCloseEditor)="closeEditor()" (triggerModifiedDocument)="isDocModified = true"></onlyoffice-viewer>
</ng-container>
<ng-container *ngIf="editInProgress && editor.mode === 'collaboraOnline'">
<app-collabora-online-viewer #collaboraOnlineViewer style="height:100%;width:100%;" [params]="editor.options" [file]="file"
[editMode]="true" (triggerAfterUpdatedDoc)="triggerEvent.emit()"
- (triggerCloseEditor)="closeEditor()" (triggerModifiedDocument)="isDocModified = true" [inSignatureBook]="inSignatureBook"></app-collabora-online-viewer>
+ (triggerCloseEditor)="closeEditor()" (triggerModifiedDocument)="isDocModified = true"></app-collabora-online-viewer>
<div *ngIf="collaboraOnlineViewer.isSaving" class="example-loading-shade">
<mat-spinner style="margin:auto;"></mat-spinner>
</div>
diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts
index 8747d73b3db3f81c4908cba5bd780f6b5c62d368..15ea18f14bfb42da8b5d016edee9014cc4046af0 100755
--- a/src/frontend/app/viewer/document-viewer.component.ts
+++ b/src/frontend/app/viewer/document-viewer.component.ts
@@ -84,11 +84,6 @@ export class DocumentViewerComponent implements OnInit, OnDestroy {
*/
@Output() triggerEvent = new EventEmitter<string>();
- /**
- * true if viewer in signature book
- */
- @Input() inSignatureBook: boolean = false;
-
lang: any = LANG;
loading: boolean = true;
diff --git a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts
index eb352150498e473e181932376a68cd9b896cacc3..f386d9edbd247fcf11d4166b1f4e9a1eeab21672 100644
--- a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts
+++ b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.ts
@@ -26,7 +26,6 @@ export class CollaboraOnlineViewerComponent implements OnInit, AfterViewInit, On
@Input() editMode: boolean = false;
@Input() file: any = {};
@Input() params: any = {};
- @Input() inSignatureBook: boolean = false;
@Output() triggerAfterUpdatedDoc = new EventEmitter<string>();
@Output() triggerCloseEditor = new EventEmitter<string>();
@@ -109,7 +108,7 @@ export class CollaboraOnlineViewerComponent implements OnInit, AfterViewInit, On
}
closeEditor() {
- if (this.headerService.sideNavLeft !== null) {
+ if (this.headerService.sideNavLeft !== null && !this.headerService.hideSideBar) {
this.headerService.sideNavLeft.open();
}
$('iframe[name=\'frameEditor\']').css('position', 'initial');
@@ -315,7 +314,7 @@ export class CollaboraOnlineViewerComponent implements OnInit, AfterViewInit, On
iframe.css('position', 'fixed');
iframe.css('z-index', '2');
} else {
- if (this.headerService.sideNavLeft !== null && !this.inSignatureBook) {
+ if (this.headerService.sideNavLeft !== null && !this.headerService.hideSideBar) {
this.headerService.sideNavLeft.open();
}
iframe.css('position', 'initial');
diff --git a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
index c9aca8382978e5ee801892117872e5bf02b3b44c..ca516f66a899a932416934a0cc361eb45a3f3926 100644
--- a/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
+++ b/src/frontend/plugins/onlyoffice-api-js/onlyoffice-viewer.component.ts
@@ -37,7 +37,6 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit, OnD
@Input() file: any = {};
@Input() params: any = {};
@Input() hideCloseEditor: any = false;
- @Input() inSignatureBook: boolean = false;
@Output() triggerAfterUpdatedDoc = new EventEmitter<string>();
@Output() triggerCloseEditor = new EventEmitter<string>();
@@ -359,7 +358,7 @@ export class EcplOnlyofficeViewerComponent implements OnInit, AfterViewInit, OnD
$('iframe[name=\'frameEditor\']').css('position', 'fixed');
$('iframe[name=\'frameEditor\']').css('z-index', '2');
} else {
- if (this.headerService.sideNavLeft !== null && !this.inSignatureBook) {
+ if (this.headerService.sideNavLeft !== null && !this.headerService.hideSideBar) {
this.headerService.sideNavLeft.open();
}
$('iframe[name=\'frameEditor\']').css('position', 'initial');