X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=4f3acdee5521545717d9b9907184dd8de8a1edb0;hb=e84ad1556926acfebadfb70fd3161a0bc9ef4c6d;hp=3f1ec6a2e60db966132dc0244f3bee843e5aac35;hpb=e447375cddb847edbc9d4486be3938674ae66b8c;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 3f1ec6a2e6..4f3acdee55 100644 --- 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'])) { //