X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=1331ce7fb5f36167219d6a12aa5b051dcbcb9675;hb=16123f5ad5ec08257ba97e1def23db90ce9062f7;hp=744a3eb3f7c8a6a50e584c0cb2a0a03d17b6dc6e;hpb=23c873fc515d7a6118f18280beba1c5c117d3746;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 744a3eb3f7..1331ce7fb5 100644 --- a/mod/message.php +++ b/mod/message.php @@ -9,8 +9,9 @@ function message_init(&$a) { 'label' => t('New Message'), 'url' => $a->get_baseurl(true) . '/message/new', 'sel'=> ($a->argv[1] == 'new'), + 'accesskey' => 'm', ); - + $tpl = get_markup_template('message_side.tpl'); $a->page['aside'] = replace_macros($tpl, array( '$tabs'=>$tabs, @@ -29,7 +30,7 @@ function message_init(&$a) { '$baseurl' => $a->get_baseurl(true), '$base' => $base )); - + } function message_post(&$a) { @@ -82,6 +83,8 @@ function message_post(&$a) { $a->argc = 2; $a->argv[1] = 'new'; } + else + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); } @@ -137,7 +140,7 @@ function item_redir_and_replace_images($body, $images, $cid) { for($i = 0; $i < count($images); $i++) { $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is'; - $replace = '[url=' . z_path() . '/redir/' . $cid + $replace = '[url=' . z_path() . '/redir/' . $cid . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ; $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]'); @@ -185,6 +188,36 @@ function message_content(&$a) { if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) { 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) { + if(strpos($arg, 'confirm=') === false) { + $arg_parts = explode('=', $arg); + $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); + } + } + + //$a->page['aside'] = ''; + return replace_macros(get_markup_template('confirm.tpl'), array( + '$method' => 'get', + '$message' => t('Do you really want to delete this message?'), + '$extra_inputs' => $inputs, + '$confirm' => t('Yes'), + '$confirm_url' => $query['base'], + '$confirm_name' => 'confirmed', + '$cancel' => t('Cancel'), + )); + } + // Now check how the user responded to the confirmation query + if($_REQUEST['canceled']) { + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); + } + $cmd = $a->argv[1]; if($cmd === 'drop') { $r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -194,7 +227,8 @@ function message_content(&$a) { if($r) { info( t('Message deleted.') . EOL ); } - goaway($a->get_baseurl(true) . '/message' ); + //goaway($a->get_baseurl(true) . '/message' ); + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); } else { $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -223,16 +257,17 @@ function message_content(&$a) { if($r) info( t('Conversation removed.') . EOL ); - } - goaway($a->get_baseurl(true) . '/message' ); - } - + } + //goaway($a->get_baseurl(true) . '/message' ); + goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); + } + } if(($a->argc > 1) && ($a->argv[1] === 'new')) { - + $o .= $header; - + /* $plaintext = false; if(intval(get_pconfig(local_user(),'system','plaintext'))) $plaintext = true;*/ @@ -248,7 +283,7 @@ function message_content(&$a) { '$nickname' => $a->user['nickname'], '$linkurl' => t('Please enter a link URL:') )); - + $tpl = get_markup_template('msg-end.tpl'); $a->page['end'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(true), @@ -256,9 +291,9 @@ function message_content(&$a) { '$nickname' => $a->user['nickname'], '$linkurl' => t('Please enter a link URL:') )); - + $preselect = (isset($a->argv[2])?array($a->argv[2]):false); - + $prename = $preurl = $preid = ''; @@ -272,19 +307,19 @@ function message_content(&$a) { $preurl = $r[0]['url']; $preid = $r[0]['id']; } - } + } $prefill = (($preselect) ? $prename : ''); // the ugly select box - + $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( '$header' => t('Send Private Message'), '$to' => t('To:'), - '$showinputs' => 'true', + '$showinputs' => 'true', '$prefill' => $prefill, '$autocomp' => $autocomp, '$preid' => $preid, @@ -304,14 +339,17 @@ function message_content(&$a) { return $o; } + + $_SESSION['return_url'] = $a->query_string; + if($a->argc == 1) { // list messages $o .= $header; - - $r = q("SELECT count(*) AS `total` FROM `mail` + + $r = q("SELECT count(*) AS `total` FROM `mail` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()), dbesc($myprofile) @@ -319,10 +357,10 @@ function message_content(&$a) { if(count($r)) $a->set_pager_total($r[0]['total']); - $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, + $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, count( * ) as count - FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` + 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(local_user()), // @@ -346,24 +384,35 @@ function message_content(&$a) { else { $partecipants = sprintf( t("%s and You"), $rr['from-name']); } - + + if($a->theme['template_engine'] === 'internal') { + $subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '')); + $body_e = template_escape($rr['body']); + $to_name_e = template_escape($rr['name']); + } + else { + $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''); + $body_e = $rr['body']; + $to_name_e = $rr['name']; + } + $o .= replace_macros($tpl, array( '$id' => $rr['id'], '$from_name' => $partecipants, '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']), '$sparkle' => ' sparkle', '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']), - '$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '')), + '$subject' => $subject_e, '$delete' => t('Delete conversation'), - '$body' => template_escape($rr['body']), - '$to_name' => template_escape($rr['name']), + '$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']), '$seen' => $rr['mailseen'], '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']), )); } - $o .= paginate($a); + $o .= paginate($a); return $o; } @@ -371,13 +420,17 @@ function message_content(&$a) { $o .= $header; - $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` - FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` + $plaintext = true; + if( local_user() && feature_enabled(local_user(),'richtext') ) + $plaintext = false; + + $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]) ); - if(count($r)) { + if(count($r)) { $contact_id = $r[0]['contact-id']; $convid = $r[0]['convid']; @@ -386,10 +439,10 @@ function message_content(&$a) { $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ", dbesc($r[0]['parent-uri']), intval($convid) - ); + ); - $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` - FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `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()) ); @@ -408,14 +461,18 @@ function message_content(&$a) { $tpl = get_markup_template('msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(true), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$nickname' => $a->user['nickname'], - '$baseurl' => $a->get_baseurl(true) + '$linkurl' => t('Please enter a link URL:') )); $tpl = get_markup_template('msg-end.tpl'); $a->page['end'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(true), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$nickname' => $a->user['nickname'], - '$baseurl' => $a->get_baseurl(true) + '$linkurl' => t('Please enter a link URL:') )); @@ -440,20 +497,33 @@ function message_content(&$a) { if($extracted['images']) $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']); + if($a->theme['template_engine'] === 'internal') { + $from_name_e = template_escape($message['from-name']); + $subject_e = template_escape($message['title']); + $body_e = template_escape(smilies(bbcode($message['body']))); + $to_name_e = template_escape($message['name']); + } + else { + $from_name_e = $message['from-name']; + $subject_e = $message['title']; + $body_e = smilies(bbcode($message['body'])); + $to_name_e = $message['name']; + } + $mails[] = array( 'id' => $message['id'], - 'from_name' => template_escape($message['from-name']), + 'from_name' => $from_name_e, 'from_url' => $from_url, 'sparkle' => $sparkle, 'from_photo' => $message['from-photo'], - 'subject' => template_escape($message['title']), - 'body' => template_escape(smilies(bbcode($message['body']))), + 'subject' => $subject_e, + 'body' => $body_e, 'delete' => t('Delete message'), - 'to_name' => template_escape($message['name']), + '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']), ); - + $seen = $message['seen']; } @@ -462,21 +532,29 @@ function message_content(&$a) { $parent = ''; $tpl = get_markup_template('mail_display.tpl'); + + if($a->theme['template_engine'] === 'internal') { + $subjtxt_e = template_escape($message['title']); + } + else { + $subjtxt_e = $message['title']; + } + $o = replace_macros($tpl, array( '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, '$delete' => 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' => 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:'), '$showinputs' => '', '$subject' => t('Subject:'), - '$subjtxt' => template_escape($message['title']), + '$subjtxt' => $subjtxt_e, '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', '$yourmessage' => t('Your message:'), '$text' => '',