- if ($a->argc > 1 && is_numeric($a->argv[1])) {
- $tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl');
+ if (DI::args()->getArgc() > 1 && is_numeric(DI::args()->getArgv()[1])) {
+ $tabs = render_messages(get_messages(DI::userSession()->getLocalUserId(), 0, 5), 'mail_list.tpl');
- 'label' => DI::l10n()->t('New Message'),
- 'url' => 'message/new',
- 'sel' => $a->argc > 1 && $a->argv[1] == 'new',
+ 'label' => DI::l10n()->t('New Message'),
+ 'url' => 'message/new',
+ 'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
'accesskey' => 'm',
];
$tpl = Renderer::getMarkupTemplate('message_side.tpl');
DI::page()['aside'] = Renderer::replaceMacros($tpl, [
'$tabs' => $tabs,
'accesskey' => 'm',
];
$tpl = Renderer::getMarkupTemplate('message_side.tpl');
DI::page()['aside'] = Renderer::replaceMacros($tpl, [
'$tabs' => $tabs,
$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
- $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['recipient']) ? intval($_REQUEST['recipient']) : 0;
+ $sender_id = DI::userSession()->getLocalUserId();
+ $replyto = !empty($_REQUEST['replyto']) ? trim($_REQUEST['replyto']) : '';
+ $subject = !empty($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
+ $body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
+ $recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient']) : 0;
- $ret = Mail::send($recipient, $body, $subject, $replyto);
+ $ret = Mail::send($sender_id, $recipient, $body, $subject, $replyto);
- 'label' => DI::l10n()->t('New Message'),
- 'url' => '/message/new',
- 'sel' => 'new',
+ 'label' => DI::l10n()->t('New Message'),
+ 'url' => '/message/new',
+ 'sel' => 'new',
'accesskey' => 'm',
];
}
$header = Renderer::replaceMacros($tpl, [
'$messages' => DI::l10n()->t('Messages'),
'accesskey' => 'm',
];
}
$header = Renderer::replaceMacros($tpl, [
'$messages' => DI::l10n()->t('Messages'),
- 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])) {
- $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
+ $message = DBA::selectFirst('mail', ['convid'], ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()]);
- if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
- notice(DI::l10n()->t('Message was not deleted.'));
+ if (!DBA::delete('mail', ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()])) {
+ DI::sysmsg()->addNotice(DI::l10n()->t('Message was not deleted.'));
- $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
+ $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => DI::userSession()->getLocalUserId()]);
if(!DBA::isResult($conversation)){
DI::baseUrl()->redirect('message');
}
DI::baseUrl()->redirect('message/' . $conversation['id'] );
} else {
if(!DBA::isResult($conversation)){
DI::baseUrl()->redirect('message');
}
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' => DI::userSession()->getLocalUserId()]);
+ 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 (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => DI::userSession()->getLocalUserId()])) {
+ DI::sysmsg()->addNotice(DI::l10n()->t('Conversation was not removed.'));
$o .= $header;
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
$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(),
$select = ACL::getMessageContactSelectHTML($recipientId);
$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
$o .= Renderer::replaceMacros($tpl, [
$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:'),
- '$subject' => DI::l10n()->t('Subject:'),
- '$subjtxt' => $_REQUEST['subject'] ?? '',
- '$text' => $_REQUEST['body'] ?? '',
- '$readonly' => '',
- '$yourmessage'=> DI::l10n()->t('Your message:'),
- '$select' => $select,
- '$parent' => '',
- '$upload' => DI::l10n()->t('Upload photo'),
- '$insert' => DI::l10n()->t('Insert web link'),
- '$wait' => DI::l10n()->t('Please wait'),
- '$submit' => DI::l10n()->t('Submit')
+ '$header' => DI::l10n()->t('Send Private Message'),
+ '$to' => DI::l10n()->t('To:'),
+ '$subject' => DI::l10n()->t('Subject:'),
+ '$subjtxt' => $_REQUEST['subject'] ?? '',
+ '$text' => $_REQUEST['body'] ?? '',
+ '$readonly' => '',
+ '$yourmessage' => DI::l10n()->t('Your message:'),
+ '$select' => $select,
+ '$parent' => '',
+ '$upload' => DI::l10n()->t('Upload photo'),
+ '$insert' => DI::l10n()->t('Insert web link'),
+ '$wait' => DI::l10n()->t('Please wait'),
+ '$submit' => DI::l10n()->t('Submit')
- $total = 0;
- $r = q("SELECT count(*) AS `total`, ANY_VALUE(`created`) AS `created` FROM `mail`
- WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
- intval(local_user())
- );
- if (DBA::isResult($r)) {
- $total = $r[0]['total'];
- }
+ $total = DBA::count('mail', ['uid' => DI::userSession()->getLocalUserId()], ['distinct' => true, 'expression' => 'parent-uri']);
LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
LIMIT 1",
LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
LIMIT 1",
- DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+ DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => DI::userSession()->getLocalUserId()]);
return $o;
}
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
return $o;
}
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
- '$baseurl' => DI::baseUrl()->get(true),
- '$nickname' => $a->user['nickname'],
+ '$nickname' => $a->getLoggedInUserNickname(),
- $contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar']);
- $from_photo = Contact::getThumb($contact, $message['from-photo']);
+ $contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
+ $from_photo = Contact::getThumb($contact);
- 'id' => $message['id'],
- 'from_name' => $from_name_e,
- 'from_url' => $from_url,
- 'from_addr' => $contact['addr'] ?? $from_url,
- 'sparkle' => $sparkle,
+ 'id' => $message['id'],
+ 'from_name' => $from_name_e,
+ 'from_url' => $from_url,
+ 'from_addr' => $contact['addr'] ?? $from_url,
+ 'sparkle' => $sparkle,
- 'subject' => $subject_e,
- 'body' => $body_e,
- 'delete' => DI::l10n()->t('Delete message'),
- 'to_name' => $to_name_e,
- 'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
- 'ago' => Temporal::getRelativeDate($message['created']),
+ 'subject' => $subject_e,
+ 'body' => $body_e,
+ 'delete' => DI::l10n()->t('Delete message'),
+ 'to_name' => $to_name_e,
+ 'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
+ 'ago' => Temporal::getRelativeDate($message['created']),
$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
$o = Renderer::replaceMacros($tpl, [
$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
$o = Renderer::replaceMacros($tpl, [
- '$thread_seen' => $seen,
- '$delete' => DI::l10n()->t('Delete conversation'),
- '$canreply' => (($unknown) ? false : '1'),
- '$unknown_text' => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
- '$mails' => $mails,
-
+ '$thread_seen' => $seen,
+ '$delete' => DI::l10n()->t('Delete conversation'),
+ '$canreply' => (($unknown) ? false : '1'),
+ '$unknown_text' => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
+ '$mails' => $mails,
- '$header' => DI::l10n()->t('Send Reply'),
- '$to' => DI::l10n()->t('To:'),
- '$subject' => DI::l10n()->t('Subject:'),
- '$subjtxt' => $message['title'],
- '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
- '$yourmessage' => DI::l10n()->t('Your message:'),
- '$text' => '',
- '$select' => $select,
- '$parent' => $parent,
- '$upload' => DI::l10n()->t('Upload photo'),
- '$insert' => DI::l10n()->t('Insert web link'),
- '$submit' => DI::l10n()->t('Submit'),
- '$wait' => DI::l10n()->t('Please wait')
+ '$header' => DI::l10n()->t('Send Reply'),
+ '$to' => DI::l10n()->t('To:'),
+ '$subject' => DI::l10n()->t('Subject:'),
+ '$subjtxt' => $message['title'],
+ '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+ '$yourmessage' => DI::l10n()->t('Your message:'),
+ '$text' => '',
+ '$select' => $select,
+ '$parent' => $parent,
+ '$upload' => DI::l10n()->t('Upload photo'),
+ '$insert' => DI::l10n()->t('Insert web link'),
+ '$submit' => DI::l10n()->t('Submit'),
+ '$wait' => DI::l10n()->t('Please wait')
- m2.`count`,
- m2.`mailcreated`,
- m2.`mailseen`
- FROM `mail` m
- JOIN (
- SELECT
- `parent-uri`,
- MIN(`id`) AS `id`,
- COUNT(*) AS `count`,
- MAX(`created`) AS `mailcreated`,
- MIN(`seen`) AS `mailseen`
- FROM `mail`
- WHERE `uid` = ?
- GROUP BY `parent-uri`
- ) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
+ m2.`count`,
+ m2.`mailcreated`,
+ m2.`mailseen`
+ FROM `mail` m
+ JOIN (
+ SELECT
+ `parent-uri`,
+ MIN(`id`) AS `id`,
+ COUNT(*) AS `count`,
+ MAX(`created`) AS `mailcreated`,
+ MIN(`seen`) AS `mailseen`
+ FROM `mail`
+ WHERE `uid` = ?
+ GROUP BY `parent-uri`
+ ) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
, $uid, $uid, $start, $limit));
}
, $uid, $uid, $start, $limit));
}
- $contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
- $from_photo = Contact::getThumb($contact, $rr['thumb'] ?: $rr['from-photo']);
+ if (is_null($rr['url'])) {
+ // contact-id is pointing to a nonexistent contact
+ continue;
+ }
+
+ $contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
+ $from_photo = Contact::getThumb($contact);
- '$id' => $rr['id'],
- '$from_name' => $participants,
- '$from_url' => Contact::magicLink($rr['url']),
- '$from_addr' => $contact['addr'] ?? '',
- '$sparkle' => ' sparkle',
+ '$id' => $rr['id'],
+ '$from_name' => $participants,
+ '$from_url' => Contact::magicLink($rr['url']),
+ '$from_addr' => $contact['addr'] ?? '',
+ '$sparkle' => ' sparkle',
- '$subject' => $rr['title'],
- '$delete' => DI::l10n()->t('Delete conversation'),
- '$body' => $body_e,
- '$to_name' => $to_name_e,
- '$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
- '$ago' => Temporal::getRelativeDate($rr['mailcreated']),
- '$seen' => $rr['mailseen'],
- '$count' => DI::l10n()->tt('%d message', '%d messages', $rr['count']),
+ '$subject' => $rr['title'],
+ '$delete' => DI::l10n()->t('Delete conversation'),
+ '$body' => $body_e,
+ '$to_name' => $to_name_e,
+ '$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
+ '$ago' => Temporal::getRelativeDate($rr['mailcreated']),
+ '$seen' => $rr['mailseen'],
+ '$count' => DI::l10n()->tt('%d message', '%d messages', $rr['count']),