From c32bc9dda4dc08f2e4e72dc91c78457a0383244e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 15 Jan 2017 19:51:14 -0800
Subject: more integration of vcard and profiles

---
 Zotlabs/Module/Profiles.php | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 72a056963..e166c3c19 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -319,10 +319,38 @@ class Profiles extends \Zotlabs\Web\Controller {
 
 			$orig_vcard = (($orig[0]['profile_vcard']) ? \Sabre\VObject\Reader::read($orig[0]['profile_vcard']) : null); 
 
-			$_REQUEST['fn'] = $name;
-			$_REQUEST['title'] = $pdesc;
+			$channel = \App::get_channel();
+
+			$default_vcard_cat = ((defined('DEFAULT_VCARD_CAT')) ? DEFAULT_VCARD_CAT : 'HOME');
+
+			$defcard = [
+				'fn'         => $name,
+				'title'      => $pdesc,
+				'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_type'   => [ $default_vcard_cat ]
+			];
+
+			$defcard['adr'][] = [
+				0 => '',
+				1 => '',
+				2 => $address,
+				3 => $locality,
+				4 => $region,
+				5 => $postal_code,
+				6 => $country_name
+			];
+				
 
-			$profile_vcard = update_vcard($_REQUEST,$orig_vcard);
+			$profile_vcard = update_vcard($defcard,$orig_vcard);
 
 
 			require_once('include/text.php');
-- 
cgit v1.2.3