Replace remaining $a->page by DI::page()

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 3f1ec6a2e60db966132dc0244f3bee843e5aac35..4f3acdee5521545717d9b9907184dd8de8a1edb0 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -13,9 +13,10 @@ use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -37,14 +38,14 @@ function message_init(App $a)
        ];
 
        $tpl = Renderer::getMarkupTemplate('message_side.tpl');
-       $a->page['aside'] = Renderer::replaceMacros($tpl, [
+       DI::page()['aside'] = Renderer::replaceMacros($tpl, [
                '$tabs' => $tabs,
                '$new' => $new,
        ]);
        $base = System::baseUrl();
 
        $head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
@@ -88,7 +89,7 @@ function message_post(App $a)
                $a->argc = 2;
                $a->argv[1] = 'new';
        } else {
-               $a->internalRedirect($a->cmd . '/' . $ret);
+               DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret);
        }
 }
 
@@ -133,7 +134,7 @@ function message_content(App $a)
                if (!empty($_REQUEST['confirm'])) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
-                       $query = explode_querystring($a->query_string);
+                       $query = explode_querystring(DI::args()->getQueryString());
                        $inputs = [];
                        foreach ($query['args'] as $arg) {
                                if (strpos($arg, 'confirm=') === false) {
@@ -142,7 +143,7 @@ function message_content(App $a)
                                }
                        }
 
-                       //$a->page['aside'] = '';
+                       //DI::page()['aside'] = '';
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
                                '$message' => L10n::t('Do you really want to delete this message?'),
@@ -156,7 +157,7 @@ function message_content(App $a)
 
                // Now check how the user responded to the confirmation query
                if (!empty($_REQUEST['canceled'])) {
-                       $a->internalRedirect('message');
+                       DI::baseUrl()->redirect('message');
                }
 
                $cmd = $a->argv[1];
@@ -164,7 +165,7 @@ function message_content(App $a)
                        $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
                        if(!DBA::isResult($message)){
                                info(L10n::t('Conversation not found.') . EOL);
-                               $a->internalRedirect('message');
+                               DI::baseUrl()->redirect('message');
                        }
 
                        if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
@@ -174,10 +175,10 @@ function message_content(App $a)
                        $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
                        if(!DBA::isResult($conversation)){
                                info(L10n::t('Conversation removed.') . EOL);
-                               $a->internalRedirect('message');
+                               DI::baseUrl()->redirect('message');
                        }
 
-                       $a->internalRedirect('message/' . $conversation['id'] );
+                       DI::baseUrl()->redirect('message/' . $conversation['id'] );
                } else {
                        $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
@@ -185,13 +186,12 @@ function message_content(App $a)
                        );
                        if (DBA::isResult($r)) {
                                $parent = $r[0]['parent-uri'];
-                               $convid = $r[0]['convid'];
 
                                if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
                                        info(L10n::t('Conversation removed.') . EOL);
                                }
                        }
-                       $a->internalRedirect('message');
+                       DI::baseUrl()->redirect('message');
                }
        }
 
@@ -199,7 +199,7 @@ function message_content(App $a)
                $o .= $header;
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
@@ -230,7 +230,6 @@ function message_content(App $a)
 
                        if (DBA::isResult($r)) {
                                $prename = $r[0]['name'];
-                               $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
                                $preselect = [$preid];
                        } else {
@@ -251,8 +250,8 @@ function message_content(App $a)
                        '$prefill'    => $prefill,
                        '$preid'      => $preid,
                        '$subject'    => L10n::t('Subject:'),
-                       '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
-                       '$text'       => defaults($_REQUEST, 'body', ''),
+                       '$subjtxt'    => $_REQUEST['subject'] ?? '',
+                       '$text'       => $_REQUEST['body'] ?? '',
                        '$readonly'   => '',
                        '$yourmessage'=> L10n::t('Your message:'),
                        '$select'     => $select,
@@ -266,7 +265,7 @@ function message_content(App $a)
        }
 
 
-       $_SESSION['return_path'] = $a->query_string;
+       $_SESSION['return_path'] = DI::args()->getQueryString();
 
        if ($a->argc == 1) {
 
@@ -283,7 +282,7 @@ function message_content(App $a)
                        $total = $r[0]['total'];
                }
 
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
@@ -356,7 +355,7 @@ function message_content(App $a)
                }
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
@@ -386,7 +385,7 @@ function message_content(App $a)
 
                        $from_name_e = $message['from-name'];
                        $subject_e = $message['title'];
-                       $body_e = Smilies::replace(BBCode::convert($message['body']));
+                       $body_e = BBCode::convert($message['body']);
                        $to_name_e = $message['name'];
 
                        $contact = Contact::getDetailsByURL($message['from-url']);
@@ -532,7 +531,7 @@ function render_messages(array $msg, $t)
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
-                       '$from_addr' => defaults($contact, 'addr', ''),
+                       '$from_addr' => $contact['addr'] ?? '',
                        '$sparkle' => ' sparkle',
                        '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                        '$subject' => $rr['title'],