--- data.php	Sun Feb 23 11:06:23 2003
+++ ../turba-RELENG/data.php	Fri Jan  3 13:48:56 2003
@@ -232,7 +232,7 @@
                 } else {
                     $dest = $cfgSources[$dest]['map'];
                     foreach ($data as $object) {
-                        if ($object['type'] == 'vcard') {
+                        if ($object['type'] == 'VCARD') {
                             $hash = array();
                             foreach ($object['params'] as $item) {
 
@@ -273,7 +273,7 @@
 
                                 case 'EMAIL':
                                     if (isset($item['params']['PREF']) || !isset($hash['email'])) {
-                                        $hash['email'] = Turba::getBareEmail($vcf->read($item));
+                                        $hash['email'] = Turba::getBareAddress($vcf->read($item));
                                     }
                                     break;