diff --git a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php index 01eedfb30e..997db74e8a 100644 --- a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php +++ b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php @@ -168,7 +168,6 @@ class UserManager { foreach ([ 'DELETE FROM `edit_presets` WHERE usr_id = :usr_id', - 'DELETE FROM `sselnew` WHERE usr_id = :usr_id', 'DELETE FROM `tokens` WHERE usr_id = :usr_id', ] as $sql) { $stmt = $this->appboxConnection->prepare($sql); diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php index 15306ee1e0..af30f06ca7 100644 --- a/lib/classes/ACL.php +++ b/lib/classes/ACL.php @@ -349,20 +349,17 @@ class ACL implements cache_cacheableInterface $mask_and = $this->app['acl']->get($template_user)->get_mask_and($base_id); $mask_xor = $this->app['acl']->get($template_user)->get_mask_xor($base_id); - $mask_and = ctype_digit($mask_and) ? $mask_and : '0'; - $mask_xor = ctype_digit($mask_xor) ? $mask_xor : '0'; - /** * apply sb is substractive */ $mand = substr( str_repeat('0', 32) - . databox_status::dec2bin($this->app, $mask_and) + . decbin($mask_and) , -32 ); $mxor = substr( str_repeat('0', 32) - . databox_status::dec2bin($this->app, $mask_xor) + . decbin($mask_xor) , -32 ); $m = ['aa' => '', 'ao' => '', 'xa' => '', 'xo' => '']; diff --git a/lib/classes/User/Adapter.php b/lib/classes/User/Adapter.php index 72b7130219..0d0974d02e 100644 --- a/lib/classes/User/Adapter.php +++ b/lib/classes/User/Adapter.php @@ -786,11 +786,6 @@ class User_Adapter implements User_Interface, cache_cacheableInterface $stmt->execute([':usr_id' => $this->get_id()]); $stmt->closeCursor(); - $sql = 'DELETE FROM sselnew WHERE usr_id = :usr_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute([':usr_id' => $this->get_id()]); - $stmt->closeCursor(); - $sql = 'DELETE FROM tokens WHERE usr_id = :usr_id'; $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt->execute([':usr_id' => $this->get_id()]); diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index 93d85638c2..6a9dfccd33 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -2322,59 +2322,6 @@ InnoDB - - - - - id - int(11) unsigned - - auto_increment - - - - - - - ssel_id - int(11) unsigned - - - - - 0 - - - - usr_id - int(11) unsigned - - - - - 0 - - - - - - PRIMARY - PRIMARY - - id - - - - couple - UNIQUE - - ssel_id - usr_id - - - - InnoDB -