Improve vcard import: map more fields, support photo urls, better UTF-16 charset detection

2 files changed, 8 insertions, 0 deletions

diff --git a/tests/src/utf-16_sample.vcf b/tests/src/utf-16_sample.vcf
new file mode 100755
index 000000000..22f54618a
--- /dev/null
+++ b/tests/src/utf-16_sample.vcf
diff --git a/tests/vcards.php b/tests/vcards.php
index 3b8f260c4..ba5ce2bef 100644
--- a/tests/vcards.php
+++ b/tests/vcards.php
@@ -54,4 +54,12 @@ class rcube_test_vcards extends UnitTestCase
     $this->assertEqual("Iksiñski", $vcards2[0]->surname, "Detect charset in encoded values");
   }
   
+  function test_encodings()
+  {
+      $input = file_get_contents($this->_srcpath('utf-16_sample.vcf'));
+      
+      $vcards = rcube_vcard::import($input);
+      $this->assertEqual("Ǽgean ĽdaMonté", $vcards[0]->displayname, "Decoded from UTF-16");
+  }
+  
 }