extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

"fix for newest Funambol Outlook client: ignoring VOICE in TEL;VOICE;HOME and TEL;VOICE;WORK"

Browse Source
This commit is contained in:
Ralf Becker 2009-06-29 19:03:43 +00:00
parent e1dbb4688a
commit 48993a04dd
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -65,7 +65,7 @@ class addressbook_vcal extends addressbook_bo
require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php'); require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
$vCard = new Horde_iCalendar_vcard; $vCard = new Horde_iCalendar_vcard;
if(!is_array($this->supportedFields)) { if(!is_array($this->supportedFields)) {
$this->setSupportedFields(); $this->setSupportedFields();
} }
@ -75,10 +75,10 @@ class addressbook_vcal extends addressbook_bo
return false; return false;
} }
//error_log("entry before fixed:\n".print_r($entry,true)); //error_log("entry before fixed:\n".print_r($entry,true));
$this->fixup_contact($entry); $this->fixup_contact($entry);
foreach($this->supportedFields as $vcardField => $databaseFields) foreach($this->supportedFields as $vcardField => $databaseFields)
{ {
$values = array(); $values = array();
@ -630,12 +630,12 @@ class addressbook_vcal extends addressbook_bo
{ {
case 'kde': // KDE Addressbook case 'kde': // KDE Addressbook
$this->supportedFields = $defaultFields[1]; $this->supportedFields = $defaultFields[1];
error_log(__FILE__ . ":groupdav kde 1"); error_log(__FILE__ . ":groupdav kde 1");
break; break;
default: default:
$this->supportedFields = $defaultFields[1]; $this->supportedFields = $defaultFields[1];
} }
break; break;
// the fallback for SyncML // the fallback for SyncML
default: default:
error_log(__FILE__. __METHOD__ ."\nManufacturer-Product not found: '$_productManufacturer' '$_productName'"); error_log(__FILE__. __METHOD__ ."\nManufacturer-Product not found: '$_productManufacturer' '$_productName'");
@ -702,16 +702,29 @@ class addressbook_vcal extends addressbook_bo
// we need also to take care about ADR for example. we do not // we need also to take care about ADR for example. we do not
// support this. We support only ADR;WORK or ADR;HOME // support this. We support only ADR;WORK or ADR;HOME
// njv: As the order of tag occurence is undefined and tags 1... to n are mapped to one addressbook // njv: As the order of tag occurence is undefined and tags 1... to n are mapped to one addressbook
// fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty // fieldname and tags 1... to n may have conflicting content eg EMAIL is set but EMAIL;INTERNET is empty
// and both are mapped to "email" who wins? // and both are mapped to "email" who wins?
foreach($rowNames as $rowName => $vcardKey) foreach($rowNames as $rowName => $vcardKey)
{ {
// error_log("eachrownane:".print_r($rowName,true)); // error_log("eachrownane:".print_r($rowName,true));
switch($rowName) switch($rowName)
{ {
case 'TEL;VOICE;HOME':
case 'TEL;VOICE;WORK': // check if we have a mapping without VOICE
$replace = str_replace('VOICE;','',$rowName);
if (!isset($rowNames[$replace]) && array_key_exists($replace, $this->supportedFields))
{
$finalRowNames[$replace] = $vcardKey; // if yes use that
}
else
{
$finalRowNames[$rowName] = $vcardKey; // else use existing mapping
}
break;
case 'ADR': case 'ADR':
case 'TEL': case 'TEL':
case 'URL': case 'URL':
@ -776,7 +789,7 @@ class addressbook_vcal extends addressbook_bo
} }
} }
// error_log("key:$akey:$vcardKey"); // error_log("key:$akey:$vcardKey");
if( $akey && !empty($vcardValues[$vcardKey]['value'])) if( $akey && !empty($vcardValues[$vcardKey]['value']))
{ {
//error_log("$akey : ".print_r($vcardKey,true)); //error_log("$akey : ".print_r($vcardKey,true));
@ -788,9 +801,9 @@ class addressbook_vcal extends addressbook_bo
{ {
$finalRowNames['EMAIL;INTERNET;HOME'] = $vcardKey; $finalRowNames['EMAIL;INTERNET;HOME'] = $vcardKey;
} }
// error_log("email_home-key: ".print_r($bkey, true)); // error_log("email_home-key: ".print_r($bkey, true));
if($bkey && !empty($vcardValues[$vcardKey]['value'])) if($bkey && !empty($vcardValues[$vcardKey]['value']))
{ {
// error_log("$bkey :".print_r($vcardKey,true)); // error_log("$bkey :".print_r($vcardKey,true));