X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=b414fe0e49f6110371dbeb6a6c7bec1a0a533f8f;hb=5af9596dde162b1b9819869e3d5129f571a1c503;hp=04073139f3cabe88f40232d8776ed8d48e8b032e;hpb=77dfbaa0bf8b4749ec3f8ea46519a96f5cba464c;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 04073139f3..b414fe0e49 100644 --- a/mod/message.php +++ b/mod/message.php @@ -2,14 +2,20 @@ /** * @file mod/message.php */ + use Friendica\App; +use Friendica\Content\Nav; use Friendica\Content\Smilies; +use Friendica\Content\Text\BBCode; +use Friendica\Core\ACL; +use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Temporal; -require_once 'include/acl_selectors.php'; require_once 'include/conversation.php'; function message_init(App $a) @@ -20,37 +26,37 @@ function message_init(App $a) $tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl'); } - $new = array( - 'label' => t('New Message'), + $new = [ + 'label' => 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, array( + $a->page['aside'] = replace_macros($tpl, [ '$tabs' => $tabs, '$new' => $new, - )); + ]); $base = System::baseUrl(); $head_tpl = get_markup_template('message-head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_tpl, array( + $a->page['htmlhead'] .= replace_macros($head_tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); $end_tpl = get_markup_template('message-end.tpl'); - $a->page['end'] .= replace_macros($end_tpl, array( + $a->page['end'] .= replace_macros($end_tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); } function message_post(App $a) { if (!local_user()) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } @@ -64,20 +70,20 @@ function message_post(App $a) switch ($ret) { case -1: - notice(t('No recipient selected.') . EOL); + notice(L10n::t('No recipient selected.') . EOL); $norecip = true; break; case -2: - notice(t('Unable to locate contact information.') . EOL); + notice(L10n::t('Unable to locate contact information.') . EOL); break; case -3: - notice(t('Message could not be sent.') . EOL); + notice(L10n::t('Message could not be sent.') . EOL); break; case -4: - notice(t('Message collection failure.') . EOL); + notice(L10n::t('Message collection failure.') . EOL); break; default: - info(t('Message sent.') . EOL); + info(L10n::t('Message sent.') . EOL); } // fake it to go back to the input form if no recipient listed @@ -92,19 +98,19 @@ function message_post(App $a) function message_content(App $a) { $o = ''; - nav_set_selected('messages'); + Nav::setSelected('messages'); if (!local_user()) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; $tpl = get_markup_template('mail_head.tpl'); - $header = replace_macros($tpl, array( - '$messages' => t('Messages'), - )); + $header = replace_macros($tpl, [ + '$messages' => L10n::t('Messages'), + ]); if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { if (!intval($a->argv[2])) { @@ -112,43 +118,41 @@ function message_content(App $a) } // Check if we should do HTML-based delete confirmation - if ($_REQUEST['confirm']) { + if (!empty($_REQUEST['confirm'])) { //