Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 2cd575df90eb9bef70b9af3e96ccaa0c01a186b8..243ec4be3e588fb5381ec6cb2953e1b15fe205ea 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -96,7 +96,7 @@ class Contact extends BaseModule
                DI::baseUrl()->redirect($redirectUrl);
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
                if (!local_user()) {
                        return;
@@ -226,7 +226,7 @@ class Contact extends BaseModule
                Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
        }
 
-       public static function content(array $parameters = [], $update = 0)
+       public function content($update = 0): string
        {
                if (!local_user()) {
                        return Login::form($_SERVER['REQUEST_URI']);
@@ -234,10 +234,10 @@ class Contact extends BaseModule
 
                $a = DI::app();
 
-               $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
-               $nets   = Strings::escapeTags(trim($_GET['nets']   ?? ''));
-               $rel    = Strings::escapeTags(trim($_GET['rel']    ?? ''));
-               $group  = Strings::escapeTags(trim($_GET['group']  ?? ''));
+               $search = trim($_GET['search'] ?? '');
+               $nets   = trim($_GET['nets']   ?? '');
+               $rel    = trim($_GET['rel']    ?? '');
+               $group  = trim($_GET['group']  ?? '');
 
                $accounttype = $_GET['accounttype'] ?? '';
                $accounttypeid = User::getAccountTypeByString($accounttype);
@@ -523,7 +523,7 @@ class Contact extends BaseModule
                                '$submit'         => DI::l10n()->t('Submit'),
                                '$lbl_info1'      => $lbl_info1,
                                '$lbl_info2'      => DI::l10n()->t('Their personal note'),
-                               '$reason'         => trim(Strings::escapeTags($contact['reason'])),
+                               '$reason'         => trim($contact['reason']),
                                '$infedit'        => DI::l10n()->t('Edit contact notes'),
                                '$common_link'    => 'contact/' . $contact['id'] . '/contacts/common',
                                '$relation_text'  => $relation_text,