harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more zot6

Browse Source
This commit is contained in:
zotlabs
2017-09-13 20:40:01 -07:00
parent 62d6bada4c
commit b5966041be
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/connections.php
View File

@@ -629,13 +629,20 @@ function get_vcard_array($vc,$id) {
if($vc->ADR) {
foreach($vc->ADR as $adr) {
$type = (($adr['TYPE']) ? vcard_translate_type((string)$adr['TYPE']) : '');
$adrs[] = [
$entry = [
'type' => $type,
'address' => $adr->getParts()
];
$last_entry = end($adrs);
if($last_entry && is_array($adrs[$last_entry]['address']))
array_walk($adrs[$last_entry]['address'],'array_escape_tags');
if(is_array($entry['address'])) {
array_walk($entry['address'],'array_escape_tags');
}
else {
$entry['address'] = (string) escape_tags($entry['address']);
}
$adrs[] = $entry;
}
}

1
include/zot.php
View File

@@ -4188,6 +4188,7 @@ function zot_site_info($channel = null) {
$ret['site']['url'] = z_root();
$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method));
$ret['site']['zot_auth'] = z_root() . '/magic';
$ret['site']['key'] = get_config('system','pubkey');
$dirmode = get_config('system','directory_mode');
if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL))