X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Funfollow.php;h=de1cb6cf7cdb05dd02a69c2bbc6447c59295f42b;hb=b521e45903544f15443d9f77bfe684c67d139873;hp=d24745c8bb5efa584ad24999d40c541f08e7d593;hpb=33575a94fa009c479e6c9eb330fad317e5c92d2f;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index d24745c8bb..de1cb6cf7c 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,12 +20,12 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
 
@@ -37,7 +37,9 @@ function unfollow_post(App $a)
 		// NOTREACHED
 	}
 
-	unfollow_process();
+	$url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
+
+	unfollow_process($url);
 }
 
 function unfollow_content(App $a)
@@ -50,10 +52,6 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	if (!empty($_REQUEST['auto'])) {
-		unfollow_process();
-	}
-
 	$uid = local_user();
 	$url = Strings::escapeTags(trim($_REQUEST['url']));
 
@@ -61,7 +59,7 @@ function unfollow_content(App $a)
 		local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
 		Strings::normaliseLink($url), $url];
 
-	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
+	$contact = DBA::selectFirst('contact', ['url', 'id', 'uid', 'network', 'addr', 'name'], $condition);
 
 	if (!DBA::isResult($contact)) {
 		notice(DI::l10n()->t("You aren't following this contact."));
@@ -86,8 +84,9 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	// Makes the connection request for friendica contacts easier
-	$_SESSION['fastlane'] = $contact['url'];
+	if (!empty($_REQUEST['auto'])) {
+		unfollow_process($contact['url']);
+	}
 
 	$o = Renderer::replaceMacros($tpl, [
 		'$header'        => DI::l10n()->t('Disconnect/Unfollow'),
@@ -97,7 +96,7 @@ function unfollow_content(App $a)
 		'$submit'        => DI::l10n()->t('Submit Request'),
 		'$cancel'        => DI::l10n()->t('Cancel'),
 		'$url'           => $contact['url'],
-		'$zrl'           => Contact::magicLink($contact['url']),
+		'$zrl'           => Contact::magicLinkByContact($contact),
 		'$url_label'     => DI::l10n()->t('Profile URL'),
 		'$myaddr'        => $self['url'],
 		'$request'       => $request,
@@ -105,8 +104,7 @@ function unfollow_content(App $a)
 		'$keywords_label'=> ''
 	]);
 
-	DI::page()['aside'] = '';
-	Profile::load($a, '', Contact::getByURL($contact['url'], false));
+	DI::page()['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false));
 
 	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);
 
@@ -116,12 +114,11 @@ function unfollow_content(App $a)
 	return $o;
 }
 
-function unfollow_process()
+function unfollow_process(string $url)
 {
 	$base_return_path = 'contact';
 
 	$uid = local_user();
-	$url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		$uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
@@ -157,4 +154,4 @@ function unfollow_process()
 	}
 
 	DI::baseUrl()->redirect($return_path);
-}
\ No newline at end of file
+}