Merge pull request #6226 from annando/oembed-array

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index adc3fcc3bd5125465e4c3a0720053869360f8cfb..1ee61ce9e14802448c8a8b87e59a699a18b5ed4c 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -6,12 +6,14 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Database\DBA;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 function follow_post(App $a)
 {
@@ -20,12 +22,12 @@ function follow_post(App $a)
        }
 
        if (isset($_REQUEST['cancel'])) {
-               $a->internalRedirect('contacts');
+               $a->internalRedirect('contact');
        }
 
        $uid = local_user();
-       $url = notags(trim($_REQUEST['url']));
-       $return_path = 'contacts';
+       $url = Strings::escapeTags(trim($_REQUEST['url']));
+       $return_path = 'follow?url=' . urlencode($url);
 
        // Makes the connection request for friendica contacts easier
        // This is just a precaution if maybe this page is called somewhere directly via POST
@@ -50,7 +52,7 @@ function follow_post(App $a)
 
 function follow_content(App $a)
 {
-       $return_path = 'contacts';
+       $return_path = 'contact';
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.'));
@@ -59,7 +61,7 @@ function follow_content(App $a)
        }
 
        $uid = local_user();
-       $url = notags(trim($_REQUEST['url']));
+       $url = Strings::escapeTags(trim($_REQUEST['url']));
 
        $submit = L10n::t('Submit Request');
 
@@ -67,8 +69,8 @@ function follow_content(App $a)
        $r = q("SELECT `pending` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
                (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
                `network` != '%s' LIMIT 1",
-               intval(local_user()), DBA::escape(Contact::FOLLOWER), DBA::escape(Protocol::DFRN), DBA::escape(normalise_link($url)),
-               DBA::escape(normalise_link($url)), DBA::escape($url), DBA::escape(Protocol::STATUSNET));
+               intval(local_user()), DBA::escape(Contact::FOLLOWER), DBA::escape(Protocol::DFRN), DBA::escape(Strings::normaliseLink($url)),
+               DBA::escape(Strings::normaliseLink($url)), DBA::escape($url), DBA::escape(Protocol::STATUSNET));
 
        if ($r) {
                if ($r[0]['pending']) {
@@ -108,10 +110,10 @@ function follow_content(App $a)
 
        if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
                $request = $ret['request'];
-               $tpl = get_markup_template('dfrn_request.tpl');
+               $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
        } else {
                $request = System::baseUrl() . '/follow';
-               $tpl = get_markup_template('auto_request.tpl');
+               $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
        }
 
        $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
@@ -129,7 +131,7 @@ function follow_content(App $a)
        $_SESSION['fastlane'] = $ret['url'];
 
        $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
-               normalise_link($ret['url']));
+               Strings::normaliseLink($ret['url']));
 
        if (!$r) {
                $r = [['location' => '', 'about' => '', 'keywords' => '']];
@@ -144,7 +146,7 @@ function follow_content(App $a)
 
        $header = L10n::t('Connect/Follow');
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$header'        => htmlentities($header),
                //'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
                '$desc'          => '',
@@ -187,7 +189,7 @@ function follow_content(App $a)
        }
 
        if ($gcontact_id <> 0) {
-               $o .= replace_macros(get_markup_template('section_title.tpl'),
+               $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
                        ['$title' => L10n::t('Status Messages and Posts')]
                );