From: Stéphane Jacob Date: Fri, 18 Mar 2011 21:37:33 +0000 (+0100) Subject: Users without email redirection cannot be lost. X-Git-Tag: xorg/1.1.0~26^2~16 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=dac6e2c6ebdc9cba855f349a4eb2a4d9f840cf82;p=platal.git Users without email redirection cannot be lost. Signed-off-by: Stéphane Jacob --- diff --git a/classes/user.php b/classes/user.php index 32d5ef4..e1f5ce5 100644 --- a/classes/user.php +++ b/classes/user.php @@ -163,7 +163,7 @@ class User extends PlUser IF(ef.email IS NULL, NULL, CONCAT(ef.email, \'@\', mf.name)) AS forlife, IF(ef.email IS NULL, NULL, CONCAT(ef.email, \'@\', df.name)) AS forlife_alternate, IF(eb.email IS NULL, NULL, CONCAT(eb.email, \'@\', mb.name)) AS bestalias, - (er.redirect IS NULL AND a.state = \'active\') AS lost, + (er.redirect IS NULL AND a.state = \'active\' AND FIND_IN_SET(\'mail\', at.perms)) AS lost, a.email, a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender, IF(a.state = \'active\', CONCAT(at.perms, \',\', IF(a.user_perms IS NULL, \'\', a.user_perms)), \'\') AS perms, a.user_perms, a.email_format, a.is_admin, a.state, a.type, at.description AS type_description, a.skin,