/**
* read_body.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This file is used for reading the msgs array and displaying
"</script>\n" .
"<a href=\"javascript:printFormat();\">$print_text</a>\n";
} else {
- $result = '<A target="_blank" HREF="../src/printer_friendly_bottom.php' .
+ $result = '<a target="_blank" href="../src/printer_friendly_bottom.php' .
"$params\">$print_text</a>\n";
}
return $result;
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ $msg = $deliver->dlv_msg . '<br>' .
+ _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $deliver->dlv_server_msg;
require_once(SM_PATH . 'functions/display_messages.php');
plain_error_message($msg, $color);
} else {
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rem_attachments = array();
- foreach ($attachments as $info) {
- if ($info['session'] == -1) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- } else {
- $rem_attachments[] = $info;
- }
+ if (isset($attachments)) {
+ foreach ($attachments as $info) {
+ 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;
}
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;
+ global $msn_user_support, $default_use_mdn, $default_use_priority,
+ $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
+ $squirrelmail_language;
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ if ($squirrelmail_language == 'ja_JP') {
+ $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ } else {
+ $env[_("Subject")] = decodeHeader(htmlspecialchars($header->subject));
+ }
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
$env[_("Priority")] = getPriorityStr($header->priority);
}
if ($show_xmailer_default) {
- $env[_("Mailer")] = decodeHeader($header->xmailer);
+ $env[_("Mailer")] = htmlentities(decodeHeader($header->xmailer));
}
if ($default_use_mdn) {
if ($mdn_user_support) {
$env[_("Read receipt")] = _("send");
} else {
$env[_("Read receipt")] = _("requested");
- if (!($mailbox == $draft_folder ||
- $mailbox == $sent_folder ||
+ if (!(handleAsSent($mailbox) ||
$message->is_deleted ||
$passed_ent_id)) {
$mdn_url = $PHP_SELF . '&sendreceipt=1';
echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
$color[4].'"></TD></TR><TR><TD align=center>'."\n";
echo $s;
- do_hook("read_body_header");
+ do_hook('read_body_header');
formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
echo '</TABLE>';
echo '</TD></TR><TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
}
function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
- global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort,
+ global $base_uri, $draft_folder, $where, $what, $color, $sort,
$startMessage, $compose_new_win, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment;
$topbar_delimiter = ' | ';
$urlMailbox = urlencode($mailbox);
$s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
- ' border="0" bgcolor="'.$color[9].'"><tr><td align="left" width="33%"><small>';
+ ' border="0" bgcolor="'.$color[9].'"><tr>' .
+ html_tag( 'td', '', 'left', '', 'width="33%"' ) . '<small>';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$comp_alt_uri = $comp_uri . '&action=draft';
$comp_alt_string = _("Resume Draft");
- } else if ($mailbox == $sent_folder) {
+ } else if (handleAsSent($mailbox)) {
$comp_alt_uri = $comp_uri . '&action=edit_as_new';
$comp_alt_string = _("Edit Message as New");
}
$s .= $topbar_delimiter . $next_link;
}
- $s .= '</small></td>' . "\n" . '<td align="right" width="33%" nowrap><small>';
+ $s .= '</small></td>' . "\n" .
+ html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
$comp_action_uri = $comp_uri . '&action=forward';
$s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
$url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
$s = "<TR>\n" .
- '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ": </B></TD>\n" .
- '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>' .
+ html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ": </B></TD>\n" .
+ html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '<SMALL>' .
'<a href="'.$url.'">'._("View Full Header").'</a>';
/* Output the printer friendly link if we are in subtle mode. */
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
echo ' <tr bgcolor="'.$color[4].'"><td>';
-echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
+// echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
+echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
echo ' <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
. '</tr>';
echo ' </table>';
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
+ // echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
+ echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo ' <tr><td>';