X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=393d5d276bdee950a8ca48049e4b1ede011d5121;hb=1f535016d473b2e619ff9dc5b45c75b45be92a70;hp=af194879902e8fd898682b75237ebe901aabd821;hpb=6d4412ffea7acc2156bda83eb63e25901925590c;p=friendica.git diff --git a/mod/message.php b/mod/message.php index af19487990..393d5d276b 100644 --- a/mod/message.php +++ b/mod/message.php @@ -21,8 +21,6 @@ use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; use Friendica\Util\Temporal; -require_once 'include/conversation.php'; - function message_init(App $a) { $tabs = ''; @@ -187,7 +185,6 @@ function message_content(App $a) ); 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); @@ -232,7 +229,6 @@ function message_content(App $a) if (DBA::isResult($r)) { $prename = $r[0]['name']; - $preurl = $r[0]['url']; $preid = $r[0]['id']; $preselect = [$preid]; } else { @@ -247,22 +243,22 @@ function message_content(App $a) $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; } @@ -305,41 +301,58 @@ function message_content(App $a) $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), @@ -352,8 +365,10 @@ function message_content(App $a) $unknown = false; foreach ($messages as $message) { - if ($message['unknown']) + if ($message['unknown']) { $unknown = true; + } + if ($message['from-url'] == $myprofile) { $from_url = $myprofile; $sparkle = ''; @@ -369,7 +384,7 @@ function message_content(App $a) $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']); @@ -485,7 +500,7 @@ function get_messages($uid, $start, $limit) function render_messages(array $msg, $t) { - $a = get_app(); + $a = \get_app(); $tpl = Renderer::getMarkupTemplate($t); $rslt = ''; @@ -501,7 +516,6 @@ function render_messages(array $msg, $t) $participants = L10n::t("%s and You", $rr['from-name']); } - $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''); $body_e = $rr['body']; $to_name_e = $rr['name']; @@ -516,10 +530,10 @@ function render_messages(array $msg, $t) '$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,