strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2232 from annando/1601-bugfix-request

Browse source 
Bugfix: The request process from DFRN hadn't worked anymore
This commit is contained in:
Tobias Diekershoff 2016-01-02 10:03:48 +01:00
parent d090dc19a7 2ed3ae1aab
commit 0f615fdcd7
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mod/dfrn_request.php
View file

@ -441,25 +441,25 @@ function dfrn_request_post(&$a) {
// Next send an email verify form to the requestor. // Next send an email verify form to the requestor.
} } else {
else {
// Detect the network // Detect the network
$data = probe_url($url); $data = probe_url($url);
$network = $data["network"]; $network = $data["network"];
// Use the detected address - if present
if ($data["addr"] != "")
$url = $data["addr"];
// Canonicalise email-style profile locator // Canonicalise email-style profile locator
$url = webfinger_dfrn($url,$hcard); $url = webfinger_dfrn($url,$hcard);
if (substr($url,0,5) === 'stat:') if (substr($url,0,5) === 'stat:') {
$url = substr($url,5);
if (($url == "") AND ($network === NETWORK_DIASPORA)) // Every time we detect the remote subscription we define this as OStatus.
$url = $data["baseurl"]."/people?q={uri}"; // 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;
$url = substr($url,5);
} else
$network = NETWORK_DFRN;
} }
logger('dfrn_request: url: ' . $url); logger('dfrn_request: url: ' . $url);