X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=6dcef3472679bb371bf6321c28559d721ee7754d;hb=247ca43bd087a71c05bb700085dd3ac483349192;hp=f73598f98ba7d932496be1ecc410572b59541991;hpb=85b2b2257110a8c77d70624f0fa9bba402d99e5f;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index f73598f..6dcef34 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -346,11 +346,11 @@ class ListsModule extends PLModule
         $this->prepare_client($page);
         $members = $this->client->get_members($liste);
         $list = list_fetch_basic_info(list_extract_members($members[1]));
-        pl_cached_content_headers('text/x-csv', 1);
+        pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1);
 
-        echo "nom,promo\n";
-        echo implode("\n", $list);
-        exit;
+        echo utf8_decode("Nom;Prénom;Promotion\n");
+        echo utf8_decode(implode("\n", $list));
+        exit();
     }
 
     function handler_annu($page, $liste = null, $action = null, $subaction = null)
@@ -618,8 +618,9 @@ class ListsModule extends PLModule
 
                   case 'marketu': case 'markets':
                     require_once 'emails.inc.php';
+                    $user = User::get($uids[$key]);
                     $mail = valide_email($mails[$key]);
-                    if (isvalid_email_redirection($mail)) {
+                    if (isvalid_email_redirection($mail, $user)) {
                         $from = ($action == 'marketu') ? 'user' : 'staff';
                         $market = Marketing::get($uids[$key], $mail);
                         if (!$market) {
@@ -643,6 +644,10 @@ class ListsModule extends PLModule
             $members = User::getBulkForlifeEmails(Env::v('add_member'),
                                                   true,
                                                   array('ListsModule', 'no_login_callback'));
+            // Make sure we send a list (array_values) of unique (array_unique)
+            // emails.
+            $members = array_values(array_unique($members));
+
             $arr = $this->client->mass_subscribe($liste, $members);
             if (is_array($arr)) {
                 foreach($arr as $addr) {
@@ -661,6 +666,10 @@ class ListsModule extends PLModule
                 $members = User::getBulkForlifeEmails($upload->getContents(),
                                                       true,
                                                       array('ListsModule', 'no_login_callback'));
+                // Make sure we send a list (array_values) of unique (array_unique)
+                // emails.
+                $members = array_values(array_unique($members));
+
                 $arr = $this->client->mass_subscribe($liste, $members);
                 if (is_array($arr)) {
                     foreach($arr as $addr) {