use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-require_once 'include/conversation.php';
-
function message_init(App $a)
{
$tabs = '';
return;
}
- $replyto = x($_REQUEST, 'replyto') ? Strings::removeTags(trim($_REQUEST['replyto'])) : '';
- $subject = x($_REQUEST, 'subject') ? Strings::removeTags(trim($_REQUEST['subject'])) : '';
- $body = x($_REQUEST, 'body') ? Strings::escapeTags(trim($_REQUEST['body'])) : '';
- $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto']) : 0;
+ $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;
$ret = Mail::send($recipient, $body, $subject, $replyto);
$norecip = false;
$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' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
- '$text' => x($_REQUEST, 'body') ? Strings::escapeTags(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' => defaults($_REQUEST, 'subject', ''),
+ '$text' => defaults($_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;
}
$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, [
'$baseurl' => System::baseUrl(true),
$unknown = false;
foreach ($messages as $message) {
- if ($message['unknown'])
+ if ($message['unknown']) {
$unknown = true;
+ }
+
if ($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
}
}
-function get_messages($user, $lstart, $lend)
+/**
+ * @param int $uid
+ * @param int $start
+ * @param int $limit
+ * @return array
+ */
+function get_messages($uid, $start, $limit)
{
- //TODO: rewritte with a sub-query to get the first message of each private thread with certainty
- return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
- ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`,
- ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`,
- ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`,
- ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`,
- ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`,
- ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`,
- `mail`.`parent-uri`,
- ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`,
- ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`,
- count( * ) as `count`
- FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
- WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
- intval($user), intval($lstart), intval($lend)
- );
+ return DBA::toArray(DBA::p('SELECT
+ m.`id`,
+ m.`uid`,
+ m.`guid`,
+ m.`from-name`,
+ m.`from-photo`,
+ m.`from-url`,
+ m.`contact-id`,
+ m.`convid`,
+ m.`title`,
+ m.`body`,
+ m.`seen`,
+ m.`reply`,
+ m.`replied`,
+ m.`unknown`,
+ m.`uri`,
+ m.`parent-uri`,
+ m.`created`,
+ c.`name`,
+ c.`url`,
+ c.`thumb`,
+ c.`network`,
+ 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`
+ LEFT JOIN `contact` c ON m.`contact-id` = c.`id`
+ WHERE m.`uid` = ?
+ ORDER BY m2.`mailcreated` DESC
+ LIMIT ?, ?'
+ , $uid, $uid, $start, $limit));
}
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'];
'$from_addr' => defaults($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,