From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 17 Jun 2011 11:22:56 +0000 (+0200)
Subject: Do not export emails in members csv files (Closes #1508).
X-Git-Tag: xorg/1.1.2~17
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=889fbf00f1036ad79096283e9a8a9552476b8b23;p=platal.git

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

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index d1c6ce6..10d4118 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ Bug/Wish:
         - #947: Lists group former members to group admins                 -JAC
         - #1481: Adds group nl subscription from group profile edition     -JAC
         - #1504: Displays users without profile in alphabetic lists        -JAC
+        - #1508: Do not export emails in members csv files                 -JAC
 
     * XnetEvent:
         - #1487: Removes link to event attending users to group outsiders  -JAC
diff --git a/modules/lists.php b/modules/lists.php
index 8c52f23..59f0bd0 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -348,7 +348,7 @@ class ListsModule extends PLModule
         $list = list_fetch_basic_info(list_extract_members($members[1]));
         pl_cached_content_headers('text/x-csv', 1);
 
-        echo "email,nom,promo\n";
+        echo "nom,promo\n";
         echo implode("\n", $list);
         exit;
     }
diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index c18809f..891ef94 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -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;
diff --git a/templates/xnetgrp/annuaire-csv.tpl b/templates/xnetgrp/annuaire-csv.tpl
index 130a254..75a8c8b 100644
--- a/templates/xnetgrp/annuaire-csv.tpl
+++ b/templates/xnetgrp/annuaire-csv.tpl
@@ -19,11 +19,11 @@
 {*  59 Temple Place, Suite 330; Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-Nom,Prénom,Sexe,Promotion,Email,Commentaire
+Nom,Prénom,Sexe,Promotion,Commentaire
 {if $users|@count}
 {foreach from=$users item=user}
 
-{$user->lastName()},{$user->firstName()},{if $user->isFemale()}F{else}M{/if},{$user->promo()},{$user->forlifeEmail()},{$user->group_comm|replace:',':'\,'}
+{$user->lastName()},{$user->firstName()},{if $user->isFemale()}F{else}M{/if},{$user->promo()},{$user->group_comm|replace:',':'\,'}
 
 {/foreach}
 {/if}