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;
];
$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
]);
}
$a->argc = 2;
$a->argv[1] = 'new';
} else {
- $a->internalRedirect($a->cmd . '/' . $ret);
+ DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret);
}
}
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') {
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) {
// 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];
$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()])) {
$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]),
info(L10n::t('Conversation removed.') . EOL);
}
}
- $a->internalRedirect('message');
+ DI::baseUrl()->redirect('message');
}
}
$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:')
]);
}
- $_SESSION['return_path'] = $a->query_string;
+ $_SESSION['return_path'] = DI::args()->getQueryString();
if ($a->argc == 1) {
$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());
}
$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:')
]);
$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']) {