X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=d872eda18f1e912481cd2a151e873267bc5e530f;hb=dd092f56992ad4dd8a7189173878691522c5a0f1;hp=0898aa41165895d68d1813cb4a862c14c5f3f87a;hpb=6ff4f8c0ff2e02e07b1f45793a5db3b306d50813;p=platal.git diff --git a/modules/email.php b/modules/email.php index 0898aa4..d872eda 100644 --- a/modules/email.php +++ b/modules/email.php @@ -1,6 +1,6 @@ $this->make_hook('emails', AUTH_COOKIE), - 'emails/alias' => $this->make_hook('alias', AUTH_MDP), - 'emails/antispam' => $this->make_hook('antispam', AUTH_MDP), + 'emails' => $this->make_hook('emails', AUTH_COOKIE, 'mail'), + 'emails/alias' => $this->make_hook('alias', AUTH_MDP, 'mail'), + 'emails/antispam' => $this->make_hook('antispam', AUTH_MDP, 'mail'), 'emails/broken' => $this->make_hook('broken', AUTH_COOKIE), - 'emails/redirect' => $this->make_hook('redirect', AUTH_MDP), - 'emails/send' => $this->make_hook('send', AUTH_MDP), + 'emails/redirect' => $this->make_hook('redirect', AUTH_MDP, 'mail'), + 'emails/send' => $this->make_hook('send', AUTH_MDP, 'mail'), 'emails/antispam/submit' => $this->make_hook('submit', AUTH_COOKIE), - 'emails/test' => $this->make_hook('test', AUTH_COOKIE, 'user', NO_AUTH), + 'emails/test' => $this->make_hook('test', AUTH_COOKIE, 'mail', NO_AUTH), 'emails/rewrite/in' => $this->make_hook('rewrite_in', AUTH_PUBLIC), 'emails/rewrite/out' => $this->make_hook('rewrite_out', AUTH_PUBLIC), @@ -45,7 +45,7 @@ class EmailModule extends PLModule ); } - function handler_emails(&$page, $action = null, $email = null) + function handler_emails($page, $action = null, $email = null) { global $globals; require_once 'emails.inc.php'; @@ -61,140 +61,143 @@ class EmailModule extends PLModule return PL_FORBIDDEN; } - XDB::execute("UPDATE aliases + // First delete the bestalias flag from all this user's emails. + XDB::execute("UPDATE email_source_account SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ',')) - WHERE id = {?}", $user->id()); - XDB::execute("UPDATE aliases + WHERE uid = {?}", $user->id()); + // Then gives the bestalias flag to the given email. + list($email, $domain) = explode('@', $email); + XDB::execute("UPDATE email_source_account SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') - WHERE id = {?} AND alias = {?}", $user->id(), $email); + WHERE uid = {?} AND email = {?}", $user->id(), $email); + XDB::execute('UPDATE accounts AS a + INNER JOIN email_virtual_domains AS d ON (d.name = {?}) + SET a.best_domain = d.id + WHERE a.uid = {?}', + $domain, $user->id()); // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the // validity of the bestalias. fix_bestalias($user); + // Then refetch the user to update its bestalias. + S::set('user', User::getWithUID(S::user()->id())); } // Fetch and display aliases. - $sql = "SELECT alias, (type='a_vie') AS a_vie, - (alias REGEXP '\\\\.[0-9]{2}$') AS cent_ans, - FIND_IN_SET('bestalias',flags) AS best, expire - FROM aliases - WHERE id = {?} AND type!='homonyme' - ORDER BY LENGTH(alias)"; - $page->assign('aliases', XDB::iterator($sql, $user->id())); + $aliases = XDB::iterator("SELECT CONCAT(s.email, '@', d.name) AS email, (s.type = 'forlife') AS forlife, + (s.email REGEXP '\\\\.[0-9]{2}$') AS hundred_year, s.expire, + (FIND_IN_SET('bestalias', s.flags) AND a.best_domain = d.id) AS bestalias, + ((s.type = 'alias_aux') AND d.aliasing = d.id) AS alias + FROM email_source_account AS s + INNER JOIN accounts AS a ON (s.uid = a.uid) + INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) + WHERE s.uid = {?} + ORDER BY !alias, s.email", + $user->id()); + $page->assign('aliases', $aliases); + + $alias = XDB::fetchOneCell('SELECT COUNT(email) + FROM email_source_account + WHERE uid = {?} AND type = \'alias_aux\'', + $user->id()); + $page->assign('alias', $alias); + // Check for homonyms. - $homonyme = XDB::query( - "SELECT alias - FROM aliases - INNER JOIN homonymes ON (id = homonyme_id) - WHERE user_id = {?} AND type = 'homonyme'", $user->id()); - $page->assign('homonyme', $homonyme->fetchOneCell()); + $page->assign('homonyme', $user->homonyme); // Display active redirections. $redirect = new Redirect($user); $page->assign('mails', $redirect->active_emails()); - // Display, when available, the @alias_dom email alias. - $res = XDB::query( - "SELECT alias - FROM virtual AS v - INNER JOIN virtual_redirect AS vr USING(vid) - WHERE (redirect={?} OR redirect={?}) - AND alias LIKE '%@{$globals->mail->alias_dom}'", - $user->forlifeEmail(), - // TODO: remove this über-ugly hack. The issue is that you need - // to remove all @m4x.org addresses in virtual_redirect first. - $user->login() . '@' . $globals->mail->domain2); - $page->assign('melix', $res->fetchOneCell()); + // User's mail domains. + $mail_domains = array($user->alternateEmailDomain()); + $mail_domains[] = User::$sub_mail_domains['all'] . $globals->mail->domain; + $mail_domains[] = User::$sub_mail_domains['all'] . $globals->mail->domain2; + $page->assign('main_email_domain', $user->mainEmailDomain()); + $page->assign('mail_domains', $mail_domains); } - function handler_alias(&$page, $action = null, $value = null) + function handler_alias($page, $action = null, $value = null) { - require_once 'validations.inc.php'; - global $globals; $page->changeTpl('emails/alias.tpl'); $page->setTitle('Alias melix.net'); $user = S::user(); - $page->assign('demande', AliasReq::get_request($user->id())); + $page->assign('request', AliasReq::get_request($user->id())); // Remove the email alias. - if ($action == 'delete' && $value) { + if ($action == 'delete') { S::assert_xsrf_token(); - XDB::execute( - "DELETE virtual, virtual_redirect - FROM virtual - INNER JOIN virtual_redirect USING (vid) - WHERE alias = {?} AND (redirect = {?} OR redirect = {?})", - $value, $user->forlifeEmail(), - // TODO: remove this über-ugly hack. The issue is that you need - // to remove all @m4x.org addresses in virtual_redirect first. - $user->login() . '@' . $globals->mail->domain2); + XDB::execute('DELETE FROM email_source_account + WHERE uid = {?} AND type = \'alias_aux\'', + $user->id()); + + require_once 'emails.inc.php'; + fix_bestalias($user); } - // Fetch existing @alias_dom aliases. - $res = XDB::query( - "SELECT alias, emails_alias_pub - FROM auth_user_quick, virtual - INNER JOIN virtual_redirect USING(vid) - WHERE (redirect = {?} OR redirect = {?}) - AND alias LIKE '%@{$globals->mail->alias_dom}' AND user_id = {?}", - $user->forlifeEmail(), - // TODO: remove this über-ugly hack. The issue is that you need - // to remove all @m4x.org addresses in virtual_redirect first. - $user->login() . '@' . $globals->mail->domain2, $user->id()); - list($alias, $visibility) = $res->fetchOneRow(); - $page->assign('actuel', $alias); - - if ($action == 'ask' && Env::has('alias') && Env::has('raison')) { + // Fetch existing auxiliary aliases. + list($alias, $old_alias) = XDB::fetchOneRow('SELECT CONCAT(s.email, \'@\', d.name), s.email + FROM email_source_account AS s + INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) + WHERE s.uid = {?} AND s.type = \'alias_aux\'', + $user->id()); + $visibility = $user->hasProfile() && ($user->profile(true)->alias_pub == 'public'); + $page->assign('current', $alias); + $page->assign('user', $user); + $page->assign('mail_public', $visibility); + + if ($action == 'ask' && Env::has('alias') && Env::has('reason')) { 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"; + // Retrieves user request. + $new_alias = Env::v('alias'); + $reason = Env::v('reason'); + $public = (Env::v('public', 'off') == 'on') ? 'public' : 'private'; - $page->assign('r_alias', $alias); - $page->assign('r_raison', $raison); + $page->assign('r_alias', $new_alias); + $page->assign('r_reason', $reason); if ($public == 'public') { $page->assign('r_public', true); } - //Quelques vérifications sur l'alias (caractères spéciaux) - if (!preg_match( "/^[a-zA-Z0-9\-.]{3,20}$/", $alias)) { + // Checks special charaters in alias. + if (!preg_match("/^[a-zA-Z0-9\-.]{3,20}$/", $new_alias)) { $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); + // Checks if the alias has already been given. + $res = XDB::query('SELECT COUNT(email) + FROM email_source_account + WHERE email = {?} AND type = \'alias_aux\'', + $new_alias); if ($res->fetchOneCell() > 0) { - $page->trigError("L'alias $alias@{$globals->mail->alias_dom} a déja été attribué. - Tu ne peux donc pas l'obtenir."); + $page->trigError("L'alias $new_alias a déja été attribué. Tu ne peux donc pas l'obtenir."); return; } - //vérifier que l'alias n'est pas déja en demande - $it = new ValidateIterator (); + // Checks if the alias has already been asked for. + $it = Validate::iterate('alias'); while($req = $it->next()) { - if ($req->type == "alias" and $req->alias == $alias . '@' . $globals->mail->alias_dom) { - $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 ; + if ($req->alias == $new_alias) { + $page->trigError("L'alias $new_alias a déja été demandé. Tu ne peux donc pas l'obtenir pour l'instant."); + return; } } - //Insertion de la demande dans la base, écrase les requêtes précédente - $myalias = new AliasReq($user, $alias, $raison, $public); + // Sends requests. This will erase any previous alias pending request. + $myalias = new AliasReq($user, $new_alias, $reason, $public, $old_alias); $myalias->submit(); - $page->assign('success',$alias); + $page->assign('success', $new_alias); return; } } elseif ($action == 'set' && ($value == 'public' || $value == 'private')) { @@ -202,24 +205,19 @@ class EmailModule extends PLModule return PL_FORBIDDEN; } - if ($value == 'public') { - XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = 'public' - WHERE user_id = {?}", $user->id()); - } else { - XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = 'private' - WHERE user_id = {?}", $user->id()); + if ($user->hasProfile()) { + XDB::execute('UPDATE profiles + SET alias_pub = {?} + WHERE pid = {?}', + $value, $user->profile()->id()); } - - $visibility = $value; + exit; } - - $page->assign('mail_public', ($visibility == 'public')); } - function handler_redirect(&$page, $action = null, $email = null) + function handler_redirect($page, $action = null, $email = null, $rewrite = null) { global $globals; - require_once 'emails.inc.php'; $page->changeTpl('emails/redirect.tpl'); @@ -250,21 +248,30 @@ class EmailModule extends PLModule } 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')); + $actifs = Env::v('emails_actifs', array()); if (Env::v('emailop') == "ajouter" && Env::has('email')) { - $result = $redirect->add_email(Env::v('email')); + $error_email = false; + $new_email = Env::v('email'); + if ($new_email == "new@example.org") { + $new_email = Env::v('email_new'); + } + $result = $redirect->add_email($new_email); + if ($result == ERROR_INVALID_EMAIL) { + $error_email = true; + $page->assign('email', $new_email); + } + $page->assign('retour', $result); + $page->assign('error_email', $error_email); } elseif (empty($actifs)) { $result = ERROR_INACTIVE_REDIRECTION; } elseif (is_array($actifs)) { - $result = $redirect->modify_email($actifs, Env::v('emails_rewrite', Array())); + $result = $redirect->modify_email($actifs, Env::v('emails_rewrite', array())); } } @@ -274,7 +281,7 @@ class EmailModule extends PLModule . $user->forlifeEmail() . ' ne fonctionnerait plus.'); break; case ERROR_INVALID_EMAIL: - $page->trigError('Erreur: l\'email n\'est pas valide.'); + $page->trigError('Erreur : l\'email n\'est pas valide.'); break; case ERROR_LOOP_EMAIL: $page->trigError('Erreur : ' . $user->forlifeEmail() @@ -282,39 +289,28 @@ class EmailModule extends PLModule . $globals->mail->domain2 . ' ni vers polytechnique.edu.'); break; } - - // Fetch the @alias_dom email alias, if any. - $res = XDB::query( - "SELECT alias - FROM virtual - INNER JOIN virtual_redirect USING(vid) - WHERE (redirect={?} OR redirect={?}) - AND alias LIKE '%@{$globals->mail->alias_dom}'", - $user->forlifeEmail(), - // TODO: remove this über-ugly hack. The issue is that you need - // to remove all @m4x.org addresses in virtual_redirect first. - $user->login() . '@' . $globals->mail->domain2); - $melix = $res->fetchOneCell(); - if ($melix) { - list($melix) = explode('@', $melix); - $page->assign('melix',$melix); - } - // Fetch existing email aliases. - $res = XDB::query( - "SELECT alias,expire - FROM aliases - WHERE id={?} AND (type='a_vie' OR type='alias') - ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $user->id()); - $page->assign('alias', $res->fetchAllAssoc()); + $alias = XDB::query('SELECT CONCAT(s.email, \'@\', d.name) AS email, s.expire + FROM email_source_account AS s + INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) + INNER JOIN email_virtual_domains AS d ON (m.id = d.aliasing) + WHERE s.uid = {?} + ORDER BY NOT(s.type = \'alias_aux\'), s.email, d.name', + $user->id()); + $page->assign('alias', $alias->fetchAllAssoc()); + $page->assign('best_email', $user->bestEmail()); + $page->assign('emails', $redirect->emails); // Display GoogleApps acount information. require_once 'googleapps.inc.php'; $page->assign('googleapps', GoogleAppsAccount::account_status($user->id())); + + require_once 'emails.combobox.inc.php'; + fill_email_combobox($page); } - function handler_antispam(&$page, $statut_filtre = null) + function handler_antispam($page, $filter_status = null, $redirection = null) { require_once 'emails.inc.php'; $wp = new PlWikiPage('Xorg.Antispam'); @@ -322,14 +318,22 @@ class EmailModule extends PLModule $page->changeTpl('emails/antispam.tpl'); - $bogo = new Bogo(S::user()); - if (isset($statut_filtre)) { - $bogo->change($statut_filtre + 0); + $user = S::user(); + $bogo = new Bogo($user); + if (!is_null($filter_status)) { + if (is_null($redirection)) { + $bogo->changeAll($filter_status); + } else { + $bogo->change($redirection, $filter_status); + } } - $page->assign('filtre', $bogo->level()); + $page->assign('filter', $bogo->state); + $page->assign('single_state', $bogo->single_state); + $page->assign('single_redirection', $bogo->single_redirection); + $page->assign('redirections', $bogo->redirections); } - function handler_submit(&$page) + function handler_submit($page) { $wp = new PlWikiPage('Xorg.Mails'); $wp->buildCache(); @@ -364,10 +368,9 @@ class EmailModule extends PLModule } } - function handler_send(&$page) + function handler_send($page) { $page->changeTpl('emails/send.tpl'); - $page->addJsLink('ajax.js'); $page->setTitle('Envoyer un email'); @@ -379,11 +382,13 @@ class EmailModule extends PLModule unset($_POST['save']); if (trim(preg_replace('/-- .*/', '', Post::v('contenu'))) != "") { - $_POST['to_contacts'] = explode(';', @$_POST['to_contacts']); - $_POST['cc_contacts'] = explode(';', @$_POST['cc_contacts']); + Post::set('to_contacts', explode(';', Post::s('to_contacts'))); + Post::set('cc_contacts', explode(';', Post::s('cc_contacts'))); $data = serialize($_POST); - XDB::execute("REPLACE INTO email_send_save - VALUES ({?}, {?})", S::i('uid'), $data); + XDB::execute('INSERT INTO email_send_save (uid, data) + VALUES ({?}, {?}) + ON DUPLICATE KEY UPDATE data = VALUES(data)', + S::user()->id('uid'), $data); } exit; } else if (Env::v('submit') == 'Envoyer') { @@ -394,10 +399,11 @@ class EmailModule extends PLModule if (!is_array($aliases)) { return null; } - $rel = Env::v('contacts'); + $uf = new UserFilter(new UFC_Hrpid($aliases)); + $users = $uf->iterUsers(); $ret = array(); - foreach ($aliases as $alias) { - $ret[$alias] = $rel[$alias]; + while ($user = $users->next()) { + $ret[] = $user->forlife; } return join(', ', $ret); } @@ -413,7 +419,8 @@ class EmailModule extends PLModule if (!$error) { XDB::execute("DELETE FROM email_send_save - WHERE uid = {?}", S::i('uid')); + WHERE uid = {?}", + S::user()->id()); $to2 = getEmails(Env::v('to_contacts')); $cc2 = getEmails(Env::v('cc_contacts')); @@ -480,19 +487,16 @@ class EmailModule extends PLModule } } - $res = XDB::query( - "SELECT u.prenom, u.nom, u.promo, a.alias as forlife - FROM auth_user_md5 AS u - INNER JOIN contacts AS c ON (u.user_id = c.contact) - INNER JOIN aliases AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags)) - WHERE c.uid = {?} - ORDER BY u.nom, u.prenom", S::v('uid')); - $page->assign('contacts', $res->fetchAllAssoc()); + $uf = new UserFilter(new PFC_And(new UFC_Contact(S::user()), + new UFC_Registered()), + UserFilter::sortByName()); + $contacts = $uf->getProfiles(); + $page->assign('contacts', $contacts); $page->assign('maxsize', ini_get('upload_max_filesize') . 'o'); $page->assign('user', S::user()); } - function handler_test(&$page, $hruid = null) + function handler_test($page, $hruid = null) { require_once 'emails.inc.php'; @@ -522,7 +526,7 @@ class EmailModule extends PLModule exit; } - function handler_rewrite_in(&$page, $mail, $hash) + function handler_rewrite_in($page, $mail, $hash) { $page->changeTpl('emails/rewrite.tpl'); $page->assign('option', 'in'); @@ -534,23 +538,23 @@ class EmailModule extends PLModule return PL_NOT_FOUND; } $mail{$pos} = '@'; - $res = XDB::query("SELECT COUNT(*) - FROM emails - WHERE email = {?} AND hash = {?}", + $res = XDB::query('SELECT COUNT(*) + FROM email_redirect_account + WHERE redirect = {?} AND hash = {?} AND type = \'smtp\'', $mail, $hash); $count = intval($res->fetchOneCell()); if ($count > 0) { - XDB::query("UPDATE emails + XDB::query('UPDATE email_redirect_account SET allow_rewrite = true, hash = NULL - WHERE email = {?} AND hash = {?}", - $mail, $hash); + WHERE redirect = {?} AND hash = {?} AND type = \'smtp\'', + $mail, $hash); $page->trigSuccess("Réécriture activée pour l'adresse " . $mail); return; } return PL_NOT_FOUND; } - function handler_rewrite_out(&$page, $mail, $hash) + function handler_rewrite_out($page, $mail, $hash) { $page->changeTpl('emails/rewrite.tpl'); $page->assign('option', 'out'); @@ -562,28 +566,28 @@ class EmailModule extends PLModule return PL_NOT_FOUND; } $mail{$pos} = '@'; - $res = XDB::query("SELECT COUNT(*) - FROM emails - WHERE email = {?} AND hash = {?}", + $res = XDB::query('SELECT COUNT(*) + FROM email_redirect_account + WHERE redirect = {?} AND hash = {?} AND type = \'smtp\'', $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 = {?}", + $res = XDB::query('SELECT e.redirect, e.rewrite, a.hruid + FROM email_redirect_account AS e + INNER JOIN accounts AS a ON (e.uid = a.uid) + WHERE e.redirect = {?} AND e.hash = {?}', $mail, $hash); - XDB::query("UPDATE emails + XDB::query('UPDATE email_redirect_account SET allow_rewrite = false, hash = NULL - WHERE email = {?} AND hash = {?}", - $mail, $hash); - list($mail, $rewrite, $forlife) = $res->fetchOneRow(); + WHERE redirect = {?} AND hash = {?}', + $mail, $hash); + list($mail, $rewrite, $hruid) = $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->setTxtBody("$hruid 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; @@ -591,38 +595,39 @@ class EmailModule extends PLModule return PL_NOT_FOUND; } - function handler_imap_in(&$page, $hash = null, $login = null) + function handler_imap_in($page, $hash = null, $login = null) { $page->changeTpl('emails/imap_register.tpl'); $user = null; if (!empty($hash) || !empty($login)) { $user = User::getSilent($login); if ($user) { - $req = XDB::query("SELECT 1 FROM newsletter_ins WHERE user_id = {?} AND hash = {?}", $user->id(), $hash); + $req = XDB::query('SELECT 1 + FROM newsletter_ins + WHERE uid = {?} AND hash = {?}', + $user->id(), $hash); if ($req->numRows() == 0) { $user = null; } } } - require_once('emails.inc.php'); + require_once 'emails.inc.php'; $page->assign('ok', false); if (S::logged() && (is_null($user) || $user->id() == S::i('uid'))) { - $storage = new EmailStorage(S::user(), 'imap'); - $storage->activate(); + Email::activate_storage(S::user(), 'imap'); $page->assign('ok', true); - $page->assign('prenom', S::v('prenom')); - $page->assign('sexe', S::v('femme')); + $page->assign('yourself', S::user()->displayName()); + $page->assign('sexe', S::user()->isFemale()); } else if (!S::logged() && $user) { - $storage = new EmailStorage($user, 'imap'); - $storage->activate(); + Email::activate_storage($user, 'imap'); $page->assign('ok', true); - $page->assign('prenom', $user->displayName()); + $page->assign('yourself', $user->displayName()); $page->assign('sexe', $user->isFemale()); } } - function handler_broken(&$page, $warn = null, $email = null) + function handler_broken($page, $warn = null, $email = null) { require_once 'emails.inc.php'; $wp = new PlWikiPage('Xorg.PatteCassée'); @@ -635,82 +640,37 @@ class EmailModule extends PLModule if ($warn == 'warn' && $email) { S::assert_xsrf_token(); + // Usual verifications. $email = valide_email($email); - // vérifications d'usage - $sel = XDB::query("SELECT uid FROM emails WHERE email = {?}", $email); - if (($uid = $sel->fetchOneCell())) { - $dest = User::getSilent($uid); - - // envoi du mail - $message = "Bonjour ! - -Cet email a été généré automatiquement par le service de patte cassée de -Polytechnique.org car un autre utilisateur, " . S::user()->fullName() . ", -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 ! - -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 renseignements sur le service de patte cassée, n'hésite pas à -consulter la page <{$globals->baseurl}/emails/broken>. + $uid = XDB::fetchOneCell('SELECT uid + FROM email_redirect_account + WHERE redirect = {?}', $email); + if ($uid) { + $dest = User::getWithUID($uid); -À bientôt sur Polytechnique.org ! -L'équipe d'administration mail->domain . '>'; - - $mail = new PlMailer(); - $mail->setFrom('"Polytechnique.org" mail->domain . '>'); - $mail->addTo($dest->bestEmail()); - $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!"); - $mail->setTxtBody($message); - $mail->send(); + $mail = new PlMailer('emails/broken-web.mail.tpl'); + $mail->assign('email', $email); + $mail->assign('request', S::user()); + $mail->sendTo($dest); $page->trigSuccess('Email envoyé !'); } } elseif (Post::has('email')) { S::assert_xsrf_token(); - $email = valide_email(Post::v('email')); + $email = Post::t('email'); - list(,$fqdn) = explode('@', $email); - $fqdn = strtolower($fqdn); - if ($fqdn == 'polytechnique.org' || $fqdn == 'melix.org' || $fqdn == 'm4x.org' || $fqdn == 'melix.net') { + if (!User::isForeignEmailAddress($email)) { $page->assign('neuneu', true); } else { - $page->assign('email',$email); - $sel = XDB::query( - "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, u.hruid - FROM emails as e1 - LEFT JOIN emails as e2 ON(e1.uid = e2.uid - AND FIND_IN_SET('active', e2.flags) - AND e1.email != e2.email) - INNER JOIN auth_user_md5 as u ON(e1.uid = u.user_id) - WHERE e1.email = {?} - GROUP BY e1.uid", $email); - if ($x = $sel->fetchOneAssoc()) { - // on écrit dans la base que l'adresse est cassée - if (!$x['panne']) { - XDB::execute("UPDATE emails - SET panne=NOW(), - last=NOW(), - panne_level = 1 - WHERE email = {?}", $email); - } else { - XDB::execute("UPDATE emails - SET panne_level = 1 - WHERE email = {?} AND panne_level = 0", $email); - } - $page->assign_by_ref('x', $x); - } + $user = mark_broken_email($email); + $page->assign('user', $user); + $page->assign('email', $email); } } } - function handler_duplicated(&$page, $action = 'list', $email = null) + function handler_duplicated($page, $action = 'list', $email = null) { $page->changeTpl('emails/duplicated.tpl'); @@ -726,21 +686,21 @@ L'équipe d'administration mail->domain . '>'; switch (Post::v('action')) { case 'create': if (trim(Post::v('emailN')) != '') { - Xdb::execute('INSERT IGNORE INTO emails_watch (email, state, detection, last, uid, description) + Xdb::execute('INSERT IGNORE INTO email_watch (email, state, detection, last, uid, description) VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})', trim(Post::v('emailN')), Post::v('stateN'), S::i('uid'), Post::v('descriptionN')); }; break; case 'edit': - Xdb::execute('UPDATE emails_watch + Xdb::execute('UPDATE email_watch SET state = {?}, last = NOW(), uid = {?}, description = {?} WHERE email = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('emailN')); break; default: if ($action == 'delete' && !is_null($email)) { - Xdb::execute('DELETE FROM emails_watch WHERE email = {?}', $email); + Xdb::execute('DELETE FROM email_watch WHERE email = {?}', $email); } } if ($action != 'create' && $action != 'edit') { @@ -749,12 +709,11 @@ L'équipe d'administration mail->domain . '>'; $page->assign('action', $action); if ($action == 'list') { - $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife - FROM emails_watch AS w - 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); + $it = XDB::iterRow('SELECT w.email, w.detection, w.state, s.email AS forlife + FROM email_watch AS w + INNER JOIN email_redirect_account AS r ON (w.email = r.redirect) + INNER JOIN email_source_account AS s ON (s.uid = r.uid AND s.type = \'forlife\') + ORDER BY w.state, w.email, s.email'); $table = array(); $props = array(); @@ -776,15 +735,15 @@ L'équipe d'administration mail->domain . '>'; } $page->assign('table', $table); } elseif ($action == 'edit') { - $sql = "SELECT w.detection, w.state, w.last, w.description, - a1.alias AS edit, a2.alias AS forlife - FROM emails_watch AS w - LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') - LEFT JOIN emails AS e ON (w.email = e.email) - 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); + $it = XDB::iterRow('SELECT w.detection, w.state, w.last, w.description, + a.hruid AS edit, s.email AS forlife + FROM email_watch AS w + INNER JOIN email_redirect_account AS r ON (w.email = r.redirect) + INNER JOIN email_source_account AS s ON (s.uid = r.uid AND s.type = \'forlife\') + INNER JOIN accounts AS a ON (w.uid = a.uid) + WHERE w.email = {?} + ORDER BY s.email', + $email); $props = array(); while (list($detection, $state, $last, $description, $edit, $forlife) = $it->next()) { @@ -804,20 +763,24 @@ L'équipe d'administration mail->domain . '>'; } } - function handler_lost(&$page, $action = 'list', $email = null) + function handler_lost($page, $action = 'list', $email = null) { $page->changeTpl('emails/lost.tpl'); - $page->assign('lost_emails', XDB::iterator(" - SELECT u.user_id, u.hruid - FROM auth_user_md5 AS u - 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 AND u.perms IN ('user', 'admin', 'disabled') - ORDER BY u.promo DESC, u.nom, u.prenom")); + $page->assign('lost_emails', + XDB::iterator('SELECT a.uid, a.hruid, pd.promo + FROM accounts AS a + INNER JOIN account_types AS at ON (a.type = at.type) + LEFT JOIN email_redirect_account AS er ON (er.uid = a.uid AND er.flags = \'active\' AND er.broken_level < 3 + AND er.type != \'imap\' AND er.type != \'homonym\') + LEFT JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET(\'owner\', ap.perms)) + LEFT JOIN profile_display AS pd ON (ap.pid = pd.pid) + WHERE a.state = \'active\' AND er.redirect IS NULL AND FIND_IN_SET(\'mail\', at.perms) + GROUP BY a.uid + ORDER BY pd.promo, a.hruid')); } - function handler_broken_addr(&$page) + function handler_broken_addr($page) { require_once 'emails.inc.php'; $page->changeTpl('emails/broken_addr.tpl'); @@ -834,17 +797,20 @@ L'équipe d'administration mail->domain . '>'; $broken_list = explode("\n", $list); sort($broken_list); foreach ($broken_list as $orig_email) { - $email = valide_email(trim($orig_email)); - if (empty($email) || $email == '@') { - $invalid_emails[] = trim($orig_email) . ': invalid email'; - } elseif (!in_array($email, $valid_emails)) { - $res = XDB::query('SELECT COUNT(*) - FROM emails - WHERE email = {?}', $email); - if ($res->fetchOneCell() > 0) { - $valid_emails[] = $email; - } else { - $invalid_emails[] = "$orig_email: no such redirection"; + $orig_email = trim($orig_email); + if ($orig_email != '') { + $email = valide_email($orig_email); + if (empty($email) || $email == '@') { + $invalid_emails[] = trim($orig_email) . ': invalid email'; + } elseif (!in_array($email, $valid_emails)) { + $nb = XDB::fetchOneCell('SELECT COUNT(*) + FROM email_redirect_account + WHERE redirect = {?}', $email); + if ($nb > 0) { + $valid_emails[] = $email; + } else { + $invalid_emails[] = $orig_email . ': no such redirection'; + } } } } @@ -861,92 +827,75 @@ L'équipe d'administration mail->domain . '>'; if ($list == '') { $page->trigError('La liste est vide.'); } else { - global $platal; - $broken_user_list = array(); $broken_list = explode("\n", $list); sort($broken_list); - foreach ($broken_list as $orig_email) { - $email = valide_email(trim($orig_email)); - if (empty($email) || $email == '@') { - continue; - } - - $sel = XDB::query( - "SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, - u.nom, u.prenom, u.promo, a.alias - FROM emails AS e1 - LEFT JOIN emails AS e2 ON (e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags) - AND e1.email != e2.email) - INNER JOIN auth_user_md5 AS u ON (e1.uid = u.user_id) - INNER JOIN aliases AS a ON (u.user_id = a.id AND FIND_IN_SET('bestalias', a.flags)) - WHERE e1.email = {?} - GROUP BY e1.uid", $email); - - if ($x = $sel->fetchOneAssoc()) { - if (!$x['panne']) { - XDB::execute('UPDATE emails - SET panne=NOW(), last=NOW(), panne_level = 1 - WHERE email = {?}', - $email); - } else { - XDB::execute('UPDATE emails - SET last = CURDATE(), panne_level = panne_level + 1 - WHERE email = {?} - AND DATE_ADD(last, INTERVAL 14 DAY) < CURDATE()', - $email); - } - if (!empty($x['nb_mails'])) { + foreach ($broken_list as $email) { + if ($user = mark_broken_email($email, true)) { + if ($user['nb_mails'] > 0 && $user['notify']) { $mail = new PlMailer('emails/broken.mail.tpl'); - $mail->addTo("\"{$x['prenom']} {$x['nom']}\" <{$x['alias']}@" - . $globals->mail->domain . '>'); - $mail->assign('x', $x); + $dest = User::getSilentWithUID($user['uid']); + $mail->setTo($dest); + $mail->assign('user', $user); $mail->assign('email', $email); $mail->send(); } - if (!isset($broken_user_list[$x['alias']])) { - $broken_user_list[$x['alias']] = array($email); + if (!isset($broken_user_list[$user['alias']])) { + $broken_user_list[$user['alias']] = array($email); } else { - $broken_user_list[$x['alias']][] = $email; + $broken_user_list[$user['alias']][] = $email; } } } - XDB::execute("UPDATE emails - SET panne_level = panne_level - 1 - WHERE flags = 'active' AND panne_level > 1 - AND DATE_ADD(last, INTERVAL 1 MONTH) < CURDATE()"); - XDB::execute("UPDATE emails - SET panne_level = 0 - WHERE flags = 'active' AND panne_level = 1 - AND DATE_ADD(last, INTERVAL 1 YEAR) < CURDATE()"); + XDB::execute('UPDATE email_redirect_account + SET broken_level = broken_level - 1 + WHERE flags = \'active\' AND broken_level > 1 + AND DATE_ADD(last, INTERVAL 1 MONTH) < CURDATE()'); + XDB::execute('UPDATE email_redirect_account + SET broken_level = 0 + WHERE flags = \'active\' AND broken_level = 1 + AND DATE_ADD(last, INTERVAL 1 YEAR) < CURDATE()'); // Output the list of users with recently broken addresses, // along with the count of valid redirections. - require_once 'include/notifs.inc.php'; - pl_content_headers("text/x-csv"); + require_once 'notifs.inc.php'; + pl_cached_content_headers('text/x-csv', 1); $csv = fopen('php://output', 'w'); - fputcsv($csv, array('nom', 'prenom', 'promo', 'alias', 'bounce', 'nbmails', 'url'), ';'); + fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url', 'corps', 'job', 'networking'), ';'); foreach ($broken_user_list as $alias => $mails) { $sel = Xdb::query( - "SELECT u.user_id, count(e.email) AS nb_mails, u.nom, u.prenom, u.promo - FROM aliases AS a - INNER JOIN auth_user_md5 AS u ON a.id = u.user_id - LEFT JOIN emails AS e ON (e.uid = u.user_id - AND FIND_IN_SET('active', e.flags) AND e.panne = 0) - WHERE a.alias = {?} - GROUP BY u.user_id", $alias); + 'SELECT a.uid, count(DISTINCT(r.redirect)) AS nb_mails, + IFNULL(pd.public_name, a.full_name) AS fullname, + IFNULL(pd.promo, 0) AS promo, IFNULL(pce.name, \'Aucun\') AS corps, + IFNULL(pje.name, \'Aucun\') AS job, GROUP_CONCAT(pn.address SEPARATOR \', \') AS networking + FROM email_source_account AS s + INNER JOIN accounts AS a ON (s.uid = a.uid) + LEFT JOIN email_redirect_account AS r ON (a.uid = r.uid AND r.broken_level = 0 AND r.flags = \'active\' AND + (r.type = \'smtp\' OR r.type = \'googleapps\')) + LEFT JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) + LEFT JOIN profile_display AS pd ON (pd.pid = ap.pid) + LEFT JOIN profile_corps AS pc ON (pc.pid = ap.pid) + LEFT JOIN profile_corps_enum AS pce ON (pc.current_corpsid = pce.id) + LEFT JOIN profile_job AS pj ON (pj.pid = ap.pid) + LEFT JOIN profile_job_enum AS pje ON (pj.jobid = pje.id) + LEFT JOIN profile_networking AS pn ON (pn.pid = ap.pid) + WHERE s.email = {?} + GROUP BY a.uid', $alias); if ($x = $sel->fetchOneAssoc()) { if ($x['nb_mails'] == 0) { - register_profile_update($x['user_id'], 'broken'); + $user = User::getSilentWithUID($x['uid']); + $profile = $user->profile(); + WatchProfileUpdate::register($profile, 'broken'); } - fputcsv($csv, array($x['nom'], $x['prenom'], $x['promo'], $alias, + fputcsv($csv, array($x['fullname'], $x['promo'], $alias, join(',', $mails), $x['nb_mails'], - 'https://www.polytechnique.org/marketing/broken/' . $alias), ';'); + 'https://www.polytechnique.org/marketing/broken/' . $alias, + $x['corps'], $x['job'], $x['networking']), ';'); } } fclose($csv);