diff options
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 9 | ||||
| -rw-r--r-- | include/zot.php | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index a25cfa2ac..7e0f5fb7c 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -32,8 +32,10 @@ class Finger { $address = $webbie; $host = \App::get_hostname(); } else { - $address = substr($webbie, 0, strpos($webbie, '@')); - $host = substr($webbie, strpos($webbie, '@')+1); + $address = substr($webbie,0,strpos($webbie,'@')); + $host = substr($webbie,strpos($webbie,'@')+1); + if(strpos($host,'/')) + $host = substr($host,0,strpos($host,'/')); } $xchan_addr = $address . '@' . $host; @@ -61,8 +63,7 @@ class Finger { if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') { logger('zot_finger: alternate network: ' . $webbie); - logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'], true), LOGGER_DATA, LOG_DEBUG); - + logger('url: ' . $url . ', net: ' . var_export($r[0]['hubloc_network'],true), LOGGER_DATA, LOG_DEBUG); return $ret; } } else { diff --git a/include/zot.php b/include/zot.php index 0641a443d..838ac44c6 100644 --- a/include/zot.php +++ b/include/zot.php @@ -186,6 +186,8 @@ function zot_finger($webbie, $channel = null, $autofallback = true) { } else { $address = substr($webbie,0,strpos($webbie,'@')); $host = substr($webbie,strpos($webbie,'@')+1); + if(strpos($host,'/')) + $host = substr($host,0,strpos($host,'/')); } $xchan_addr = $address . '@' . $host; @@ -355,6 +357,8 @@ function zot_refresh($them, $channel = null, $force = false) { $rhs = '/.well-known/zot-info'; + logger('zot_refresh: ' . $url, LOGGER_DATA, LOG_INFO); + $result = z_post_url($url . $rhs,$postvars); logger('zot_refresh: zot-info: ' . print_r($result,true), LOGGER_DATA, LOG_DEBUG); |