X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=f12f54015f589717c45b100aea20f8111a688317;hb=215c6ecc14b799dc5359fd933275d9307ccd35ed;hp=7377ba5e48a74d88210c51fbe31a0197ba617ba8;hpb=d039d9510663db9985ece1f9fd96d30d5216e9d9;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 7377ba5e48..f12f54015f 100644 --- a/mod/message.php +++ b/mod/message.php @@ -1,24 +1,40 @@ . + * */ use Friendica\App; use Friendica\Content\Nav; -use Friendica\Content\Smilies; +use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Core\ACL; -use Friendica\Core\L10n; -use Friendica\Core\System; +use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Model\Notify\Type; +use Friendica\Module\Security\Login; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; use Friendica\Util\Temporal; -require_once 'include/conversation.php'; - function message_init(App $a) { $tabs = ''; @@ -28,28 +44,22 @@ function message_init(App $a) } $new = [ - 'label' => L10n::t('New Message'), + 'label' => DI::l10n()->t('New Message'), 'url' => 'message/new', 'sel' => $a->argc > 1 && $a->argv[1] == 'new', 'accesskey' => 'm', ]; - $tpl = get_markup_template('message_side.tpl'); - $a->page['aside'] = replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('message_side.tpl'); + DI::page()['aside'] = Renderer::replaceMacros($tpl, [ '$tabs' => $tabs, '$new' => $new, ]); - $base = System::baseUrl(); - - $head_tpl = get_markup_template('message-head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_tpl, [ - '$baseurl' => System::baseUrl(true), - '$base' => $base - ]); + $base = DI::baseUrl(); - $end_tpl = get_markup_template('message-end.tpl'); - $a->page['end'] .= replace_macros($end_tpl, [ - '$baseurl' => System::baseUrl(true), + $head_tpl = Renderer::getMarkupTemplate('message-head.tpl'); + DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [ + '$baseurl' => DI::baseUrl()->get(true), '$base' => $base ]); } @@ -57,34 +67,32 @@ function message_init(App $a) function message_post(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.')); return; } - $replyto = x($_REQUEST, 'replyto') ? notags(trim($_REQUEST['replyto'])) : ''; - $subject = x($_REQUEST, 'subject') ? notags(trim($_REQUEST['subject'])) : ''; - $body = x($_REQUEST, 'body') ? escape_tags(trim($_REQUEST['body'])) : ''; - $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto']) : 0; + $replyto = !empty($_REQUEST['replyto']) ? Strings::escapeTags(trim($_REQUEST['replyto'])) : ''; + $subject = !empty($_REQUEST['subject']) ? Strings::escapeTags(trim($_REQUEST['subject'])) : ''; + $body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : ''; + $recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient']) : 0; $ret = Mail::send($recipient, $body, $subject, $replyto); $norecip = false; switch ($ret) { case -1: - notice(L10n::t('No recipient selected.') . EOL); + notice(DI::l10n()->t('No recipient selected.')); $norecip = true; break; case -2: - notice(L10n::t('Unable to locate contact information.') . EOL); + notice(DI::l10n()->t('Unable to locate contact information.')); break; case -3: - notice(L10n::t('Message could not be sent.') . EOL); + notice(DI::l10n()->t('Message could not be sent.')); break; case -4: - notice(L10n::t('Message collection failure.') . EOL); + notice(DI::l10n()->t('Message collection failure.')); break; - default: - info(L10n::t('Message sent.') . EOL); } // fake it to go back to the input form if no recipient listed @@ -92,7 +100,7 @@ function message_post(App $a) $a->argc = 2; $a->argv[1] = 'new'; } else { - goaway($a->cmd . '/' . $ret); + DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret); } } @@ -102,29 +110,29 @@ function message_content(App $a) Nav::setSelected('messages'); if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); - return; + notice(DI::l10n()->t('Permission denied.')); + return Login::form(); } - $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; + $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname']; - $tpl = get_markup_template('mail_head.tpl'); + $tpl = Renderer::getMarkupTemplate('mail_head.tpl'); if ($a->argc > 1 && $a->argv[1] == 'new') { $button = [ - 'label' => L10n::t('Discard'), + 'label' => DI::l10n()->t('Discard'), 'url' => '/message', 'sel' => 'close', ]; } else { $button = [ - 'label' => L10n::t('New Message'), + 'label' => DI::l10n()->t('New Message'), 'url' => '/message/new', 'sel' => 'new', 'accesskey' => 'm', ]; } - $header = replace_macros($tpl, [ - '$messages' => L10n::t('Messages'), + $header = Renderer::replaceMacros($tpl, [ + '$messages' => DI::l10n()->t('Messages'), '$button' => $button, ]); @@ -133,44 +141,24 @@ function message_content(App $a) return; } - // Check if we should do HTML-based delete confirmation - if (!empty($_REQUEST['confirm'])) { - //