diff options
author | zotlabs <mike@macgirvin.com> | 2016-12-20 19:31:50 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2016-12-20 19:31:50 -0800 |
commit | a270ca51014e8bf98554bd5e8eda33a44aa60460 (patch) | |
tree | 24070d3d0039de5eb1cd0b27aff15371894d1548 | |
parent | 493aa9f20d3a48132a83b1da0c643f80c038e617 (diff) | |
download | volse-hubzilla-a270ca51014e8bf98554bd5e8eda33a44aa60460.tar.gz volse-hubzilla-a270ca51014e8bf98554bd5e8eda33a44aa60460.tar.bz2 volse-hubzilla-a270ca51014e8bf98554bd5e8eda33a44aa60460.zip |
allow update of fn and initial setting from channel name
-rw-r--r-- | Zotlabs/Module/Connedit.php | 3 | ||||
-rw-r--r-- | include/connections.php | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 55113eb82..9d55d8ace 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -657,6 +657,9 @@ class Connedit extends \Zotlabs\Web\Controller { $vctmp = (($vc) ? \Sabre\VObject\Reader::read($vc) : null); $vcard = (($vctmp) ? get_vcard_array($vctmp,$contact['abook_id']) : [] ); + if(! $vcard) + $vcard['fn'] = $contact['xchan_name']; + $tpl = get_markup_template("abook_edit.tpl"); diff --git a/include/connections.php b/include/connections.php index ca6931601..b85be33b2 100644 --- a/include/connections.php +++ b/include/connections.php @@ -640,6 +640,11 @@ function update_vcard($arr,$vcard = null) { 'N' => array_reverse(explode(' ', $fn)) ]); } + else { + $vcard->FN = $fn; + $vcard->N = array_reverse(explode(' ', $fn)); + } + $org = $arr['org']; if($org) { $vcard->ORG = $org; |