]> source.dussan.org Git - nextcloud-server.git/commitdiff
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 11 Jun 2012 16:13:12 +0000 (18:13 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 11 Jun 2012 16:13:12 +0000 (18:13 +0200)
apps/contacts/import.php

index 232de8233a9728b3c5b8567c3e884cf0749e7fd6..9d5504563fd7c0f3c3850942c851da534ce6df4e 100644 (file)
@@ -63,13 +63,13 @@ foreach($lines as $line){
        if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
                $inelement = true;
        } elseif (strtoupper(trim($line)) == 'END:VCARD') {
-               $card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
+               $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
                $parts[] = implode($nl, $card);
                $card = array();
                $inelement = false;
        }
        if ($inelement === true && trim($line) != '') {
-               $card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line);
+               $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
        }
 }
 //import the contacts