Remove deprecated App::removeBaseURL - process methods to DI::baseUrl()->remove()

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

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index db44ee3d14449975abda86df5e3346d05f64b238..5d4a3c18edfb0f145e49e1d6a90672dba9a646e8 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -12,12 +12,13 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Crypto;
@@ -29,7 +30,7 @@ class Compose extends BaseModule
                if (!empty($_REQUEST['body'])) {
                        $_REQUEST['return'] = 'network';
                        require_once 'mod/item.php';
-                       item_post(self::getApp());
+                       item_post(DI::app());
                } else {
                        notice(L10n::t('Please enter a post body.'));
                }
@@ -41,7 +42,7 @@ class Compose extends BaseModule
                        return Login::form('compose', false);
                }
 
-               $a = self::getApp();
+               $a = DI::app();
 
                if ($a->getCurrentTheme() !== 'frio') {
                        throw new NotImplementedException(L10n::t('This feature is only available with the frio theme.'));
@@ -62,8 +63,7 @@ class Compose extends BaseModule
 
                $user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'hidewall', 'default-location']);
 
-               /** @var ACLFormatter $aclFormatter */
-               $aclFormatter = self::getClass(ACLFormatter::class);
+               $aclFormatter = DI::aclFormatter();
 
                $contact_allow_list = $aclFormatter->expand($user['allow_cid']);
                $group_allow_list   = $aclFormatter->expand($user['allow_gid']);
@@ -85,15 +85,20 @@ class Compose extends BaseModule
                                $type = 'post';
                                $doesFederate = true;
 
-                               if ($_REQUEST['contact_allow']
-                                       . $_REQUEST['group_allow']
-                                       . $_REQUEST['contact_deny']
-                                   . $_REQUEST['group_deny'])
+                               $contact_allow = $_REQUEST['contact_allow'] ?? '';
+                               $group_allow = $_REQUEST['group_allow'] ?? '';
+                               $contact_deny = $_REQUEST['contact_deny'] ?? '';
+                               $group_deny = $_REQUEST['group_deny'] ?? '';
+
+                               if ($contact_allow
+                                       . $group_allow
+                                       . $contact_deny
+                                   . $group_deny)
                                {
-                                       $contact_allow_list = $_REQUEST['contact_allow'] ? explode(',', $_REQUEST['contact_allow']) : [];
-                                       $group_allow_list   = $_REQUEST['group_allow']   ? explode(',', $_REQUEST['group_allow'])   : [];
-                                       $contact_deny_list  = $_REQUEST['contact_deny']  ? explode(',', $_REQUEST['contact_deny'])  : [];
-                                       $group_deny_list    = $_REQUEST['group_deny']    ? explode(',', $_REQUEST['group_deny'])    : [];
+                                       $contact_allow_list = $contact_allow ? explode(',', $contact_allow) : [];
+                                       $group_allow_list   = $group_allow   ? explode(',', $group_allow)   : [];
+                                       $contact_deny_list  = $contact_deny  ? explode(',', $contact_deny)  : [];
+                                       $group_deny_list    = $group_deny    ? explode(',', $group_deny)    : [];
                                }
 
                                break;
@@ -122,9 +127,9 @@ class Compose extends BaseModule
                        '$type'         => $type,
                        '$wall'         => $wall,
                        '$default'      => '',
-                       '$mylink'       => $a->removeBaseURL($a->contact['url']),
+                       '$mylink'       => DI::baseUrl()->remove($a->contact['url']),
                        '$mytitle'      => L10n::t('This is you'),
-                       '$myphoto'      => $a->removeBaseURL($a->contact['thumb']),
+                       '$myphoto'      => DI::baseUrl()->remove($a->contact['thumb']),
                        '$submit'       => L10n::t('Submit'),
                        '$edbold'       => L10n::t('Bold'),
                        '$editalic'     => L10n::t('Italic'),