Move share content conversion before link handling in Text\BBCode::convert

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index e1d8b0ea7d8aa22f379983e0c8e1898ebca89b4f..58419dfd3ba54836f144ae3b3ff2d3148df98c50 100644 (file)
--- 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;
@@ -24,7 +41,7 @@ function follow_post(App $a)
        }
 
        $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
@@ -177,7 +194,7 @@ function follow_content(App $a)
                '$myaddr'        => $myaddr,
                '$keywords'      => $r[0]['keywords'],
 
-               '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name'])],
+               '$does_know_you' => ['knowyou', DI::l10n()->t('%s knows you', $ret['name'])],
                '$addnote_field' => ['dfrn-request-message', DI::l10n()->t('Add a personal note:')],
        ]);