From 5c2c6b071c2ec5745d2f95c8e3666a5b6998e81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Wed, 9 Jun 2010 17:51:27 +0000
Subject: [PATCH] Update full supported fields for addressbook synchronization

---
 .../inc/class.addressbook_vcal.inc.php        | 64 +++++++++++--------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php
index e243cf120e..665a4b4f69 100644
--- a/addressbook/inc/class.addressbook_vcal.inc.php
+++ b/addressbook/inc/class.addressbook_vcal.inc.php
@@ -38,34 +38,42 @@ class addressbook_vcal extends addressbook_bo
 	 *
 	 * @var array
 	 */
-	var $supportedFields = array(	// all entries, nexthaus corporation, groupdav, ...
-			'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'),
-			'CATEGORIES'	=> array('cat_id'),
-			'EMAIL;INTERNET;WORK' => array('email'),
-			'EMAIL;INTERNET;HOME' => array('email_home'),
-			'N'		=> array('n_family','n_given','n_middle','n_prefix','n_suffix'),
-			'FN'		=> array('n_fn'),
-			'NOTE'		=> array('note'),
-			'ORG'		=> array('org_name','org_unit'),
-			'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'),
-			'ROLE'		=> array('role'),
-			'URL;HOME'	=> array('url_home'),
-			'FBURL'		=> array('freebusy_uri'),
-			'PHOTO'		=> array('jpegphoto'),
-			'UID'       => array('uid'),
-		);
+	var $supportedFields = array( // all entries e.g. for groupdav
+			'ADR;WORK'			=> array('','adr_one_street2','adr_one_street','adr_one_locality','adr_one_region',
+									'adr_one_postalcode','adr_one_countryname'),
+			'ADR;HOME'			=> array('','adr_two_street2','adr_two_street','adr_two_locality','adr_two_region',
+									'adr_two_postalcode','adr_two_countryname'),
+			'BDAY'				=> array('bday'),
+			'CLASS'				=> array('private'),
+			'CATEGORIES'		=> array('cat_id'),
+			'EMAIL;WORK'		=> array('email'),
+			'EMAIL;HOME'		=> array('email_home'),
+			'N'					=> array('n_family','n_given','n_middle',
+									'n_prefix','n_suffix'),
+			'FN'				=> array('n_fn'),
+			'NOTE'				=> array('note'),
+			'ORG'				=> array('org_name','org_unit','room'),
+			'TEL;CELL;WORK'		=> array('tel_cell'),
+			'TEL;CELL;HOME'		=> array('tel_cell_private'),
+			'TEL;CAR'			=> array('tel_car'),
+			'TEL;OTHER;VOICE'	=> array('tel_other'),
+			'TEL;VOICE;WORK'	=> array('tel_work'),
+			'TEL;FAX;WORK'		=> array('tel_fax'),
+			'TEL;HOME;VOICE'	=> array('tel_home'),
+			'TEL;FAX;HOME'		=> array('tel_fax_home'),
+			'TEL;PAGER'			=> array('tel_pager'),
+			'TITLE'				=> array('title'),
+			'URL;WORK'			=> array('url'),
+			'URL;HOME'			=> array('url_home'),
+			'ROLE'				=> array('role'),
+			'NICKNAME'			=> array('label'),
+			'FBURL'				=> array('freebusy_uri'),
+			'PHOTO'				=> array('jpegphoto'),
+			'X-ASSISTANT'		=> array('assistent'),
+			'X-ASSISTANT-TEL'	=> array('tel_assistent'),
+			'UID'				=> array('uid'),
+		); 
+
 	/**
 	 * VCard version
 	 *