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

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

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index e8e0fc2f09eeaef514b8d173c88c700d28f19c6e..b0456377f1c53d8ed76f29996d3b9f81300ec12d 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -38,16 +38,16 @@ use Friendica\Worker\Delivery;
  */
 class FriendSuggest extends BaseModule
 {
-       public static function init(array $parameters = [])
+       public function init()
        {
                if (!local_user()) {
                        throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
-               $cid = intval($parameters['contact']);
+               $cid = intval($this->parameters['contact']);
 
                // We do query the "uid" as well to ensure that it is our contact
                if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
@@ -83,9 +83,9 @@ class FriendSuggest extends BaseModule
                info(DI::l10n()->t('Friend suggestion sent.'));
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
-               $cid = intval($parameters['contact']);
+               $cid = intval($this->parameters['contact']);
 
                $contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
                if (empty($contact)) {
@@ -93,7 +93,7 @@ class FriendSuggest extends BaseModule
                        DI::baseUrl()->redirect();
                }
 
-               $contacts = ContactModel::selectToArray(['id', 'name'], [
+               $suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
                        '`uid` = ? 
                        AND `id` != ? 
                        AND `network` = ? 
@@ -110,8 +110,8 @@ class FriendSuggest extends BaseModule
 
                $formattedContacts = [];
 
-               foreach ($contacts as $contact) {
-                       $formattedContacts[$contact['id']] = $contact['name'];
+               foreach ($suggestableContacts as $suggestableContact) {
+                       $formattedContacts[$suggestableContact['id']] = $suggestableContact['name'];
                }
 
                $tpl = Renderer::getMarkupTemplate('fsuggest.tpl');