Merge pull request #6104 from nupplaphil/friendica-6101

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 0e083c2276233a449f5dd9e41440229b87c7bd2c..9b1049286b8ed6e2b7b3fcdcf07aa8e062dcb29f 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -12,6 +12,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
@@ -24,11 +25,11 @@ function unfollow_post(App $a)
        }
 
        $uid = local_user();
-       $url = notags(trim(defaults($_REQUEST, 'url', '')));
+       $url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
-               $uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
-               normalise_link($url), $url];
+               $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+               Strings::normaliseLink($url), $url];
        $contact = DBA::selectFirst('contact', [], $condition);
 
        if (!DBA::isResult($contact)) {
@@ -79,11 +80,11 @@ function unfollow_content(App $a)
        }
 
        $uid = local_user();
-       $url = notags(trim($_REQUEST['url']));
+       $url = Strings::escapeTags(trim($_REQUEST['url']));
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
-               local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
-               normalise_link($url), $url];
+               local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+               Strings::normaliseLink($url), $url];
 
        $contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
@@ -100,7 +101,7 @@ function unfollow_content(App $a)
        }
 
        $request = System::baseUrl() . '/unfollow';
-       $tpl = get_markup_template('auto_request.tpl');
+       $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 
        $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
@@ -145,7 +146,7 @@ function unfollow_content(App $a)
        $a->page['aside'] = '';
        Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
-       $o .= Renderer::replaceMacros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
 
        // Show last public posts
        $o .= Contact::getPostsFromUrl($contact['url']);