X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fcron%2Femails.check.php;h=b6aaf86f0824c71f34e73042e340711064b1493e;hb=c974e61c78efb98c0cbe81aa78bfdc47f3c31ead;hp=99958cca074f108cd2246598030cbd241c9062d2;hpb=0380bf854bc295fb66fb8e1071d63a3537cdba2c;p=platal.git diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php index 99958cc..b6aaf86 100755 --- a/bin/cron/emails.check.php +++ b/bin/cron/emails.check.php @@ -26,19 +26,19 @@ $panne_level = 3; require('./connect.db.inc.php'); -/* +/* * Check duplicated addresses */ $sql = "SELECT a1.alias, a2.alias, e1.email FROM emails AS e1 - INNER JOIN emails AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid - AND (e1.uid < e2.uid OR NOT FIND_IN_SET(e2.flags, 'active'))) + INNER JOIN emails AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid + AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags))) LEFT JOIN emails_watch AS w ON (e1.email = w.email) INNER JOIN aliases AS a1 ON (a1.id = e1.uid AND a1.type = 'a_vie') INNER JOIN aliases AS a2 ON (a2.id = e2.uid AND a2.type = 'a_vie') INNER JOIN auth_user_md5 AS u1 ON (a1.id = u1.user_id) INNER JOIN auth_user_md5 AS u2 ON (a2.id = u2.user_id) - WHERE FIND_IN_SET(e1.flags, 'active') AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL + WHERE FIND_IN_SET('active', e1.flags) AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL ORDER BY a1.alias"; $it = Xdb::iterRow($sql);