X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=837eec2dd244ef222e9013ccb8160439c00011f0;hb=7e7cac19f62cef5fe52660a9312ac01a7d3f74a2;hp=1b1bf4e05689e0c7f6b974930a82e2023d840786;hpb=cf86162a08a71435865803b40dd283fc0b83427d;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 1b1bf4e056..837eec2dd2 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -10,6 +10,7 @@
  */
 
 require_once('include/enotify.php');
+require_once('include/Scrape.php');
 
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
@@ -41,8 +42,10 @@ function dfrn_request_init(&$a) {
 if(! function_exists('dfrn_request_post')) {
 function dfrn_request_post(&$a) {
 
-	if(($a->argc != 2) || (! count($a->profile)))
+	if(($a->argc != 2) || (! count($a->profile))) {
+		logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
 		return;
+	}
 
 
 	if(x($_POST, 'cancel')) {
@@ -112,8 +115,6 @@ function dfrn_request_post(&$a) {
 					 * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
 					 */
 
-					require_once('include/Scrape.php');
-
 					$parms = scrape_dfrn($dfrn_url);
 
 					if(! count($parms)) {
@@ -173,18 +174,16 @@ function dfrn_request_post(&$a) {
 					info( t("Introduction complete.") . EOL);
 				}
 
-				$r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s' limit 1",
+				$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
 					intval(local_user()),
 					dbesc($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
 				if(count($r)) {
-					$g = q("select def_gid from user where uid = %d limit 1",
-						intval(local_user())
-					);
-					if($g && intval($g[0]['def_gid'])) {
+					$def_gid = get_default_group(local_user(), $r[0]["network"]);
+					if(intval($def_gid)) {
 						require_once('include/group.php');
-						group_add_member(local_user(),'',$r[0]['id'],$g[0]['def_gid']);
+						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
 					}
 					$forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
 				} else
@@ -387,19 +386,17 @@ function dfrn_request_post(&$a) {
 				intval($rel)
 			);
 
-			$r = q("select id from contact where poll = '%s' and uid = %d limit 1",
+			$r = q("SELECT `id`, `network` FROM `contact` WHERE `poll` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($poll),
 				intval($uid)
 			);
 			if(count($r)) {
 				$contact_id = $r[0]['id'];
 
-				$g = q("select def_gid from user where uid = %d limit 1",
-					intval($uid)
-				);
-				if($g && intval($g[0]['def_gid'])) {
+				$def_gid = get_default_group($uid, $r[0]["network"]);
+				if (intval($def_gid)) {
 					require_once('include/group.php');
-					group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+					group_add_member($uid, '', $contact_id, $def_gid);
 				}
 
 				$photo = avatar_img($addr);
@@ -441,28 +438,28 @@ 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:') {
 
-			if (($url == "") AND ($network === NETWORK_DIASPORA))
-				$url = $data["baseurl"]."/people?q={uri}";
+				// 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;
+
+				$url = substr($url,5);
+			} else
+				$network = NETWORK_DFRN;
 		}
 
-		logger('dfrn_request: url: ' . $url);
+		logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
 
 		if($network === NETWORK_DFRN) {
 			$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
@@ -826,7 +823,7 @@ function dfrn_request_content(&$a) {
 		else
 			$tpl = get_markup_template('auto_request.tpl');
 
-		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+		$page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
 		// see if we are allowed to have NETWORK_MAIL2 contacts
 
@@ -851,7 +848,7 @@ function dfrn_request_content(&$a) {
 			get_server()
 		);
 
-		$o .= replace_macros($tpl,array(
+		$o = replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
 			'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
 			'$pls_answer' => t('Please answer the following:'),