Add INNER JOIN to admin pending user list please @annando

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 67395a9fcc714abb740ab9eecf15e1ac5177d278..ec675865617b49d2d35f7fa8e0021117a478c16f 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -15,11 +15,12 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
-use Friendica\Object\Contact;
 
 require_once 'include/enotify.php';
-require_once 'include/group.php';
 
 function dfrn_request_init(App $a)
 {
@@ -190,12 +191,11 @@ function dfrn_request_post(App $a) {
                                        $parms['key'] // this was already escaped
                                );
                                if (DBM::is_result($r)) {
-                                       $def_gid = get_default_group(local_user(), $r[0]["network"]);
-                                       if(intval($def_gid))
-                                               group_add_member(local_user(), '', $r[0]['id'], $def_gid);
+                                       Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']);
 
-                                       if (isset($photo))
+                                       if (isset($photo)) {
                                                Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
+                                       }
 
                                        $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
                                } else {