<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Mail;
-use Friendica\Model\Notify\Type;
use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
{
$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' => 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',
];
$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;
// 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 {
DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret);
}
return Login::form();
}
- $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+ $myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
$tpl = Renderer::getMarkupTemplate('mail_head.tpl');
- if ($a->argc > 1 && $a->argv[1] == 'new') {
+ if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') {
$button = [
'label' => DI::l10n()->t('Discard'),
'url' => '/message',
'$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 (!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];
+ $cmd = DI::args()->getArgv()[1];
if ($cmd === 'drop') {
- $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
+ $message = DBA::selectFirst('mail', ['convid'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
if(!DBA::isResult($message)){
notice(DI::l10n()->t('Conversation not found.'));
DI::baseUrl()->redirect('message');
}
- if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+ if (!DBA::delete('mail', ['id' => DI::args()->getArgv()[2], 'uid' => local_user()])) {
notice(DI::l10n()->t('Message was not deleted.'));
}
DI::baseUrl()->redirect('message/' . $conversation['id'] );
} else {
- $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($a->argv[2]),
- intval(local_user())
- );
- if (DBA::isResult($r)) {
- $parent = $r[0]['parent-uri'];
+ $parentmail = DBA::selectFirst('mail', ['parent-uri'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
+ if (DBA::isResult($parentmail)) {
+ $parent = $parentmail['parent-uri'];
if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
notice(DI::l10n()->t('Conversation was not removed.'));
}
}
- if (($a->argc > 1) && ($a->argv[1] === 'new')) {
+ if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'new')) {
$o .= $header;
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => DI::baseUrl()->get(true),
- '$nickname' => $a->user['nickname'],
+ '$nickname' => $a->getLoggedInUserNickname(),
'$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 = DI::args()->getArgv()[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'] ?? '',
$_SESSION['return_path'] = DI::args()->getQueryString();
- if ($a->argc == 1) {
+ if (DI::args()->getArgc() == 1) {
// List messages
return $o;
}
- if (($a->argc > 1) && (intval($a->argv[1]))) {
+ if ((DI::args()->getArgc() > 1) && (intval(DI::args()->getArgv()[1]))) {
$o .= $header;
WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
LIMIT 1",
local_user(),
- $a->argv[1]
+ DI::args()->getArgv()[1]
);
if (DBA::isResult($message)) {
$contact_id = $message['contact-id'];
$messages = DBA::toArray($messages_stmt);
DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
- DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]);
} else {
$messages = false;
}
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => DI::baseUrl()->get(true),
- '$nickname' => $a->user['nickname'],
+ '$nickname' => $a->getLoggedInUserNickname(),
'$linkurl' => DI::l10n()->t('Please enter a link URL:')
]);
$sparkle = ' sparkle';
}
- $extracted = item_extract_images($message['body']);
- if ($extracted['images']) {
- $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
- }
-
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
- $body_e = BBCode::convert($message['body']);
+ $body_e = BBCode::convertForUriId($message['uri-id'], $message['body']);
$to_name_e = $message['name'];
$contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar']);
- $from_photo = Contact::getThumb($contact, $message['from-photo']);
+ $from_photo = Contact::getThumb($contact);
$mails[] = [
'id' => $message['id'],
'from_name' => $from_name_e,
'from_url' => $from_url,
- 'from_addr' => $contact['addr'],
+ 'from_addr' => $contact['addr'] ?? $from_url,
'sparkle' => $sparkle,
'from_photo' => $from_photo,
'subject' => $subject_e,
$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');
$o = Renderer::replaceMacros($tpl, [
- '$thread_id' => $a->argv[1],
+ '$thread_id' => DI::args()->getArgv()[1],
'$thread_subject' => $message['title'],
'$thread_seen' => $seen,
'$delete' => DI::l10n()->t('Delete conversation'),
// 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;" ',
* @param int $limit
* @return array
*/
-function get_messages($uid, $start, $limit)
+function get_messages(int $uid, int $start, int $limit)
{
return DBA::toArray(DBA::p('SELECT
m.`id`,
$tpl = Renderer::getMarkupTemplate($t);
$rslt = '';
- $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+ $myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
foreach ($msg as $rr) {
if ($rr['unknown']) {
$body_e = $rr['body'];
$to_name_e = $rr['name'];
+ if (is_null($rr['url'])) {
+ // contact-id is pointing to a non existing contact
+ continue;
+ }
+
$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
- $from_photo = Contact::getThumb($contact, $rr['thumb'] ?: $rr['from-photo']);
+ $from_photo = Contact::getThumb($contact);
$rslt .= Renderer::replaceMacros($tpl, [
'$id' => $rr['id'],