From: Michael Vogel <icarus@dabo.de>
Date: Fri, 1 Jan 2016 16:49:07 +0000 (+0100)
Subject: Bugfix: The request process from DFRN hadn't worked anymore since the last pull request
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2ed3ae1aab60877a12edb86117d46da43e8e943f;p=friendica.git

Bugfix: The request process from DFRN hadn't worked anymore since the last pull request
---

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);