From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Wed, 19 May 2010 18:36:30 +0000 (+0200)
Subject: Improve testing of axletter-subset validity
X-Git-Tag: xorg/1.0.0~251
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=83320f57720f19927598498e5ec722bb373c5ade;p=platal.git

Improve testing of axletter-subset validity

* displays number of errors
* displays number of correct emails
* displays number of real users (hence, number of duplicates)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/modules/axletter.php b/modules/axletter.php
index 2d3761e..4d106b9 100644
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -158,16 +158,22 @@ class AXLetterModule extends PLModule
                 if ($subset) {
                     require_once 'emails.inc.php';
                     $ids = ids_from_mails($subset_to);
-                    $has_error = false;
+                    $nb_error = 0;
                     foreach ($subset_to as $e) {
                         if (!array_key_exists($e, $ids)) {
-                            if (!$has_error) {
+                            if ($nb_error == 0) {
                                 $page->trigError("Emails inconnus :");
-                                $has_error = true;
                             }
+                            $nb_error++;
                             $page->trigError($e);
                         }
                     }
+                    if ($nb_error == 0) {
+                        $page->trigSuccess("Les " . count($subset_to) . " emails soumis ont été reconnus avec succès.");
+                    } else {
+                        $page->trigError("Total : $nb_error erreur" . ($nb_error > 1 ? "s" : "") . " sur " . count($subset_to) . " adresses mail soumises.");
+                    }
+                    $page->trigSuccess("Les adresses soumises correspondent à un total de " . count(array_unique($ids)) . " camarades.");
                 }
                 // XXX : no break here, since Vérifier is a subcase of Aperçu.
               case 'Aperçu':