Add INNER JOIN to admin pending user list please @annando

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 8484ace2cf6f376509ddb8c88f1befe4371e4de9..112ee34ab3195bd906e0bd97cbfd5ff22a4f1b37 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -24,11 +24,13 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 
 require_once 'include/enotify.php';
-require_once 'include/group.php';
 
 function dfrn_confirm_post(App $a, $handsfree = null) {
 
@@ -325,9 +327,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                 *
                 */
 
-               require_once 'include/Photo.php';
-
-               update_contact_avatar($contact['photo'],$uid,$contact_id);
+               Contact::updateAvatar($contact['photo'], $uid, $contact_id);
 
                logger('dfrn_confirm: confirm - imported photos');
 
@@ -440,7 +440,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
                        if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
-                               $ret = Diaspora::send_share($user[0],$r[0]);
+                               $ret = Diaspora::sendShare($user[0],$r[0]);
                                logger('share returns: ' . $ret);
                        }
 
@@ -503,13 +503,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        }
                }
 
-               $def_gid = get_default_group($uid, $contact["network"]);
-               if($contact && intval($def_gid))
-                       group_add_member($uid, '', $contact['id'], $def_gid);
+               Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
 
                // Let's send our user to the contact editor in case they want to
                // do anything special with this new friend.
-
                if ($handsfree === null) {
                        goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
                } else {
@@ -676,9 +673,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        $photo = System::baseUrl() . '/images/person-175.jpg';
                }
 
-               require_once 'include/Photo.php';
-
-               update_contact_avatar($photo,$local_uid,$dfrn_record);
+               Contact::updateAvatar($photo,$local_uid,$dfrn_record);
 
                logger('dfrn_confirm: request - photos imported');