diff options
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/network.php b/include/network.php index fe001b362..c23005935 100644 --- a/include/network.php +++ b/include/network.php @@ -1148,8 +1148,10 @@ function discover_by_webbie($webbie) { if($link['rel'] === PROTOCOL_ZOT) { logger('discover_by_webbie: zot found for ' . $webbie, LOGGER_DEBUG); - if(array_key_exists('zot',$x) && $x['zot']['success']) + if(array_key_exists('zot',$x) && $x['zot']['success']) { $i = import_xchan($x['zot']); + return true; + } else { $z = z_fetch_url($link['href']); if($z['success']) { @@ -2008,11 +2010,11 @@ function get_site_info() { $admin = array(); foreach($r as $rr) { if($rr['channel_pageflags'] & PAGE_HUBADMIN) - $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . App::get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); } if(! $admin) { foreach($r as $rr) { - $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . App::get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + $admin[] = array( 'name' => $rr['channel_name'], 'address' => channel_reddress($rr), 'channel' => z_root() . '/channel/' . $rr['channel_address']); } } } |