X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Funfollow.php;h=92bded2faa501b4f1741d26f08596f5d30e9a72c;hb=23b10cf2ae5fe10ba21a4b43e1aae17818647661;hp=2dc9180dc940084ec7f558d90e1bbf8b24d32205;hpb=810699b454067f7849286bd63346df9f2d659e78;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 2dc9180dc9..92bded2faa 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
@@ -137,21 +137,14 @@ function unfollow_process(string $url)
 		// NOTREACHED
 	}
 
-	$notice_message = '';
 	$return_path = $base_return_path . '/' . $contact['id'];
 
 	try {
 		$result = Contact::terminateFriendship($owner, $contact);
 
-		if ($result === null) {
-			$notice_message = DI::l10n()->t('Unfollowing is currently not supported by this contact\'s network.');
-		}
-
 		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) {