From e4ecada44147bebc922da00e72324e7e9622a247 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Sun, 23 Mar 2008 17:54:02 +0100 Subject: [PATCH] Adds email storage backends in the redirection list in redirection testing emails. Signed-off-by: Vincent Zanotti --- modules/email.php | 20 ++++++++++---------- templates/emails/test.mail.tpl | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/email.php b/modules/email.php index 7e992df..63cd1ab 100644 --- a/modules/email.php +++ b/modules/email.php @@ -421,22 +421,22 @@ class EmailModule extends PLModule function handler_test(&$page, $forlife = null) { global $globals; + require_once 'emails.inc.php'; + if (!S::has_perms() || !$forlife) { $forlife = S::v('bestalias'); } - $mailer = new PlMailer('emails/test.mail.tpl'); - $mailer->assign('email', $forlife . '@' . $globals->mail->domain); - $iterator = XDB::iterator("SELECT email - FROM emails AS e - INNER JOIN aliases AS a ON (e.uid = a.id) - WHERE FIND_IN_SET('active', e.flags) AND a.alias = {?}", - $forlife); - $mailer->assign('redirects', $iterator); - $res = XDB::query("SELECT FIND_IN_SET('femme', u.flags), prenom + + $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) = $res->fetchOneRow(); + 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(); diff --git a/templates/emails/test.mail.tpl b/templates/emails/test.mail.tpl index c761fa1..ba39165 100644 --- a/templates/emails/test.mail.tpl +++ b/templates/emails/test.mail.tpl @@ -29,11 +29,11 @@ {if $sexe}Chère{else}Cher{/if} {$prenom}, Tu reçois ce mail car tu as demandé la confirmation du bon fonctionnement de ton adresse polytechnicienne {$email}. -{if $redirects->total() gt 1}Si toutes tes redirections fonctionnent correctement tu devrais recevoir une copie de ce mail +{if count($redirects) gt 1}Si toutes tes redirections fonctionnent correctement tu devrais recevoir une copie de ce mail dans les boîtes suivantes : -{iterate from=$redirects item=mail} -* {$mail.email} -{/iterate} +{foreach from=$redirects item=mail} +* {$mail->display_email} +{/foreach} {/if} Tu trouveras sur le site divers outils pour gérer ton adresse email : -- 2.1.4