From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 28 Nov 2009 13:21:46 +0000 (+0100)
Subject: Improves and fixes the admin interface for broken addresses.
X-Git-Tag: xorg/1.0.0~249^2~10
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=35a224884f65700df59890012f66849d94a3aff7;p=platal.git

Improves and fixes the admin interface for broken addresses.
---

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 <support@" . $globals->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 <support@" . $globals->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');