From 312aaa02f241fe7b8c2795e73f8e4ce5ca481ff3 Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Sun, 23 Oct 2011 11:35:47 +0200
Subject: [PATCH 01/10] Improve style in contacts

---
 css/styles.css             | 2 +-
 js/interface.js            | 6 +++---
 templates/part.details.php | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index 68f843b7..e2e67334 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -6,7 +6,7 @@
 #contacts_details_list li { overflow:hidden; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em; }
 #contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%; overflow:hidden; }
-#contacts_addproperty, #contacts_addproperty_button { margin-left:25%; }
+#contacts_addproperty_button, #contacts_setproperty_button { margin-left:25%; }
 
 .contacts_property_data ul, .contacts_property_data ol { list-style:none; }
 .contacts_property_data li { overflow: hidden; }
diff --git a/js/interface.js b/js/interface.js
index 9270297f..1cc3a5df 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -56,13 +56,13 @@ $(document).ready(function(){
 		$('#contacts_addpropertyform #contacts_fieldpart').remove();
 		$('#contacts_addpropertyform #contacts_generic').remove();
 		if($(this).val() == 'ADR'){
-			$('#contacts_addresspart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_addresspart').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
 		else if($(this).val() == 'TEL'){
-			$('#contacts_phonepart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_phonepart').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
 		else{
-			$('#contacts_generic').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+			$('#contacts_generic').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
 	});
 
diff --git a/templates/part.details.php b/templates/part.details.php
index e9fa8356..212be283 100644
--- a/templates/part.details.php
+++ b/templates/part.details.php
@@ -35,7 +35,8 @@
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
 					<input type="text" name="value" value="">
-				</p><br>
+				</p>
+				<br>
 				<input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
 			</form>
 			<div id="contacts_addcontactsparts" style="display:none;">

From f2484423a7842131badd01aea8337dd2c816b88b Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Wed, 9 Nov 2011 11:33:10 +0100
Subject: [PATCH 02/10] contacts: put property key in background, the value is
 important!

---
 css/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/styles.css b/css/styles.css
index e2e67334..ad64c777 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -4,7 +4,7 @@
 #contacts_deletecard {position:absolute;top:15px;right:0;}
 #contacts_details_list { list-style:none; }
 #contacts_details_list li { overflow:hidden; }
-#contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em; }
+#contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
 #contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%; overflow:hidden; }
 #contacts_addproperty_button, #contacts_setproperty_button { margin-left:25%; }
 

From e6cf001105ecfb8b72e71c881512c8780d22a408 Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Wed, 9 Nov 2011 11:34:04 +0100
Subject: [PATCH 03/10] contacts: every card needs a version!

---
 lib/vcard.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/vcard.php b/lib/vcard.php
index adfa32b6..a6795c79 100644
--- a/lib/vcard.php
+++ b/lib/vcard.php
@@ -95,10 +95,15 @@ class OC_Contacts_VCard{
 
 		$card = self::parse($data);
 		if(!is_null($card)){
+			// VCARD must have a version
+			$hasversion = false;
 			foreach($card->children as $property){
 				if($property->name == 'FN'){
 					$fn = $property->value;
 				}
+				elseif($property->name == 'VERSION'){
+					$hasversion = true;
+				}
 				elseif(is_null($uri) && $property->name == 'UID' ){
 					$uri = $property->value.'.vcf';
 				}
@@ -109,6 +114,11 @@ class OC_Contacts_VCard{
 				$card->add(new Sabre_VObject_Property('UID',$uid));
 				$data = $card->serialize();
 			};
+			// Add version if needed
+			if(!$hasversion){
+				$card->add(new Sabre_VObject_Property('VERSION','3.0'));
+				$data = $card->serialize();
+			}
 		}
 		else{
 			// that's hard. Creating a UID and not saving it

From 33e0263509019030f0ec25341dddcf85b74c5b5a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 5 Nov 2011 20:33:42 +0100
Subject: [PATCH 04/10] Use a function to generate select options

---
 ajax/getdetails.php                | 12 ++++++++++++
 ajax/showaddcard.php               |  5 +++++
 ajax/showsetproperty.php           |  2 ++
 lib/vcard.php                      | 20 ++++++++++++++++++++
 templates/part.addcardform.php     | 16 +++-------------
 templates/part.details.php         | 17 +++--------------
 templates/part.setpropertyform.php |  6 ++++++
 7 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/ajax/getdetails.php b/ajax/getdetails.php
index 0e76de61..260fb53a 100644
--- a/ajax/getdetails.php
+++ b/ajax/getdetails.php
@@ -51,10 +51,22 @@ if(is_null($vcard)){
 	exit();
 }
 
+$property_types = array(
+	'ADR'   => $l10n->t('Address'),
+	'TEL'   => $l10n->t('Telephone'),
+	'EMAIL' => $l10n->t('Email'),
+	'ORG'   => $l10n->t('Organization'),
+);
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $details = OC_Contacts_VCard::structureContact($vcard);
 $tmpl = new OC_Template('contacts','part.details');
 $tmpl->assign('details',$details);
 $tmpl->assign('id',$id);
+$tmpl->assign('property_types',$property_types);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'id' => $id, 'page' => $page )));
diff --git a/ajax/showaddcard.php b/ajax/showaddcard.php
index 2f534f0f..98367758 100644
--- a/ajax/showaddcard.php
+++ b/ajax/showaddcard.php
@@ -29,9 +29,14 @@ $l10n = new OC_L10N('contacts');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
 $tmpl = new OC_Template('contacts','part.addcardform');
 $tmpl->assign('addressbooks',$addressbooks);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/ajax/showsetproperty.php b/ajax/showsetproperty.php
index 6188f477..4ec3dd7d 100644
--- a/ajax/showsetproperty.php
+++ b/ajax/showsetproperty.php
@@ -61,11 +61,13 @@ if(is_null($line)){
 	exit();
 }
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
 
 $tmpl = new OC_Template('contacts','part.setpropertyform');
 $tmpl->assign('id',$id);
 $tmpl->assign('checksum',$checksum);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line]));
+$tmpl->assign('adr_types',$adr_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/lib/vcard.php b/lib/vcard.php
index a6795c79..56602f25 100644
--- a/lib/vcard.php
+++ b/lib/vcard.php
@@ -372,4 +372,24 @@ class OC_Contacts_VCard{
 			return null;
 		}
 	}
+	public static function getTypesOfProperty($l, $prop){
+		switch($prop){
+		case 'ADR':
+			return array(
+				'WORK' => $l->t('Work'),
+				'HOME' => $l->t('Home'),
+			);
+		case 'TEL':
+			return array(
+				'HOME'  =>  $l->t('Home'),
+				'CELL'  =>  $l->t('Mobile'),
+				'WORK'  =>  $l->t('Work'),
+				'TEXT'  =>  $l->t('Text'),
+				'VOICE' =>  $l->t('Voice'),
+				'FAX'   =>  $l->t('Fax'),
+				'VIDEO' =>  $l->t('Video'),
+				'PAGER' =>  $l->t('Pager'),
+			);
+		}
+	}
 }
diff --git a/templates/part.addcardform.php b/templates/part.addcardform.php
index a596ad81..037e3629 100644
--- a/templates/part.addcardform.php
+++ b/templates/part.addcardform.php
@@ -7,9 +7,7 @@
 				<li class="input stringish">
 					<label class="label" for="id"><?php echo $l->t('Group'); ?></label>
 					<select name="id" size="1">
-						<?php foreach($_['addressbooks'] as $addressbook): ?>
-							<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['displayname']; ?></option>
-						<?php endforeach; ?>
+						<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
 					</select>
 				</li>
 			</ol>
@@ -46,14 +44,7 @@
 						<li class="fragment">
 							<label for="tel_type"><?php echo $l->t('Type'); ?></label>
 							<select id="TEL" name="parameters[TEL][TYPE]" size="1">
-								<option value="home"><?php echo $l->t('Home'); ?></option>
-								<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-								<option value="work"><?php echo $l->t('Work'); ?></option>
-								<option value="text"><?php echo $l->t('Text'); ?></option>
-								<option value="voice"><?php echo $l->t('Voice'); ?></option>
-								<option value="fax"><?php echo $l->t('Fax'); ?></option>
-								<option value="video"><?php echo $l->t('Video'); ?></option>
-								<option value="pager"><?php echo $l->t('Pager'); ?></option>
+								<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 							</select>
 						</li>
 					</ol>
@@ -67,8 +58,7 @@
 			<li class="input">
 				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
 				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
-					<option value="work"><?php echo $l->t('Work'); ?></option>
-					<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
+					<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 				</select>
 			</li>
 			<li class="input stringish">
diff --git a/templates/part.details.php b/templates/part.details.php
index 212be283..f5bd7580 100644
--- a/templates/part.details.php
+++ b/templates/part.details.php
@@ -27,10 +27,7 @@
 				<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 				<p class="contacts_property_name">
 					<select name="name" size="1">
-						<option value="ADR"><?php echo $l->t('Address'); ?></option>
-						<option value="TEL"><?php echo $l->t('Telephone'); ?></option>
-						<option value="EMAIL" selected="selected"><?php echo $l->t('Email'); ?></option>
-						<option value="ORG"><?php echo $l->t('Organization'); ?></option>
+						<?php echo html_select_options($_['property_types'], 'EMAIL') ?>
 					</select>
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
@@ -44,8 +41,7 @@
 					<li>
 						<label for="adr_type"><?php echo $l->t('Type'); ?></label>
 						<select id="adr_type" name="parameters[TYPE]" size="1">
-							<option value="work"><?php echo $l->t('Work'); ?></option>
-							<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
+							<?php echo html_select_options($_['adr_types'], 'HOME') ?>
 						</select>
 					</li>
 					<li>
@@ -80,14 +76,7 @@
 				<p class="contacts_property_data" id="contacts_phonepart">
 					<input type="text" name="value" value="">
 					<select name="parameters[TYPE]" size="1">
-						<option value="home"><?php echo $l->t('Home'); ?></option>
-						<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
-						<option value="work"><?php echo $l->t('Work'); ?></option>
-						<option value="text"><?php echo $l->t('Text'); ?></option>
-						<option value="voice"><?php echo $l->t('Voice'); ?></option>
-						<option value="fax"><?php echo $l->t('Fax'); ?></option>
-						<option value="video"><?php echo $l->t('Video'); ?></option>
-						<option value="pager"><?php echo $l->t('Pager'); ?></option>
+						<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 					</select>
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index eb8a67a8..811b9626 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -5,6 +5,12 @@
 		<?php if($_['property']['name']=='ADR'): ?>
 			<p class="contacts_property_name"><label for="adr_pobox"><?php echo $l->t('Address'); ?></label></p>
 			<ol class="contacts_property_data" id="contacts_addresspart">
+				<li class="input">
+					<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
+					<select id="adr_type" name="parameters[TYPE]" size="1">
+						<?php echo html_select_options($_['adr_types'], strtoupper($_['property']['parameters']['TYPE'])) ?>
+					</select>
+				</li>
 				<li>
 					<label for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
 					<input id="adr_pobox" type="text" name="value[0]" value="<?php echo $_['property']['value'][0] ?>">

From 3abb1a1285d7d0f51fc88cbd9af06e7f90b40a7b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 17 Nov 2011 23:54:14 +0100
Subject: [PATCH 05/10] Add type selects to editing ADR & TEL contact property
 types

---
 ajax/addcard.php                   |  5 +++++
 ajax/setproperty.php               |  5 +++++
 ajax/showsetproperty.php           |  2 ++
 index.php                          |  6 ++++++
 templates/part.property.php        | 22 ++++++++++++++++++++--
 templates/part.setpropertyform.php |  5 ++++-
 6 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/ajax/addcard.php b/ajax/addcard.php
index 0cecd3bd..dd5b9065 100644
--- a/ajax/addcard.php
+++ b/ajax/addcard.php
@@ -68,11 +68,16 @@ foreach( $add as $propname){
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $details = OC_Contacts_VCard::structureContact($vcard);
 $name = $details['FN'][0]['value'];
 $tmpl = new OC_Template('contacts','part.details');
 $tmpl->assign('details',$details);
 $tmpl->assign('id',$id);
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'id' => $id, 'name' => $name, 'page' => $page )));
diff --git a/ajax/setproperty.php b/ajax/setproperty.php
index 18e00872..9164f869 100644
--- a/ajax/setproperty.php
+++ b/ajax/setproperty.php
@@ -94,7 +94,12 @@ $checksum = md5($vcard->children[$line]->serialize());
 
 OC_Contacts_VCard::edit($id,$vcard->serialize());
 
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 $tmpl = new OC_Template('contacts','part.property');
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line],$line));
 $page = $tmpl->fetchPage();
 
diff --git a/ajax/showsetproperty.php b/ajax/showsetproperty.php
index 4ec3dd7d..2ec4b89b 100644
--- a/ajax/showsetproperty.php
+++ b/ajax/showsetproperty.php
@@ -62,12 +62,14 @@ if(is_null($line)){
 }
 
 $adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
 
 $tmpl = new OC_Template('contacts','part.setpropertyform');
 $tmpl->assign('id',$id);
 $tmpl->assign('checksum',$checksum);
 $tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line]));
 $tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $page = $tmpl->fetchPage();
 
 OC_JSON::success(array('data' => array( 'page' => $page )));
diff --git a/index.php b/index.php
index 7e93d618..29d41d3c 100644
--- a/index.php
+++ b/index.php
@@ -75,8 +75,14 @@ if( !is_null($id) || count($contacts)){
 	$details = OC_Contacts_VCard::structureContact($vcard);
 }
 
+$l10n = new OC_L10N('contacts');
+$adr_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'ADR');
+$phone_types = OC_Contacts_VCard::getTypesOfProperty($l10n, 'TEL');
+
 // Process the template
 $tmpl = new OC_Template( 'contacts', 'index', 'user' );
+$tmpl->assign('adr_types',$adr_types);
+$tmpl->assign('phone_types',$phone_types);
 $tmpl->assign('addressbooks', $addressbooks);
 $tmpl->assign('contacts', $contacts);
 $tmpl->assign('details', $details );
diff --git a/templates/part.property.php b/templates/part.property.php
index 4bc3a4d8..dbd125dc 100644
--- a/templates/part.property.php
+++ b/templates/part.property.php
@@ -24,7 +24,16 @@
 		<p class="contacts_property_data">
 			<?php echo $_['property']['value']; ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
-				(<?php echo $l->t(ucwords(str_replace('cell','mobile',strtolower($_['property']['parameters']['TYPE'])))); ?>)
+<?php
+	$type = $_['property']['parameters']['TYPE'];
+	if (isset($_['phone_types'][strtoupper($type)])){
+		$label=$_['phone_types'][strtoupper($type)];
+	}
+	else{
+		$label=$l->t(ucwords(strtolower($type)));
+	}
+?>
+				(<?php echo $label; ?>)
 			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
@@ -34,7 +43,16 @@
 			<?php echo $l->t('Address'); ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				<br>
-				(<?php echo $l->t(ucwords($_['property']['parameters']['TYPE'])); ?>)
+<?php
+	$type = $_['property']['parameters']['TYPE'];
+	if (isset($_['adr_types'][strtoupper($type)])){
+		$label=$_['adr_types'][strtoupper($type)];
+	}
+	else{
+		$label=$l->t(ucwords(strtolower($type)));
+	}
+?>
+				(<?php echo $label; ?>)
 			<?php endif; ?>
 		</p>
 		<p class="contacts_property_data">
diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index 811b9626..9340ce7c 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -42,7 +42,10 @@
 			</ol>
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
-			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value']; ?>"></p>
+			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value']; ?>">
+				<select id="tel_type" name="parameters[TYPE]" size="1">
+					<?php echo html_select_options($_['phone_types'], strtoupper($_['property']['parameters']['TYPE'])) ?>
+				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>
 			<p class="contacts_property_data"><input id="email" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>

From 5372e61d348b84b606c59875a99003c91c08d622 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 23 Nov 2011 21:06:51 +0100
Subject: [PATCH 06/10] Contacts: support multiple phone type parameter

---
 ajax/setproperty.php               | 12 +++++++++++-
 css/formtastic.css                 |  8 +++-----
 css/styles.css                     | 11 ++++++++---
 js/interface.js                    | 12 ++++++++----
 lib/vcard.php                      | 20 ++++++++++++++++++--
 templates/part.addcardform.php     |  2 +-
 templates/part.property.php        | 19 +++++++++++--------
 templates/part.setpropertyform.php |  6 +++---
 8 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/ajax/setproperty.php b/ajax/setproperty.php
index 9164f869..c9102c4a 100644
--- a/ajax/setproperty.php
+++ b/ajax/setproperty.php
@@ -70,6 +70,9 @@ $vcard->children[$line]->setValue($value);
 
 // Add parameters
 $postparameters = isset($_POST['parameters'])?$_POST['parameters']:array();
+if ($vcard->children[$line]->name == 'TEL' && !array_key_exists('TYPE', $postparameters)){
+	$postparameters['TYPE']='';
+}
 for($i=0;$i<count($vcard->children[$line]->parameters);$i++){
 	$name = $vcard->children[$line]->parameters[$i]->name;
 	if(array_key_exists($name,$postparameters)){
@@ -77,7 +80,14 @@ for($i=0;$i<count($vcard->children[$line]->parameters);$i++){
 			unset($vcard->children[$line]->parameters[$i]);
 		}
 		else{
-			$vcard->children[$line]->parameters[$i]->value = $postparameters[$name];
+			unset($vcard->children[$line][$name]);
+			$values = $postparameters[$name];
+			if (!is_array($values)){
+				$values = array($values);
+			}
+			foreach($values as $value){
+				$vcard->children[$line]->add($name, $value);
+			}
 		}
 		unset($postparameters[$name]);
 	}
diff --git a/css/formtastic.css b/css/formtastic.css
index 629c2207..fede92b6 100644
--- a/css/formtastic.css
+++ b/css/formtastic.css
@@ -94,16 +94,14 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .inputs {
-  overflow:hidden; /* clear containing floats */
-}
-
-.formtastic .input {
-  overflow:hidden; /* clear containing floats */
   padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
   margin-top:-0.5em;
   margin-bottom:1em;
 }
 
+.formtastic .input {
+}
+
 
 /* LEFT ALIGNED LABELS
 --------------------------------------------------------------------------------------------------*/
diff --git a/css/styles.css b/css/styles.css
index ad64c777..e226c48a 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -3,16 +3,21 @@
 
 #contacts_deletecard {position:absolute;top:15px;right:0;}
 #contacts_details_list { list-style:none; }
-#contacts_details_list li { overflow:hidden; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
-#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%; overflow:hidden; }
+#contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; }
 #contacts_addproperty_button, #contacts_setproperty_button { margin-left:25%; }
 
-.contacts_property_data ul, .contacts_property_data ol { list-style:none; }
+.contacts_property_data ul, ol.contacts_property_data { list-style:none; }
 .contacts_property_data li { overflow: hidden; }
 .contacts_property_data li label { width:20%; float:left; text-align:right;padding-right:0.3em; }
+.contacts_property_data input { float:left; }
 .contacts_property_data li input { width:70%;overflow:hidden; }
 
+.chzn-container { margin:3px 0 0; }
+.chzn-container .chzn-choices { border-radius: 0.5em; }
+.chzn-container.chzn-container-active .chzn-choices { border-bottom-left-radius: 0;border-bottom-right-radius: 0; }
+.chzn-container .chzn-drop { border-bottom-left-radius: 0.5em;border-bottom-right-radius: 0.5em; }
+
 /* Form setup ----------------------------------------------------------------*/
 /* .forme {} */
 /* .forme ul, .forme ol { list-style:none; } */
diff --git a/js/interface.js b/js/interface.js
index 1cc3a5df..24b512e5 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -82,7 +82,8 @@ $(document).ready(function(){
 		$.getJSON('ajax/showaddcard.php',{},function(jsondata){
 			if(jsondata.status == 'success'){
 				$('#rightcontent').data('id','');
-				$('#rightcontent').html(jsondata.data.page);
+				$('#rightcontent').html(jsondata.data.page)
+					.find('select').chosen();
 			}
 			else{
 				alert(jsondata.data.message);
@@ -111,7 +112,8 @@ $(document).ready(function(){
 		var checksum = $(this).parents('li').first().data('checksum');
 		$.getJSON('ajax/showsetproperty.php',{'id': id, 'checksum': checksum },function(jsondata){
 			if(jsondata.status == 'success'){
-				$('.contacts_property[data-checksum="'+checksum+'"]').html(jsondata.data.page);
+				$('.contacts_property[data-checksum="'+checksum+'"]').html(jsondata.data.page)
+					.find('select').chosen();
 			}
 			else{
 				alert(jsondata.data.message);
@@ -148,10 +150,12 @@ $(document).ready(function(){
 
 
 	$('.contacts_property').live('mouseenter',function(){
-		$(this).find('span').show();
+		$(this).find('span[data-use]').show();
 	});
 
 	$('.contacts_property').live('mouseleave',function(){
-		$(this).find('span').hide();
+		$(this).find('span[data-use]').hide();
 	});
+
+	$('#contacts_addcardform select').chosen();
 });
diff --git a/lib/vcard.php b/lib/vcard.php
index 56602f25..4865fae7 100644
--- a/lib/vcard.php
+++ b/lib/vcard.php
@@ -296,7 +296,13 @@ class OC_Contacts_VCard{
 		$property = new Sabre_VObject_Property( $name, $value );
 		$parameternames = array_keys($parameters);
 		foreach($parameternames as $i){
-			$property->parameters[] = new Sabre_VObject_Parameter($i,$parameters[$i]);
+			$values = $parameters[$i];
+			if (!is_array($values)){
+				$values = array($values);
+			}
+			foreach($values as $value){
+				$property->add($i, $value);
+			}
 		}
 
 		$vcard->add($property);
@@ -352,7 +358,17 @@ class OC_Contacts_VCard{
 				$parameter->name = 'PREF';
 				$parameter->value = '1';
 			}
-			$temp['parameters'][$parameter->name] = $parameter->value;
+			if ($property->name == 'TEL' && $parameter->name == 'TYPE'){
+				if (isset($temp['parameters'][$parameter->name])){
+					$temp['parameters'][$parameter->name][] = $parameter->value;
+				}
+				else{
+					$temp['parameters'][$parameter->name] = array($parameter->value);
+				}
+			}
+			else{
+				$temp['parameters'][$parameter->name] = $parameter->value;
+			}
 		}
 		return $temp;
 	}
diff --git a/templates/part.addcardform.php b/templates/part.addcardform.php
index 037e3629..62705354 100644
--- a/templates/part.addcardform.php
+++ b/templates/part.addcardform.php
@@ -43,7 +43,7 @@
 						</li>
 						<li class="fragment">
 							<label for="tel_type"><?php echo $l->t('Type'); ?></label>
-							<select id="TEL" name="parameters[TEL][TYPE]" size="1">
+							<select id="TEL" name="parameters[TEL][TYPE][]" multiple="multiple">
 								<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 							</select>
 						</li>
diff --git a/templates/part.property.php b/templates/part.property.php
index dbd125dc..afef4311 100644
--- a/templates/part.property.php
+++ b/templates/part.property.php
@@ -23,15 +23,18 @@
 		<p class="contacts_property_name"><?php echo $l->t('Phone'); ?></p>
 		<p class="contacts_property_data">
 			<?php echo $_['property']['value']; ?>
-			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
+			<?php if(isset($_['property']['parameters']['TYPE']) && !empty($_['property']['parameters']['TYPE'])): ?>
 <?php
-	$type = $_['property']['parameters']['TYPE'];
-	if (isset($_['phone_types'][strtoupper($type)])){
-		$label=$_['phone_types'][strtoupper($type)];
-	}
-	else{
-		$label=$l->t(ucwords(strtolower($type)));
-	}
+	$types = array();
+	foreach($_['property']['parameters']['TYPE'] as $type):
+		if (isset($_['phone_types'][strtoupper($type)])){
+			$types[]=$_['phone_types'][strtoupper($type)];
+		}
+		else{
+			$types[]=$l->t(ucwords(strtolower($type)));
+		}
+	endforeach;
+	$label = join(' ', $types);
 ?>
 				(<?php echo $label; ?>)
 			<?php endif; ?>
diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index 9340ce7c..bd18d86b 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -42,9 +42,9 @@
 			</ol>
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
-			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value']; ?>">
-				<select id="tel_type" name="parameters[TYPE]" size="1">
-					<?php echo html_select_options($_['phone_types'], strtoupper($_['property']['parameters']['TYPE'])) ?>
+			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
+				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple">
+					<?php echo html_select_options($_['phone_types'], ($_['property']['parameters']['TYPE'])) ?>
 				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>

From f076db00dc3bb919b8762e37f165db8ec7bbfd09 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 23 Nov 2011 21:07:26 +0100
Subject: [PATCH 07/10] Contacts: remove redundant li in setpropertyform
 template

---
 templates/part.setpropertyform.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index bd18d86b..b0bf6645 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -1,4 +1,3 @@
-<li class="contacts_property_edit" data-checksum="<?php echo $_['property']['checksum']; ?>">
 	<form id="contacts_setpropertyform">
 		<input type="hidden" name="checksum" value="<?php echo $_['property']['checksum']; ?>">
 		<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
@@ -55,4 +54,3 @@
 		<?php endif; ?>
 		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Edit'); ?>">
 	</form>
-</li>

From adab7b7012168e5a90c2a7f34f8e0c01badb7480 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 24 Nov 2011 21:34:50 +0100
Subject: [PATCH 08/10] Contacts: make type of phone property also multiselect
 in addproperty

---
 js/interface.js            | 1 +
 templates/part.details.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/interface.js b/js/interface.js
index 24b512e5..ba1c0e53 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -64,6 +64,7 @@ $(document).ready(function(){
 		else{
 			$('#contacts_generic').clone().insertAfter($('#contacts_addpropertyform .contacts_property_name'));
 		}
+		$('#contacts_addpropertyform .contacts_property_data select').chosen();
 	});
 
 	$('#contacts_addpropertyform input[type="submit"]').live('click',function(){
diff --git a/templates/part.details.php b/templates/part.details.php
index f5bd7580..5e9a5c56 100644
--- a/templates/part.details.php
+++ b/templates/part.details.php
@@ -75,7 +75,7 @@
 				</ul>
 				<p class="contacts_property_data" id="contacts_phonepart">
 					<input type="text" name="value" value="">
-					<select name="parameters[TYPE]" size="1">
+					<select name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
 						<?php echo html_select_options($_['phone_types'], 'CELL') ?>
 					</select>
 				</p>

From 0e9fa8b88fdd228e5475c6e71c25b12711e3f90e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 24 Nov 2011 21:35:41 +0100
Subject: [PATCH 09/10] Contacts: better label for saving a property

---
 templates/part.setpropertyform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index b0bf6645..d31bde00 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -52,5 +52,5 @@
 			<p class="contacts_property_name"><label for="org"><?php echo $l->t('Organization'); ?></label></p>
 			<p class="contacts_property_data"><input id="org" type="text" name="value" value="<?php echo $_['property']['value']; ?>"></p>
 		<?php endif; ?>
-		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Edit'); ?>">
+		<input id="contacts_setproperty_button" type="submit" value="<?php echo $l->t('Update'); ?>">
 	</form>

From 59e3d53e6208d80710dbdec3bf32df0447111497 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 24 Nov 2011 21:36:14 +0100
Subject: [PATCH 10/10] Contacts: layout updates

---
 css/styles.css                     | 3 ++-
 templates/part.details.php         | 4 ++--
 templates/part.setpropertyform.php | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index e226c48a..f351589f 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -3,9 +3,10 @@
 
 #contacts_deletecard {position:absolute;top:15px;right:0;}
 #contacts_details_list { list-style:none; }
+#contacts_details_list li { overflow:visible; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
 #contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; }
-#contacts_addproperty_button, #contacts_setproperty_button { margin-left:25%; }
+#contacts_setproperty_button { margin-left:25%; }
 
 .contacts_property_data ul, ol.contacts_property_data { list-style:none; }
 .contacts_property_data li { overflow: hidden; }
diff --git a/templates/part.details.php b/templates/part.details.php
index 5e9a5c56..f6d69005 100644
--- a/templates/part.details.php
+++ b/templates/part.details.php
@@ -29,12 +29,12 @@
 					<select name="name" size="1">
 						<?php echo html_select_options($_['property_types'], 'EMAIL') ?>
 					</select>
+					<br>
+					<input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
 				</p>
 				<p class="contacts_property_data" id="contacts_generic">
 					<input type="text" name="value" value="">
 				</p>
-				<br>
-				<input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
 			</form>
 			<div id="contacts_addcontactsparts" style="display:none;">
 				<ul class="contacts_property_data" id="contacts_addresspart">
diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index d31bde00..f216a55f 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -42,8 +42,8 @@
 		<?php elseif($_['property']['name']=='TEL'): ?>
 			<p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
 			<p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
-				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple">
-					<?php echo html_select_options($_['phone_types'], ($_['property']['parameters']['TYPE'])) ?>
+				<select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
+					<?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:'') ?>
 				</select></p>
 		<?php elseif($_['property']['name']=='EMAIL'): ?>
 			<p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>