Merge branch '2.4RC'2.4

1 files changed, 31 insertions, 10 deletions

diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 32e888f14..f6e8b11ed 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -317,8 +317,10 @@ class Profiles extends \Zotlabs\Web\Controller {
 	
 			$hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
 	
+// start fresh and create a new vcard. TODO: preserve the original guid or whatever else needs saving
+//			$orig_vcard = (($orig[0]['profile_vcard']) ? \Sabre\VObject\Reader::read($orig[0]['profile_vcard']) : null); 
 
-			$orig_vcard = (($orig[0]['profile_vcard']) ? \Sabre\VObject\Reader::read($orig[0]['profile_vcard']) : null); 
+			$orig_vcard = null;
 
 			$channel = \App::get_channel();
 
@@ -330,13 +332,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 				'photo'      => $channel['xchan_photo_l'],
 				'adr'        => [],
 				'adr_type'   => [ $default_vcard_cat ],
-				'tel'        => [],
-				'tel_type'   => [ $default_vcard_cat ],
-				'email'      => [],
-				'email_type' => [ $default_vcard_cat ],
-				'impp'       => [],
-				'impp_type'  => [ $default_vcard_cat ],
-				'url'        => [],
+				'url'        => [ $homepage ],
 				'url_type'   => [ $default_vcard_cat ]
 			];
 
@@ -350,9 +346,12 @@ class Profiles extends \Zotlabs\Web\Controller {
 				6 => $country_name
 			];
 				
-
 			$profile_vcard = update_vcard($defcard,$orig_vcard);
 
+			$orig_vcard = \Sabre\VObject\Reader::read($profile_vcard);
+
+			$profile_vcard = update_vcard($_REQUEST,$orig_vcard);
+
 
 			require_once('include/text.php');
 			linkify_tags($a, $likes, local_channel());
@@ -700,6 +699,10 @@ class Profiles extends \Zotlabs\Web\Controller {
 			}
 	
 	//logger('extra_fields: ' . print_r($extra_fields,true));
+
+			$vc = $r[0]['profile_vcard'];
+			$vctmp = (($vc) ? \Sabre\VObject\Reader::read($vc) : null); 
+			$vcard = (($vctmp) ? get_vcard_array($vctmp,$r[0]['id']) : [] );
 	
 			$f = get_config('system','birthday_input_format');
 			if(! $f)
@@ -717,6 +720,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 					. get_form_security_token("profile_drop"),
 	
 				'$fields'       => $fields,
+				'$vcard'        => $vcard,
 				'$guid'         => $r[0]['profile_guid'],
 				'$banner'       => t('Edit Profile Details'),
 				'$submit'       => t('Submit'),
@@ -776,11 +780,28 @@ class Profiles extends \Zotlabs\Web\Controller {
 				'$film'         => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']),
 				'$interest'     => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
 				'$romance'      => array('romance',t('Love/Romance'), $r[0]['romance']),
-				'$work'         => array('work', t('Work/Employment'), $r[0]['employment']),
+				'$employ'         => array('work', t('Work/Employment'), $r[0]['employment']),
 				'$education'    => array('education', t('School/Education'), $r[0]['education']),
 				'$contact'      => array('contact', t('Contact information and social networks'), $r[0]['contact']),
 				'$channels'     => array('channels', t('My other channels'), $r[0]['channels']),
 				'$extra_fields' => $extra_fields,
+				'$comms'          => t('Communications'),
+                '$tel_label'      => t('Phone'),
+                '$email_label'    => t('Email'),
+                '$impp_label'     => t('Instant messenger'),
+                '$url_label'      => t('Website'),
+                '$adr_label'      => t('Address'),
+                '$note_label'     => t('Note'),
+                '$mobile'         => t('Mobile'),
+                '$home'           => t('Home'),
+                '$work'           => t('Work'),
+                '$other'          => t('Other'),
+                '$add_card'       => t('Add Contact'),
+                '$add_field'      => t('Add Field'),
+                '$create'         => t('Create'),
+                '$update'         => t('Update'),
+                '$delete'         => t('Delete'),
+                '$cancel'         => t('Cancel'),
 			));
 	
 			$arr = array('profile' => $r[0], 'entry' => $o);