Happy New Year!

[platal.git] / modules / axletter.php

diff --git a/modules/axletter.php b/modules/axletter.php
index 939b631..67bdf55 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -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,13 +169,17 @@ 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,
@@ -184,10 +188,15 @@ class AXLetterModule extends PLModule
                 break;
 
               case 'Confirmer':
-                XDB::execute("REPLACE INTO  axletter
-                                       SET  id = {?}, short_name = {?}, subject = {?}, title = {?}, body = {?},
-                                            signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}, subset = {?}, subset_rm = {?}",
-                             $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to) : null, $subset_rm);
+                XDB::execute('INSERT INTO  axletter (id, short_name, subject, title, body, signature,
+                                                     promo_min, promo_max, echeance, subset, subset_rm)
+                                   VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})
+                  ON DUPLICATE KEY UPDATE  short_name = VALUES(short_name), subject = VALUES(subject), title = VALUES(title),
+                                           body = VALUES(body), signature = VALUES(signature), promo_min = VALUES(promo_min),
+                                           promo_max = VALUES(promo_max), echeance = VALUES(echeance), subset = VALUES(subset),
+                                           subset_rm = VALUES(subset_rm)',
+                             $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance,
+                             $subset ? implode("\n", $subset_to) : null, $subset_rm);
                 if (!$saved) {
                     global $globals;
                     $mailer = new PlMailer();