From 9e54e6fd455326185b54b5e2cb1b7936c7817670 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 23 Sep 2011 06:11:27 -0400
Subject: [PATCH] - Make the whole PHP output non-cacheable (#1487797)
---
program/steps/addressbook/export.inc | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 04b98a3..8ba1c08 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -66,18 +66,20 @@
}
// send downlaod headers
-send_nocacheing_headers();
header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
while ($result && ($row = $result->next())) {
// we already have a vcard record
if ($row['vcard'] && $row['name']) {
- echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n";
+ $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
+ echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
}
// copy values into vcard object
else {
- $vcard = new rcube_vcard($row['vcard']);
+ $vcard = new rcube_vcard();
+ $vcard->extend_fieldmap($CONTACTS->vcard_map);
+ $vcard->load($row['vcard']);
$vcard->reset();
foreach ($row as $key => $values) {
@@ -88,7 +90,7 @@
}
}
- echo $vcard->export(true) . "\n";
+ echo $vcard->export(true) . rcube_vcard::$eol;
}
}
--
Gitblit v1.9.1