X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=ddd5d03d6667255d2d143cb5363a00d34bdc3493;hb=19209f6826fc513b5e1bc3460c212a4b80c02049;hp=7bb17f39068011e63d7241caf6a9c6cd546cf917;hpb=e437c74d0e4e4ece4693a2e32513c3ecde7efb4d;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 7bb17f3906..ddd5d03d66 100644 --- a/mod/message.php +++ b/mod/message.php @@ -1,217 +1,147 @@ argc >1 && is_numeric($a->argv[1])) { - $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl'); + if ($a->argc > 1 && is_numeric($a->argv[1])) { + $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->argv[1] == '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( - '$tabs'=>$tabs, - '$new'=>$new, - )); + $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); +function message_post(App $a) +{ + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); 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 = 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; - $ret = send_message($recipient, $body, $subject, $replyto); + $ret = Mail::send($recipient, $body, $subject, $replyto); $norecip = false; - switch($ret){ + 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 - if ($norecip) { $a->argc = 2; $a->argv[1] = 'new'; - } else + } else { goaway($_SESSION['return_url']); - -} - -// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images' -// is identical to the code in include/conversation.php -if (! function_exists('item_extract_images')) { -function item_extract_images($body) { - - $saved_image = array(); - $orig_body = $body; - $new_body = ''; - - $cnt = 0; - $img_start = strpos($orig_body, '[img'); - $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); - $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { - - $img_st_close++; // make it point to AFTER the closing bracket - $img_end += $img_start; - - if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { - // This is an embedded image - - $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); - $new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]'; - - $cnt++; - } else - $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]')); - - $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - - if ($orig_body === false) // in case the body ends on a closing image tag - $orig_body = ''; - - $img_start = strpos($orig_body, '[img'); - $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); - $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } +} - $new_body = $new_body . $orig_body; - - return array('body' => $new_body, 'images' => $saved_image); -}} - -if (! function_exists('item_redir_and_replace_images')) { -function item_redir_and_replace_images($body, $images, $cid) { - - $origbody = $body; - $newbody = ''; - - for($i = 0; $i < count($images); $i++) { - $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is'; - $replace = '[url=' . System::baseUrl() . '/redir/' . $cid - . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ; - - $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]'); - $process_part = substr($origbody, 0, $img_end); - $origbody = substr($origbody, $img_end); - - $process_part = preg_replace($search, $replace, $process_part); - $newbody = $newbody . $process_part; - } - $newbody = $newbody . $origbody; - - $cnt = 0; - foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element - $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); - $cnt++; - } - - return $newbody; -}} - - - -function message_content(App $a) { - +function message_content(App $a) +{ $o = ''; - nav_set_selected('messages'); + Nav::setSelected('messages'); - if (! local_user()) { - notice( t('Permission denied.') . EOL); + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } - $myprofile = System::baseUrl().'/profile/' . $a->user['nickname']; + $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; $tpl = get_markup_template('mail_head.tpl'); - $header = replace_macros($tpl, array( - '$messages' => t('Messages'), - '$tab_content' => $tab_content - )); - + $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])) + if (!intval($a->argv[2])) { return; + } // Check if we should do HTML-based delete confirmation if ($_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(); - foreach($query['args'] as $arg) { + $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']) { goaway($_SESSION['return_url']); @@ -219,13 +149,10 @@ function message_content(App $a) { $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 { @@ -237,51 +164,33 @@ 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' ); goaway($_SESSION['return_url']); } - } if (($a->argc > 1) && ($a->argv[1] === 'new')) { - $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:') - )); - - $preselect = (isset($a->argv[2])?array($a->argv[2]):false); + '$linkurl' => L10n::t('Please enter a link URL:') + ]); + $preselect = isset($a->argv[2]) ? [$a->argv[2]] : []; $prename = $preurl = $preid = ''; @@ -308,37 +217,36 @@ function message_content(App $a) { $prename = $r[0]['name']; $preurl = $r[0]['url']; $preid = $r[0]['id']; - $preselect = array($preid); - } else - $preselect = false; + $preselect = [$preid]; + } else { + $preselect = []; + } } - $prefill = (($preselect) ? $prename : ''); + $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:'), - '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), - '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), + '$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; } @@ -362,8 +270,8 @@ 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); + if (!DBM::is_result($r)) { + info(L10n::t('No messages.') . EOL); return $o; } @@ -401,8 +309,8 @@ function message_content(App $a) { intval(local_user()) ); } - if (! count($messages)) { - notice( t('Message not available.') . EOL ); + if (!count($messages)) { + notice(L10n::t('Message not available.') . EOL); return $o; } @@ -411,57 +319,53 @@ 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; - foreach($messages as $message) { + foreach ($messages as $message) { 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'; } - $extracted = item_extract_images($message['body']); - if ($extracted['images']) + if ($extracted['images']) { $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']); + } $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']); - if (isset($contact["thumb"])) + if (isset($contact["thumb"])) { $from_photo = $contact["thumb"]; - else + } else { $from_photo = $message['from-photo']; + } - $mails[] = array( + $mails[] = [ 'id' => $message['id'], 'from_name' => $from_name_e, 'from_url' => $from_url, @@ -470,55 +374,51 @@ 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']; } - $select = $message['name'] . ''; $parent = ''; $tpl = get_markup_template('mail_display.tpl'); - - $subjtxt_e = $message['title']; - - $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:'), - '$subjtxt' => $subjtxt_e, + '$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; } } -function get_messages($user, $lstart, $lend) { +function get_messages($user, $lstart, $lend) +{ //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`, @@ -537,50 +437,51 @@ function get_messages($user, $lstart, $lend) { ); } -function render_messages(array $msg, $t) { - +function render_messages(array $msg, $t) +{ $a = get_app(); $tpl = get_markup_template($t); $rslt = ''; - $myprofile = System::baseUrl().'/profile/' . $a->user['nickname']; - - foreach($msg as $rr) { + $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; - if ($rr['unknown']) - $participants = sprintf( t("Unknown sender - %s"),$rr['from-name']); - elseif (link_compare($rr['from-url'], $myprofile)) - $participants = sprintf( t("You and %s"), $rr['name']); - else - $participants = sprintf(t("%s and You"), $rr['from-name']); + foreach ($msg as $rr) { + if ($rr['unknown']) { + $participants = L10n::t("Unknown sender - %s", $rr['from-name']); + } elseif (link_compare($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']; $contact = Contact::getDetailsByURL($rr['url']); - if (isset($contact["thumb"])) + if (isset($contact["thumb"])) { $from_photo = $contact["thumb"]; - else + } else { $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' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']), - )); + '$count' => L10n::tt('%d message', '%d messages', $rr['count']), + ]); } return $rslt;