[Svn] r1998 - in trunk/roundcubemail/program: include localization/ar_SA localization/az_AZ localization/cs_CZ localization/cy_GB localization/de_DE localization/en_GB localization/fi_FI localization/fr_FR localization/he_IL localization/it_IT localization/lt_LT localization/nn_NO localization/ru_RU localization/zh_CN steps/addressbook
trac at roundcube.net
trac at roundcube.net
Tue Oct 21 11:41:32 CEST 2008
Author: thomasb
Date: 2008-10-21 04:41:32 -0500 (Tue, 21 Oct 2008)
New Revision: 1998
Modified:
trunk/roundcubemail/program/include/rcube_shared.inc
trunk/roundcubemail/program/include/rcube_vcard.php
trunk/roundcubemail/program/localization/ar_SA/messages.inc
trunk/roundcubemail/program/localization/az_AZ/messages.inc
trunk/roundcubemail/program/localization/cs_CZ/messages.inc
trunk/roundcubemail/program/localization/cy_GB/messages.inc
trunk/roundcubemail/program/localization/de_DE/messages.inc
trunk/roundcubemail/program/localization/en_GB/messages.inc
trunk/roundcubemail/program/localization/fi_FI/messages.inc
trunk/roundcubemail/program/localization/fr_FR/messages.inc
trunk/roundcubemail/program/localization/he_IL/messages.inc
trunk/roundcubemail/program/localization/it_IT/messages.inc
trunk/roundcubemail/program/localization/lt_LT/messages.inc
trunk/roundcubemail/program/localization/nn_NO/messages.inc
trunk/roundcubemail/program/localization/ru_RU/messages.inc
trunk/roundcubemail/program/localization/zh_CN/messages.inc
trunk/roundcubemail/program/steps/addressbook/import.inc
Log:
Improve vcard import (#1485502); try utf-8 first in charset detection
Modified: trunk/roundcubemail/program/include/rcube_shared.inc
===================================================================
--- trunk/roundcubemail/program/include/rcube_shared.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/include/rcube_shared.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -575,12 +575,12 @@
// FIXME: the order is important, because sometimes
// iso string is detected as euc-jp and etc.
$enc = array(
- 'SJIS', 'BIG5', 'GB2312', 'UTF-8',
- 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
- 'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
- 'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
- 'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R',
- 'ISO-2022-KR', 'ISO-2022-JP'
+ 'UTF-8', 'SJIS', 'BIG5', 'GB2312',
+ 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
+ 'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
+ 'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
+ 'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R',
+ 'ISO-2022-KR', 'ISO-2022-JP'
);
$result = mb_detect_encoding($string, join(',', $enc));
Modified: trunk/roundcubemail/program/include/rcube_vcard.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_vcard.php 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/include/rcube_vcard.php 2008-10-21 09:41:32 UTC (rev 1998)
@@ -218,6 +218,9 @@
// remove vcard 2.1 charset definitions
$vcard = preg_replace('/;CHARSET=[^:;]+/', '', $vcard);
+
+ // if N doesn't have any semicolons, add some
+ $vcard = preg_replace('/^(N:[^;\R]*)$/m', '\1;;;;', $vcard);
return $vcard;
}
@@ -241,38 +244,48 @@
// Perform RFC2425 line unfolding
$vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
+ $lines = preg_split('/\r?\n/', $vcard);
$data = array();
- if (preg_match_all('/^([^\\:]*):(.+)$/m', $vcard, $regs, PREG_SET_ORDER)) {
- foreach($regs as $line) {
- // 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) && !preg_match('/^TYPE=/i', $regs2[2])) {
- $line[1] = $regs2[1];
- foreach (explode(';', $regs2[2]) as $prop)
- $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
- }
+
+ for ($i=0; $i < count($lines); $i++) {
+ if (!preg_match('/^([^\\:]*):(.+)$/', $lines[$i], $line))
+ continue;
- if (!preg_match('/^(BEGIN|END)$/', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
- $entry = array(self::vcard_unquote($line[2]));
+ // 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) && !preg_match('/^TYPE=/i', $regs2[2])) {
+ $line[1] = $regs2[1];
+ foreach (explode(';', $regs2[2]) as $prop)
+ $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
+ }
- foreach($regs2[1] as $attrid => $attr) {
- if ((list($key, $value) = explode('=', $attr)) && $value) {
- if ($key == 'ENCODING')
- $entry[0] = self::decode_value($entry[0], $value);
- else
- $entry[strtolower($key)] = array_merge((array)$entry[strtolower($key)], (array)self::vcard_unquote($value, ','));
+ if (!preg_match('/^(BEGIN|END)$/', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
+ $entry = array('');
+ $field = $regs2[1][0];
+
+ foreach($regs2[1] as $attrid => $attr) {
+ if ((list($key, $value) = explode('=', $attr)) && $value) {
+ if ($key == 'ENCODING') {
+ # add next line(s) to value string if QP line end detected
+ while ($value == 'QUOTED-PRINTABLE' && ereg('=$', $lines[$i]))
+ $line[2] .= "\n" . $lines[++$i];
+
+ $line[2] = self::decode_value($line[2], $value);
}
- else if ($attrid > 0) {
- $entry[$key] = true; # true means attr without =value
- }
+ else
+ $entry[strtolower($key)] = array_merge((array)$entry[strtolower($key)], (array)self::vcard_unquote($value, ','));
}
+ else if ($attrid > 0) {
+ $entry[$key] = true; # true means attr without =value
+ }
+ }
- $data[$regs2[1][0]][] = count($entry) > 1 ? $entry : $entry[0];
- }
+ $entry[0] = self::vcard_unquote($line[2]);
+ $data[$field][] = count($entry) > 1 ? $entry : $entry[0];
}
-
- unset($data['VERSION']);
}
+ unset($data['VERSION']);
+
return $data;
}
@@ -331,7 +344,7 @@
{
foreach((array)$data as $type => $entries) {
/* valid N has 5 properties */
- while ($type == "N" && count($entries[0]) < 5)
+ while ($type == "N" && is_array($entries[0]) && count($entries[0]) < 5)
$entries[0][] = "";
foreach((array)$entries as $entry) {
Modified: trunk/roundcubemail/program/localization/ar_SA/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/ar_SA/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/ar_SA/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -89,7 +89,7 @@
$messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
$messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
$messages['importerror'] = 'فشل الاستيراد! الملف المرفوع ليس ملف vCard صالح.';
-$messages['importconfirm'] = 'تم استيراد $inserted مراسلين بنجاح، وتجاهل $skipped موجودين مسبقاً:$names';
+$messages['importconfirm'] = 'تم استيراد $inserted مراسلين بنجاح، وتجاهل $skipped موجودين مسبقاً:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'العملية ممنوعة!';
$messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد في الهويّة المنتقاة';
Modified: trunk/roundcubemail/program/localization/az_AZ/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/az_AZ/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/az_AZ/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -87,7 +87,7 @@
$messages['addresswriterror'] = 'Seçilmiş ünvan kitabçası yazılmayandır';
$messages['importwait'] = 'İdxal, gözləyin...';
$messages['importerror'] = 'İdxal alınmadı! Yüklənilən fayl vCard fayla uyğun deyil.';
-$messages['importconfirm'] = '$inserted ünvanlar müvəffəqiyyətlə idxal edildi, mövcud daxil edilən $skipped atla: $names';
+$messages['importconfirm'] = '$inserted ünvanlar müvəffəqiyyətlə idxal edildi, mövcud daxil edilən $skipped atla:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Əməliyyata icazə verilmir!';
$messages['nofromaddress'] = 'Seçilmiş eynilikdə e-poçt ünvanı axtarılır';
Modified: trunk/roundcubemail/program/localization/cs_CZ/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/cs_CZ/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/cs_CZ/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -90,7 +90,7 @@
$messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný';
$messages['importwait'] = 'Importuji, prosím čekejte...';
$messages['importerror'] = 'Během importu nastala chyba! Nahraný soubor není ve formátu vCard.';
-$messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno:$names';
+$messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Operace není povolena!';
?>
\ No newline at end of file
Modified: trunk/roundcubemail/program/localization/cy_GB/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/cy_GB/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/cy_GB/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -87,7 +87,7 @@
$messages['addresswriterror'] = 'Nid yw\'n bosib ysgrifennu i\'r llyfr cyfeiriadau ';
$messages['importwait'] = 'Yn mewnforio, arhoswch os gwelwch yn dda...';
$messages['importerror'] = 'Methwyd a mewnforio! Nid yw\'r ffeil a lwythwyd fyny yn ffeil vCard dilys.';
-$messages['importconfirm'] = 'Fe mewnforiwyd $inserted cyswllt yn llwyddiannus, anwybyddwyd $skipped cofnod presennol: $names';
+$messages['importconfirm'] = 'Fe mewnforiwyd $inserted cyswllt yn llwyddiannus, anwybyddwyd $skipped cofnod presennol: <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Ni chaniateir y weithred!';
$messages['nofromaddress'] = 'Cyfeiriad e-bost ar goll yn y personoliaeth a ddewiswyd';
Modified: trunk/roundcubemail/program/localization/de_DE/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/de_DE/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/de_DE/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -88,7 +88,7 @@
$messages['addresswriterror'] = 'Das ausgewählte Adressbuch kann nicht verändert werden';
$messages['importwait'] = 'Daten werden importiert, bitte warten...';
$messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
-$messages['importconfirm'] = 'Es wurden $inserted Adressen erfolgreich importiert und $skipped bestehende Einträge übersprungen:$names';
+$messages['importconfirm'] = 'Es wurden $inserted Adressen erfolgreich importiert und $skipped bestehende Einträge übersprungen:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Operation nicht erlaubt!';
?>
Modified: trunk/roundcubemail/program/localization/en_GB/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/en_GB/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/en_GB/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -90,7 +90,7 @@
$messages['addresswriterror'] = 'The selected address book is not writeable';
$messages['importwait'] = 'Importing, please wait...';
$messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
-$messages['importconfirm'] = 'Successfully imported $inserted contacts, $skipped existing entries skipped:$names';
+$messages['importconfirm'] = 'Successfully imported $inserted contacts, $skipped existing entries skipped:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Operation not permitted!';
$messages['nofromaddress'] = 'Missing e-mail address in selected identity';
Modified: trunk/roundcubemail/program/localization/fi_FI/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/fi_FI/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/fi_FI/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -91,7 +91,7 @@
$messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
$messages['importwait'] = 'Tuodaan, odota...';
$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard -muodossa.';
-$messages['importconfirm'] = '$inserted kontaktia tuotu onnistuneesti $inserted kontaktioa, $skipped olemassaolevaa kontaktia hypättiin yli: $names';
+$messages['importconfirm'] = '$inserted kontaktia tuotu onnistuneesti $inserted kontaktioa, $skipped olemassaolevaa kontaktia hypättiin yli: <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
$messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
Modified: trunk/roundcubemail/program/localization/fr_FR/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/fr_FR/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/fr_FR/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -90,7 +90,7 @@
$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné';
$messages['importwait'] = 'Importation, veuillez patienter...';
$messages['importerror'] = 'Importation échouée ! Le fichier envoyé n\'est pas un fichier vCard valide.';
-$messages['importconfirm'] = '$inserted contacts importés avec succès, $skipped entrées existantes ignorées:$names';
+$messages['importconfirm'] = '$inserted contacts importés avec succès, $skipped entrées existantes ignorées: <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
?>
Modified: trunk/roundcubemail/program/localization/he_IL/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/he_IL/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/he_IL/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -87,7 +87,7 @@
$messages['addresswriterror'] = 'פנקס הכתובות שנבחר אינו ניתן לכתיבה';
$messages['importwait'] = 'ייבוא, נא להמתין..';
$messages['importerror'] = 'חוקי vCard הייבוא נכשל כי הקובץ אינו בפורמט';
-$messages['importconfirm'] = 'יובאו $inserted אנשי קשר, $skipped היו קיימים $names';
+$messages['importconfirm'] = 'יובאו $inserted אנשי קשר, $skipped היו קיימים <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'פעולה אסורה!';
?>
Modified: trunk/roundcubemail/program/localization/it_IT/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/it_IT/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/it_IT/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -90,7 +90,7 @@
$messages['addresswriterror'] = 'La rubrica selezionata non è scrivibile';
$messages['importwait'] = 'Importazione in corso, attendere...';
$messages['importerror'] = 'Importazione fallita! Il file caricato non è un file vCard valido.';
-$messages['importconfirm'] = 'Importati con successo $inserted contatti, saltate $skipped voci esistenti:$names';
+$messages['importconfirm'] = 'Importati con successo $inserted contatti, saltate $skipped voci esistenti:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Operazione non consentita!';
$messages['nofromaddress'] = 'Indirizzo e-mail mancante nell\'identità selezionata';
Modified: trunk/roundcubemail/program/localization/lt_LT/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/lt_LT/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/lt_LT/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -88,7 +88,7 @@
$messages['addresswriterror'] = 'Pasirinkta adresų knyga nėra įrašoma';
$messages['importwait'] = 'Importuojama, prašome palaukti...';
$messages['importerror'] = 'Importavimas nepavyko! Įkelta byla nėra vCard formato.';
-$messages['importconfirm'] = 'Sėkmingai importuoti $inserted kontaktai, $skipped egzistuojančių įrašų praleista:$names';
+$messages['importconfirm'] = 'Sėkmingai importuoti $inserted kontaktai, $skipped egzistuojančių įrašų praleista:<p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Operacija neleistina!';
?>
Modified: trunk/roundcubemail/program/localization/nn_NO/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/nn_NO/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/nn_NO/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -86,7 +86,7 @@
$messages['addresswriterror'] = 'Denne adresseboka er ikkje skrivbar';
$messages['importwait'] = 'Importerer, vent...';
$messages['importerror'] = 'Importering feila! Fila er ikkje ei korrekt vCard-file.';
-$messages['importconfirm'] = 'Importerte $inserted kontakar, hoppa over $skipped oppføringar: $names';
+$messages['importconfirm'] = 'Importerte $inserted kontakar, hoppa over $skipped oppføringar: <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Ulovleg operasjon.';
?>
Modified: trunk/roundcubemail/program/localization/ru_RU/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/ru_RU/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/ru_RU/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -91,7 +91,7 @@
$messages['addresswriterror'] = 'Выбранная адресная книга недоступна для записи';
$messages['importwait'] = 'Импортирование, пожалуйста, подождите...';
$messages['importerror'] = 'Импорт завершился неудачно! Загруженный файл не является правильным файлом vCard.';
-$messages['importconfirm'] = 'Успешно импортировано $inserted контакт(ов), пропущено $skipped существующих:$names';
+$messages['importconfirm'] = 'Успешно импортировано $inserted контакт(ов), пропущено $skipped существующих: <p><em>$names</em></p>';
$messages['opnotpermitted'] = 'Действие запрещено!';
$messages['nofromaddress'] = 'В выбранном профиле не хватает адреса электронной почты';
Modified: trunk/roundcubemail/program/localization/zh_CN/messages.inc
===================================================================
--- trunk/roundcubemail/program/localization/zh_CN/messages.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/localization/zh_CN/messages.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -91,7 +91,7 @@
$messages['addresswriterror'] = '已选择的地址簿不可写';
$messages['importwait'] = '正在导入，请稍后...';
$messages['importerror'] = '导入失败！所上传的文件不是有效的 vCard 文件。';
-$messages['importconfirm'] = '成功导入 $inserted 联系人，$skipped 乎略已存在的联系人:$names';
+$messages['importconfirm'] = '成功导入 $inserted 联系人，$skipped 乎略已存在的联系人: <p><em>$names</em></p>';
$messages['opnotpermitted'] = '不允许的操作';
$messages['nofromaddress'] = '选种的身份中没有邮件地址';
Modified: trunk/roundcubemail/program/steps/addressbook/import.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/import.inc 2008-10-20 14:24:01 UTC (rev 1997)
+++ trunk/roundcubemail/program/steps/addressbook/import.inc 2008-10-21 09:41:32 UTC (rev 1998)
@@ -58,7 +58,7 @@
global $IMPORT_STATS;
$vars = get_object_vars($IMPORT_STATS);
- $vars['names'] = join(', ', $IMPORT_STATS->names);
+ $vars['names'] = join(', ', array_map('Q', $IMPORT_STATS->names));
return html::p($attrib, Q(rcube_label(array(
'name' => 'importconfirm',
_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn
More information about the Svn
mailing list