summaryrefslogtreecommitdiff
path: root/program/include/rcube_vcard.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-04-14 08:16:49 +0000
committerthomascube <thomas@roundcube.net>2011-04-14 08:16:49 +0000
commitbf80b5a237418621970a7c2bfd4f99c9373cb471 (patch)
tree0eca7d195ceede737cf856f331c2cddc1f6cd707 /program/include/rcube_vcard.php
parent1633bcafcab5a09aae587edfaf7dfb7c20b4035e (diff)
Fix vcard folding with uncode characters (#1487868)
Diffstat (limited to 'program/include/rcube_vcard.php')
-rw-r--r--program/include/rcube_vcard.php21
1 files changed, 20 insertions, 1 deletions
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 81d4d11ab..25041ea6a 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -465,7 +465,26 @@ class rcube_vcard
private static function rfc2425_fold_callback($matches)
{
- return ":\n ".rtrim(chunk_split($matches[1], 72, "\n "));
+ // use mb string function if available
+ if (function_exists('mb_ereg_replace')) {
+ mb_internal_encoding(RCMAIL_CHARSET);
+ return ":\n " . mb_ereg_replace('(.{70})', "\\1\n ", $matches[1]);
+ }
+
+ // chunk_split string and avoid lines breaking multibyte characters
+ $c = 66;
+ $out = ":\n " . substr($matches[1], 0, $c);
+ for ($n = $c; $c < strlen($matches[1]); $c++) {
+ // break if length > 70 or mutlibyte character starts after position 66
+ if ($n > 70 || ($n > 66 && ord($matches[1][$c]) >> 6 == 3)) {
+ $out .= "\n ";
+ $n = 0;
+ }
+ $out .= $matches[1][$c];
+ $n++;
+ }
+
+ return $out;
}
private static function rfc2425_fold($val)