Merge pull request #9408 from annando/announce

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index f04bdaecd72dfb4284ce5cd7e68169655e93da7b..4f680aa0b7b7ebd448eecb65c3df326a1d8c6f77 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -74,7 +74,7 @@ function message_post(App $a)
        $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;
+       $recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient'])                  : 0;
 
        $ret = Mail::send($recipient, $body, $subject, $replyto);
        $norecip = false;
@@ -141,36 +141,6 @@ function message_content(App $a)
                        return;
                }
 
-               // Check if we should do HTML-based delete confirmation
-               if (!empty($_REQUEST['confirm'])) {
-                       // <form> can't take arguments in its "action" parameter
-                       // so add any arguments as hidden inputs
-                       $query = explode_querystring(DI::args()->getQueryString());
-                       $inputs = [];
-                       foreach ($query['args'] as $arg) {
-                               if (strpos($arg, 'confirm=') === false) {
-                                       $arg_parts = explode('=', $arg);
-                                       $inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-                               }
-                       }
-
-                       //DI::page()['aside'] = '';
-                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
-                               '$method' => 'get',
-                               '$message' => DI::l10n()->t('Do you really want to delete this message?'),
-                               '$extra_inputs' => $inputs,
-                               '$confirm' => DI::l10n()->t('Yes'),
-                               '$confirm_url' => $query['base'],
-                               '$confirm_name' => 'confirmed',
-                               '$cancel' => DI::l10n()->t('Cancel'),
-                       ]);
-               }
-
-               // Now check how the user responded to the confirmation query
-               if (!empty($_REQUEST['canceled'])) {
-                       DI::baseUrl()->redirect('message');
-               }
-
                $cmd = $a->argv[1];
                if ($cmd === 'drop') {
                        $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
@@ -215,50 +185,14 @@ function message_content(App $a)
                        '$linkurl' => DI::l10n()->t('Please enter a link URL:')
                ]);
 
-               $preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
-
-               $prename = $preurl = $preid = '';
-
-               if ($preselect) {
-                       $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                               intval(local_user()),
-                               intval($a->argv[2])
-                       );
-                       if (!DBA::isResult($r)) {
-                               $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
-                                       intval(local_user()),
-                                       DBA::escape(Strings::normaliseLink(base64_decode($a->argv[2])))
-                               );
-                       }
-
-                       if (!DBA::isResult($r)) {
-                               $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
-                                       intval(local_user()),
-                                       DBA::escape(base64_decode($a->argv[2]))
-                               );
-                       }
-
-                       if (DBA::isResult($r)) {
-                               $prename = $r[0]['name'];
-                               $preid = $r[0]['id'];
-                               $preselect = [$preid];
-                       } else {
-                               $preselect = [];
-                       }
-               }
-
-               $prefill = $preselect ? $prename : '';
+               $recipientId = $a->argv[2] ?? null;
 
-               // the ugly select box
-               $select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
+               $select = ACL::getMessageContactSelectHTML($recipientId);
 
                $tpl = Renderer::getMarkupTemplate('prv_message.tpl');
                $o .= Renderer::replaceMacros($tpl, [
                        '$header'     => DI::l10n()->t('Send Private Message'),
                        '$to'         => DI::l10n()->t('To:'),
-                       '$showinputs' => 'true',
-                       '$prefill'    => $prefill,
-                       '$preid'      => $preid,
                        '$subject'    => DI::l10n()->t('Subject:'),
                        '$subjtxt'    => $_REQUEST['subject'] ?? '',
                        '$text'       => $_REQUEST['body'] ?? '',
@@ -413,7 +347,7 @@ function message_content(App $a)
                        $seen = $message['seen'];
                }
 
-               $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
+               $select = $message['name'] . '<input type="hidden" name="recipient" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
                $tpl = Renderer::getMarkupTemplate('mail_display.tpl');
@@ -429,7 +363,6 @@ function message_content(App $a)
                        // reply
                        '$header' => DI::l10n()->t('Send Reply'),
                        '$to' => DI::l10n()->t('To:'),
-                       '$showinputs' => '',
                        '$subject' => DI::l10n()->t('Subject:'),
                        '$subjtxt' => $message['title'],
                        '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',