extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

- added mappings for nokia e61

Browse Source 
- removed unneeded charset conversion on import
This commit is contained in:
Lars Kneschke 2006-08-15 12:46:26 +00:00
parent 1f0d4797aa
commit 215bf8f305
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
addressbook/inc/class.vcaladdressbook.inc.php
View File

@ -248,9 +248,32 @@ class vcaladdressbook extends bocontacts
'TEL;WORK' => array('tel_work'), 'TEL;WORK' => array('tel_work'),
'TITLE' => array('title'), 'TITLE' => array('title'),
'URL;WORK' => array('url'), 'URL;WORK' => array('url'),
'URL:HOME' => array('url_home'), 'URL;HOME' => array('url_home'),
); );
$defaultFields[5] = array(
'ADR;WORK' => array('','','adr_one_street','adr_one_locality','adr_one_region',
'adr_one_postalcode','adr_one_countryname'),
'ADR;HOME' => array('','','adr_two_street','adr_two_locality','adr_two_region',
'adr_two_postalcode','adr_two_countryname'),
'BDAY' => array('bday'),
'EMAIL;INTERNET;WORK' => array('email'),
'EMAIL;INTERNET;HOME' => array('email_home'),
'N' => array('n_family','n_given','','n_prefix','n_suffix'),
'NOTE' => array('note'),
'ORG' => array('org_name',''),
'TEL;CELL;WORK' => array('tel_cell'),
'TEL;CELL;HOME' => array('tel_cell_private'),
'TEL;FAX;WORK' => array('tel_fax'),
'TEL;FAX;HOME' => array('tel_fax_home'),
'TEL;HOME' => array('tel_home'),
'TEL;PAGER;WORK' => array('tel_pager'),
'TEL;WORK' => array('tel_work'),
'TITLE' => array('title'),
'URL;WORK' => array('url'),
'URL;HOME' => array('url_home'),
);
//error_log("Client: $_productManufacturer $_productName");
switch(strtolower($_productManufacturer)) switch(strtolower($_productManufacturer))
{ {
case 'nexthaus corporation': case 'nexthaus corporation':
@ -266,6 +289,9 @@ class vcaladdressbook extends bocontacts
case 'nokia': case 'nokia':
switch(strtolower($_productName)) switch(strtolower($_productName))
{ {
case 'e61':
$this->supportedFields = $defaultFields[5];
break;
case '6600': case '6600':
default: default:
$this->supportedFields = $defaultFields[4]; $this->supportedFields = $defaultFields[4];
@ -328,11 +354,9 @@ class vcaladdressbook extends bocontacts
function vcardtoegw($_vcard) function vcardtoegw($_vcard)
{ {
// convert from utf-8 to eGW's charset // the horde class does the charset conversion. DO NOT CONVERT HERE.
$_vcard = $GLOBALS['egw']->translation->convert($_vcard, 'utf-8');
if(!is_array($this->supportedFields)) if(!is_array($this->supportedFields)) {
{
$this->setSupportedFields(); $this->setSupportedFields();
} }
@ -504,6 +528,7 @@ class vcaladdressbook extends bocontacts
} }
} }
} }
$contact['n_fn'] = trim($contact['n_given'].' '.$contact['n_family']); $contact['n_fn'] = trim($contact['n_given'].' '.$contact['n_family']);
return $contact; return $contact;