use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Mail;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
];
$tpl = Renderer::getMarkupTemplate('message_side.tpl');
- $a->page['aside'] = Renderer::replaceMacros($tpl, [
+ DI::page()['aside'] = Renderer::replaceMacros($tpl, [
'$tabs' => $tabs,
'$new' => $new,
]);
$base = System::baseUrl();
$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
'$baseurl' => System::baseUrl(true),
'$base' => $base
]);
$a->argc = 2;
$a->argv[1] = 'new';
} else {
- $a->internalRedirect($a->cmd . '/' . $ret);
+ DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret);
}
}
if (!empty($_REQUEST['confirm'])) {
// <form> can't take arguments in its "action" parameter
// so add any arguments as hidden inputs
- $query = explode_querystring($a->query_string);
+ $query = explode_querystring(DI::args()->getQueryString());
$inputs = [];
foreach ($query['args'] as $arg) {
if (strpos($arg, 'confirm=') === false) {
}
}
- //$a->page['aside'] = '';
+ //DI::page()['aside'] = '';
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'get',
'$message' => L10n::t('Do you really want to delete this message?'),
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
- $a->internalRedirect('message');
+ DI::baseUrl()->redirect('message');
}
$cmd = $a->argv[1];
$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
if(!DBA::isResult($message)){
info(L10n::t('Conversation not found.') . EOL);
- $a->internalRedirect('message');
+ DI::baseUrl()->redirect('message');
}
if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
if(!DBA::isResult($conversation)){
info(L10n::t('Conversation removed.') . EOL);
- $a->internalRedirect('message');
+ DI::baseUrl()->redirect('message');
}
- $a->internalRedirect('message/' . $conversation['id'] );
+ 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]),
);
if (DBA::isResult($r)) {
$parent = $r[0]['parent-uri'];
- $convid = $r[0]['convid'];
if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
info(L10n::t('Conversation removed.') . EOL);
}
}
- $a->internalRedirect('message');
+ DI::baseUrl()->redirect('message');
}
}
$o .= $header;
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(true),
'$nickname' => $a->user['nickname'],
'$linkurl' => L10n::t('Please enter a link URL:')
if (DBA::isResult($r)) {
$prename = $r[0]['name'];
- $preurl = $r[0]['url'];
$preid = $r[0]['id'];
$preselect = [$preid];
} else {
$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
$o .= Renderer::replaceMacros($tpl, [
- '$header' => L10n::t('Send Private Message'),
- '$to' => L10n::t('To:'),
+ '$header' => L10n::t('Send Private Message'),
+ '$to' => L10n::t('To:'),
'$showinputs' => 'true',
- '$prefill' => $prefill,
- '$preid' => $preid,
- '$subject' => L10n::t('Subject:'),
- '$subjtxt' => !empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : '',
- '$text' => !empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
- '$readonly' => '',
- '$yourmessage' => L10n::t('Your message:'),
- '$select' => $select,
- '$parent' => '',
- '$upload' => L10n::t('Upload photo'),
- '$insert' => L10n::t('Insert web link'),
- '$wait' => L10n::t('Please wait'),
- '$submit' => L10n::t('Submit')
+ '$prefill' => $prefill,
+ '$preid' => $preid,
+ '$subject' => L10n::t('Subject:'),
+ '$subjtxt' => $_REQUEST['subject'] ?? '',
+ '$text' => $_REQUEST['body'] ?? '',
+ '$readonly' => '',
+ '$yourmessage'=> L10n::t('Your message:'),
+ '$select' => $select,
+ '$parent' => '',
+ '$upload' => L10n::t('Upload photo'),
+ '$insert' => L10n::t('Insert web link'),
+ '$wait' => L10n::t('Please wait'),
+ '$submit' => L10n::t('Submit')
]);
return $o;
}
- $_SESSION['return_path'] = $a->query_string;
+ $_SESSION['return_path'] = DI::args()->getQueryString();
if ($a->argc == 1) {
$total = $r[0]['total'];
}
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::args()->getQueryString());
$r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
$o .= $header;
- $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
- FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
- WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
- intval(local_user()),
- intval($a->argv[1])
+ $message = DBA::fetchFirst("
+ SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+ FROM `mail`
+ LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
+ WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
+ LIMIT 1",
+ local_user(),
+ $a->argv[1]
);
- if (DBA::isResult($r)) {
- $contact_id = $r[0]['contact-id'];
- $convid = $r[0]['convid'];
-
- $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", DBA::escape($r[0]['parent-uri']));
- if ($convid)
- $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
- DBA::escape($r[0]['parent-uri']),
- intval($convid)
- );
+ if (DBA::isResult($message)) {
+ $contact_id = $message['contact-id'];
- $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
- FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
- WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
- intval(local_user())
+ $params = [
+ local_user(),
+ $message['parent-uri']
+ ];
+
+ if ($message['convid']) {
+ $sql_extra = "AND (`mail`.`parent-uri` = ? OR `mail`.`convid` = ?)";
+ $params[] = $message['convid'];
+ } else {
+ $sql_extra = "AND `mail`.`parent-uri` = ?";
+ }
+ $messages_stmt = DBA::p("
+ SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+ FROM `mail`
+ LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
+ WHERE `mail`.`uid` = ?
+ $sql_extra
+ ORDER BY `mail`.`created` ASC",
+ ...$params
);
+
+ $messages = DBA::toArray($messages_stmt);
+
+ DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+
+ if ($message['convid']) {
+ // Clear Diaspora private message notifications
+ DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
+ }
+ // Clear DFRN private message notifications
+ DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
} else {
$messages = false;
}
+
if (!DBA::isResult($messages)) {
notice(L10n::t('Message not available.') . EOL);
return $o;
}
- $r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
- DBA::escape($r[0]['parent-uri']),
- intval(local_user())
- );
-
$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(true),
'$nickname' => $a->user['nickname'],
'$linkurl' => L10n::t('Please enter a link URL:')
$unknown = false;
foreach ($messages as $message) {
- if ($message['unknown'])
+ if ($message['unknown']) {
$unknown = true;
+ }
+
if ($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
- $body_e = Smilies::replace(BBCode::convert($message['body']));
+ $body_e = BBCode::convert($message['body']);
$to_name_e = $message['name'];
$contact = Contact::getDetailsByURL($message['from-url']);
function render_messages(array $msg, $t)
{
- $a = get_app();
+ $a = \get_app();
$tpl = Renderer::getMarkupTemplate($t);
$rslt = '';
$participants = L10n::t("%s and You", $rr['from-name']);
}
- $subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => Contact::magicLink($rr['url']),
- '$from_addr' => defaults($contact, 'addr', ''),
+ '$from_addr' => $contact['addr'] ?? '',
'$sparkle' => ' sparkle',
'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
- '$subject' => $subject_e,
+ '$subject' => $rr['title'],
'$delete' => L10n::t('Delete conversation'),
'$body' => $body_e,
'$to_name' => $to_name_e,