X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=9c70ba21ab4c19c4721d7b8d345d489af4eb350f;hb=09931b71247c2261371a5a40b38a2127f79f344d;hp=f1ce296d901c727ca338040733b5284779641483;hpb=a3f757808584145287f38934a68692e43c02fd22;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index f1ce296d90..9c70ba21ab 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -15,6 +15,7 @@
  */
 
 require_once('include/enotify.php');
+require_once('include/group.php');
 
 function dfrn_confirm_post(&$a,$handsfree = null) {
 
@@ -315,7 +316,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		require_once('include/Photo.php');
 
-		$photos = import_profile_photo($contact['photo'],$uid,$contact_id);
+		update_contact_avatar($contact['photo'],$uid,$contact_id);
 
 		logger('dfrn_confirm: confirm - imported photos');
 
@@ -328,29 +329,21 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			if(($relation == CONTACT_IS_SHARING) && ($duplex))
 				$duplex = 0;
 
-			$r = q("UPDATE `contact` SET
-				`photo` = '%s',
-				`thumb` = '%s',
-				`micro` = '%s',
-				`rel` = %d,
+			$r = q("UPDATE `contact` SET `rel` = %d,
 				`name-date` = '%s',
 				`uri-date` = '%s',
-				`avatar-date` = '%s',
 				`blocked` = 0,
 				`pending` = 0,
 				`duplex` = %d,
 				`hidden` = %d,
-				`network` = 'dfrn' WHERE `id` = %d
+				`network` = '%s' WHERE `id` = %d
 			",
-				dbesc($photos[0]),
-				dbesc($photos[1]),
-				dbesc($photos[2]),
 				intval($new_relation),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
 				intval($duplex),
 				intval($hidden),
+				dbesc(NETWORK_DFRN),
 				intval($contact_id)
 			);
 		}
@@ -381,7 +374,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				if($duplex)
 					$new_relation = CONTACT_IS_FRIEND;
 				else
-					$new_relation = CONTACT_IS_SHARING;
+					$new_relation = CONTACT_IS_FOLLOWER;
 
 				if($new_relation != CONTACT_IS_FOLLOWER)
 					$writable = 1;
@@ -393,12 +386,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			);
 
 
-			$r = q("UPDATE `contact` SET `photo` = '%s',
-				`thumb` = '%s',
-				`micro` = '%s',
-				`name-date` = '%s',
+			$r = q("UPDATE `contact` SET `name-date` = '%s',
 				`uri-date` = '%s',
-				`avatar-date` = '%s',
 				`notify` = '%s',
 				`poll` = '%s',
 				`blocked` = 0,
@@ -409,10 +398,6 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				`rel` = %d
 				WHERE `id` = %d
 			",
-				dbesc($photos[0]),
-				dbesc($photos[1]),
-				dbesc($photos[2]),
-				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
 				dbesc($notify),
@@ -443,8 +428,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 			if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
 				require_once('include/diaspora.php');
-				$ret = diaspora_share($user[0],$r[0]);
-				logger('mod_follow: diaspora_share returns: ' . $ret);
+				$ret = diaspora::send_share($user[0],$r[0]);
+				logger('share returns: ' . $ret);
 			}
 
 			// Send a new friend post if we are allowed to...
@@ -464,6 +449,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				if(count($self)) {
 
 					$arr = array();
+					$arr['guid'] = get_guid(32);
 					$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid);
 					$arr['uid'] = $uid;
 					$arr['contact-id'] = $self[0]['id'];
@@ -482,7 +468,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 					$BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
 
 					$arr['verb'] = ACTIVITY_FRIEND;
-				    $arr['object-type'] = ACTIVITY_OBJ_PERSON;
+					$arr['object-type'] = ACTIVITY_OBJ_PERSON;
 					$arr['body'] =  sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
@@ -505,14 +491,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			}
 		}
 
-
-		$g = q("select def_gid from user where uid = %d limit 1",
-			intval($uid)
-		);
-		if($contact && $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, $contact["network"]);
+		if($contact && intval($def_gid))
+			group_add_member($uid, '', $contact['id'], $def_gid);
 
 		// Let's send our user to the contact editor in case they want to
 		// do anything special with this new friend.
@@ -682,7 +663,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		require_once("include/Photo.php");
 
-		$photos = import_profile_photo($photo,$local_uid,$dfrn_record);
+		update_contact_avatar($photo,$local_uid,$dfrn_record);
 
 		logger('dfrn_confirm: request - photos imported');
 
@@ -694,13 +675,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$duplex = 0;
 
 		$r = q("UPDATE `contact` SET
-			`photo` = '%s',
-			`thumb` = '%s',
-			`micro` = '%s',
 			`rel` = %d,
 			`name-date` = '%s',
 			`uri-date` = '%s',
-			`avatar-date` = '%s',
 			`blocked` = 0,
 			`pending` = 0,
 			`duplex` = %d,
@@ -708,13 +685,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			`prv` = %d,
 			`network` = '%s' WHERE `id` = %d
 		",
-			dbesc($photos[0]),
-			dbesc($photos[1]),
-			dbesc($photos[2]),
 			intval($new_relation),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
 			intval($duplex),
 			intval($forum),
 			intval($prv),