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 17185d1438c99a2f3281dbf48d6720d2bddf72c2..68b14b97d69fc6f98b348c0e77b5df603e579988 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -1,7 +1,27 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Item;
 
+use DateTime;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\ACL;
@@ -9,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';
@@ -28,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);
@@ -41,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':
@@ -53,7 +76,7 @@ class Compose extends BaseModule
                        }
                }
 
-               $user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'hidewall', 'default-location']);
+               $user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
 
                $aclFormatter = DI::aclFormatter();
 
@@ -67,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 = [];
@@ -110,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,
@@ -119,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'),
@@ -140,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,
@@ -152,9 +184,8 @@ class Compose extends BaseModule
                        '$group_deny'   => implode(',', $group_deny_list),
 
                        '$jotplugins'   => $jotplugins,
-                       '$sourceapp'    => DI::l10n()->t($a->sourcename),
                        '$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,