hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml
This commit is contained in:
Romain Neutron
2013-12-20 09:53:09 +01:00
parent 49ea64b1c3 573b51451a
commit bfe5da79d2
4 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Model/Manager/UserManager.php
View File

@@ -168,7 +168,6 @@ class UserManager
{ {
foreach ([ foreach ([
'DELETE FROM `edit_presets` WHERE usr_id = :usr_id', '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', 'DELETE FROM `tokens` WHERE usr_id = :usr_id',
] as $sql) { ] as $sql) {
$stmt = $this->appboxConnection->prepare($sql); $stmt = $this->appboxConnection->prepare($sql);

7
lib/classes/ACL.php
View File

@@ -349,20 +349,17 @@ class ACL implements cache_cacheableInterface
$mask_and = $this->app['acl']->get($template_user)->get_mask_and($base_id); $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_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 * apply sb is substractive
*/ */
$mand = substr( $mand = substr(
str_repeat('0', 32) str_repeat('0', 32)
. databox_status::dec2bin($this->app, $mask_and) . decbin($mask_and)
, -32 , -32
); );
$mxor = substr( $mxor = substr(
str_repeat('0', 32) str_repeat('0', 32)
. databox_status::dec2bin($this->app, $mask_xor) . decbin($mask_xor)
, -32 , -32
); );
$m = ['aa' => '', 'ao' => '', 'xa' => '', 'xo' => '']; $m = ['aa' => '', 'ao' => '', 'xa' => '', 'xo' => ''];

5
lib/classes/User/Adapter.php
View File

@@ -786,11 +786,6 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
$stmt->execute([':usr_id' => $this->get_id()]); $stmt->execute([':usr_id' => $this->get_id()]);
$stmt->closeCursor(); $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'; $sql = 'DELETE FROM tokens WHERE usr_id = :usr_id';
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute([':usr_id' => $this->get_id()]); $stmt->execute([':usr_id' => $this->get_id()]);

53
lib/conf.d/bases_structure.xml
View File

@@ -2322,59 +2322,6 @@
</defaults> </defaults>
<engine>InnoDB</engine> <engine>InnoDB</engine>
</table> </table>
<table name="sselnew">
<fields>
<field>
<name>id</name>
<type>int(11) unsigned</type>
<null></null>
<extra>auto_increment</extra>
<default></default>
<comment></comment>
</field>
<field>
<name>ssel_id</name>
<type>int(11) unsigned</type>
<null></null>
<extra></extra>
<default>0</default>
<comment></comment>
</field>
<field>
<name>usr_id</name>
<type>int(11) unsigned</type>
<null></null>
<extra></extra>
<default>0</default>
<comment></comment>
</field>
</fields>
<indexes>
<index>
<name>PRIMARY</name>
<type>PRIMARY</type>
<fields>
<field>id</field>
</fields>
</index>
<index>
<name>couple</name>
<type>UNIQUE</type>
<fields>
<field>ssel_id</field>
<field>usr_id</field>
</fields>
</index>
</indexes>
<engine>InnoDB</engine>
</table>
<table name="tokens"> <table name="tokens">
<fields> <fields>
<field> <field>