diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_vcard.php | 14 |
2 files changed, 8 insertions, 7 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fixed wrong vCard type parameter mobile (#1488067) - Fixed vCard WORKFAX issue (#1488046) - Add vCard's Profile URL support (#1488062) - jQuery 1.6.3 diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php index ec3ad9c87..283da1db7 100644 --- a/program/include/rcube_vcard.php +++ b/program/include/rcube_vcard.php @@ -51,7 +51,7 @@ class rcube_vcard 'edit' => 'X-AB-EDIT', ); 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'); @@ -252,7 +252,7 @@ class rcube_vcard public function set($field, $value, $type = 'HOME') { $field = strtolower($field); - $type = strtoupper($type); + $type_uc = strtoupper($type); $typemap = array_flip($this->typemap); switch ($field) { @@ -301,7 +301,7 @@ class rcube_vcard break; 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; @@ -318,8 +318,8 @@ class rcube_vcard break; 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']); @@ -328,8 +328,8 @@ class rcube_vcard break; 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))) { $index = count($this->raw[$tag]); |