X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=3ff84a1e6684478b2200d2c552451aad2d2401c3;hb=e7be87df93895de47414a5a788cd6487adb98a29;hp=ec5669937370a8d7709cc350869044b6c0276062;hpb=9b37f5c0855c8071075fa3ce49b7e9c38f2c6a2e;p=friendica.git diff --git a/mod/message.php b/mod/message.php index ec56699373..3ff84a1e66 100644 --- a/mod/message.php +++ b/mod/message.php @@ -5,16 +5,21 @@ use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Pager; use Friendica\Content\Smilies; +use Friendica\Content\Text\BBCode; +use Friendica\Core\ACL; use Friendica\Core\L10n; +use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Module\Login; use Friendica\Util\DateTimeFormat; - -require_once 'include/acl_selectors.php'; -require_once 'include/conversation.php'; +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; +use Friendica\Util\Temporal; function message_init(App $a) { @@ -31,21 +36,15 @@ function message_init(App $a) 'accesskey' => 'm', ]; - $tpl = get_markup_template('message_side.tpl'); - $a->page['aside'] = replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('message_side.tpl'); + $a->page['aside'] = Renderer::replaceMacros($tpl, [ '$tabs' => $tabs, '$new' => $new, ]); $base = System::baseUrl(); - $head_tpl = get_markup_template('message-head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_tpl, [ - '$baseurl' => System::baseUrl(true), - '$base' => $base - ]); - - $end_tpl = get_markup_template('message-end.tpl'); - $a->page['end'] .= replace_macros($end_tpl, [ + $head_tpl = Renderer::getMarkupTemplate('message-head.tpl'); + $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base ]); @@ -58,10 +57,10 @@ function message_post(App $a) return; } - $replyto = x($_REQUEST, 'replyto') ? notags(trim($_REQUEST['replyto'])) : ''; - $subject = x($_REQUEST, 'subject') ? notags(trim($_REQUEST['subject'])) : ''; - $body = x($_REQUEST, 'body') ? escape_tags(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; @@ -89,7 +88,7 @@ function message_post(App $a) $a->argc = 2; $a->argv[1] = 'new'; } else { - goaway($_SESSION['return_url']); + $a->internalRedirect($a->cmd . '/' . $ret); } } @@ -100,14 +99,29 @@ function message_content(App $a) if (!local_user()) { notice(L10n::t('Permission denied.') . EOL); - return; + return Login::form(); } $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; - $tpl = get_markup_template('mail_head.tpl'); - $header = replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('mail_head.tpl'); + if ($a->argc > 1 && $a->argv[1] == 'new') { + $button = [ + 'label' => L10n::t('Discard'), + 'url' => '/message', + 'sel' => 'close', + ]; + } else { + $button = [ + 'label' => L10n::t('New Message'), + 'url' => '/message/new', + 'sel' => 'new', + 'accesskey' => 'm', + ]; + } + $header = Renderer::replaceMacros($tpl, [ '$messages' => L10n::t('Messages'), + '$button' => $button, ]); if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { @@ -116,7 +130,7 @@ function message_content(App $a) } // Check if we should do HTML-based delete confirmation - if ($_REQUEST['confirm']) { + if (!empty($_REQUEST['confirm'])) { //
can't take arguments in its "action" parameter // so add any arguments as hidden inputs $query = explode_querystring($a->query_string); @@ -129,7 +143,7 @@ function message_content(App $a) } //$a->page['aside'] = ''; - return replace_macros(get_markup_template('confirm.tpl'), [ + return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [ '$method' => 'get', '$message' => L10n::t('Do you really want to delete this message?'), '$extra_inputs' => $inputs, @@ -139,73 +153,58 @@ function message_content(App $a) '$cancel' => L10n::t('Cancel'), ]); } + // Now check how the user responded to the confirmation query - if ($_REQUEST['canceled']) { - goaway($_SESSION['return_url']); + if (!empty($_REQUEST['canceled'])) { + $a->internalRedirect('message'); } $cmd = $a->argv[1]; if ($cmd === 'drop') { - $r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($a->argv[2]), - intval(local_user()) - ); - if ($r) { + $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'); + } + + if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { info(L10n::t('Message deleted.') . EOL); } - //goaway(System::baseUrl(true) . '/message' ); - goaway($_SESSION['return_url']); + + $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]); + if(!DBA::isResult($conversation)){ + info(L10n::t('Conversation removed.') . EOL); + $a->internalRedirect('message'); + } + + $a->internalRedirect('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 (DBM::is_result($r)) { + if (DBA::isResult($r)) { $parent = $r[0]['parent-uri']; - $convid = $r[0]['convid']; - - $r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ", - dbesc($parent), - intval(local_user()) - ); - // remove diaspora conversation pointer - // Actually if we do this, we can never receive another reply to that conversation, - // as we will never again have the info we need to re-create it. - // We'll just have to orphan it. - //if ($convid) { - // q("delete from conv where id = %d limit 1", - // intval($convid) - // ); - //} - - if ($r) { + if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) { info(L10n::t('Conversation removed.') . EOL); } } - //goaway(System::baseUrl(true) . '/message' ); - goaway($_SESSION['return_url']); + $a->internalRedirect('message'); } } if (($a->argc > 1) && ($a->argv[1] === 'new')) { $o .= $header; - $tpl = get_markup_template('msg-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, [ - '$baseurl' => System::baseUrl(true), - '$nickname' => $a->user['nickname'], - '$linkurl' => L10n::t('Please enter a link URL:') - ]); - - $tpl = get_markup_template('msg-end.tpl'); - $a->page['end'] .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('msg-header.tpl'); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], '$linkurl' => L10n::t('Please enter a link URL:') ]); - $preselect = isset($a->argv[2]) ? [$a->argv[2]] : false; + $preselect = isset($a->argv[2]) ? [$a->argv[2]] : []; $prename = $preurl = $preid = ''; @@ -214,60 +213,58 @@ function message_content(App $a) intval(local_user()), intval($a->argv[2]) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", intval(local_user()), - dbesc(normalise_link(base64_decode($a->argv[2]))) + DBA::escape(Strings::normaliseLink(base64_decode($a->argv[2]))) ); } - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1", intval(local_user()), - dbesc(base64_decode($a->argv[2])) + DBA::escape(base64_decode($a->argv[2])) ); } - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $prename = $r[0]['name']; - $preurl = $r[0]['url']; $preid = $r[0]['id']; $preselect = [$preid]; } else { - $preselect = false; + $preselect = []; } } $prefill = $preselect ? $prename : ''; // the ugly select box - $select = contact_select('messageto', 'message-to-select', $preselect, 4, true, false, false, 10); + $select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10); - $tpl = get_markup_template('prv_message.tpl'); - $o .= replace_macros($tpl, [ - '$header' => L10n::t('Send Private Message'), - '$to' => L10n::t('To:'), + $tpl = Renderer::getMarkupTemplate('prv_message.tpl'); + $o .= Renderer::replaceMacros($tpl, [ + '$header' => L10n::t('Send Private Message'), + '$to' => L10n::t('To:'), '$showinputs' => 'true', - '$prefill' => $prefill, - '$autocomp' => $autocomp, - '$preid' => $preid, - '$subject' => L10n::t('Subject:'), - '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '', - '$text' => x($_REQUEST, 'body') ? escape_tags(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; } - $_SESSION['return_url'] = $a->query_string; + $_SESSION['return_path'] = $a->query_string; if ($a->argc == 1) { @@ -275,25 +272,27 @@ function message_content(App $a) $o .= $header; + $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 (DBM::is_result($r)) { - $a->set_pager_total($r[0]['total']); + if (DBA::isResult($r)) { + $total = $r[0]['total']; } - $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']); + $pager = new Pager($a->query_string); - if (!DBM::is_result($r)) { + $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage()); + + if (!DBA::isResult($r)) { info(L10n::t('No messages.') . EOL); return $o; } $o .= render_messages($r, 'mail_list.tpl'); - $o .= paginate($a); + $o .= $pager->renderFull($total); return $o; } @@ -302,50 +301,60 @@ 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 (DBM::is_result($r)) { - $contact_id = $r[0]['contact-id']; - $convid = $r[0]['convid']; - - $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri'])); - if ($convid) - $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ", - dbesc($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 (!count($messages)) { + + 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", - dbesc($r[0]['parent-uri']), - intval(local_user()) - ); - - require_once("include/bbcode.php"); - - $tpl = get_markup_template('msg-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, [ - '$baseurl' => System::baseUrl(true), - '$nickname' => $a->user['nickname'], - '$linkurl' => L10n::t('Please enter a link URL:') - ]); - - $tpl = get_markup_template('msg-end.tpl'); - $a->page['end'] .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('msg-header.tpl'); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], '$linkurl' => L10n::t('Please enter a link URL:') @@ -356,16 +365,15 @@ 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 = ''; - } elseif ($message['contact-id'] != 0) { - $from_url = 'redir/' . $message['contact-id']; - $sparkle = ' sparkle'; } else { - $from_url = $message['from-url'] . "?zrl=" . urlencode($myprofile); + $from_url = Contact::magicLink($message['from-url']); $sparkle = ' sparkle'; } @@ -376,7 +384,7 @@ function message_content(App $a) $from_name_e = $message['from-name']; $subject_e = $message['title']; - $body_e = Smilies::replace(bbcode($message['body'])); + $body_e = Smilies::replace(BBCode::convert($message['body'])); $to_name_e = $message['name']; $contact = Contact::getDetailsByURL($message['from-url']); @@ -392,13 +400,13 @@ function message_content(App $a) 'from_url' => $from_url, 'from_addr' => $contact['addr'], 'sparkle' => $sparkle, - 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), + 'from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB), 'subject' => $subject_e, 'body' => $body_e, 'delete' => L10n::t('Delete message'), 'to_name' => $to_name_e, - 'date' => DateTimeFormat::local($message['created'], 'D, d M Y - g:i A'), - 'ago' => relative_date($message['created']), + 'date' => DateTimeFormat::local($message['created'], L10n::t('D, d M Y - g:i A')), + 'ago' => Temporal::getRelativeDate($message['created']), ]; $seen = $message['seen']; @@ -407,8 +415,8 @@ function message_content(App $a) $select = $message['name'] . ''; $parent = ''; - $tpl = get_markup_template('mail_display.tpl'); - $o = replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('mail_display.tpl'); + $o = Renderer::replaceMacros($tpl, [ '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, @@ -438,31 +446,63 @@ function message_content(App $a) } } -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 = get_markup_template($t); + $tpl = Renderer::getMarkupTemplate($t); $rslt = ''; $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; @@ -470,13 +510,12 @@ function render_messages(array $msg, $t) foreach ($msg as $rr) { if ($rr['unknown']) { $participants = L10n::t("Unknown sender - %s", $rr['from-name']); - } elseif (link_compare($rr['from-url'], $myprofile)) { + } elseif (Strings::compareLink($rr['from-url'], $myprofile)) { $participants = L10n::t("You and %s", $rr['name']); } else { $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']; @@ -487,19 +526,19 @@ function render_messages(array $msg, $t) $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']); } - $rslt .= replace_macros($tpl, [ + $rslt .= Renderer::replaceMacros($tpl, [ '$id' => $rr['id'], '$from_name' => $participants, - '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']), - '$from_addr' => $contact['addr'], + '$from_url' => Contact::magicLink($rr['url']), + '$from_addr' => defaults($contact, 'addr', ''), '$sparkle' => ' sparkle', - '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), - '$subject' => $subject_e, + '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB), + '$subject' => $rr['title'], '$delete' => L10n::t('Delete conversation'), '$body' => $body_e, '$to_name' => $to_name_e, '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')), - '$ago' => relative_date($rr['mailcreated']), + '$ago' => Temporal::getRelativeDate($rr['mailcreated']), '$seen' => $rr['mailseen'], '$count' => L10n::tt('%d message', '%d messages', $rr['count']), ]);