Move redundant System::baseUrl() to DI::baseUrl() calls

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 393d5d276bdee950a8ca48049e4b1ede011d5121..093ef07317c82593db4a221c5aac8208fd62c851 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -6,16 +6,15 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 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,15 +36,15 @@ 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();
+       $base = DI::baseUrl();
 
        $head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
-               '$baseurl' => System::baseUrl(true),
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
+               '$baseurl' => DI::baseUrl()->get(true),
                '$base' => $base
        ]);
 }
@@ -88,7 +87,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);
        }
 }
 
@@ -102,7 +101,7 @@ function message_content(App $a)
                return Login::form();
        }
 
-       $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
+       $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
 
        $tpl = Renderer::getMarkupTemplate('mail_head.tpl');
        if ($a->argc > 1 && $a->argv[1] == 'new') {
@@ -133,7 +132,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) {
@@ -156,7 +155,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 +163,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 +173,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]),
@@ -190,7 +189,7 @@ function message_content(App $a)
                                        info(L10n::t('Conversation removed.') . EOL);
                                }
                        }
-                       $a->internalRedirect('message');
+                       DI::baseUrl()->redirect('message');
                }
        }
 
@@ -198,8 +197,8 @@ function message_content(App $a)
                $o .= $header;
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+                       '$baseurl' => DI::baseUrl()->get(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
                ]);
@@ -264,7 +263,7 @@ function message_content(App $a)
        }
 
 
-       $_SESSION['return_path'] = $a->query_string;
+       $_SESSION['return_path'] = DI::args()->getQueryString();
 
        if ($a->argc == 1) {
 
@@ -281,7 +280,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());
 
@@ -354,8 +353,8 @@ function message_content(App $a)
                }
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+                       '$baseurl' => DI::baseUrl()->get(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
                ]);
@@ -505,7 +504,7 @@ function render_messages(array $msg, $t)
        $tpl = Renderer::getMarkupTemplate($t);
        $rslt = '';
 
-       $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
+       $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
 
        foreach ($msg as $rr) {
                if ($rr['unknown']) {