From 35a224884f65700df59890012f66849d94a3aff7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sat, 28 Nov 2009 14:21:46 +0100 Subject: [PATCH] Improves and fixes the admin interface for broken addresses. --- modules/email.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/modules/email.php b/modules/email.php index 0898aa4..299e5c2 100644 --- a/modules/email.php +++ b/modules/email.php @@ -834,17 +834,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)) { + $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"; + } } } } @@ -925,7 +928,7 @@ L'équipe d'administration mail->domain . '>'; // Output the list of users with recently broken addresses, // along with the count of valid redirections. - require_once 'include/notifs.inc.php'; + require_once 'notifs.inc.php'; pl_content_headers("text/x-csv"); $csv = fopen('php://output', 'w'); -- 2.1.4