X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=2e5e429117beb41705e3029655b9ee8183a120c9;hb=5b2c99878fc75a6acffb2239e284f2cb1782142c;hp=3a0721efa75514048d08f8d6be4f6e723a652c85;hpb=f4035298fd421e87b9a58f6a801b53da348613de;p=platal.git diff --git a/modules/email.php b/modules/email.php index 3a0721e..2e5e429 100644 --- a/modules/email.php +++ b/modules/email.php @@ -1,6 +1,6 @@ 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); + $value, $user->forlifeEmail(), $user->m4xForlifeEmail()); } // 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); + $alias = $user->emailAlias(); + $visibility = $user->hasProfile() && $user->profile()->alias_pub; if ($action == 'ask' && Env::has('alias') && Env::has('raison')) { S::assert_xsrf_token(); @@ -155,7 +142,7 @@ class EmailModule extends PLModule //Si l'utilisateur vient de faire une damande $alias = Env::v('alias'); $raison = Env::v('raison'); - $public = (Env::v('public', 'off') == 'on')?"public":"private"; + $public = (Env::v('public', 'off') == 'on') ? 'public' : 'private'; $page->assign('r_alias', $alias); $page->assign('r_raison', $raison); @@ -164,27 +151,31 @@ class EmailModule extends PLModule } //Quelques vérifications sur l'alias (caractères spéciaux) - if (!preg_match( "/^[a-zA-Z0-9\-.]{3,20}$/", $alias)) { + if (!preg_match("/^[a-zA-Z0-9\-.]{3,20}$/", $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 { + $alias_mail = $alias.'@'.$globals->mail->alias_dom; + //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); + $res = XDB::query('SELECT COUNT(*) + FROM virtual + WHERE alias={?}', + $alias_mail); 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 $alias_mail 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 (); + $it = new ValidateIterator(); 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é. + if ($req->type == 'alias' and $req->alias == $alias_mail) { + $page->trigError("L'alias $alias_mail a déja été demandé. Tu ne peux donc pas l'obtenir pour l'instant."); return ; } @@ -201,18 +192,18 @@ 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; + $visibility = ($value == 'public'); } - $page->assign('mail_public', ($visibility == 'public')); + $page->assign('actuel', $alias); + $page->assign('user', $user); + $page->assign('mail_public', $visibility); } function handler_redirect(&$page, $action = null, $email = null) @@ -478,12 +469,12 @@ 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)) + "SELECT ac.full_name, a.alias as forlife + FROM accounts AS ac + INNER JOIN contacts AS c ON (ac.uid = c.contact) + INNER JOIN aliases AS a ON (ac.uid = a.id AND FIND_IN_SET('bestalias', a.flags)) WHERE c.uid = {?} - ORDER BY u.nom, u.prenom", S::v('uid')); + ORDER BY ac.full_name", S::i('uid')); $page->assign('contacts', $res->fetchAllAssoc()); $page->assign('maxsize', ini_get('upload_max_filesize') . 'o'); $page->assign('user', S::user()); @@ -634,36 +625,16 @@ class EmailModule extends PLModule $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>. - - -À 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(); + $uid = XDB::fetchOneCell("SELECT uid + FROM emails + WHERE email = {?}", $email); + if ($uid) { + $dest = User::getWithUID($uid); + + $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')) { @@ -677,30 +648,27 @@ L'équipe d'administration mail->domain . '>'; $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 + $x = XDB::fetchOneAssoc("SELECT e1.uid, e1.panne != 0 AS panne, + (count(e2.uid) + IF(FIND_IN_SET('googleapps', eo.storage), 1, 0)) AS nb_mails + FROM emails as e1 + INNER JOIN email_options AS eo ON (eo.uid = e1.uid) + 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()) { + WHERE e1.email = {?} + GROUP BY e1.uid", $email); + if ($x) { // 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); + 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); + XDB::execute("UPDATE emails + SET panne_level = 1 + WHERE email = {?} AND panne_level = 0", $email); } + $x['user'] = User::getWithUID($x['uid']); $page->assign_by_ref('x', $x); } } @@ -800,17 +768,20 @@ L'équipe d'administration mail->domain . '>'; $page->assign('doublon', $props); } } + 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")); + // TODO: Order by promo. + $page->assign('lost_emails', + XDB::iterator("SELECT a.uid, a.hruid + FROM accounts AS a + INNER JOIN email_options AS eo ON (eo.uid = a.uid) + LEFT JOIN emails AS e ON (a.uid = e.uid AND FIND_IN_SET('active', e.flags)) + WHERE e.uid IS NULL AND FIND_IN_SET('googleapps', eo.storage) = 0 AND + a.state = 'active' + ORDER BY a.hruid")); } }