Merge pull request #12956 from annando/server-blocked

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

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index d8a42d8de9f1da127bf07adc37adcd8f34bb5e18..a4bdb957dc21a82b432fef44edc32cb24ea8485a 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,12 +28,13 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Model\Contact as ContactModel;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Protocol\Delivery;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
-use Friendica\Worker\Delivery;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -52,7 +53,7 @@ class FriendSuggest extends BaseModule
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        throw new ForbiddenException($this->t('Permission denied.'));
                }
 
@@ -66,7 +67,7 @@ class FriendSuggest extends BaseModule
                $cid = intval($this->parameters['contact']);
 
                // We do query the "uid" as well to ensure that it is our contact
-               if (!$this->dba->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
+               if (!$this->dba->exists('contact', ['id' => $cid, 'uid' => DI::userSession()->getLocalUserId()])) {
                        throw new NotFoundException($this->t('Contact not found.'));
                }
 
@@ -76,16 +77,16 @@ class FriendSuggest extends BaseModule
                }
 
                // We do query the "uid" as well to ensure that it is our contact
-               $contact = $this->dba->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
+               $contact = $this->dba->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => DI::userSession()->getLocalUserId()]);
                if (empty($contact)) {
-                       notice($this->t('Suggested contact not found.'));
+                       DI::sysmsg()->addNotice($this->t('Suggested contact not found.'));
                        return;
                }
 
                $note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
 
                $suggest = $this->friendSuggestRepo->save($this->friendSuggestFac->createNew(
-                       local_user(),
+                       DI::userSession()->getLocalUserId(),
                        $cid,
                        $contact['name'],
                        $contact['url'],
@@ -96,16 +97,16 @@ class FriendSuggest extends BaseModule
 
                Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
 
-               info($this->t('Friend suggestion sent.'));
+               DI::sysmsg()->addInfo($this->t('Friend suggestion sent.'));
        }
 
        protected function content(array $request = []): string
        {
                $cid = intval($this->parameters['contact']);
 
-               $contact = $this->dba->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+               $contact = $this->dba->selectFirst('contact', [], ['id' => $cid, 'uid' => DI::userSession()->getLocalUserId()]);
                if (empty($contact)) {
-                       notice($this->t('Contact not found.'));
+                       DI::sysmsg()->addNotice($this->t('Contact not found.'));
                        $this->baseUrl->redirect();
                }
 
@@ -119,7 +120,7 @@ class FriendSuggest extends BaseModule
                        AND NOT `archive` 
                        AND NOT `deleted` 
                        AND `notify` != ""',
-                       local_user(),
+                       DI::userSession()->getLocalUserId(),
                        $cid,
                        Protocol::DFRN,
                ]);