Merge remote-tracking branch 'upstream/develop' into inbox-gsid

[friendica.git] / src / Module / Item / Compose.php

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 895a548e40d70aada694acc289e6abdda3624dd3..d44fe2cd7d84e0133ebcac06a7b059dd9e9b3487 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.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
  *
@@ -26,6 +26,7 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\ACL;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
@@ -60,7 +61,10 @@ class Compose extends BaseModule
        /** @var IManagePersonalConfigValues */
        private $pConfig;
 
-       public function __construct(IManagePersonalConfigValues $pConfig, App\Page $page, ACLFormatter $ACLFormatter, SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       /** @var IManageConfigValues */
+       private $config;
+
+       public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, ACLFormatter $ACLFormatter, SystemMessages $systemMessages, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -68,6 +72,7 @@ class Compose extends BaseModule
                $this->ACLFormatter   = $ACLFormatter;
                $this->page           = $page;
                $this->pConfig        = $pConfig;
+               $this->config         = $config;
        }
 
        protected function post(array $request = [])
@@ -83,7 +88,7 @@ class Compose extends BaseModule
 
        protected function content(array $request = []): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return Login::form('compose');
                }
 
@@ -105,7 +110,7 @@ class Compose extends BaseModule
                        }
                }
 
-               $user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
+               $user = User::getById(DI::userSession()->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
 
                $contact_allow_list = $this->ACLFormatter->expand($user['allow_cid']);
                $group_allow_list   = $this->ACLFormatter->expand($user['allow_gid']);
@@ -162,7 +167,7 @@ class Compose extends BaseModule
 
                $contact = Contact::getById($a->getContactId());
 
-               if ($this->pConfig->get(local_user(), 'system', 'set_creation_date')) {
+               if ($this->pConfig->get(DI::userSession()->getLocalUserId(), 'system', 'set_creation_date')) {
                        $created_at = Temporal::getDateTimeField(
                                new \DateTime(DBA::NULL_DATETIME),
                                new \DateTime('now'),
@@ -198,7 +203,10 @@ class Compose extends BaseModule
                                'location_disabled'    => $this->l10n->t('Location services are disabled. Please check the website\'s permissions on your device'),
                                'wait'                 => $this->l10n->t('Please wait'),
                                'placeholdertitle'     => $this->l10n->t('Set title'),
-                               'placeholdercategory'  => Feature::isEnabled(local_user(),'categories') ? $this->l10n->t('Categories (comma-separated list)') : '',
+                               'placeholdercategory'  => Feature::isEnabled(DI::userSession()->getLocalUserId(),'categories') ? $this->l10n->t('Categories (comma-separated list)') : '',
+                               'always_open_compose'  => $this->pConfig->get(DI::userSession()->getLocalUserId(), 'frio', 'always_open_compose',
+                                       $this->config->get('frio', 'always_open_compose', false)) ? '' :
+                                               $this->l10n->t('You can make this page always open when you use the New Post button in the <a href="/settings/display">Theme Customization settings</a>.'),
                        ],
 
                        '$id'           => 0,