X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=8910f54c0c086ebb1cdeaf3f579ac9b514e8f3ec;hb=016c99935cfbd4d320f15037cf00a53589a0615d;hp=cdd7b4904e44f5845161aff1641bd7667d21778f;hpb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index cdd7b4904e..8910f54c0c 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file mod/follow.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -23,15 +40,14 @@ function follow_post(App $a)
 		DI::baseUrl()->redirect('contact');
 	}
 
-	$uid = local_user();
-	$url = Strings::escapeTags(trim($_REQUEST['url']));
+	$url = Probe::cleanURI($_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
 	$_SESSION['fastlane'] = $url;
 
-	$result = Contact::createFromProbe($uid, $url, true);
+	$result = Contact::createFromProbe($a->user, $url, true);
 
 	if ($result['success'] == false) {
 		// Possibly it is a remote item and not an account
@@ -163,29 +179,22 @@ function follow_content(App $a)
 
 	$o = Renderer::replaceMacros($tpl, [
 		'$header'        => DI::l10n()->t('Connect/Follow'),
-		'$desc'          => '',
 		'$pls_answer'    => DI::l10n()->t('Please answer the following:'),
-		'$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
-		'$add_note'      => DI::l10n()->t('Add a personal note:'),
-		'$page_desc'     => '',
-		'$friendica'     => '',
-		'$statusnet'     => '',
-		'$diaspora'      => '',
-		'$diasnote'      => '',
 		'$your_address'  => DI::l10n()->t('Your Identity Address:'),
-		'$invite_desc'   => '',
-		'$emailnet'      => '',
+		'$url_label'     => DI::l10n()->t('Profile URL'),
+		'$keywords_label'=> DI::l10n()->t('Tags:'),
 		'$submit'        => $submit,
 		'$cancel'        => DI::l10n()->t('Cancel'),
-		'$nickname'      => '',
+
+		'$request'       => $request,
 		'$name'          => $ret['name'],
 		'$url'           => $ret['url'],
 		'$zrl'           => Profile::zrl($ret['url']),
-		'$url_label'     => DI::l10n()->t('Profile URL'),
 		'$myaddr'        => $myaddr,
-		'$request'       => $request,
 		'$keywords'      => $r[0]['keywords'],
-		'$keywords_label'=> DI::l10n()->t('Tags:')
+
+		'$does_know_you' => ['knowyou', DI::l10n()->t('%s knows you', $ret['name'])],
+		'$addnote_field' => ['dfrn-request-message', DI::l10n()->t('Add a personal note:')],
 	]);
 
 	DI::page()['aside'] = '';