Merge pull request #12956 from annando/server-blocked

[friendica.git] / src / Module / Filer / SaveTag.php

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index ad242e60e8baf7fbe21c3f71d1fe3a9cbded56b0..326f415cfca8a69cb7dd9e6bb4161da6827a9ef6 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,13 +21,16 @@
 
 namespace Friendica\Module\Filer;
 
-use Friendica\App\BaseURL;
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
 use Friendica\Util\XML;
 use Psr\Log\LoggerInterface;
 
@@ -36,22 +39,17 @@ use Psr\Log\LoggerInterface;
  */
 class SaveTag extends BaseModule
 {
-       /** @var LoggerInterface */
-       protected $logger;
-       
-       public function __construct(LoggerInterface $logger, BaseURL $baseUrl, L10n $l10n, array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
-               
-               $this->logger = $logger;
-               
-               if (!local_user()) {
-                       notice($this->l10n->t('You must be logged in to use this module'));
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               if (!DI::userSession()->getLocalUserId()) {
+                       DI::sysmsg()->addNotice($this->t('You must be logged in to use this module'));
                        $baseUrl->redirect();
                }
        }
 
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                $term = XML::unescape(trim($_GET['term'] ?? ''));
 
@@ -64,16 +62,16 @@ class SaveTag extends BaseModule
                        if (!DBA::isResult($item)) {
                                throw new HTTPException\NotFoundException();
                        }
-                       Model\Post\Category::storeFileByURIId($item['uri-id'], local_user(), Model\Post\Category::FILE, $term);
+                       Model\Post\Category::storeFileByURIId($item['uri-id'], DI::userSession()->getLocalUserId(), Model\Post\Category::FILE, $term);
                }
 
                // return filer dialog
-               $filetags = Model\Post\Category::getArray(local_user(), Model\Post\Category::FILE);
+               $filetags = Model\Post\Category::getArray(DI::userSession()->getLocalUserId(), Model\Post\Category::FILE);
 
                $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
                echo Renderer::replaceMacros($tpl, [
-                       '$field' => ['term', $this->l10n->t("Save to Folder:"), '', '', $filetags, $this->l10n->t('- select -')],
-                       '$submit' => $this->l10n->t('Save'),
+                       '$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
+                       '$submit' => $this->t('Save'),
                ]);
 
                exit;