Relay: Avoid empty tags / Always use the "relay account"

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 20d024feb72388bb527c3f1288475245492bcac2..e9bfc076bb50e9ff42dcd5969a7610c1161cf48a 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,16 +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)
@@ -203,7 +207,7 @@ function message_content(App $a)
                        '$linkurl' => L10n::t('Please enter a link URL:')
                ]);
 
-               $preselect = isset($a->argv[2]) ? [$a->argv[2]] : false;
+               $preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
 
                $prename = $preurl = $preid = '';
 
@@ -232,14 +236,14 @@ function message_content(App $a)
                                $preid = $r[0]['id'];
                                $preselect = [$preid];
                        } else {
-                               $preselect = false;
+                               $preselect = [];
                        }
                }
 
                $prefill = $preselect ? $prename : '';
 
                // the ugly select box
-               $select = contact_select('messageto', 'message-to-select', $preselect, 4, true, false, false, 10);
+               $select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
 
                $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl, [
@@ -247,7 +251,6 @@ function message_content(App $a)
                        '$to' => L10n::t('To:'),
                        '$showinputs' => 'true',
                        '$prefill' => $prefill,
-                       '$autocomp' => $autocomp,
                        '$preid' => $preid,
                        '$subject' => L10n::t('Subject:'),
                        '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
@@ -333,8 +336,6 @@ function message_content(App $a)
                        intval(local_user())
                );
 
-               require_once("include/bbcode.php");
-
                $tpl = get_markup_template('msg-header.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, [
                        '$baseurl' => System::baseUrl(true),
@@ -374,7 +375,7 @@ function message_content(App $a)
 
                        $from_name_e = $message['from-name'];
                        $subject_e = $message['title'];
-                       $body_e = Smilies::replace(bbcode($message['body']));
+                       $body_e = Smilies::replace(BBCode::convert($message['body']));
                        $to_name_e = $message['name'];
 
                        $contact = Contact::getDetailsByURL($message['from-url']);
@@ -395,8 +396,8 @@ function message_content(App $a)
                                'body' => $body_e,
                                'delete' => L10n::t('Delete message'),
                                'to_name' => $to_name_e,
-                               'date' => datetime_convert('UTC', date_default_timezone_get(), $message['created'], 'D, d M Y - g:i A'),
-                               'ago' => relative_date($message['created']),
+                               'date' => DateTimeFormat::local($message['created'], L10n::t('D, d M Y - g:i A')),
+                               'ago' => Temporal::getRelativeDate($message['created']),
                        ];
 
                        $seen = $message['seen'];
@@ -496,8 +497,8 @@ function render_messages(array $msg, $t)
                        '$delete' => L10n::t('Delete conversation'),
                        '$body' => $body_e,
                        '$to_name' => $to_name_e,
-                       '$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
-                       '$ago' => relative_date($rr['mailcreated']),
+                       '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
+                       '$ago' => Temporal::getRelativeDate($rr['mailcreated']),
                        '$seen' => $rr['mailseen'],
                        '$count' => L10n::tt('%d message', '%d messages', $rr['count']),
                ]);