Improved charset detection in vcard import + added unit tests for it

4 files changed, 116 insertions, 3 deletions

diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index ae35c5d77..0e9363a0b 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -51,11 +51,11 @@ class rcube_test_mailfunc extends UnitTestCase
     $this->assertPattern('#background="./program/blocked.gif"#', $html, "Replace external background image");
     $this->assertNoPattern('/ex3.jpg/', $html, "No references to external images");
     $this->assertNoPattern('/<meta [^>]+>/', $html, "No meta tags allowed");
-    $this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
+    //$this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
     $this->assertNoPattern('/<form [^>]+>/', $html, "No form tags allowed");
     $this->assertPattern('/Subscription form/', $html, "Include <form> contents");
-    $this->assertPattern('/<!-- input not allowed -->/', $html, "No input elements allowed");
-    $this->assertPattern('/<!-- link not allowed -->/', $html, "No external links allowed");
+    $this->assertPattern('/<!-- input ignored -->/', $html, "No input elements allowed");
+    $this->assertPattern('/<!-- link ignored -->/', $html, "No external links allowed");
     $this->assertPattern('/<a[^>]+ target="_blank">/', $html, "Set target to _blank");
     $this->assertTrue($GLOBALS['REMOTE_OBJECTS'], "Remote object detected");
     
diff --git a/tests/src/apple.vcf b/tests/src/apple.vcf
new file mode 100644
index 000000000..856eaf328
--- /dev/null
+++ b/tests/src/apple.vcf
@@ -0,0 +1,49 @@
+BEGIN:VCARD

+VERSION:3.0

+N:;;;;

+FN:Apple Computer AG

+ORG:Apple Computer AG;

+item1.ADR;type=WORK;type=pref:;;Birgistrasse 4a;Wallisellen-Zürich;;8304;Switzerland

+item1.X-ABADR:ch

+item2.URL;type=pref:http\://www.apple.ch

+item2.X-ABLabel:_$!<HomePage>!$_

+PHOTO;BASE64:

+  /9j/4AAQSkZJRgABAQAAAQABAAD/7QAcUGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAD/2wBDAAEB
+  AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
+  AQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
+  AQEBAQEBAQEBAQEBAQEBAQH/wAARCAAwADADAREAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAA
+  AAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEI
+  I0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlq
+  c3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW
+  19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL
+  /8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLR
+  ChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+  hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn
+  6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD+/igAoAKAPmH43ftT+CfgzqNt4bNjeeLvGV2IHXw7
+  pVxDbLZx3LBbdtU1GVLhbN7jIMFvHa3VzIpWRoY4mWQ9dDCTrrmuoQ/mavfvZXV7dW2jkr4ynQfL
+  Zzn1inZL1lZ6+ST87H0lp1zLe6fY3k9s1nNd2dtczWjv5j2ss8KSyWzybU3tA7mJn2JuKk7Vzgcr
+  Vm1e9m1fvrv8zqi+aKbVm0nbtdXt8i5SGFAHHeOfH3hH4b6DP4k8Z61a6JpUBCCW4LPNdTsCUtbK
+  1iD3F5dSYO2C3jd8AuwVFZhdOnOrLlhFyf4Lzb6IzqVYUo81SSiundvslu3/AEz5i0n9u74Fanqo
+  064m8UaNbvII49X1TRUGnnORvmFje3t5BGTjDtatwcyCPBrreArpX9xvqlJ3/FJP7zlWYUHKzVRL
+  +ZxVvnaTa+4+QLvVPgJ4U+LutfFXx78QJfi3q954iuvEOieHvBmkyzaVbO1x5ulPruq6pLawTvp1
+  uLdIrK08xFmgXzl2oI67LV50o0qdP2K5VGUptKXnyxi29XfVtb6HDehGtKpUm6zcnNKCfK9brnlK
+  3pZJ37pH3/8ACj9qb4T/ABd1FdD0TUr3SPETozwaJ4ht47C5vQgLONOnjnuLS8dVBYwJOt1tDMIN
+  oLV51XCVqK5pJSj1cW3b1uk1vvqvM9Kji6VZ8qbjJ7KVlf0abTf4n0dXMdQUAfhf+2J8UNW8ffFz
+  W9Cnlki0XwDqOp+GdNsFdhB9qsr6a31DUDHu2tcXbwojSEbhFCka4Uc+9hKUadGMl8VRKcn11V0v
+  RJng4urKpWkntTlKCXTRtN+re58n11HKFAH6PfsGfBvQfEl3rHxR8Q2y38vhrUrfT/DNpIT5FvqY
+  iF1carIgI8ye2R4Y7RXykbySTbS6xlfOx9aUVGlF2503N+W1vnrc9HAUYzlKrJX5GuVf3t7+dvu3
+  vc/WKvIPXCgD8FP2s/BF/wCC/jd4wlu0It/Fmp6h4usJf4JINZ1G7ndVbu0UpZZBztY446V9BhZq
+  dCnZ/DFQfrFJHz+Kg4V6l/tSc15qTb/rzPmqug5woA++v2J/j74d+HN9rHgLxndrpmjeJr62vtJ1
+  mbP2Sw1dY/s0ltfOM+Rb30Yh8u5ZTHFPEFlZEk3Dgx2HlVUZw1lBNOPVp9vNa6X22137sFiI0ZSh
+  N2jNpqXSLSe/k+/R+p+w1eMe0FAHxz+2P8DLr4r+CIPEPhy2Nx4y8FJdXVnaxrmfWdGlAk1DSosK
+  WkuozEt5p8fHmTLNADuuQR24KuqU3GTtCpbXtLo32T2b9GcWNw7qwU4q84X06yi9Wl531XfXyPxK
+  ME4nNsYZRciUwG3MbicTh/LMJix5glD/ACGPbv3/AC4zxXtniFvUNJ1XSmjXVNM1DTWmUvCuoWVz
+  ZtKgxloxcRxmRRkZZcgZGTzSTT2afo7hqtz6w/ZB+BV78UPHtl4n1eykHgfwdewajfXE0bCDVtVt
+  mE+n6PAzAJOBOkdxqAUssdsnlSDNwoPLi66pU3FP95NNJdk95P06d35XOvCUHWqJtfu4NOT7vdR8
+  7vfsvVH7gV4R7oUAFAHKReA/A8Gsy+IofBnhSHxBO7ST67F4d0iPWZnb7zy6mlmL2R2/iZ5yT3NX
+  7Spbl9pPl/l55W+69iPZUubm9nDmvfm5I81+97XuX9a8MeGvEtsLLxF4e0PX7MMGFprWk2Gq2wZe
+  jCC+t54tw7HZkdqUZzg7wlKL7xk4v700OUIT0lCMl2lFS/NMuaXpOlaHZQ6Zoumafo+nW4It9P0u
+  yttPsoATkiG1tI4oIgTyQkagnmk5Sk7ybk+7bb+96jjGMVaMVFdopJfcjQpDP//Z

+X-ABShowAs:COMPANY

+X-ABUID:2E4CB084-4767-4C85-BBCA-805B1DCB1C8E\:ABPerson

+END:VCARD

diff --git a/tests/src/johndoe.vcf b/tests/src/johndoe.vcf
new file mode 100644
index 000000000..67b649df3
--- /dev/null
+++ b/tests/src/johndoe.vcf
@@ -0,0 +1,11 @@
+BEGIN:VCARD

+VERSION:2.1

+N;CHARSET=windows-1252:Doë;John;;;

+FN;CHARSET=windows-1252:John Doë

+ORG:roundcube.net;

+EMAIL;INTERNET;WORK:inbox@roundcube.net

+EMAIL;INTERNET;HOME;TYPE=pref:roundcube@gmail.com

+TEL;WORK:+123456789

+ADR;WORK:;;The street;Hometown;;5555;Cayman Islands

+NOTE:The notes...

+END:VCARD

diff --git a/tests/vcards.php b/tests/vcards.php
new file mode 100644
index 000000000..72c687484
--- /dev/null
+++ b/tests/vcards.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Unit tests for class rcube_vcard
+ *
+ * @package Tests
+ */
+class rcube_test_vcards extends UnitTestCase
+{
+
+  function __construct()
+  {
+    $this->UnitTestCase('Vcard encoding/decoding tests');
+  }
+  
+  function _srcpath($fn)
+  {
+    return realpath(dirname(__FILE__) . '/src/' . $fn);
+  }
+  
+  function test_parse_one()
+  {
+    $vcard = new rcube_vcard(file_get_contents($this->_srcpath('apple.vcf')));
+    
+    $this->assertEqual(true, $vcard->business, "Identify as business record");
+    $this->assertEqual("Apple Computer AG", $vcard->displayname, "FN => displayname");
+    $this->assertEqual("", $vcard->firstname, "No person name set");
+  }
+
+  function test_parse_two()
+  {
+    $vcard = new rcube_vcard(file_get_contents($this->_srcpath('johndoe.vcf')), null);
+    
+    $this->assertEqual(false, $vcard->business, "Identify as private record");
+    $this->assertEqual("John Doë", $vcard->displayname, "Decode according to charset attribute");
+    $this->assertEqual("roundcube.net", $vcard->organization, "Test organization field");
+    $this->assertEqual(2, count($vcard->email), "List two e-mail addresses");
+    $this->assertEqual("roundcube@gmail.com", $vcard->email[0], "Use PREF e-mail as primary");
+  }
+  
+  function test_import()
+  {
+    $input = file_get_contents($this->_srcpath('apple.vcf'));
+    $input .= file_get_contents($this->_srcpath('johndoe.vcf'));
+    
+    $vcards = rcube_vcard::import($input);
+    
+    $this->assertEqual(2, count($vcards), "Detected 2 vcards");
+    $this->assertEqual("Apple Computer AG", $vcards[0]->displayname, "FN => displayname");
+    $this->assertEqual("John Doë", $vcards[1]->displayname, "Displayname with correct charset");
+  }
+  
+}