X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter.php;h=d08b0bc82dfe902d34e1ef1a5463d3bb90018dc4;hb=7b094a73666cee7650946254c82800e25965db41;hp=4d106b95b601deff14d3c62a18ac5e5f19c4969a;hpb=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git

diff --git a/modules/axletter.php b/modules/axletter.php
index 4d106b9..d08b0bc 100644
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -103,7 +103,7 @@ class AXLetterModule extends PLModule
             $res = XDB::query("SELECT * FROM axletter WHERE FIND_IN_SET('new', bits)");
             if ($res->numRows()) {
                 extract($res->fetchOneAssoc(), EXTR_OVERWRITE);
-                $subset_to = ($subset ? explode("\n", $subset) : null);
+                $subset_to = ($subset ? explode("\n", $subset) : array());
                 $subset = (count($subset_to) > 0);
                 $saved = true;
             } else  {
@@ -153,7 +153,7 @@ class AXLetterModule extends PLModule
             }
 
             switch (@Post::v('valid')) {
-              case 'Vérifier':
+              case 'Vérifier les emails':
                 // Same as 'preview', but performs a test of all provided emails
                 if ($subset) {
                     require_once 'emails.inc.php';
@@ -169,18 +169,22 @@ class AXLetterModule extends PLModule
                         }
                     }
                     if ($nb_error == 0) {
-                        $page->trigSuccess("Les " . count($subset_to) . " emails soumis ont été reconnus avec succès.");
+                        if (count($subset_to) == 1) {
+                            $page->trigSuccess("L'email soumis a été reconnu avec succès.");
+                        } else {
+                            $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.
+                // No break here, since Vérifier is a subcase of Aperçu.
               case 'Aperçu':
                 $this->load('axletter.inc.php');
                 $al = new AXLetter(array($id, $short_name, $subject, $title, $body, $signature,
                                          $promo_min, $promo_max, $subset, $subset_rm, $echeance, 0, 'new'));
-                $al->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+                $al->toHtml($page, S::user());
                 break;
 
               case 'Confirmer':