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

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 4c6aa3d84823eb6fe9f544f8999a3419e5985884..093ef07317c82593db4a221c5aac8208fd62c851 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -6,12 +6,10 @@
 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;
@@ -38,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
        ]);
 }
@@ -103,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') {
@@ -178,7 +176,7 @@ function message_content(App $a)
                                DI::baseUrl()->redirect('message');
                        }
 
-                       DI::baseUrl()->redirectinternalRedirect('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]),
@@ -199,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:')
                ]);
@@ -355,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:')
                ]);
@@ -506,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']) {