X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=2138e904e7355647e88233ed404dcac66f6dd317;hb=25516e56ec887887fa947f2ad774c87cef78168d;hp=2d6dc5553f05088dc3a78710fb1c8b8d91775bca;hpb=32c661f4796c4d3725be5602397faabac6d2dcf2;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 2d6dc555..2138e904 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -18,6 +18,7 @@ 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');
/**
* Given an IMAP message id number, this will look it up in the cached
@@ -26,8 +27,8 @@ require_once('../functions/smtp.php');
*
* @return the index of the next valid message from the array
*/
-function findNextMessage() {
- global $msort, $currentArrayIndex, $msgs, $sort,
+function findNextMessage($passed_id) {
+ global $msort, $msgs, $sort,
$thread_sort_messages, $allow_server_sort,
$server_sort_array;
if (!is_array($server_sort_array)) {
@@ -35,10 +36,10 @@ function findNextMessage() {
$allow_server_sort = FALSE;
}
$result = -1;
- if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
+ if ($thread_sort_messages || $allow_server_sort) {
reset($server_sort_array);
while(list($key, $value) = each ($server_sort_array)) {
- if ($currentArrayIndex == $value) {
+ if ($passed_id == $value) {
if ($key == (count($server_sort_array) - 1)) {
$result = -1;
break;
@@ -48,18 +49,18 @@ function findNextMessage() {
}
}
}
- elseif ($sort == 6 && $allow_server_sort != TRUE &&
- $thread_sort_messages != 1) {
- if ($currentArrayIndex != 1) {
- $result = $currentArrayIndex - 1;
+ elseif ($sort == 6 && !$allow_server_sort &&
+ !$thread_sort_messages ) {
+ if ($passed_id != 1) {
+ $result = $passed_id - 1;
}
}
- elseif ($allow_server_sort != TRUE && $thread_sort_messages != 1 ) {
+ elseif (!$allow_server_sort && !$thread_sort_messages ) {
if (!is_array($msort)) {
return -1;
}
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($currentArrayIndex == $msgs[$key]['ID']) {
+ if ($passed_id == $msgs[$key]['ID']) {
next($msort);
$key = key($msort);
if (isset($key)){
@@ -72,35 +73,20 @@ function findNextMessage() {
return ($result);
}
-/**
- * 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) {
- 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, $thread_sort_messages,
+function findPreviousMessage($numMessages, $passed_id) {
+ global $msort, $sort, $msgs,
+ $thread_sort_messages,
$allow_server_sort, $server_sort_array;
$result = -1;
if (!is_array($server_sort_array)) {
$thread_sort_messages = 0;
$allow_server_sort = FALSE;
}
- if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) {
+ if ($thread_sort_messages || $allow_server_sort ) {
reset($server_sort_array);
while(list($key, $value) = each ($server_sort_array)) {
- if ($currentArrayIndex == $value) {
+ if ($passed_id == $value) {
if ($key == 0) {
$result = -1;
break;
@@ -110,22 +96,22 @@ function findPreviousMessage() {
}
}
}
- elseif ($sort == 6 && $allow_server_sort != TRUE &&
- $thread_sort_messages != 1) {
- $numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
- if ($currentArrayIndex != $numMessages) {
- $result = $currentArrayIndex + 1;
+ elseif ($sort == 6 && !$allow_server_sort &&
+ !$thread_sort_messages) {
+ if ($passed_id != $numMessages) {
+ $result = $passed_id + 1;
}
}
- elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) {
+ elseif (!$thread_sort_messages && !$allow_server_sort) {
if (!is_array($msort)) {
return -1;
}
for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($currentArrayIndex == $msgs[$key]['ID']) {
+ if ($passed_id == $msgs[$key]['ID']) {
prev($msort);
$key = key($msort);
if (isset($key)) {
+ echo $msort[$key];
$result = $msgs[$key]['ID'];
break;
}
@@ -139,32 +125,16 @@ function findPreviousMessage() {
* 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,
- $javascript_on;
+function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
+ global $javascript_on;
- if (strlen(trim($mailbox)) < 1) {
- $mailbox = 'INBOX';
- }
-
- $params = '?passed_ent_id=' . $ent_num .
+ $params = '?passed_ent_id=' . $passed_ent_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";
- } else {
- /* The link is subtle, below "view full header". */
- $result = " \n";
- }
-
+ $result = '';
/* Output the link. */
if ($javascript_on) {
$result .= '\n" .
- "$print_text\n";
+ "$print_text\n";
} else {
- $result .= '$print_text\n";
+ $result .= '$print_text\n";
}
-
- if (!$pf_subtle_link) {
- /* The link is large, on the bottom of the header panel. */
- $result .= ' |
' . "\n";
- }
-
return ($result);
}
@@ -195,12 +159,15 @@ function ServerMDNSupport( $read ) {
return ( $ret );
}
-function SendMDN ( $recipient , $sender) {
- global $imapConnection, $mailbox, $username, $attachment_dir, $SERVER_NAME,
- $version, $attachments, $identity, $data_dir, $passed_id;
+function SendMDN ( $mailbox, $passed_id, $sender, $message) {
+ global $username, $attachment_dir, $SERVER_NAME,
+ $version, $attachments;
- $header = sqimap_get_message_header($imapConnection, $passed_id, $mailbox);
+ $header = $message->rfc822_header;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+
+ $recipient_o = $header->dnt;
+ $recipient = $recipient_o->getAddress(true);
// part 1 (RFC2298)
@@ -208,7 +175,7 @@ function SendMDN ( $recipient , $sender) {
$to_array = $header->to;
$to = '';
foreach ($to_array as $line) {
- $to .= " $line ";
+ $to .= ' '.$line->getAddress();
}
$subject = $header->subject;
@@ -224,7 +191,6 @@ function SendMDN ( $recipient , $sender) {
sprintf( _("Was displayed on %s"), $now );
// part2 (RFC2298)
-
$original_recipient = $to;
$original_message_id = $header->message_id;
@@ -237,7 +203,6 @@ function SendMDN ( $recipient , $sender) {
"Original-Message-ID : $original_message_id\r\n" .
"Disposition: manual-action/MDN-sent-manually; displayed\r\n";
-
$localfilename = GenerateRandomString(32, 'FILE', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
@@ -250,21 +215,17 @@ function SendMDN ( $recipient , $sender) {
$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, -1) );
+ return (SendMessage($recipient, '', '', _("Read:") . ' ' . $subject,
+ $body, 0, True, 3, -1) );
}
-function ToggleMDNflag ( $set ) {
- global $imapConnection, $passed_id, $mailbox;
- sqimap_mailbox_select($imapConnection, $mailbox);
+function ToggleMDNflag ( $set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage);
+ $readmessage, $uid_support);
}
function ClearAttachments() {
@@ -287,95 +248,291 @@ function ClearAttachments() {
}
function formatRecipientString($recipients, $item ) {
- global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc,
- $echo_more, $echo_less, $show_more, $show_more_bcc, $sort;
+ global $show_more_cc, $show_more, $show_more_bcc,
+ $PHP_SELF;
- $i = 0;
- $url_string = '';
-
- if (isset ($recipients[0]) && trim($recipients[0])) {
+ 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);
+ }
+ }
- 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];
+ $cnt = count($ary);
+ $i = 0;
+ while ($i < $cnt) {
+ $ary[$i] = htmlspecialchars($ary[$i]->getAddress());
if ($string) {
- $string = "$string
$ary[$i]";
+ $string .= '
'.$ary[$i];
} else {
- $string = "$ary[$i]";
+ $string = $ary[$i];
+ if ($cnt>1) {
+ $string .= ' ('._("less").')';
+ } else {
+ $string .= '">'._("more").')';
+ break;
+ }
+ }
}
-
$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;
-}
+ return $string;
+}
+
+function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
+ $color, $FirstTimeSee) {
+ global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder,
+ $default_use_priority, $show_xmailer_default,
+ $mdn_user_support, $PHP_SELF, $javascript_on;
+
+ $header = $message->rfc822_header;
+ $env = array();
+ $env[_("Subject")] = htmlspecialchars($header->subject);
+ $from_name = $header->getAddr_s('from');
+ if (!$from_name) {
+ $from_name = $header->getAddr_s('sender');
+ if (!$from_name) {
+ $from_name = _("Unknown sender");
+ }
+ }
+ $env[_("From")] = htmlspecialchars($from_name);
+ $env[_("Date")] = getLongDateString($header->date);
+ $env[_("To")] = formatRecipientString($header->to, "to");
+ $env[_("Cc")] = formatRecipientString($header->cc, "cc");
+ $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc");
+ if ($default_use_priority) {
+ $env[_("Priority")] = getPriorityStr($header->priority);
+ }
+ if ($show_xmailer_default) {
+ $env[_("Mailer")] = $header->xmailer;
+ }
+ if ($default_use_mdn) {
+ if ($mdn_user_support) {
+ if ($header->dnt) {
+ if ($message->is_mdnsent) {
+ $env[_("Read receipt")] = _("send");
+ } else {
+ if ( !($mailbox == $draft_folder ||
+ $mailbox == $sent_folder || $message->is_deleted)) {
+ $mdn_url = $PHP_SELF . '&sendreceipt=1';
+ if ($FirstTimeSee && $javascript_on) {
+ $script = ''. "\n";
+ echo $script;
+ }
+ $env[_("Read receipt")] = _("requested") .
+ ' ['. _("Send read receipt now") .']';
+ } else {
+ $env[_("Read receipt")] = _("requested");
+ }
+ }
+ }
+ }
+ }
+
+ $s = '';
+ foreach ($env as $key => $val) {
+ if ($val) {
+ $s .= '';
+ $s .= html_tag('TD', '' . $key . ': ', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
+ $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
+ $s .= '
';
+ }
+ }
+ echo $s;
+ do_hook("read_body_header");
+ formatToolbar($mailbox,$passed_id,$passed_ent_id,$message, $color);
+ echo '
';
+}
+
+function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
+ global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort,
+ $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft;
+
+ $topbar_delimiter = ' | ';
+ $urlMailbox = urlencode($mailbox);
+ $s = '';
+
+ $msgs_url = $base_uri . 'src/';
+ if (isset($where) && isset($what)) {
+ $msgs_url .= 'search.php?where='.urlencode($where).
+ '&what='.urlencode($what).'&mailbox='.$urlMailbox;
+ $msgs_str = _("Search results");
+ } else {
+ $msgs_url .= 'right_main.php?sort='.$sort.'&startMessage='.
+ $startMessage.'&mailbox='.$urlMailbox;
+ $msgs_str = _("Message List");
+ }
+ $s .= ''.$msgs_str.'';
+ $s .= $topbar_delimiter;
+
+ $delete_url = $base_uri . 'src/delete_message.php?mailbox='.$urlMailbox.
+ '&message='.$passed_id.'&';
+ if (!(isset($passed_ent_id) && $passed_ent_id)) {
+ if ($where && $what) {
+ $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
+ } else {
+ $delete_url .= 'sort='. $sort . '&startMessage='. $startMessage;
+ }
+ $s .= ''._("Delete").'';
+ }
+
+ $comp_uri = $base_uri . 'src/compose.php'.
+ '?passed_id='.$passed_id.
+ '&mailbox='.$urlMailbox.
+ (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
+
+ if (($mailbox == $draft_folder) && ($save_as_draft)) {
+ $comp_alt_uri = $comp_uri . '&action=draft';
+ $comp_alt_string = _("Resume Draft");
+ } else if ($mailbox == $sent_folder) {
+ $comp_alt_uri = $comp_uri . '&action=edit_as_new';
+ $comp_alt_string = _("Edit Message as New");
+ }
+ if (isset($comp_alt_uri)) {
+ $s .= $topbar_delimiter;
+ if ($compose_new_win == '1') {
+ $s .= ''.$comp_alt_string.'';
+ } else {
+ $s .= ''.$comp_alt_string.'';
+ }
+ }
+
+ $s .= ' | ';
+
+ if (!(isset($where) && isset($what)) && !$passed_ent_id) {
+ $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
+ $next = findNextMessage($passed_id);
+ if ($prev != -1) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $s .= ''._("Previous").'';
+ } else {
+ $s .= _("Previous");
+ }
+ $s .= $topbar_delimiter;
+ if ($next != -1) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $s .= ''._("Next").'';
+ } else {
+ $s .= _("Next");
+ }
+ } else if (isset($passed_ent_id) && $passed_ent_id) {
+ /* code for navigating through attached message/rfc822 messages */
+ $url = set_url_var($PHP_SELF, 'passed_ent_id',0);
+ $s .= ''._("View Message").'';
+ $par_ent_id = $message->parent->entity_id;
+ if ($par_ent_id) {
+ $par_ent_id = substr($par_ent_id,0,-2);
+ $s .= $topbar_delimiter;
+ $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
+ $s .= ''._("Up").'';
+ }
+ }
+
+ $s .= ' | ';
+ $comp_action_uri = $comp_uri . '&action=forward';
+ if ($compose_new_win == '1') {
+ $s .= ''._("Forward").'';
+ } else {
+ $s .= ''._("Forward").'';
+ }
+ $s .= $topbar_delimiter;
+
+ $comp_action_uri = $comp_uri . '&action=forward_as_attachment';
+ if ($compose_new_win == '1') {
+ $s .= ''._("Forward as attachment").'';
+ } else {
+ $s .= ''._("Forward as attachment").'';
+ }
+ $s .= $topbar_delimiter;
+
+
+
+ $comp_action_uri = decodeHeader($comp_uri . '&action=reply');
+ if ($compose_new_win == '1') {
+ $s .= ''._("Reply").'';
+ } else {
+ $s .= ''._("Reply").'';
+ }
+ $s .= $topbar_delimiter;
+
+ $comp_action_uri = $comp_uri . '&action=reply_all';
+ if ($compose_new_win == '1') {
+ $s .= ''._("Reply All").'';
+ } else {
+ $s .= ''._("Reply All").'';
+ }
+ $s .= ' |
';
+ echo $s;
+}
+
+function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
+ global $QUERY_STRING, $base_uri;
+
+ $urlMailbox = urlencode($mailbox);
+ $url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
+
+ $s = "\n";
+ $s .= '' . _("Options") . ": | \n";
+ $s .= '';
+ $s .= ''.("View Full Header").'';
+
+ /* Output the printer friendly link if we are in subtle mode. */
+ $s .= ' | ';
+ $s .= printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
+ echo $s;
+ do_hook("read_body_header_right");
+ $s = " | \n";
+ $s .= "
\n";
+ echo $s;
+
+}
/*
@@ -388,704 +545,133 @@ function formatRecipientString($recipients, $item ) {
$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');
-
-/*
- * 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 ));
-}
-
-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);
-
- 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" .
- '