X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=163a6d10d126778a3dde5348c03457de002fd4e1;hb=6a8aff8c6e6c7c4e6354de1be82508a862b456b8;hp=c9fe21569710cc0288591fdcb1ef669e00505489;hpb=3d570ba0eb0d354b2216225bc0a629e3b4767671;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index c9fe2156..163a6d10 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -18,58 +18,97 @@ require_once('../functions/mime.php');
require_once('../functions/date.php');
require_once('../functions/url_parser.php');
require_once('../functions/smtp.php');
+require_once('../functions/html.php');
+require_once('../class/html.class');
+require_once('../src/view_header.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. */
-function RemoveAddress(&$addr_list, $addr) {
- if ($addr != '') {
- foreach (array_keys($addr_list, $addr) as $key_to_delete) {
- unset($addr_list[$key_to_delete]);
- }
- }
-}
-
/** 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 +124,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,20 +137,19 @@ 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 = html_tag( 'tr', '', '', $color[0] ) .
+ html_tag( 'td', ' ', 'right', '', 'class="medText" valign="top"' ) .
+ html_tag( 'td', '', 'left', '', 'class="medText" valign="top" colspan="2"' ) . "\n";
} else {
/* The link is subtle, below "view full header". */
- $result = " \n";
+ $result = "\n";
}
/* Output the link. */
@@ -124,10 +162,10 @@ function printer_friendly_link() {
" }\n" .
"// -->\n" .
"\n" .
- "$print_text\n";
+ "$print_text\n";
} else {
- $result .= '$print_text\n";
+ $result .= '$print_text\n";
}
if (!$pf_subtle_link) {
@@ -144,12 +182,15 @@ function ServerMDNSupport( $read ) {
return ( $ret );
}
-function SendMDN ( $recipient , $sender) {
+function SendMDN ( $sender, $message) {
global $imapConnection, $mailbox, $username, $attachment_dir, $SERVER_NAME,
$version, $attachments, $identity, $data_dir, $passed_id;
- $header = sqimap_get_message_header($imapConnection, $passed_id, $mailbox);
+ $header = $message->header;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+
+ $recipient_o = $header->dnt;
+ $recipient = $recipient_o->getAddress(true);
// part 1 (RFC2298)
@@ -163,6 +204,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,23 +238,23 @@ 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($recipient, '', '', _("Read:") . ' ' . $subject,
+ $body, $reply_id, True, 3, -1) );
}
function ToggleMDNflag ( $set ) {
- global $imapConnection, $passed_id, $mailbox;
+ global $imapConnection, $passed_id, $mailbox, $uid_support;
sqimap_mailbox_select($imapConnection, $mailbox);
-
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage);
+ $readmessage, $uid_support);
}
function ClearAttachments() {
@@ -219,17 +262,90 @@ 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, $passed_ent_id,
+ $PHP_SELF;
+
+ $i = 0;
+ $url_string = '';
+ if ((is_array($recipients)) && (isset($recipients[0]))) {
+ $string = '';
+ $ary = $recipients;
+ $show = false;
+
+ if ($item == 'to') {
+ if ($show_more) {
+ $show = true;
+ $url = set_url_var($PHP_SELF, 'show_more',0);
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more',1);
+ }
+ } else if ($item == 'cc') {
+ if ($show_more_cc) {
+ $url = set_url_var($PHP_SELF, 'show_more_cc',0);
+ $show = true;
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_cc',1);
+ }
+ } else if ($item == 'bcc') {
+ if ($show_more_bcc) {
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',0);
+ $show = true;
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',1);
+ }
+ }
+
+ $cnt = count($ary);
+ while ($i < $cnt) {
+ $addr_o = $ary[$i];
+ $ary[$i] = $addr_o->getAddress();
+ $ary[$i] = decodeHeader(htmlspecialchars($ary[$i]));
+ $url_string .= $ary[$i];
+ if ($string) {
+ $string .= ' '.$ary[$i];
+ } else {
+ $string = $ary[$i];
+ if ($cnt>1) {
+ $string .= ' ('.$echo_less.')';
+ } else {
+ $string .= '">'.$echo_more.')';
+ break;
+ }
+ }
+ }
+ $i++;
+ }
+ }
+ 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,171 +356,207 @@ function ClearAttachments() {
$passed_id
*/
-if ( isset( $mailbox ) ) {
+global $uid_support, $sqimap_capabilities;
+
+if (isset($mailbox)){
$mailbox = urldecode( $mailbox );
}
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
-do_hook('html_top');
+$imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapPort, 0);
+
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+
+if (!isset($messages)) {
+ $messages = array();
+ session_register('messages');
+}
+
+/**
+ * $message contains all information about the message
+ * including header and body
+ */
+
+$uidvalidity = $mbx_response['UIDVALIDITY'];
+
+if (!isset($messages[$uidvalidity])) {
+ $messages[$uidvalidity] = array();
+}
+if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $messages[$uidvalidity][$passed_id] = $message;
+} else {
+ $message = $messages[$uidvalidity][$passed_id];
+}
+if (isset($passed_ent_id)) {
+ $message = $message->getEntity($passed_ent_id);
+ $message->id = $passed_id;
+ $message->mailbox = $mailbox;
+}
+$header = $message->header;
+
+//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) ) ) {
-
- $supportMDN = ServerMDNSupport($read["PERMANENTFLAGS"]);
- $flags = sqimap_get_flags ($imapConnection, $passed_id);
- $FirstTimeSee = !(in_array( 'Seen', $flags ));
+if($default_use_mdn &&
+ ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support',
+ $default_use_mdn))) {
+ $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
+ $FirstTimeSee = !$message->is_seen;
}
-displayPageHeader($color, $mailbox);
+$xtra = '';
+$xtra = "";
+//displayPageHeader($color, $mailbox);
+
+/* =============================================================================
+ * block for handling incoming url vars
+ *
+ * =============================================================================
+ */
/*
* 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);
-
- echo ' ' .
- '\n" .
- "\n" .
- '';
-
- $cnum = 0;
- for ($i=1; $i < count($read); $i++) {
- $line = htmlspecialchars($read[$i]);
- if (eregi("^>", $line)) {
- $second[$i] = $line;
- $first[$i] = ' ';
- $cnum++;
- } else if (eregi("^[ |\t]", $line)) {
- $second[$i] = $line;
- $first[$i] = '';
- } else if (eregi("^([^:]+):(.+)", $line, $regs)) {
- $first[$i] = $regs[1] . ':';
- $second[$i] = $regs[2];
- $cnum++;
- } else {
- $second[$i] = trim($line);
- $first[$i] = '';
- }
- }
- for ($i=0; $i < count($second); $i = $j) {
- if (isset($first[$i])) {
- $f = $first[$i];
- }
- if (isset($second[$i])) {
- $s = nl2br($second[$i]);
- }
- $j = $i + 1;
- while (($first[$j] == '') && ($j < count($first))) {
- $s .= ' ' . nl2br($second[$j]);
- $j++;
- }
- parseEmail($s);
- if (isset($f)) echo "$f$s";
- }
- echo " | \n" .
- ' |