X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=abde4abd036f712866706c44e583990c727a2e16;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=2a069e72ae7ec58c3c2ac9e38bbd0a3ef83f21c8;hpb=91facd2d0a2869e2c26a5943d8afe1849d3891f8;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 2a069e72ae..abde4abd03 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -12,7 +12,7 @@ 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)
 {
@@ -21,12 +21,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
@@ -51,7 +51,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.'));
@@ -60,7 +60,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');
 
@@ -68,8 +68,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']) {
@@ -109,10 +109,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));
@@ -130,7 +130,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' => '']];
@@ -143,11 +143,8 @@ function follow_content(App $a)
 		$r[0]['about'] = '';
 	}
 
-	$header = L10n::t('Connect/Follow');
-
 	$o = Renderer::replaceMacros($tpl, [
-		'$header'        => htmlentities($header),
-		//'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
+		'$header'        => L10n::t('Connect/Follow'),
 		'$desc'          => '',
 		'$pls_answer'    => L10n::t('Please answer the following:'),
 		'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
@@ -169,13 +166,6 @@ function follow_content(App $a)
 		'$url_label'     => L10n::t('Profile URL'),
 		'$myaddr'        => $myaddr,
 		'$request'       => $request,
-		/*
-		 * @TODO commented out?
-		'$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
-		'$location_label'=> L10n::t('Location:'),
-		'$about'         => Friendica\Content\Text\BBCode::::convert($r[0]['about'], false, false),
-		'$about_label'   => L10n::t('About:'),
-		*/
 		'$keywords'      => $r[0]['keywords'],
 		'$keywords_label'=> L10n::t('Tags:')
 	]);
@@ -188,7 +178,7 @@ function follow_content(App $a)
 	}
 
 	if ($gcontact_id <> 0) {
-		$o .= Renderer::replaceMacros(get_markup_template('section_title.tpl'),
+		$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
 			['$title' => L10n::t('Status Messages and Posts')]
 		);