X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=cc76a830d46167314417066f450d24581e20b75f;hp=c9fe21569710cc0288591fdcb1ef669e00505489;hb=8ed0d71a42bdb66faf6ecc9db45ec594d479a610;hpb=3d570ba0eb0d354b2216225bc0a629e3b4767671
diff --git a/src/read_body.php b/src/read_body.php
index c9fe2156..cc76a830 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -20,35 +20,65 @@ require_once('../functions/url_parser.php');
require_once('../functions/smtp.php');
/**
-* Given an IMAP message id number, this will look it up in the cached
-* and sorted msgs array and return the index. Used for finding the next
-* and previous messages.
-*
-* returns the index of the next valid message from the array
-*/
+ * Given an IMAP message id number, this will look it up in the cached
+ * and sorted msgs array and return the index. Used for finding the next
+ * and previous messages.
+ *
+ * @return the index of the next valid message from the array
+ */
function findNextMessage() {
- global $msort, $currentArrayIndex, $msgs, $sort;
+ global $msort, $currentArrayIndex, $msgs, $sort,
+ $thread_sort_messages, $allow_server_sort,
+ $server_sort_array;
+ if (!is_array($server_sort_array)) {
+ $thread_sort_messages = 0;
+ $allow_server_sort = FALSE;
+ }
$result = -1;
-
- if ($sort == 6) {
+ if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
+ reset($server_sort_array);
+ while(list($key, $value) = each ($server_sort_array)) {
+ if ($currentArrayIndex == $value) {
+ if ($key == (count($server_sort_array) - 1)) {
+ $result = -1;
+ break;
+ }
+ $result = $server_sort_array[$key + 1];
+ break;
+ }
+ }
+ }
+ elseif ($sort == 6 && $allow_server_sort != TRUE &&
+ $thread_sort_messages != 1) {
if ($currentArrayIndex != 1) {
$result = $currentArrayIndex - 1;
}
- } else {
+ }
+ elseif ($allow_server_sort != TRUE && $thread_sort_messages != 1 ) {
+ if (!is_array($msort)) {
+ return -1;
+ }
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
if ($currentArrayIndex == $msgs[$key]['ID']) {
next($msort);
$key = key($msort);
- if (isset($key))
+ if (isset($key)){
$result = $msgs[$key]['ID'];
break;
+ }
}
}
}
return ($result);
}
-/** Removes just one address from the list of addresses. */
+/**
+ * Removes just one address from the list of addresses.
+ *
+ * @param &$addr_list a by-ref array of addresses
+ * @param $addr an address to remove
+ * @return void, since it operates on a by-ref param
+ */
function RemoveAddress(&$addr_list, $addr) {
if ($addr != '') {
foreach (array_keys($addr_list, $addr) as $key_to_delete) {
@@ -60,16 +90,37 @@ function RemoveAddress(&$addr_list, $addr) {
/** returns the index of the previous message from the array. */
function findPreviousMessage() {
global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection,
- $mailbox, $data_dir, $username;
-
+ $mailbox, $data_dir, $username, $thread_sort_messages,
+ $allow_server_sort, $server_sort_array;
$result = -1;
-
- if ($sort == 6) {
+ if (!is_array($server_sort_array)) {
+ $thread_sort_messages = 0;
+ $allow_server_sort = FALSE;
+ }
+ if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
+ reset($server_sort_array);
+ while(list($key, $value) = each ($server_sort_array)) {
+ if ($currentArrayIndex == $value) {
+ if ($key == 0) {
+ $result = -1;
+ break;
+ }
+ $result = $server_sort_array[$key -1];
+ break;
+ }
+ }
+ }
+ elseif ($sort == 6 && $allow_server_sort != TRUE &&
+ $thread_sort_messages != 1) {
$numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
if ($currentArrayIndex != $numMessages) {
$result = $currentArrayIndex + 1;
}
- } else {
+ }
+ elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) {
+ if (!is_array($msort)) {
+ return -1;
+ }
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
if ($currentArrayIndex == $msgs[$key]['ID']) {
prev($msort);
@@ -85,9 +136,9 @@ function findPreviousMessage() {
}
/**
-* Displays a link to a page where the message is displayed more
-* "printer friendly".
-*/
+ * Displays a link to a page where the message is displayed more
+ * "printer friendly".
+ */
function printer_friendly_link() {
global $passed_id, $mailbox, $ent_num, $color,
$pf_subtle_link,
@@ -98,17 +149,17 @@ function printer_friendly_link() {
}
$params = '?passed_ent_id=' . $ent_num .
- '&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id;
+ '&mailbox=' . urlencode($mailbox) .
+ '&passed_id=' . $passed_id;
$print_text = _("View Printable Version");
if (!$pf_subtle_link) {
/* The link is large, on the bottom of the header panel. */
- $result = '
' .
- '' .
- ' ' .
- ' | '."\n";
+ $result = ' |
' .
+ '' .
+ ' ' .
+ ' | '."\n";
} else {
/* The link is subtle, below "view full header". */
$result = " \n";
@@ -163,6 +214,8 @@ function SendMDN ( $recipient , $sender) {
$subject = $header->subject;
$now = getLongDateString( time() );
+ set_my_charset();
+
$body = _("Your message") . "\r\n\r\n" .
"\t" . _("To:") . ' ' . $to . "\r\n" .
"\t" . _("Subject:") . ' ' . $subject . "\r\n" .
@@ -195,19 +248,19 @@ function SendMDN ( $recipient , $sender) {
$newAttachment = array();
$newAttachment['localfilename'] = $localfilename;
$newAttachment['type'] = "message/disposition-notification";
-
+ $newAttachment['session']=-1;
$attachments[] = $newAttachment;
$MDN_to = trim($recipient);
$reply_id = 0;
- return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3) );
+ return (SendMessage($MDN_to, '', '', _("Read:") . ' ' . $subject,
+ $body, $reply_id, True, 3, -1) );
}
function ToggleMDNflag ( $set ) {
global $imapConnection, $passed_id, $mailbox;
sqimap_mailbox_select($imapConnection, $mailbox);
-
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
@@ -219,17 +272,112 @@ function ClearAttachments() {
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $rem_attachments = array();
foreach ($attachments as $info) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- }
+ if ($info->session == -1) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+ } else {
+ $rem_attachments[] = $info;
+ }
+ }
+ $attachments = $rem_attachments;
+}
- $attachments = array();
+function formatRecipientString($recipients, $item ) {
+ global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc,
+ $echo_more, $echo_less, $show_more, $show_more_bcc, $sort;
+
+ $i = 0;
+ $url_string = '';
+
+ if (isset ($recipients[0]) && trim($recipients[0])) {
+ $string = '';
+ $ary = $recipients;
+
+ switch ($item) {
+ case 'to':
+ $show = "&show_more=1&show_more_cc=$show_more_cc&".
+ "show_more_bcc=$show_more_bcc";
+ $show_n = "&show_more=0&show_more_cc=$show_more_cc&".
+ "show_more_bcc=$show_more_bcc";
+ break;
+ case 'cc':
+ $show = "&show_more=$show_more&show_more_cc=1&".
+ "show_more_bcc=$show_more_bcc";
+ $show_n = "&show_more=$show_more&show_more_cc=0&".
+ "show_more_bcc=$show_more_bcc";
+ $show_more = $show_more_cc;
+ break;
+ case 'bcc':
+ $show = "&show_more=$show_more&show_more_cc=$show_more_cc".
+ "&show_more_bcc=1";
+ $show_n = "&show_more=$show_more&show_more_cc=".
+ "$show_more_cc&show_more_bcc=0";
+ $show_more = $show_more_bcc;
+ break;
+ default:
+ $break;
+ }
+
+ while ($i < count($ary)) {
+ $ary[$i] = decodeHeader(htmlspecialchars($ary[$i]));
+ $url_string .= $ary[$i];
+ if ($string) {
+ $string = "$string $ary[$i]";
+ } else {
+ $string = "$ary[$i]";
+ }
+
+ $i++;
+ if (count($ary) > 1) {
+ if ($show_more == false) {
+ if ($i == 1) {
+ /* From a search... */
+ $string .= ' ($echo_more)";
+ } else {
+ $string .= "sort=$sort&startMessage=".
+ "$startMessage"."$show\">$echo_more)";
+ }
+ $i = count($ary);
+ }
+ } else if ($i == 1) {
+ /* From a search... */
+ $string .= ' ($echo_less)";
+ } else {
+ $string .= "sort=$sort&startMessage=$startMessage".
+ "$show_n\">$echo_less)";
+ }
+ }
+ }
+ }
+ }
+ else {
+ $string = '';
+ }
+ $url_string = urlencode($url_string);
+ $result = array();
+ $result['str'] = $string;
+ $result['url_str'] = $url_string;
+ return $result;
}
+
/*
* Main of read_boby.php --------------------------------------------------
*/
@@ -240,10 +388,11 @@ function ClearAttachments() {
$passed_id
*/
-if ( isset( $mailbox ) ) {
+if (isset($mailbox)){
$mailbox = urldecode( $mailbox );
}
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapPort, 0);
$read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
do_hook('html_top');
@@ -251,9 +400,10 @@ do_hook('html_top');
/*
* The following code sets necesarry stuff for the MDN thing
*/
-if( $default_use_mdn &&
- ( $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', $default_use_mdn) ) ) {
-
+if($default_use_mdn &&
+ ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support',
+ $default_use_mdn))) {
+
$supportMDN = ServerMDNSupport($read["PERMANENTFLAGS"]);
$flags = sqimap_get_flags ($imapConnection, $passed_id);
$FirstTimeSee = !(in_array( 'Seen', $flags ));
@@ -266,22 +416,29 @@ displayPageHeader($color, $mailbox);
* The following code shows the header of the message and then exit
*/
if (isset($view_hdr)) {
- $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[HEADER]", true, $a, $b);
-
+ $read=sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[HEADER]",
+ true, $a, $b);
+
echo ' ' .
- '\n" .
- "\n" .
- '';
-
+ echo _("View message") . " | \n".
+ "\n".
+ '';
+
$cnum = 0;
for ($i=1; $i < count($read); $i++) {
$line = htmlspecialchars($read[$i]);
@@ -314,10 +471,12 @@ if (isset($view_hdr)) {
$j++;
}
parseEmail($s);
- if (isset($f)) echo "$f$s";
+ if (isset($f)) {
+ echo "$f$s";
+ }
}
echo " | \n" .
- ' |