cakephp/vendors/process.php @@ -22,7 +22,7 @@ class VcfHelper extends AppHelper { 'cellPhone' => 'TEL;CELL:%value%', 'address' => 'ADR', 'birthday' => 'BDAY:%value%', - 'email' => 'EMAIL;INTERNET::%value%', + 'email' => 'EMAIL;INTERNET:%value%', 'timezone' => 'TZ:%value%', 'url' => 'URL:%value%', 'version' => 'VERSION:%value%', @@ -123,7 +123,7 @@ class VcfHelper extends AppHelper { $values['key'] = $this->_elements['address']; $values['type'] = strtoupper($type); - $format = "%key%;%type%:;%street%;%city%;%province%;%postal%;%country%;"; + $format = "%key%;%type%:;;%street%;%city%;%province%;%postal%;%country%;"; $adrEl = String::insert($format, $values, array('before' => '%', 'after' => '%', 'clean' => true)); $labelFormat = "LABEL;POSTAL;%type%;ENCODING=QUOTED-PRINTABLE:%street%=0D=0A%city%, %province% %postal%=0D=0A%country%"; $labelEl = String::insert($labelFormat, $values, array('before' => '%', 'after' => '%', 'clean' => true)); cakephp/helpers/vcf/vcf.php @@ -47,6 +47,10 @@ class VcfHelperTestCase extends CakeTestCase { $result = $this->vcf->attr('timezone', '-05:00'); $expected = "TZ:-05\:00\n"; $this->assertEqual($result, $expected); + + $result = $this->vcf->attr('email', 'example@example.com'); + $expected = "EMAIL;INTERNET:example@example.com\n"; + $this->assertEqual($result, $expected); } /** * test __call method. @@ -73,7 +77,7 @@ class VcfHelperTestCase extends CakeTestCase { 'country' => 'Canada', 'street' => '555 somestreet rd.' )); - $expected = "ADR;HOME:;555 somestreet rd.;Toronto;Ontario;M1M 1M1;Canada;\n" . + $expected = "ADR;HOME:;;555 somestreet rd.;Toronto;Ontario;M1M 1M1;Canada;\n" . "LABEL;POSTAL;HOME;ENCODING=QUOTED-PRINTABLE:555 somestreet rd.=0D=0AToronto, Ontario M1M 1M1=0D=0ACanada\n"; $this->assertEqual($result, $expected); @@ -84,7 +88,7 @@ class VcfHelperTestCase extends CakeTestCase { 'country' => 'Canada', 'street' => '555 somestreet rd.' )); - $expected = "ADR;HOME:;555 somestreet rd.;Toronto;Ontario;;Canada;\n" . + $expected = "ADR;HOME:;;555 somestreet rd.;Toronto;Ontario;;Canada;\n" . "LABEL;POSTAL;HOME;ENCODING=QUOTED-PRINTABLE:555 somestreet rd.=0D=0AToronto, Ontario =0D=0ACanada\n"; $this->assertEqual($result, $expected); cakephp/helpers/vcf/vcf.test.php 74a535dd8458996b2b7ffa070420e253177ab5d7 Mark Story mark@mark-story.com http://github.com/markstory/story-scribbles/commit/bb752d6f29a3a4d155dbf6ff609fc7dc4a153a0c bb752d6f29a3a4d155dbf6ff609fc7dc4a153a0c 2009-03-28T13:44:51-07:00 2009-03-28T13:44:51-07:00 Applying patch from TehTrag and adding tests. 207031143659cd4843507f8d0add952751ce547e Mark Story mark@mark-story.com