X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=99b933625e541b4b861da8fe119845653e98ff33;hb=2ed3ae1aab60877a12edb86117d46da43e8e943f;hp=1b1bf4e05689e0c7f6b974930a82e2023d840786;hpb=9d4d29ad9eb6302fb02eda0ba5f6bcd128a86f49;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 1b1bf4e056..99b933625e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -441,25 +441,25 @@ function dfrn_request_post(&$a) { // Next send an email verify form to the requestor. - } - - else { + } else { // Detect the network $data = probe_url($url); $network = $data["network"]; - // Use the detected address - if present - if ($data["addr"] != "") - $url = $data["addr"]; - // Canonicalise email-style profile locator $url = webfinger_dfrn($url,$hcard); - if (substr($url,0,5) === 'stat:') - $url = substr($url,5); + if (substr($url,0,5) === 'stat:') { + + // Every time we detect the remote subscription we define this as OStatus. + // We do this even if it is not OStatus. + // we only need to pass this through another section of the code. + if ($network != NETWORK_DIASPORA) + $network = NETWORK_OSTATUS; - if (($url == "") AND ($network === NETWORK_DIASPORA)) - $url = $data["baseurl"]."/people?q={uri}"; + $url = substr($url,5); + } else + $network = NETWORK_DFRN; } logger('dfrn_request: url: ' . $url);