From b97ecb9d9d15e48fb8320c780acf271e06f7777d Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Tue, 3 Aug 2010 15:47:41 +0200
Subject: [PATCH] Fixes ML csv (Closes #1208).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 modules/lists.php           | 8 +++-----
 modules/lists/lists.inc.php | 7 ++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/lists.php b/modules/lists.php
index 1ebf75f..9979e84 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -356,13 +356,11 @@ class ListsModule extends PLModule
         }
         $this->prepare_client($page);
         $members = $this->client->get_members($liste);
-        $list = list_fetch_names(list_extract_members($members[1]));
+        $list = list_fetch_basic_info(list_extract_members($members[1]));
         pl_content_headers("text/x-csv");
 
-        echo "email,nom,prenom,promo\n";
-        foreach ($list as $member) {
-            echo @$member['email'] . ',' . @$member['nom'] . ',' . @$member['prenom'] . ',' . @$member['promo'] . "\n";
-        }
+        echo "email,nom,promo\n";
+        echo implode("\n", $list);
         exit;
     }
 
diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 7daccf6..217745a 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -74,16 +74,17 @@ function list_sort_members($members, $tri_promo = true)
 }
 
 // }}}
+// {{{ function list_fetch_basic_info
 
-function list_fetch_names($members)
+function list_fetch_basic_info($members)
 {
     $res = array();
     foreach ($members as $member) {
         $user = User::getSilent($member);
         if (!$user) {
-            $res[] = $member;
+            $res[] = $member . ',,';
         } else {
-            $res[] = $user->fullName();
+            $res[] = $user->forlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo();
         }
     }
     return $res;
-- 
2.1.4