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

addressbook/inc/class.addressbook_vcal.inc.php

@@ -712,6 +712,19 @@ class addressbook_vcal extends addressbook_bo
 
 			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 'TEL':
 				case 'URL':