X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=6337211648c257f99ca38c71807dd905b7da3093;hb=645e4edc63a6b4cb273e06590a77f99619037e7b;hp=a307c4d6e683594d3fd61ec4a97502816276bd1a;hpb=a44d200c211eff891f7d275b7e54ded33a50c446;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a307c4d6e6..6337211648 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -37,7 +37,7 @@ function unfollow_post(App $a)
 		// NOTREACHED
 	}
 
-	$url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
+	$url = trim($_REQUEST['url'] ?? '');
 
 	unfollow_process($url);
 }
@@ -53,7 +53,7 @@ function unfollow_content(App $a)
 	}
 
 	$uid = local_user();
-	$url = Strings::escapeTags(trim($_REQUEST['url']));
+	$url = trim($_REQUEST['url']);
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
@@ -67,7 +67,7 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+	if (!Protocol::supportsFollow($contact['network'])) {
 		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
 		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
@@ -122,7 +122,7 @@ function unfollow_process(string $url)
 
 	$owner = User::getOwnerDataById($uid);
 	if (!$owner) {
-		\Friendica\Module\Security\Logout::init();
+		(new \Friendica\Module\Security\Logout())->init();
 		// NOTREACHED
 	}
 
@@ -137,27 +137,18 @@ function unfollow_process(string $url)
 		// NOTREACHED
 	}
 
-	$dissolve = ($contact['rel'] == Contact::SHARING);
-
-	$notice_message = '';
 	$return_path = $base_return_path . '/' . $contact['id'];
 
 	try {
-		$result = Contact::terminateFriendship($owner, $contact, $dissolve);
-
-		if ($result === null) {
-			$notice_message = DI::l10n()->t('Unfollowing is currently not supported by this contact\'s network.');
-		}
+		$result = Contact::terminateFriendship($owner, $contact);
 
 		if ($result === false) {
 			$notice_message = DI::l10n()->t('Unable to unfollow this contact, please retry in a few minutes or contact your administrator.');
-		}
-
-		if ($result === true) {
+		} else {
 			$notice_message = DI::l10n()->t('Contact was successfully unfollowed');
 		}
 	} catch (Exception $e) {
-		DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact, 'dissolve' => $dissolve]);
+		DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact]);
 		$notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator');
 	}