X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=f9c22d88823740390a645728e6ee4f4e108e4c22;hp=2d6dc5553f05088dc3a78710fb1c8b8d91775bca;hb=5eb5b57e4c250a5beb6976c9516f1b537b2e0b3c;hpb=32c661f4796c4d3725be5602397faabac6d2dcf2 diff --git a/src/read_body.php b/src/read_body.php index 2d6dc555..f9c22d88 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -18,6 +18,8 @@ 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('../src/view_header.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -156,13 +158,12 @@ function printer_friendly_link() { 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. */ @@ -175,10 +176,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) { @@ -259,12 +260,12 @@ function SendMDN ( $recipient , $sender) { function ToggleMDNflag ( $set ) { - global $imapConnection, $passed_id, $mailbox; + global $imapConnection, $passed_id, $mailbox, $uid; 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); } function ClearAttachments() { @@ -288,82 +289,60 @@ 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; + $echo_more, $echo_less, $show_more, $show_more_bcc, $sort, $passed_ent_id, + $PHP_SELF; $i = 0; - $url_string = ''; - - if (isset ($recipients[0]) && trim($recipients[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); + } + } - 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)) { + $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 = "$string
$ary[$i]"; + $string .= '
'.$ary[$i]; } else { - $string = "$ary[$i]"; + $string = $ary[$i]; + if ($cnt>1) { + $string .= ' ('.$echo_less.')'; + } else { + $string .= '">'.$echo_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 { @@ -388,12 +367,46 @@ function formatRecipientString($recipients, $item ) { $passed_id */ +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); + +$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])) { + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $messages[$uidvalidity][$passed_id] = $message; + $header = $message->header; +} else { + $message = $messages[$uidvalidity][$passed_id]; +// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + 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'); @@ -403,82 +416,21 @@ do_hook('html_top'); 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 )); + $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); + $FirstTimeSee = !$message->is_seen; } 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" . - "
". - _("Viewing Full Header") . ' - '. - ''; - } else { - echo "&passed_id=$passed_id&startMessage=$startMessage". - "&show_more=$show_more\">"; - } - echo _("View message") . "
\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" . - ''; - sqimap_logout($imapConnection); - exit; + $template_vars = array(); + parse_viewheader($imapConnection,$passed_id,&$template_vars); + $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr'); + view_header($template_vars, '', ''); + exit; } if (isset($msgs)) { @@ -486,25 +438,45 @@ if (isset($msgs)) { } else { $currentArrayIndex = -1; } +$msgs[$passed_id]['FLAG_SEEN'] = true; -for ($i = 0; $i < count($msgs); $i++) { - if ($msgs[$i]['ID'] == $passed_id) { - $msgs[$i]['FLAG_SEEN'] = true; - } + +/* + * 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($mbx_response["PERMANENTFLAGS"]); + $FirstTimeSee = !$message->is_seen; } -/** - * $message contains all information about the message - * including header and body +/* + * The following code shows the header of the message and then exit */ -$message = sqimap_get_message($imapConnection, $passed_id, $mailbox); +if (isset($view_hdr)) { + $template_vars = array(); + parse_viewheader($imapConnection,$passed_id,&$template_vars); + $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr'); + view_header($template_vars, '', ''); + exit; +} + +if (isset($msgs)) { + $currentArrayIndex = $passed_id; +} else { + $currentArrayIndex = -1; +} +$msgs[$passed_id]['FLAG_SEEN'] = true; /** translate the subject and mailbox into url-able text **/ -$url_subj = urlencode(trim($message->header->subject)); +$url_subj = urlencode(trim($header->subject)); $urlMailbox = urlencode($mailbox); $url_replyto = ''; -if (isset($message->header->replyto)) { - $url_replyto = urlencode($message->header->replyto); +if (isset($header->replyto)) { + $addr_o = $header->replyto; + $addr_s = $addr_o->getAddress(); + $url_replyto = urlencode($addr_s); } $url_replytoall = $url_replyto; @@ -512,81 +484,84 @@ $url_replytoall = $url_replyto; /** * If we are replying to all, then find all other addresses and * add them to the list. Remove duplicates. - * This is somewhat messy, so I'll explain: - * 1) Take all addresses (from, to, cc) (avoid nasty join errors here) - */ -$url_replytoall_extra_addrs = array_merge( - array($message->header->from), - $message->header->to, - $message->header->cc - ); - -/** - * 2) Make one big string out of them */ -$url_replytoall_extra_addrs = join(';', $url_replytoall_extra_addrs); -/** - * 3) Parse that into an array of addresses - */ -$url_replytoall_extra_addrs = parseAddrs($url_replytoall_extra_addrs); +$excl_arr = array(); /** - * 4) Make them unique -- weed out duplicates - * (Coded for PHP 4.0.0) - */ -$url_replytoall_extra_addrs = - array_keys(array_flip($url_replytoall_extra_addrs)); - -/** - * 5) Remove the addresses we'll be sending the message 'to' + * 1) Remove the addresses we'll be sending the message 'to' */ $url_replytoall_avoid_addrs = ''; -if (isset($message->header->replyto)) { - $url_replytoall_avoid_addrs = $message->header->replyto; +if (isset($header->replyto)) { + $excl_ar = $header->getAddr_a('replyto'); } -$url_replytoall_avoid_addrs = parseAddrs($url_replytoall_avoid_addrs); -foreach ($url_replytoall_avoid_addrs as $addr) { - RemoveAddress($url_replytoall_extra_addrs, $addr); -} /** - * 6) Remove our identities from the CC list (they still can be in the + * 2) Remove our identities from the CC list (they still can be in the * TO list) only if $include_self_reply_all is turned off */ if (!$include_self_reply_all) { - RemoveAddress($url_replytoall_extra_addrs, - getPref($data_dir, $username, 'email_address')); + $email_address = trim(getPref($data_dir, $username, 'email_address')); + $excl_ar[$email_address] = ''; + $idents = getPref($data_dir, $username, 'identities'); if ($idents != '' && $idents > 1) { for ($i = 1; $i < $idents; $i ++) { $cur_email_address = getPref($data_dir, $username, 'email_address' . $i); - RemoveAddress($url_replytoall_extra_addrs, $cur_email_address); + $cur_email_address = strtolower($cur_email_address); + $excl_ar[$cur_email_address] = ''; } } } -/** - * 7) Smoosh back into one nice line +/** + * 3) get the addresses. */ -$url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs); +$url_replytoall_ar = $header->getAddr_a(array('from','to','cc'), $excl_ar); + +/** + * 4) generate the string. + */ +$url_replytoallcc = ''; +foreach( $url_replytoall_ar as $email => $personal) { + if ($personal) { + $url_replytoallcc .= ", \"$personal\" <$email>"; + } else { + $url_replytoallcc .= ', '. $email; + } +} +$url_replytoallcc = substr($url_replytoallcc,2); /** - * 8) urlencode() it + * 5) urlencode() it */ $url_replytoallcc = urlencode($url_replytoallcc); -$dateString = getLongDateString($message->header->date); +$dateString = getLongDateString($header->date); /** * What do we reply to -- text only, if possible */ -$ent_ar = findDisplayEntity($message); + +$body = ''; + /* first step in displaying multiple entities */ -$ent_num = $ent_ar[0]; + $ent_ar = findDisplayEntity($message, false); + $i = 0; + for ($i = 0; $i < count($ent_ar); $i++) { + $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]); + } + + +$ent_ar = findDisplayEntity($message,true); + +$ent_num = $ent_ar[0]; +for ($i = 1 ; $i < count($ent_ar); $i++) { + $ent_num .= '_'.$ent_ar[$i]; +} /** TEXT STRINGS DEFINITIONS **/ $echo_more = _("more"); $echo_less = _("less"); @@ -607,18 +582,18 @@ $url_to_string = $to['url_str']; /** FORMAT THE CC STRING **/ -$cc = formatRecipientString($message->header->cc, "cc"); +$cc = formatRecipientString($header->cc, "cc"); $cc_string = $cc['str']; $url_cc_string = $cc['url_str']; /** FORMAT THE BCC STRING **/ -$bcc = formatRecipientString($message->header->bcc, "bcc"); +$bcc = formatRecipientString($header->bcc, "bcc"); $bcc_string = $bcc['str']; $url_bcc_string = $bcc['url_str']; if ($default_use_priority) { - $priority_level = substr($message->header->priority,0,1); + $priority_level = substr($header->priority,0,1); switch($priority_level) { /* check for a higher then normal priority. */ @@ -644,7 +619,14 @@ if ($default_use_priority) { } /** make sure everything will display in HTML format **/ -$from_name = decodeHeader(htmlspecialchars($message->header->from)); + +$from_o = $header->from; +if (is_object($from_o)) { + $from_name = $from_o->getAddress(); +} else { + $from_name = _("Unknown sender"); +} +$from_name = decodeHeader(htmlspecialchars($from_name)); $subject = decodeHeader(htmlspecialchars($message->header->subject)); $identity = ''; $idents = getPref($data_dir, $username, 'identities'); @@ -664,14 +646,16 @@ if (!empty($idents) && $idents > 1) { } do_hook('read_body_top'); -echo '
' . - '' . - '' . - '' . + html_tag( 'tr' ) . + html_tag( 'td', '', 'left', '', 'width="100%"' ) . + html_tag( 'table', '', '', '', 'width="100%" border="0" cellspacing="0" cellpadding="3"' ) . + html_tag( 'tr' ) . "\n"; /** subject **/ -echo "\n" . - '' . - ' '; +echo '' . + ' '; /** from **/ -echo '' . - '' . - ''; +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("From:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $from_name . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; + do_hook("read_body_after_from"); /** date **/ -echo '' . "\n" . - '' . "\n" . - '' . "\n"; - +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Date:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $dateString . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; /** to **/ -echo "\n" . - "' . "\n" . - '' . "\n"; +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("To:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $to_string . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; /** cc **/ if (isset($cc_string) && $cc_string <> '') { - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Cc:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $cc_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } /** bcc **/ if (isset($bcc_string) && $bcc_string <> '') { - echo ''. - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Bcc:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $bcc_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) { - echo '' . - "' . - "" . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Priority") . ':', 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $priority_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } if ($show_xmailer_default) { - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (X-Mailer User-Agent)]", true, - $response, $readmessage); - $mailer = substr($read[1], strpos($read[1], " ")); + $mailer = $header->xmailer; if (trim($mailer)) { - echo '' . - "' . - "" . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Mailer") . ':', 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $mailer . ' ' , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } } @@ -914,68 +886,59 @@ if ($default_use_mdn) { // debug gives you the capability to remove mdn-flags // $MDNDebug = false; - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (Disposition-Notification-To)]", true, - $response, $readmessage); - $MDN_to = substr($read[1], strpos($read[1], ' ')); - $MDN_flag_present = false; - - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id FLAGS", true, - $response, $readmessage); - $MDN_flag_present = preg_match( '/.*\$MDNSent/i', $read[0]); - if (trim($MDN_to) && - (!isset( $sendreceipt ) || $sendreceipt == '' ) ) { + if ($header->dnt) { + $MDN_to_o = $header->dnt; + $MDN_to = $MDN_to_o->getAddress(); + } else { + $MDN_to = ''; + } - if ( $MDN_flag_present && $supportMDN) { + if ($MDN_to && (!isset( $sendreceipt ) || $sendreceipt == '' ) ) { + if ( $message->is_mdnsent && $supportMDN) { $sendreceipt = 'removeMDN'; + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; $sendreceipt=''; /* if ($MDNDebug ) { - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' [' . _("Remove MDN flag") . ']  ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } else { */ - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; /* } */ } // when deleted or draft flag is set don't offer to send a MDN response - else if ( ereg('\\Draft',$read[0] || ereg('\\Deleted',$read[0])) ) { - echo '' . - "' . - '' . "\n"; + else if ( $message->is_draft || $message->is_deleted) { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . ' ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } // if no MDNsupport don't use the annoying popup messages else if ( !$FirstTimeSee ) { $sendreceipt = 'send'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '   [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt=''; } else { @@ -992,14 +955,12 @@ if ($default_use_mdn) { '// -->' . "\n" . '' . "\n"; } - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '  [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt = ''; } } @@ -1013,12 +974,13 @@ if ($default_use_mdn) { $final_recipient = getPref($data_dir, $username, 'email_address', '' ); } + $final_recipient = trim($final_recipient); if ($final_recipient == '' ) { $final_recipient = getPref($data_dir, $username, 'email_address', '' ); } - if ( SendMDN( $MDN_to, $final_recipient ) > 0 && $supportMDN ) { + if ( SendMDN( $MDN_to, $final_recipient, $message ) > 0 && $supportMDN ) { ToggleMDNflag( true); } ClearAttachments(); @@ -1028,22 +990,20 @@ if ($default_use_mdn) { $sendreceipt=''; /* if ($MDNDebug && $supportMDN) { - echo " \n" . - " ' . "\n" . - ' ' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . '  [' . _("Remove MDN flag") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } else { */ - echo " \n" . - " ' . "\n" . - ' ' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' ', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; /* } */ @@ -1053,14 +1013,12 @@ if ($default_use_mdn) { $sendreceipt = 'send'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - echo ''. - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '   [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt = ''; } @@ -1069,18 +1027,23 @@ if ($default_use_mdn) { do_hook('read_body_header'); -echo '
' . - '' . - '' . - '' . - '' . + html_tag( 'td', '', 'center', '', 'width="33%"' ) . + ''; if ( !($where && $what) ) { if ($currentArrayIndex == -1) { echo 'Previous | Next'; } else { - $prev = findPreviousMessage(); + $prev = findPreviousMessage($mbx_response['EXISTS']); $next = findNextMessage(); if ($prev != -1) { - echo '" . _("Previous") . " | "; + echo '" . _("Previous") . " | "; } else { echo _("Previous") . ' | '; } if ($next != -1) { - echo '" . _("Next") . ""; + echo '" . _("Next") . ""; } else { echo _("Next"); } } } -echo '' . - '' . + html_tag( 'td', '', 'right', '', 'width="33%"' ) . + '' ; $comp_uri = $base_uri . "src/compose.php?forward_id=$passed_id&". "forward_subj=$url_subj&". - ($default_use_priority?"mailprio=$priority_level&":''). + ($default_use_priority?"mailprio=$priority_level&":''). "mailbox=$urlMailbox&ent_num=$ent_num"; - + if ($compose_new_win == '1') { echo "'. _("Forward") . - ' | '; + ' | '; $comp_uri = $base_uri . "src/compose.php?send_to=$url_replyto&". "reply_subj=$url_subj&". ($default_use_priority?"mailprio=$priority_level&":''). "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num"; - + if ($compose_new_win == '1') { echo "'. _("Reply") . - ' | '; + ' | '; $comp_uri = $base_uri . "src/compose.php?send_to=$url_replytoall&". "send_to_cc=$url_replytoallcc&reply_subj=$url_subj&". @@ -790,38 +774,35 @@ $comp_uri = $base_uri . "src/compose.php?send_to=$url_replytoall&". if ($compose_new_win == '1') { echo "'. _("Reply All") . - '  ' . - '' . - '' . - '' . - '
' . - '' . - '' . + '"; } echo _("Message List") . - ' | ' . - ' | ' . + ''; } else { echo "sort=$sort&startMessage=$startMessage\">"; } -echo _("Delete") . ' '; +echo _("Delete") . ' '; if (($mailbox == $draft_folder) && ($save_as_draft)) { $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". "identity=$identity&send_to=$url_to_string&". - "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". - "subject=$url_subj&mailprio=$priority_level&". - "draft_id=$passed_id&ent_num=$ent_num"; - + "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". + "subject=$url_subj&mailprio=$priority_level&". + "draft_id=$passed_id&ent_num=$ent_num"; + if ($compose_new_win == '1') { echo "'. _("Resume Draft") . ''; @@ -708,79 +692,79 @@ if (($mailbox == $draft_folder) && ($save_as_draft)) { if ($mailbox == $sent_folder) { $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". "identity=$identity&send_to=$url_to_string&". - "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". - "subject=$url_subj&mailprio=$priority_level&". - "ent_num=$ent_num&passed_id=$passed_id&edit_as_new=1"; + "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". + "subject=$url_subj&mailprio=$priority_level&". + "ent_num=$ent_num&passed_id=$passed_id&edit_as_new=1"; if ($compose_new_win == '1') { echo "'. _("Edit Message as New") . ''; } echo '  ' . - '' . - '' . - ''; + '' . + '' . - '' ; - +echo '' . + '
' . - '
' . - '' . "\n" . - '' . "\n"; + '  ' . + '' . + '' . + '' . + '
' . + '
\n" . - _("Subject:") . - "\n" . - "$subject \n" . - "'. - '' . $subject . ' ' . "\n", 'left', $color[0], 'width="80%" valign="top"' ) . + html_tag( 'td', '', 'right', $color[0], 'rowspan="4" width="10%" valign="top" nowrap' ) . + '
' . - _("From:") . - '' . - "$from_name \n" . - '
' . "\n" . - _("Date:") . - "\n" . - "$dateString \n" . - '
\n" . - _("To:") . - '' . "\n" . - "$to_string \n" . - '
" . - 'Cc:' . - "" . - "$cc_string " . - '
" . - 'Bcc:' . - "" . - "$bcc_string " . - '
" . - _("Priority") . ': '. - "" . - "$priority_string " . - '
" . - _("Mailer") . ': '. - "" . - "$mailer " . - '
" . - _("Read receipt") . ': ' . - "" . - '' . - _("send") . - " [" . _("Remove MDN flag") . '] ' . - '
" . - _("Read receipt") . ': ' . - "" . - ''._("send").''. - '
" . - _("Read receipt") . ': '. - "" . - '' . _("requested") . "" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . "  " . '[' . - _("Send read receipt now") . '] ' ." \n" . - '
\n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''." " . '[' . _("Remove MDN flag") . '] ' . "\n" . - '
\n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''. "\n" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '
' . - ' ' . - ''; +echo '' . + ' ' . + ''; flush(); -echo "\n" . - "
\n" . - '
'. - formatBody($imapConnection, $message, $color, $wrap_at, $ent_num). - '
' . - '' . "\n" . - " " . - '
 
' . "\n"; +echo html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', '
' . "\n" . $body . "\n", 'left', $color[4] + ) + ) , + 'center', '', 'cellspacing=0 width="97%" border="0" cellpadding="0"') . + + html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', ' ', 'left', $color[9] + ) + ) , + 'center', '', 'cellspacing=0 width="100%" border="0" cellpadding="0"'); /* show attached images inline -- if pref'fed so */ if (($attachment_common_show_images) && @@ -1094,14 +1057,12 @@ if (($attachment_common_show_images) && '&passed_ent_id=' . urlencode($img['ent_id']) . '&absolute_dl=true'; - echo "\n" . - '' . - '\n" . - "\n" . - "
' . - "\n" . - "
\n"; - + echo html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', '' ."\n", 'left' + ) + ) , + 'center', '', 'cellspacing=0 border="0" cellpadding="2"'); } }