X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=818a1ae5e95c7dd6ac0291655a2d50799ef5d526;hb=314431507da53469fe0bcf79b4b31ad362186db9;hp=ac74d217bc4d816f09a952d0180d417d93bf7afa;hpb=4dc6b290461f0bbbf8183eb572fadfc06d6bedd7;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index ac74d217bc..818a1ae5e9 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,6 +20,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -59,8 +60,7 @@ function follow_content(App $a)
 
 	$uid = local_user();
 
-	// Issue 4815: Silently removing a prefixing @
-	$url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!');
+	$url = Probe::cleanURI(trim($_REQUEST['url'] ?? ''));
 
 	// Issue 6874: Allow remote following from Peertube
 	if (strpos($url, 'acct:') === 0) {
@@ -75,7 +75,7 @@ function follow_content(App $a)
 
 	// Don't try to add a pending contact
 	$user_contact = DBA::selectFirst('contact', ['pending'], ["`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND
-		(`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?", 
+		(`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
 		$uid, Contact::FOLLOWER, Protocol::DFRN, Strings::normaliseLink($url),
 		Strings::normaliseLink($url), $url, Protocol::STATUSNET]);
 
@@ -156,8 +156,8 @@ function follow_content(App $a)
 
 	DI::page()['aside'] = '';
 
-	if ($protocol != Protocol::PHANTOM) {
-		Profile::load($a, '', $contact, false);
+	if (!in_array($protocol, [Protocol::PHANTOM, Protocol::MAIL])) {
+		DI::page()['aside'] = Widget\VCard::getHTML($contact);
 
 		$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
 			['$title' => DI::l10n()->t('Status Messages and Posts')]
@@ -174,7 +174,7 @@ function follow_process(App $a, string $url)
 {
 	$return_path = 'follow?url=' . urlencode($url);
 
-	$result = Contact::createFromProbe($a->user, $url, true);
+	$result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $url);
 
 	if ($result['success'] == false) {
 		// Possibly it is a remote item and not an account