X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=32e835b71557450863c161e5eed197dd02e09bb9;hb=9e5a4b2050a1fd8da2b03e02a69de233a1768187;hp=5455996069d0b5fd3324e0073b5c1e2d7d8b10fe;hpb=7d5166c9fefd03ec63807813e831017e6ad25382;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5455996069..32e835b715 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -11,6 +11,7 @@
 
 require_once('include/enotify.php');
 require_once('include/Scrape.php');
+require_once('include/group.php');
 
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
@@ -174,19 +175,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'])) {
-						require_once('include/group.php');
-						group_add_member(local_user(),'',$r[0]['id'],$g[0]['def_gid']);
-					}
+					$def_gid = get_default_group(local_user(), $r[0]["network"]);
+					if(intval($def_gid))
+						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
+
 					$forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
 				} else
 					$forwardurl = $a->get_baseurl()."/contacts";
@@ -388,20 +386,16 @@ 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'])) {
-					require_once('include/group.php');
-					group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
-				}
+				$def_gid = get_default_group($uid, $r[0]["network"]);
+				if (intval($def_gid))
+					group_add_member($uid, '', $contact_id, $def_gid);
 
 				$photo = avatar_img($addr);