X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=1c6502ee1593fe36822a0bbb4ea5075e4df13f40;hb=5974d045a52aa70d9971053c09b07d4d25e285c3;hp=c1b2d989e9651a0e147added038373a8c19ff4a3;hpb=dc366bf1f7b5b7b0fc1c1a86772783074b301993;p=friendica.git diff --git a/mod/message.php b/mod/message.php index c1b2d989e9..1c6502ee15 100644 --- a/mod/message.php +++ b/mod/message.php @@ -1,52 +1,64 @@ . + * */ use Friendica\App; use Friendica\Content\Nav; -use Friendica\Content\Smilies; -use Friendica\Core\L10n; -use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Content\Pager; +use Friendica\Content\Text\BBCode; +use Friendica\Core\ACL; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Module\Security\Login; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Strings; use Friendica\Util\Temporal; -require_once 'include/acl_selectors.php'; -require_once 'include/conversation.php'; - function message_init(App $a) { $tabs = ''; - if ($a->argc > 1 && is_numeric($a->argv[1])) { + if (DI::args()->getArgc() > 1 && is_numeric(DI::args()->getArgv()[1])) { $tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl'); } $new = [ - 'label' => L10n::t('New Message'), + 'label' => DI::l10n()->t('New Message'), 'url' => 'message/new', - 'sel' => $a->argc > 1 && $a->argv[1] == 'new', + 'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[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 ]); } @@ -54,42 +66,39 @@ 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 if ($norecip) { - $a->argc = 2; - $a->argv[1] = 'new'; + DI::args()->setArgv(['message', 'new']); } else { - goaway($_SESSION['return_url']); + DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret); } } @@ -99,256 +108,182 @@ 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->getLoggedInUserNickname(); - $tpl = get_markup_template('mail_head.tpl'); - $header = replace_macros($tpl, [ - '$messages' => L10n::t('Messages'), + $tpl = Renderer::getMarkupTemplate('mail_head.tpl'); + if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') { + $button = [ + 'label' => DI::l10n()->t('Discard'), + 'url' => '/message', + 'sel' => 'close', + ]; + } else { + $button = [ + 'label' => DI::l10n()->t('New Message'), + 'url' => '/message/new', + 'sel' => 'new', + 'accesskey' => 'm', + ]; + } + $header = Renderer::replaceMacros($tpl, [ + '$messages' => DI::l10n()->t('Messages'), + '$button' => $button, ]); - if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { - if (!intval($a->argv[2])) { + if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop' || DI::args()->getArgv()[1] === 'dropconv')) { + if (!intval(DI::args()->getArgv()[2])) { return; } - // Check if we should do HTML-based delete confirmation - if ($_REQUEST['confirm']) { - //