// NOTREACHED
}
- $url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
+ $url = trim($_REQUEST['url'] ?? '');
unfollow_process($url);
}
}
$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),
// 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
// 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');
}