X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=093ef07317c82593db4a221c5aac8208fd62c851;hb=3f3422975266835fc125d1d61aae85ccc10d96d9;hp=bb3000736aac6f7721dfb4541f6c0a53b2313c77;hpb=28456de249fe05a1edd88b9451451a22e18b27b3;p=friendica.git diff --git a/mod/message.php b/mod/message.php index bb3000736a..093ef07317 100644 --- a/mod/message.php +++ b/mod/message.php @@ -5,20 +5,20 @@ 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\Module\Security\Login; use Friendica\Util\DateTimeFormat; use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; use Friendica\Util\Temporal; -use Friendica\Module\Login; - -require_once 'include/conversation.php'; function message_init(App $a) { @@ -35,16 +35,16 @@ function message_init(App $a) '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(); + $base = DI::baseUrl(); - $head_tpl = get_markup_template('message-head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_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 ]); } @@ -56,10 +56,10 @@ function message_post(App $a) 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['messageto']) ? intval($_REQUEST['messageto']) : 0; $ret = Mail::send($recipient, $body, $subject, $replyto); $norecip = false; @@ -87,7 +87,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); } } @@ -101,9 +101,9 @@ function message_content(App $a) 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'), @@ -118,7 +118,7 @@ function message_content(App $a) 'accesskey' => 'm', ]; } - $header = replace_macros($tpl, [ + $header = Renderer::replaceMacros($tpl, [ '$messages' => L10n::t('Messages'), '$button' => $button, ]); @@ -132,7 +132,7 @@ function message_content(App $a) if (!empty($_REQUEST['confirm'])) { //