X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Femail.php;h=37760430787a0032d630227bb40d92789d0d0d29;hb=3d17e48f42eaf218c25920cb5c3829c6aa3986ce;hp=c280f1491807887afd68ea38ed0e230355284ae7;hpb=3360c04f67f5c37696d1dad6ed3267a331670e18;p=platal.git diff --git a/modules/email.php b/modules/email.php index c280f14..3776043 100644 --- a/modules/email.php +++ b/modules/email.php @@ -1,6 +1,6 @@ $this->make_hook('redirect', AUTH_MDP), 'emails/send' => $this->make_hook('send', AUTH_MDP), 'emails/antispam/submit' => $this->make_hook('submit', AUTH_COOKIE), + 'emails/test' => $this->make_hook('test', AUTH_COOKIE, 'user', NO_AUTH), + + 'emails/rewrite/in' => $this->make_hook('rewrite_in', AUTH_PUBLIC), + 'emails/rewrite/out' => $this->make_hook('rewrite_out', AUTH_PUBLIC), + + 'emails/imap/in' => $this->make_hook('imap_in', AUTH_PUBLIC), 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), - 'admin/emails/lost' => $this->make_hook('lost', AUTH_MDP, 'admin'), + 'admin/emails/lost' => $this->make_hook('lost', AUTH_MDP, 'admin'), ); } function handler_emails(&$page, $action = null, $email = null) { global $globals; + require_once 'emails.inc.php'; $page->changeTpl('emails/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Mes emails'); + $page->setTitle('Mes emails'); $uid = S::v('uid'); if ($action == 'best' && $email) { + if (!S::has_xsrf_token()) { + return PL_FORBIDDEN; + } + // bestalias is the first bit : 1 // there will be maximum 8 bits in flags : 255 XDB::execute("UPDATE aliases SET flags=flags & (255 - 1) WHERE id={?}", $uid); @@ -64,14 +75,12 @@ class EmailModule extends PLModule ORDER BY LENGTH(alias)"; $page->assign('aliases', XDB::iterator($sql, $uid)); - $homonyme = XDB::query("SELECT alias FROM aliases INNER JOIN homonymes ON (id = homonyme_id) WHERE user_id = {?} AND type = 'homonyme'", $uid); - $page->assign('homonyme', $homonyme->fetchOneCell()); - - $sql = "SELECT email - FROM emails - WHERE uid = {?} AND FIND_IN_SET('active', flags)"; - $page->assign('mails', XDB::iterator($sql, $uid)); + $homonyme = XDB::query("SELECT alias FROM aliases INNER JOIN homonymes ON (id = homonyme_id) WHERE user_id = {?} AND type = 'homonyme'", $uid); + $page->assign('homonyme', $homonyme->fetchOneCell()); + // Affichage des redirections de l'utilisateur. + $redirect = new Redirect($uid); + $page->assign('mails', $redirect->active_emails()); // on regarde si l'utilisateur a un alias et si oui on l'affiche ! $forlife = S::v('forlife'); @@ -92,7 +101,7 @@ class EmailModule extends PLModule global $globals; $page->changeTpl('emails/alias.tpl'); - $page->assign('xorg_title','Polytechnique.org - Alias melix.net'); + $page->setTitle('Alias melix.net'); $uid = S::v('uid'); $forlife = S::v('forlife'); @@ -100,6 +109,8 @@ class EmailModule extends PLModule $page->assign('demande', AliasReq::get_request($uid)); if ($action == 'delete' && $value) { + S::assert_xsrf_token(); + //Suppression d'un alias XDB::execute( 'DELETE virtual, virtual_redirect @@ -121,9 +132,10 @@ class EmailModule extends PLModule list($alias, $visibility) = $res->fetchOneRow(); $page->assign('actuel', $alias); - if ($action == 'ask' && Env::has('alias') and Env::has('raison')) { - //Si l'utilisateur vient de faire une damande + if ($action == 'ask' && Env::has('alias') && Env::has('raison')) { + S::assert_xsrf_token(); + //Si l'utilisateur vient de faire une damande $alias = Env::v('alias'); $raison = Env::v('raison'); $public = (Env::v('public', 'off') == 'on')?"public":"private"; @@ -136,17 +148,17 @@ class EmailModule extends PLModule //Quelques vérifications sur l'alias (caractères spéciaux) if (!preg_match( "/^[a-zA-Z0-9\-.]{3,20}$/", $alias)) { - $page->trig("L'adresse demandée n'est pas valide. - Vérifie qu'elle comporte entre 3 et 20 caractères - et qu'elle ne contient que des lettres non accentuées, - des chiffres ou les caractères - et ."); + $page->trigError("L'adresse demandée n'est pas valide." + . " Vérifie qu'elle comporte entre 3 et 20 caractères" + . " et qu'elle ne contient que des lettres non accentuées," + . " des chiffres ou les caractères - et ."); return; } else { //vérifier que l'alias n'est pas déja pris $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $alias.'@'.$globals->mail->alias_dom); if ($res->fetchOneCell() > 0) { - $page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été attribué. + $page->trigError("L'alias $alias@{$globals->mail->alias_dom} a déja été attribué. Tu ne peux donc pas l'obtenir."); return; } @@ -155,7 +167,7 @@ class EmailModule extends PLModule $it = new ValidateIterator (); while($req = $it->next()) { if ($req->type == "alias" and $req->alias == $alias . '@' . $globals->mail->alias_dom) { - $page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été demandé. + $page->trigError("L'alias $alias@{$globals->mail->alias_dom} a déja été demandé. Tu ne peux donc pas l'obtenir pour l'instant."); return ; } @@ -167,10 +179,11 @@ class EmailModule extends PLModule $page->assign('success',$alias); return; } - } - elseif ($action == 'set' - && ($value == 'public' || $value == 'private')) - { + } elseif ($action == 'set' && ($value == 'public' || $value == 'private')) { + if (!S::has_xsrf_token()) { + return PL_FORBIDDEN; + } + if ($value == 'public') { XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = 'public' WHERE user_id = {?}", S::v('uid')); @@ -209,21 +222,23 @@ class EmailModule extends PLModule $retour = $redirect->delete_email($email); $page->assign('retour', $retour); } - - if ($action == 'active' && $email) { - $redirect->modify_one_email($email, true); - } - - if ($action == 'inactive' && $email) { - $redirect->modify_one_email($email, false); - } - - if ($action == 'rewrite' && $email) { - $rewrite = @func_get_arg(3); - $redirect->modify_one_email_redirect($email, $rewrite); - } - + + if ($action == 'active' && $email) { + $redirect->modify_one_email($email, true); + } + + if ($action == 'inactive' && $email) { + $redirect->modify_one_email($email, false); + } + + if ($action == 'rewrite' && $email) { + $rewrite = @func_get_arg(3); + $redirect->modify_one_email_redirect($email, $rewrite); + } + if (Env::has('emailop')) { + S::assert_xsrf_token(); + $actifs = Env::v('emails_actifs', Array()); print_r(Env::v('emails_rewrite')); if (Env::v('emailop') == "ajouter" && Env::has('email')) { @@ -254,41 +269,47 @@ class EmailModule extends PLModule FROM aliases WHERE id={?} AND (type='a_vie' OR type='alias') ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $uid); + $page->assign('alias', $res->fetchAllAssoc()); $page->assign('emails',$redirect->emails); + + require_once 'googleapps.inc.php'; + $page->assign('googleapps', GoogleAppsAccount::account_status($uid)); } function handler_antispam(&$page, $statut_filtre = null) { require_once 'emails.inc.php'; - require_once('wiki.inc.php'); - wiki_require_page('Xorg.Antispam'); + $wp = new PlWikiPage('Xorg.Antispam'); + $wp->buildCache(); $page->changeTpl('emails/antispam.tpl'); $bogo = new Bogo(S::v('uid')); if (isset($statut_filtre)) { - $bogo->change(S::v('uid'), $statut_filtre + 0); + $bogo->change($statut_filtre + 0); } $page->assign('filtre',$bogo->level()); } function handler_submit(&$page) { - require_once('wiki.inc.php'); - wiki_require_page('Xorg.Mails'); + $wp = new PlWikiPage('Xorg.Mails'); + $wp->buildCache(); $page->changeTpl('emails/submit_spam.tpl'); if (Post::has('send_email')) { + S::assert_xsrf_token(); + $upload = PlUpload::get($_FILES['mail'], S::v('forlife'), 'spam.submit', true); if (!$upload) { - $page->trig('Une erreur a été rencontrée lors du transfert du fichier'); + $page->trigError('Une erreur a été rencontrée lors du transfert du fichier'); return; } $mime = $upload->contentType(); if ($mime != 'text/x-mail' && $mime != 'message/rfc822') { $upload->clear(); - $page->trig('Le fichier ne contient pas un mail complet'); + $page->trigError('Le fichier ne contient pas un email complet'); return; } global $globals; @@ -299,7 +320,7 @@ class EmailModule extends PLModule $mailer->setTxtBody(Post::v('type') . ' soumis par ' . S::v('forlife') . ' via le web'); $mailer->addUploadAttachment($upload, Post::v('type') . '.mail'); $mailer->send(); - $page->trig('Le message a été transmis à ' . $box); + $page->trigSuccess('Le message a été transmis à ' . $box); $upload->clear(); } } @@ -310,10 +331,14 @@ class EmailModule extends PLModule $page->changeTpl('emails/send.tpl'); $page->addJsLink('ajax.js'); - $page->assign('xorg_title','Polytechnique.org - Envoyer un email'); + $page->setTitle('Envoyer un email'); // action si on recoit un formulaire if (Post::has('save')) { + if (!S::has_xsrf_token()) { + return PL_FORBIDDEN; + } + unset($_POST['save']); if (trim(preg_replace('/-- .*/', '', Post::v('contenu'))) != "") { $_POST['to_contacts'] = explode(';', @$_POST['to_contacts']); @@ -324,6 +349,8 @@ class EmailModule extends PLModule } exit; } else if (Env::v('submit') == 'Envoyer') { + S::assert_xsrf_token(); + function getEmails($aliases) { if (!is_array($aliases)) { @@ -337,52 +364,57 @@ class EmailModule extends PLModule return join(', ', $ret); } + $error = false; foreach ($_FILES as &$file) { if ($file['name'] && !PlUpload::get($file, S::v('forlife'), 'emails.send', false)) { - $page->trig("Impossible de télécharger '" . pl_entities($file['name']) . "'"); + $page->trigError(PlUpload::$lastError); + $error = true; + break; } } - XDB::execute("DELETE FROM email_send_save - WHERE uid = {?}", S::i('uid')); - - $to2 = getEmails(Env::v('to_contacts')); - $cc2 = getEmails(Env::v('cc_contacts')); - $txt = str_replace('^M', '', Env::v('contenu')); - $to = Env::v('to'); - $subj = Env::v('sujet'); - $from = Env::v('from'); - $cc = trim(Env::v('cc')); - $bcc = trim(Env::v('bcc')); - - if (empty($to) && empty($cc) && empty($to2) && empty($bcc) && empty($cc2)) { - $page->trig("Indique au moins un destinataire."); - $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send')); - } else { - $mymail = new PlMailer(); - $mymail->setFrom($from); - $mymail->setSubject($subj); - if (!empty($to)) { $mymail->addTo($to); } - if (!empty($cc)) { $mymail->addCc($cc); } - if (!empty($bcc)) { $mymail->addBcc($bcc); } - if (!empty($to2)) { $mymail->addTo($to2); } - if (!empty($cc2)) { $mymail->addCc($cc2); } - $files =& PlUpload::listFiles(S::v('forlife'), 'emails.send'); - foreach ($files as $name=>&$upload) { - $mymail->addUploadAttachment($upload, $name); - } - if (Env::v('nowiki')) { - $mymail->setTxtBody(wordwrap($txt, 78, "\n")); - } else { - $mymail->setWikiBody($txt); - } - if ($mymail->send()) { - $page->trig("Ton mail a bien été envoyé."); - $_REQUEST = array('bcc' => S::v('bestalias').'@'.$globals->mail->domain); - PlUpload::clear(S::v('forlife'), 'emails.send'); - } else { - $page->trig("Erreur lors de l'envoi du courriel, réessaye."); + if (!$error) { + XDB::execute("DELETE FROM email_send_save + WHERE uid = {?}", S::i('uid')); + + $to2 = getEmails(Env::v('to_contacts')); + $cc2 = getEmails(Env::v('cc_contacts')); + $txt = str_replace('^M', '', Env::v('contenu')); + $to = Env::v('to'); + $subj = Env::v('sujet'); + $from = Env::v('from'); + $cc = trim(Env::v('cc')); + $bcc = trim(Env::v('bcc')); + + if (empty($to) && empty($cc) && empty($to2) && empty($bcc) && empty($cc2)) { + $page->trigError("Indique au moins un destinataire."); $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send')); + } else { + $mymail = new PlMailer(); + $mymail->setFrom($from); + $mymail->setSubject($subj); + if (!empty($to)) { $mymail->addTo($to); } + if (!empty($cc)) { $mymail->addCc($cc); } + if (!empty($bcc)) { $mymail->addBcc($bcc); } + if (!empty($to2)) { $mymail->addTo($to2); } + if (!empty($cc2)) { $mymail->addCc($cc2); } + $files =& PlUpload::listFiles(S::v('forlife'), 'emails.send'); + foreach ($files as $name=>&$upload) { + $mymail->addUploadAttachment($upload, $name); + } + if (Env::v('nowiki')) { + $mymail->setTxtBody(wordwrap($txt, 78, "\n")); + } else { + $mymail->setWikiBody($txt); + } + if ($mymail->send()) { + $page->trigSuccess("Ton email a bien été envoyé."); + $_REQUEST = array('bcc' => S::v('bestalias').'@'.$globals->mail->domain); + PlUpload::clear(S::v('forlife'), 'emails.send'); + } else { + $page->trigError("Erreur lors de l'envoi du courriel, réessaye."); + $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send')); + } } } } else { @@ -406,26 +438,154 @@ class EmailModule extends PLModule WHERE c.uid = {?} ORDER BY u.nom, u.prenom", S::v('uid')); $page->assign('contacts', $res->fetchAllAssoc()); - $page->assign('maxsize', ini_get('post_max_size') . 'o'); + $page->assign('maxsize', ini_get('upload_max_filesize') . 'o'); + } + + function handler_test(&$page, $forlife = null) + { + global $globals; + require_once 'emails.inc.php'; + + if (!S::has_xsrf_token()) { + return PL_FORBIDDEN; + } + if (!S::has_perms() || !$forlife) { + $forlife = S::v('bestalias'); + } + + $res = XDB::query("SELECT FIND_IN_SET('femme', u.flags), prenom, user_id + FROM auth_user_md5 AS u + INNER JOIN aliases AS a ON (a.id = u.user_id) + WHERE a.alias = {?}", $forlife); + list($sexe, $prenom, $uid) = $res->fetchOneRow(); + $redirect = new Redirect($uid); + + $mailer = new PlMailer('emails/test.mail.tpl'); + $mailer->assign('email', $forlife . '@' . $globals->mail->domain); + $mailer->assign('redirects', $redirect->active_emails()); + $mailer->assign('sexe', $sexe); + $mailer->assign('prenom', $prenom); + $mailer->send(); + exit; + } + + function handler_rewrite_in(&$page, $mail, $hash) + { + $page->changeTpl('emails/rewrite.tpl'); + $page->assign('option', 'in'); + if (empty($mail) || empty($hash)) { + return PL_NOT_FOUND; + } + $pos = strrpos($mail, '_'); + if ($pos === false) { + return PL_NOT_FOUND; + } + $mail{$pos} = '@'; + $res = XDB::query("SELECT COUNT(*) + FROM emails + WHERE email = {?} AND hash = {?}", + $mail, $hash); + $count = intval($res->fetchOneCell()); + if ($count > 0) { + XDB::query("UPDATE emails + SET allow_rewrite = true, hash = NULL + WHERE email = {?} AND hash = {?}", + $mail, $hash); + $page->trigSuccess("Réécriture activée pour l'adresse " . $mail); + return; + } + return PL_NOT_FOUND; + } + + function handler_rewrite_out(&$page, $mail, $hash) + { + $page->changeTpl('emails/rewrite.tpl'); + $page->assign('option', 'out'); + if (empty($mail) || empty($hash)) { + return PL_NOT_FOUND; + } + $pos = strrpos($mail, '_'); + if ($pos === false) { + return PL_NOT_FOUND; + } + $mail{$pos} = '@'; + $res = XDB::query("SELECT COUNT(*) + FROM emails + WHERE email = {?} AND hash = {?}", + $mail, $hash); + $count = intval($res->fetchOneCell()); + if ($count > 0) { + global $globals; + $res = XDB::query("SELECT e.email, e.rewrite, a.alias + FROM emails AS e + INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') + WHERE e.email = {?} AND e.hash = {?}", + $mail, $hash); + XDB::query("UPDATE emails + SET allow_rewrite = false, hash = NULL + WHERE email = {?} AND hash = {?}", + $mail, $hash); + list($mail, $rewrite, $forlife) = $res->fetchOneRow(); + $mail = new PlMailer(); + $mail->setFrom("webmaster@" . $globals->mail->domain); + $mail->addTo("support@" . $globals->mail->domain); + $mail->setSubject("Tentative de détournement de correspondance via le rewrite"); + $mail->setTxtBody("$forlife a tenté un rewrite de $mail vers $rewrite. Cette demande a été rejetée via le web"); + $mail->send(); + $page->trigWarning("Un mail d'alerte a été envoyé à l'équipe de " . $globals->core->sitename); + return; + } + return PL_NOT_FOUND; + } + + function handler_imap_in(&$page, $hash = null, $login = null) + { + $page->changeTpl('emails/imap_register.tpl'); + $id = null; + if (!empty($hash) || !empty($login)) { + $req = XDB::query("SELECT u.prenom, FIND_IN_SET('femme', u.flags) AS sexe, a.id + FROM aliases AS a + INNER JOIN newsletter_ins AS ni ON (a.id = ni.user_id) + INNER JOIN auth_user_md5 AS u ON (u.user_id = a.id) + WHERE a.alias = {?} AND ni.hash = {?}", $login, $hash); + list($prenom, $sexe, $id) = $req->fetchOneRow(); + } + + require_once('emails.inc.php'); + $page->assign('ok', false); + if (S::logged() && (is_null($id) || $id == S::i('uid'))) { + $storage = new EmailStorage(S::i('uid'), 'imap'); + $storage->activate(); + $page->assign('ok', true); + $page->assign('prenom', S::v('prenom')); + $page->assign('sexe', S::v('femme')); + } else if (!S::logged() && $id) { + $storage = new EmailStorage($id, 'imap'); + $storage->activate(); + $page->assign('ok', true); + $page->assign('prenom', $prenom); + $page->assign('sexe', $sexe); + } } function handler_broken(&$page, $warn = null, $email = null) { require_once 'emails.inc.php'; - require_once('wiki.inc.php'); - wiki_require_page('Xorg.PatteCassée'); + $wp = new PlWikiPage('Xorg.PatteCassée'); + $wp->buildCache(); global $globals; $page->changeTpl('emails/broken.tpl'); if ($warn == 'warn' && $email) { + S::assert_xsrf_token(); + $email = valide_email($email); // vérifications d'usage $sel = XDB::query( "SELECT e.uid, a.alias FROM emails AS e - INNER JOIN auth_user_md5 AS u ON e.uid = u.user_id INNER JOIN aliases AS a ON (e.uid = a.id AND type!='homonyme' AND FIND_IN_SET('bestalias',a.flags)) WHERE e.email={?}", $email); @@ -434,9 +594,9 @@ class EmailModule extends PLModule // envoi du mail $message = "Bonjour ! -Ce mail a été généré automatiquement par le service de patte cassée de +Cet email a été généré automatiquement par le service de patte cassée de Polytechnique.org car un autre utilisateur, ".S::v('prenom').' '.S::v('nom').", -nous a signalé qu'en t'envoyant un mail, il avait reçu un message d'erreur +nous a signalé qu'en t'envoyant un email, il avait reçu un message d'erreur indiquant que ton adresse de redirection $email ne fonctionnait plus ! @@ -444,11 +604,11 @@ Nous te suggérons de vérifier cette adresse, et le cas échéant de mettre à jour sur le site <{$globals->baseurl}/emails> tes adresses de redirection... -Pour plus de rensignements sur le service de patte cassée, n'hésites pas à +Pour plus de renseignements sur le service de patte cassée, n'hésite pas à consulter la page <{$globals->baseurl}/emails/broken>. -A bientôt sur Polytechnique.org ! +À bientôt sur Polytechnique.org ! L'équipe d'administration mail->domain . '>'; $mail = new PlMailer(); @@ -457,21 +617,22 @@ L'équipe d'administration mail->domain . '>'; $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!"); $mail->setTxtBody($message); $mail->send(); - $page->trig("Mail envoyé ! :o)"); + $page->trigSuccess("Email envoyé !"); } } elseif (Post::has('email')) { + S::assert_xsrf_token(); + $email = valide_email(Post::v('email')); list(,$fqdn) = explode('@', $email); $fqdn = strtolower($fqdn); - if ($fqdn == 'polytechnique.org' || $fqdn == 'melix.org' - || $fqdn == 'm4x.org' || $fqdn == 'melix.net') - { + if ($fqdn == 'polytechnique.org' || $fqdn == 'melix.org' || $fqdn == 'm4x.org' || $fqdn == 'melix.net') { $page->assign('neuneu', true); } else { $page->assign('email',$email); $sel = XDB::query( - "SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, + "SELECT e1.uid, e1.panne != 0 AS panne, + (count(e2.uid) + IF(FIND_IN_SET('googleapps', u.mail_storage), 1, 0)) AS nb_mails, u.nom, u.prenom, u.promo, a.alias AS forlife FROM emails as e1 LEFT JOIN emails as e2 ON(e1.uid = e2.uid @@ -510,8 +671,11 @@ L'équipe d'administration mail->domain . '>'; 'dangerous' => 'Usurpations par cette adresse'); $page->assign('states', $states); + if (Post::has('action')) { + S::assert_xsrf_token(); + } switch (Post::v('action')) { - case 'create': + case 'create': if (trim(Post::v('emailN')) != '') { Xdb::execute('INSERT IGNORE INTO emails_watch (email, state, detection, last, uid, description) VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})', @@ -519,13 +683,13 @@ L'équipe d'administration mail->domain . '>'; }; break; - case 'edit': + case 'edit': Xdb::execute('UPDATE emails_watch SET state = {?}, last = NOW(), uid = {?}, description = {?} WHERE email = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('emailN')); break; - default: + default: if ($action == 'delete' && !is_null($email)) { Xdb::execute('DELETE FROM emails_watch WHERE email = {?}', $email); } @@ -595,12 +759,14 @@ L'équipe d'administration mail->domain . '>'; $page->changeTpl('emails/lost.tpl'); $page->assign('lost_emails', XDB::iterator(' - SELECT u.user_id, a.alias - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type = "a_vie") - LEFT JOIN emails AS e ON (u.user_id=e.uid AND FIND_IN_SET("active",e.flags)) - WHERE e.uid IS NULL AND u.deces = 0 - ORDER BY u.promo DESC, u.nom, u.prenom')); + SELECT u.user_id, a.alias + FROM auth_user_md5 AS u + INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type = "a_vie") + LEFT JOIN emails AS e ON (u.user_id=e.uid AND FIND_IN_SET("active",e.flags)) + WHERE e.uid IS NULL AND + FIND_IN_SET("googleapps", u.mail_storage) = 0 AND + u.deces = 0 + ORDER BY u.promo DESC, u.nom, u.prenom')); } }