Changeset 5160 in subversion

Timestamp:

Sep 5, 2011 3:40:18 AM (21 months ago)

Author:

thomasb

Message:

Fix wrong vCard type parameter mobile (#1488067)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_vcard.php (modified) (5 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fixed wrong vCard type parameter mobile (#1488067)
 - Fixed vCard WORKFAX issue (#1488046)
 - Add vCard's Profile URL support (#1488062)

trunk/roundcubemail/program/include/rcube_vcard.php

@@ -52 +52 @@
   );
   private $typemap = array('iPhone' => 'mobile', 'CELL' => 'mobile', 'WORK,FAX' => 'workfax');
-  private $phonetypemap = array('HOME1' => 'HOME', 'BUSINESS1' => 'WORK', 'BUSINESS2' => 'WORK2', 'BUSINESSFAX' => 'WORK,FAX', 'WORKFAX' => 'WORK,FAX');
+  private $phonetypemap = array('HOME1' => 'HOME', 'BUSINESS1' => 'WORK', 'BUSINESS2' => 'WORK2', 'BUSINESSFAX' => 'WORK,FAX');
   private $addresstypemap = array('BUSINESS' => 'WORK');
   private $immap = array('X-JABBER' => 'jabber', 'X-ICQ' => 'icq', 'X-MSN' => 'msn', 'X-AIM' => 'aim', 'X-YAHOO' => 'yahoo', 'X-SKYPE' => 'skype', 'X-SKYPE-USERNAME' => 'skype');
@@ -253 +253 @@
   {
     $field = strtolower($field);
-    $type = strtoupper($type);
+    $type_uc = strtoupper($type);
     $typemap = array_flip($this->typemap);
 
@@ -302 +302 @@
 
       case 'email':
-        $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type)));
+        $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type_uc)));
         $this->email[] = $value;
         break;
@@ -319 +319 @@
 
       case 'address':
-        if ($this->addresstypemap[$type])
-          $type = $this->addresstypemap[$type];
+        if ($this->addresstypemap[$type_uc])
+          $type = $this->addresstypemap[$type_uc];
 
         $value = $value[0] ? $value : array('', '', $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']);
@@ -329 +329 @@
 
       default:
-        if ($field == 'phone' && $this->phonetypemap[$type])
-          $type = $this->phonetypemap[$type];
+        if ($field == 'phone' && $this->phonetypemap[$type_uc])
+          $type = $this->phonetypemap[$type_uc];
 
         if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) {