break;
}
}
- }
- elseif ($sort == 6 && !$allow_server_sort &&
+ } else if ($sort == 6 && !$allow_server_sort &&
!$thread_sort_messages ) {
if ($passed_id != 1) {
$result = $passed_id - 1;
}
- }
- elseif (!$allow_server_sort && !$thread_sort_messages ) {
+ } else if (!$allow_server_sort && !$thread_sort_messages ) {
if (!is_array($msort)) {
return -1;
}
break;
}
}
- }
- elseif ($sort == 6 && !$allow_server_sort &&
+ } else if ($sort == 6 && !$allow_server_sort &&
!$thread_sort_messages) {
if ($passed_id != $numMessages) {
$result = $passed_id + 1;
}
- }
- elseif (!$thread_sort_messages && !$allow_server_sort) {
+ } else if (!$thread_sort_messages && !$allow_server_sort) {
if (!is_array($msort)) {
return -1;
}
prev($msort);
$key = key($msort);
if (isset($key)) {
- echo $msort[$key];
+ //echo $msort[$key]; /* Why again were we echoing here? */
$result = $msgs[$key]['ID'];
break;
}
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
+ $body = charset_encode_japanese($body);
+
// part2 (RFC2298)
$original_recipient = $to;
$original_message_id = $header->message_id;
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = htmlspecialchars($header->subject);
+ $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
$from_name = _("Unknown sender");
}
}
- $env[_("From")] = htmlspecialchars($from_name);
+ $env[_("From")] = htmlspecialchars(decodeHeader($from_name));
$env[_("Date")] = getLongDateString($header->date);
$env[_("To")] = formatRecipientString($header->to, "to");
$env[_("Cc")] = formatRecipientString($header->cc, "cc");
$env[_("Priority")] = getPriorityStr($header->priority);
}
if ($show_xmailer_default) {
- $env[_("Mailer")] = $header->xmailer;
+ $env[_("Mailer")] = decodeHeader($header->xmailer);
}
if ($default_use_mdn) {
if ($mdn_user_support) {
$env[_("Read receipt")] = _("send");
} else {
if ( !($mailbox == $draft_folder ||
- $mailbox == $sent_folder || $message->is_deleted)) {
+ $mailbox == $sent_folder ||
+ $message->is_deleted ||
+ $passed_ent_id)) {
$mdn_url = $PHP_SELF . '&sendreceipt=1';
if ($FirstTimeSee && $javascript_on) {
$script = '<script language="JavaScript" type="text/javascript">' ."\n";
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;
+ $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft,
+ $enable_forward_as_attachment;
$topbar_delimiter = ' | ';
$urlMailbox = urlencode($mailbox);
}
$s .= '<a href="'. $msgs_url.'">'.$msgs_str.'</a>';
$s .= $topbar_delimiter;
-
+
$delete_url = $base_uri . 'src/delete_message.php?mailbox='.$urlMailbox.
'&message='.$passed_id.'&';
if (!(isset($passed_ent_id) && $passed_ent_id)) {
}
$s .= $topbar_delimiter;
- $comp_action_uri = $comp_uri . '&action=forward_as_attachment';
- if ($compose_new_win == '1') {
- $s .= '<a href="javascript:void(0)" '.
- 'onclick="comp_in_new(\''.$comp_action_uri.'\')">'._("Forward as attachment").'</a>';
- } else {
- $s .= '<a href="'.$comp_action_uri.'">'._("Forward as attachment").'</a>';
+ if ($enable_forward_as_attachment) {
+ $comp_action_uri = $comp_uri . '&action=forward_as_attachment';
+ if ($compose_new_win == '1') {
+ $s .= '<a href="javascript:void(0)" '.
+ 'onclick="comp_in_new(\''.$comp_action_uri.'\')">'._("Forward as Attachment").'</a>';
+ } else {
+ $s .= '<a href="'.$comp_action_uri.'">'._("Forward as Attachment").'</a>';
+ }
+ $s .= $topbar_delimiter;
}
- $s .= $topbar_delimiter;
-
$comp_action_uri = decodeHeader($comp_uri . '&action=reply');
}
-
-/*
- * Main of read_boby.php --------------------------------------------------
- */
+/***************************/
+/* Main of read_boby.php */
+/***************************/
/*
Urled vars
$mailbox = urldecode( $mailbox );
}
-$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0);
-
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
if (!isset($messages)) {
$message->is_seen = true;
$messages[$uidvalidity][$passed_id] = $message;
-if (isset($passed_ent_id)) {
+if (isset($passed_ent_id) && $passed_ent_id) {
$message = $message->getEntity($passed_ent_id);
+ if ($message->type0 != 'message' && $message->type1 != 'rfc822') {
+ $message = $message->parent;
+ }
$read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support);
$rfc822_header = new rfc822_header();
$rfc822_header->parseHeader($read);
}
$header = $message->header;
-//do_hook('html_top');
+do_hook('html_top');
-/* =============================================================================
- * block for handling incoming url vars
- *
- * =============================================================================
- */
+/****************************************/
+/* Block for handling incoming url vars */
+/****************************************/
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
ClearAttachments();
}
}
-/* =============================================================================
- * end block for handling incoming url vars
- *
- * =============================================================================
- */
+/***********************************************/
+/* End of block for handling incoming url vars */
+/***********************************************/
+
$msgs[$passed_id]['FLAG_SEEN'] = true;
$messagebody = '';
-$ent_ar = $message->findDisplayEntity(array());
+do_hook('read_body_top');
+if ($show_html_default == 1) {
+ $ent_ar = $message->findDisplayEntity(array());
+} else {
+ $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
$cnt = count($ent_ar);
for ($i = 0; $i < $cnt; $i++) {
$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
}
displayPageHeader($color, $mailbox);
-do_hook('read_body_top');
formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
-echo '<table width="100%" cellpadding="0" cellspacing="5" align="center" border="0">';
-echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+echo '<table width="100%" cellpadding="0" cellspacing="0" align="center" border="0">';
+echo ' <tr><td>';
+echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
-echo ' <tr bgcolor="'.$color[4].'"><td>'.$messagebody. '</td></tr>';
-echo ' </table></td></tr>';
-echo ' </table>';
-echo ' </td></tr>';
+echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
+echo ' <tr bgcolor="'.$color[4].'"><td>';
+echo ' <table cellpadding="0" cellspacing="0" align="center" border="0">';
+echo ' <tr><td><br>' . $messagebody . '</td></td>';
+echo ' </table>';
+echo ' </td></tr>';
+echo ' </table></td></tr>';
+echo ' </table>';
+echo ' </td></tr>';
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
- echo ' <tr><td>';
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+ echo ' <tr><td>';
+ echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'"><b>';
- echo _("Attachments").':</b></td></tr><tr><td>';
- echo ' <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'">';
- echo $attachmentsdisplay;
- echo ' </td></tr></table></table></td></tr>';
+ echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
+ echo ' <b>' . _("Attachments") . ':</b>';
+ echo ' </td></tr>';
+ echo ' <tr><td>';
+ echo ' <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'"><tr><td>';
+ echo $attachmentsdisplay;
+ echo ' </td></tr></table>';
+ echo ' </table></td></tr>';
echo ' </table></td></tr>';
- echo ' </table>';
- echo ' </td></tr>';
+ echo ' </table>';
+ echo ' </td></tr>';
}
echo '</table>';
'?' .
'passed_id=' . urlencode($img['passed_id']) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_ent_id=' . urlencode($img['ent_id']) .
+ '&ent_id=' . urlencode($img['ent_id']) .
'&absolute_dl=true';
echo html_tag( 'table', "\n" .