summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-07-07 19:06:10 +0200
committerAleksander Machniak <alec@alec.pl>2014-07-07 19:06:10 +0200
commitb231c8f6accb7c04461ab8364016d0abbe81f82e (patch)
treedd31cbe0ae7d4e0dd30bfc93af6f2e790cfd26bf /program
parent4cef8c7ec98d19a8dc29cd74a15e87e8995d0c3c (diff)
Fix images import from various vCard formats (#1489977)
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_vcard.php51
1 files changed, 33 insertions, 18 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index fb8fdd525..4a2684f10 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -594,29 +594,34 @@ class rcube_vcard
private static function vcard_decode($vcard)
{
// Perform RFC2425 line unfolding and split lines
- $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
- $lines = explode("\n", $vcard);
- $data = array();
+ $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
+ $lines = explode("\n", $vcard);
+ $result = array();
for ($i=0; $i < count($lines); $i++) {
- if (!preg_match('/^([^:]+):(.+)$/', $lines[$i], $line))
+ if (!($pos = strpos($lines[$i], ':'))) {
continue;
+ }
+
+ $prefix = substr($lines[$i], 0, $pos);
+ $data = substr($lines[$i], $pos+1);
- if (preg_match('/^(BEGIN|END)$/i', $line[1]))
+ if (preg_match('/^(BEGIN|END)$/i', $prefix)) {
continue;
+ }
// convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
- if ($data['VERSION'][0] == "2.1"
- && preg_match('/^([^;]+);([^:]+)/', $line[1], $regs2)
+ if ($result['VERSION'][0] == "2.1"
+ && preg_match('/^([^;]+);([^:]+)/', $prefix, $regs2)
&& !preg_match('/^TYPE=/i', $regs2[2])
) {
- $line[1] = $regs2[1];
+ $prefix = $regs2[1];
foreach (explode(';', $regs2[2]) as $prop) {
- $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
+ $prefix .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
}
}
- if (preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
+ if (preg_match_all('/([^\\;]+);?/', $prefix, $regs2)) {
$entry = array();
$field = strtoupper($regs2[1][0]);
$enc = null;
@@ -629,10 +634,10 @@ class rcube_vcard
// add next line(s) to value string if QP line end detected
if ($value == 'QUOTED-PRINTABLE') {
while (preg_match('/=$/', $lines[$i])) {
- $line[2] .= "\n" . $lines[++$i];
+ $data .= "\n" . $lines[++$i];
}
}
- $enc = $value;
+ $enc = $value == 'BASE64' ? 'B' : $value;
}
else {
$lc_key = strtolower($key);
@@ -652,20 +657,30 @@ class rcube_vcard
// should we use vCard 3.0 instead?
// $entry['base64'] = true;
}
- $line[2] = self::decode_value($line[2], $enc ? $enc : 'base64');
+
+ $data = self::decode_value($data, $enc ? $enc : 'base64');
+ }
+ else if ($field == 'PHOTO') {
+ // vCard 4.0 data URI, "PHOTO:data:image/jpeg;base64,..."
+ if (preg_match('/^data:[a-z\/_-]+;base64,/i', $data, $m)) {
+ $entry['encoding'] = $enc = 'B';
+ $data = substr($data, strlen($m[0]));
+ $data = self::decode_value($data, 'base64');
+ }
}
if ($enc != 'B' && empty($entry['base64'])) {
- $line[2] = self::vcard_unquote($line[2]);
+ $data = self::vcard_unquote($data);
}
- $entry = array_merge($entry, (array) $line[2]);
- $data[$field][] = $entry;
+ $entry = array_merge($entry, (array) $data);
+ $result[$field][] = $entry;
}
}
- unset($data['VERSION']);
- return $data;
+ unset($result['VERSION']);
+
+ return $result;
}
/**