X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Femail.php;h=199e6c4ed7b150cdf6a6ea594a1b43d63933b397;hb=3a84c1191ef0c2e503edf95def102bd276cc5f29;hp=ef34aacbaa621589bde454c845ff7cccc856e880;hpb=74938c8280ecd3a1ddcdee9e06d48726b8616daf;p=platal.git diff --git a/modules/email.php b/modules/email.php index ef34aac..199e6c4 100644 --- a/modules/email.php +++ b/modules/email.php @@ -424,8 +424,8 @@ L' if ($action == 'list') { $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife FROM emails_watch AS w - INNER JOIN emails AS e USING(email) - INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') + LEFT JOIN emails AS e USING(email) + LEFT JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') ORDER BY w.state, w.email, a.alias"; $it = Xdb::iterRow($sql); @@ -452,9 +452,9 @@ L' $sql = "SELECT w.detection, w.state, w.last, w.description, a1.alias AS edit, a2.alias AS forlife FROM emails_watch AS w - INNER JOIN emails AS e USING(email) - LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') - INNER JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie') + LEFT JOIN emails AS e USING(email) + INNER JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') + LEFT JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie') WHERE w.email = {?} ORDER BY a2.alias"; $it = Xdb::iterRow($sql, $email);