X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=112ee34ab3195bd906e0bd97cbfd5ff22a4f1b37;hb=63622966666729ba82fef8f12484e022500ff867;hp=47871debdb1da9820a9b740f7eb6c18c3af9af79;hpb=0d23a56706765b885d98e9f664f65f837e4950ea;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 47871debdb..112ee34ab3 100644
--- 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');
 
@@ -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');