From 023c46fb7f3015fc87744c5a8293342c2e569acd Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sun, 9 Jan 2011 14:53:22 +0100 Subject: [PATCH] Fixes csv downloading with IE8 (Closes #1325) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 1 + include/userset.inc.php | 2 +- modules/email.php | 2 +- modules/lists.php | 2 +- modules/xnetevents.php | 2 +- modules/xnetgrp.php | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 350c414..1eeb79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Bug/Wish: - #1362: List last profile modifications for secretary -JAC * Core: + - #1352: Fixes csv downloading with IE8. -JAC - #1355: Mode with propagation of the skinning mode -FRU * Payments: diff --git a/include/userset.inc.php b/include/userset.inc.php index 21ad42d..11f49e4 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -333,7 +333,7 @@ class AddressesView implements PlView { $pids = $this->set->getIds(new PlLimit()); $visibility = new ProfileVisibility(ProfileVisibility::VIS_AX); - pl_content_headers('text/x-csv'); + pl_cached_content_headers('text/x-csv', 1); $csv = fopen('php://output', 'w'); fputcsv($csv, array('adresses'), ';'); diff --git a/modules/email.php b/modules/email.php index a632e47..b97b6c9 100644 --- a/modules/email.php +++ b/modules/email.php @@ -915,7 +915,7 @@ class EmailModule extends PLModule // Output the list of users with recently broken addresses, // along with the count of valid redirections. require_once 'notifs.inc.php'; - pl_content_headers("text/x-csv"); + pl_cached_content_headers('text/x-csv', 1); $csv = fopen('php://output', 'w'); fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url', 'corps', 'job', 'networking'), ';'); diff --git a/modules/lists.php b/modules/lists.php index 5587714..2ed4836 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -356,7 +356,7 @@ 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_content_headers("text/x-csv"); + pl_cached_content_headers('text/x-csv', 1); echo "email,nom,promo\n"; echo implode("\n", $list); diff --git a/modules/xnetevents.php b/modules/xnetevents.php index bae5758..4b2f7d3 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -284,7 +284,7 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - pl_content_headers("text/x-csv"); + pl_cached_content_headers('text/x-csv', 1); $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index a558cbf..48e0ce8 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -373,7 +373,7 @@ class XnetGrpModule extends PLModule $filename = $globals->asso('diminutif') . '.csv'; } $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers(); - pl_content_headers("text/x-csv"); + pl_cached_content_headers('text/x-csv', 1); $page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN); $page->assign('users', $users); } -- 2.1.4