X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=b414fe0e49f6110371dbeb6a6c7bec1a0a533f8f;hb=5af9596dde162b1b9819869e3d5129f571a1c503;hp=04073139f3cabe88f40232d8776ed8d48e8b032e;hpb=77dfbaa0bf8b4749ec3f8ea46519a96f5cba464c;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 04073139f3..b414fe0e49 100644 --- a/mod/message.php +++ b/mod/message.php @@ -2,14 +2,20 @@ /** * @file mod/message.php */ + use Friendica\App; +use Friendica\Content\Nav; use Friendica\Content\Smilies; +use Friendica\Content\Text\BBCode; +use Friendica\Core\ACL; +use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Mail; +use Friendica\Util\DateTimeFormat; +use Friendica\Util\Temporal; -require_once 'include/acl_selectors.php'; require_once 'include/conversation.php'; function message_init(App $a) @@ -20,37 +26,37 @@ function message_init(App $a) $tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl'); } - $new = array( - 'label' => t('New Message'), + $new = [ + 'label' => L10n::t('New Message'), 'url' => 'message/new', 'sel' => $a->argc > 1 && $a->argv[1] == 'new', 'accesskey' => 'm', - ); + ]; $tpl = get_markup_template('message_side.tpl'); - $a->page['aside'] = replace_macros($tpl, array( + $a->page['aside'] = replace_macros($tpl, [ '$tabs' => $tabs, '$new' => $new, - )); + ]); $base = System::baseUrl(); $head_tpl = get_markup_template('message-head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_tpl, array( + $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, array( + $a->page['end'] .= replace_macros($end_tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); } function message_post(App $a) { if (!local_user()) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } @@ -64,20 +70,20 @@ function message_post(App $a) switch ($ret) { case -1: - notice(t('No recipient selected.') . EOL); + notice(L10n::t('No recipient selected.') . EOL); $norecip = true; break; case -2: - notice(t('Unable to locate contact information.') . EOL); + notice(L10n::t('Unable to locate contact information.') . EOL); break; case -3: - notice(t('Message could not be sent.') . EOL); + notice(L10n::t('Message could not be sent.') . EOL); break; case -4: - notice(t('Message collection failure.') . EOL); + notice(L10n::t('Message collection failure.') . EOL); break; default: - info(t('Message sent.') . EOL); + info(L10n::t('Message sent.') . EOL); } // fake it to go back to the input form if no recipient listed @@ -92,19 +98,19 @@ function message_post(App $a) function message_content(App $a) { $o = ''; - nav_set_selected('messages'); + Nav::setSelected('messages'); if (!local_user()) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; $tpl = get_markup_template('mail_head.tpl'); - $header = replace_macros($tpl, array( - '$messages' => t('Messages'), - )); + $header = replace_macros($tpl, [ + '$messages' => L10n::t('Messages'), + ]); if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { if (!intval($a->argv[2])) { @@ -112,43 +118,41 @@ 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); - $inputs = array(); + $inputs = []; foreach ($query['args'] as $arg) { if (strpos($arg, 'confirm=') === false) { $arg_parts = explode('=', $arg); - $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); + $inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]]; } } //$a->page['aside'] = ''; - return replace_macros(get_markup_template('confirm.tpl'), array( + return replace_macros(get_markup_template('confirm.tpl'), [ '$method' => 'get', - '$message' => t('Do you really want to delete this message?'), + '$message' => L10n::t('Do you really want to delete this message?'), '$extra_inputs' => $inputs, - '$confirm' => t('Yes'), + '$confirm' => L10n::t('Yes'), '$confirm_url' => $query['base'], '$confirm_name' => 'confirmed', - '$cancel' => t('Cancel'), - )); + '$cancel' => L10n::t('Cancel'), + ]); } + // Now check how the user responded to the confirmation query - if ($_REQUEST['canceled']) { + if (!empty($_REQUEST['canceled'])) { goaway($_SESSION['return_url']); } $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) { - info(t('Message deleted.') . EOL); + 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']); } else { @@ -160,23 +164,8 @@ function message_content(App $a) $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) { - info(t('Conversation removed.') . EOL); + if (dba::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) { + info(L10n::t('Conversation removed.') . EOL); } } //goaway(System::baseUrl(true) . '/message' ); @@ -188,20 +177,20 @@ function message_content(App $a) $o .= $header; $tpl = get_markup_template('msg-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, array( + $a->page['htmlhead'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], - '$linkurl' => t('Please enter a link URL:') - )); + '$linkurl' => L10n::t('Please enter a link URL:') + ]); $tpl = get_markup_template('msg-end.tpl'); - $a->page['end'] .= replace_macros($tpl, array( + $a->page['end'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], - '$linkurl' => t('Please enter a link URL:') - )); + '$linkurl' => L10n::t('Please enter a link URL:') + ]); - $preselect = isset($a->argv[2]) ? array($a->argv[2]) : false; + $preselect = isset($a->argv[2]) ? [$a->argv[2]] : []; $prename = $preurl = $preid = ''; @@ -228,37 +217,36 @@ function message_content(App $a) $prename = $r[0]['name']; $preurl = $r[0]['url']; $preid = $r[0]['id']; - $preselect = array($preid); + $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, array( - '$header' => t('Send Private Message'), - '$to' => t('To:'), + $o .= replace_macros($tpl, [ + '$header' => L10n::t('Send Private Message'), + '$to' => L10n::t('To:'), '$showinputs' => 'true', '$prefill' => $prefill, - '$autocomp' => $autocomp, '$preid' => $preid, - '$subject' => t('Subject:'), + '$subject' => L10n::t('Subject:'), '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '', '$text' => x($_REQUEST, 'body') ? escape_tags(htmlspecialchars($_REQUEST['body'])) : '', '$readonly' => '', - '$yourmessage' => t('Your message:'), + '$yourmessage' => L10n::t('Your message:'), '$select' => $select, '$parent' => '', - '$upload' => t('Upload photo'), - '$insert' => t('Insert web link'), - '$wait' => t('Please wait'), - '$submit' => t('Submit') - )); + '$upload' => L10n::t('Upload photo'), + '$insert' => L10n::t('Insert web link'), + '$wait' => L10n::t('Please wait'), + '$submit' => L10n::t('Submit') + ]); return $o; } @@ -283,7 +271,7 @@ function message_content(App $a) $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']); if (!DBM::is_result($r)) { - info(t('No messages.') . EOL); + info(L10n::t('No messages.') . EOL); return $o; } @@ -320,9 +308,11 @@ function message_content(App $a) WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC", intval(local_user()) ); + } else { + $messages = false; } - if (!count($messages)) { - notice(t('Message not available.') . EOL); + if (!DBM::is_result($messages)) { + notice(L10n::t('Message not available.') . EOL); return $o; } @@ -331,23 +321,21 @@ function message_content(App $a) intval(local_user()) ); - require_once("include/bbcode.php"); - $tpl = get_markup_template('msg-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, array( + $a->page['htmlhead'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], - '$linkurl' => t('Please enter a link URL:') - )); + '$linkurl' => L10n::t('Please enter a link URL:') + ]); $tpl = get_markup_template('msg-end.tpl'); - $a->page['end'] .= replace_macros($tpl, array( + $a->page['end'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$nickname' => $a->user['nickname'], - '$linkurl' => t('Please enter a link URL:') - )); + '$linkurl' => L10n::t('Please enter a link URL:') + ]); - $mails = array(); + $mails = []; $seen = 0; $unknown = false; @@ -357,11 +345,8 @@ function message_content(App $a) 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'; } @@ -372,7 +357,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']); @@ -382,7 +367,7 @@ function message_content(App $a) $from_photo = $message['from-photo']; } - $mails[] = array( + $mails[] = [ 'id' => $message['id'], 'from_name' => $from_name_e, 'from_url' => $from_url, @@ -391,11 +376,11 @@ function message_content(App $a) 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), 'subject' => $subject_e, 'body' => $body_e, - 'delete' => t('Delete message'), + 'delete' => L10n::t('Delete message'), 'to_name' => $to_name_e, - 'date' => datetime_convert('UTC', date_default_timezone_get(), $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']; } @@ -404,31 +389,31 @@ function message_content(App $a) $parent = ''; $tpl = get_markup_template('mail_display.tpl'); - $o = replace_macros($tpl, array( + $o = replace_macros($tpl, [ '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, - '$delete' => t('Delete conversation'), + '$delete' => L10n::t('Delete conversation'), '$canreply' => (($unknown) ? false : '1'), - '$unknown_text' => t("No secure communications available. You may be able to respond from the sender's profile page."), + '$unknown_text' => L10n::t("No secure communications available. You may be able to respond from the sender's profile page."), '$mails' => $mails, // reply - '$header' => t('Send Reply'), - '$to' => t('To:'), + '$header' => L10n::t('Send Reply'), + '$to' => L10n::t('To:'), '$showinputs' => '', - '$subject' => t('Subject:'), + '$subject' => L10n::t('Subject:'), '$subjtxt' => $message['title'], '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', - '$yourmessage' => t('Your message:'), + '$yourmessage' => L10n::t('Your message:'), '$text' => '', '$select' => $select, '$parent' => $parent, - '$upload' => t('Upload photo'), - '$insert' => t('Insert web link'), - '$submit' => t('Submit'), - '$wait' => t('Please wait') - )); + '$upload' => L10n::t('Upload photo'), + '$insert' => L10n::t('Insert web link'), + '$submit' => L10n::t('Submit'), + '$wait' => L10n::t('Please wait') + ]); return $o; } @@ -465,11 +450,11 @@ function render_messages(array $msg, $t) foreach ($msg as $rr) { if ($rr['unknown']) { - $participants = t("Unknown sender - %s", $rr['from-name']); + $participants = L10n::t("Unknown sender - %s", $rr['from-name']); } elseif (link_compare($rr['from-url'], $myprofile)) { - $participants = t("You and %s", $rr['name']); + $participants = L10n::t("You and %s", $rr['name']); } else { - $participants = t("%s and You", $rr['from-name']); + $participants = L10n::t("%s and You", $rr['from-name']); } $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''); @@ -483,22 +468,22 @@ function render_messages(array $msg, $t) $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']); } - $rslt .= replace_macros($tpl, array( + $rslt .= replace_macros($tpl, [ '$id' => $rr['id'], '$from_name' => $participants, - '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']), + '$from_url' => Contact::magicLink($rr['url']), '$from_addr' => $contact['addr'], '$sparkle' => ' sparkle', '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), '$subject' => $subject_e, - '$delete' => t('Delete conversation'), + '$delete' => L10n::t('Delete conversation'), '$body' => $body_e, '$to_name' => $to_name_e, - '$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], t('D, d M Y - g:i A')), - '$ago' => relative_date($rr['mailcreated']), + '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')), + '$ago' => Temporal::getRelativeDate($rr['mailcreated']), '$seen' => $rr['mailseen'], - '$count' => tt('%d message', '%d messages', $rr['count']), - )); + '$count' => L10n::tt('%d message', '%d messages', $rr['count']), + ]); } return $rslt;