Do not export emails in members csv files (Closes #1508).

[platal.git] / modules / lists / lists.inc.php

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 5f8c2f4..891ef94 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.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   *
@@ -41,14 +41,14 @@ function list_sort_owners($members, $tri_promo = true)
             if (!$category) {
                 $category = 'extérieurs';
             }
-            $membres[$key][$name . $member] = array('name' => $name, 'email' => $member, 'category' => $category,
-                                                    'uid' => $uid, 'lost' => $user->lost, 'hasProfile' => $hasProfile);
+            $membres[$key][$name] = array('name' => $name, 'email' => $member, 'category' => $category,
+                                          'uid' => $uid, 'lost' => $user->lost, 'hasProfile' => $hasProfile);
         }
     }
 
     ksort($membres);
-    foreach($membres as $membre)  {
-        ksort($membre);
+    foreach($membres as &$membre)  {
+        uksort($membre, 'strcasecmp');
     }
     return $membres;
 }
@@ -86,7 +86,7 @@ function list_fetch_basic_info($members)
         if (!$user) {
             $res[] = $member . ',,';
         } else {
-            $res[] = $user->forlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo();
+            $res[] = $user->directoryName() . ',' . $user->promo();
         }
     }
     return $res;