Normalize base URL usage in admin templates

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

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index c2bfba2dc447499892d697602808adc97272112b..68b14b97d69fc6f98b348c0e77b5df603e579988 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Item;
 
+use DateTime;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\ACL;
@@ -28,15 +29,18 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 class Compose extends BaseModule
 {
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
                if (!empty($_REQUEST['body'])) {
                        $_REQUEST['return'] = 'network';
@@ -47,7 +51,7 @@ class Compose extends BaseModule
                }
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Login::form('compose', false);
@@ -60,7 +64,7 @@ class Compose extends BaseModule
                }
 
                /// @TODO Retrieve parameter from router
-               $posttype = $parameters['type'] ?? Item::PT_ARTICLE;
+               $posttype = $this->parameters['type'] ?? Item::PT_ARTICLE;
                if (!in_array($posttype, [Item::PT_ARTICLE, Item::PT_PERSONAL_NOTE])) {
                        switch ($posttype) {
                                case 'note':
@@ -86,7 +90,7 @@ class Compose extends BaseModule
                                $compose_title = DI::l10n()->t('Compose new personal note');
                                $type = 'note';
                                $doesFederate = false;
-                               $contact_allow_list = [$a->contact['id']];
+                               $contact_allow_list = [$a->getContactId()];
                                $group_allow_list = [];
                                $contact_deny_list = [];
                                $group_deny_list = [];
@@ -129,6 +133,8 @@ class Compose extends BaseModule
                DI::page()->registerFooterScript(Theme::getPathForFile('js/linkPreview.js'));
                DI::page()->registerFooterScript(Theme::getPathForFile('js/compose.js'));
 
+               $contact = Contact::getById($a->getContactId());
+
                $tpl = Renderer::getMarkupTemplate('item/compose.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$compose_title'=> $compose_title,
@@ -138,9 +144,9 @@ class Compose extends BaseModule
                        '$type'         => $type,
                        '$wall'         => $wall,
                        '$default'      => '',
-                       '$mylink'       => DI::baseUrl()->remove($a->contact['url']),
+                       '$mylink'       => DI::baseUrl()->remove($contact['url']),
                        '$mytitle'      => DI::l10n()->t('This is you'),
-                       '$myphoto'      => DI::baseUrl()->remove($a->contact['thumb']),
+                       '$myphoto'      => DI::baseUrl()->remove($contact['thumb']),
                        '$submit'       => DI::l10n()->t('Submit'),
                        '$edbold'       => DI::l10n()->t('Bold'),
                        '$editalic'     => DI::l10n()->t('Italic'),
@@ -159,6 +165,13 @@ class Compose extends BaseModule
                        '$wait'         => DI::l10n()->t('Please wait'),
                        '$placeholdertitle' => DI::l10n()->t('Set title'),
                        '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t('Categories (comma-separated list)') : ''),
+                       '$scheduled_at' => Temporal::getDateTimeField(
+                               new DateTime(),
+                               new DateTime('now + 6 months'),
+                               null,
+                               DI::l10n()->t('Scheduled at'),
+                               'scheduled_at'
+                       ),
 
                        '$title'        => $title,
                        '$category'     => $category,
@@ -172,7 +185,7 @@ class Compose extends BaseModule
 
                        '$jotplugins'   => $jotplugins,
                        '$rand_num'     => Crypto::randomDigits(12),
-                       '$acl_selector'  => ACL::getFullSelectorHTML(DI::page(), $a->user, $doesFederate, [
+                       '$acl_selector'  => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), $doesFederate, [
                                'allow_cid' => $contact_allow_list,
                                'allow_gid' => $group_allow_list,
                                'deny_cid'  => $contact_deny_list,