X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=faed6afaa1b57f8ddb1f238ce56f94b5597a2577;hb=4eb9284bbae330fe6225ead656ef76505c3463f0;hp=0fc323fa0c55f283561d0a5637c8f435fd8515de;hpb=39bfea8fa9fd939da9766a79381f68ea4b725c23;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 0fc323fa..faed6afa 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -1,4 +1,5 @@
subject,false,false) . "\r\n" .
- "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
+ "\t" . _("To") . ': ' . decodeHeader($to,false,false) . "\r\n" .
+ "\t" . _("Subject") . ': ' . decodeHeader($header->subject,false,false) . "\r\n" .
+ "\t" . _("Sent") . ': ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
@@ -302,7 +303,7 @@ function ClearAttachments() {
if ($info['session'] == -1) {
$attached_file = "$hashed_attachment_dir/$info[localfilename]";
if (file_exists($attached_file)) {
- unlink($attached_file);
+ unlink($attached_file);
}
} else {
$rem_attachments[] = $info;
@@ -369,9 +370,9 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
global $msn_user_support, $default_use_mdn, $default_use_priority,
$show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
- $squirrelmail_language;
+ $squirrelmail_language;
- $mailbox = $aMailbox['NAME'] ;
+ $mailbox = $aMailbox['NAME'];
$header = $message->rfc822_header;
$env = array();
@@ -630,11 +631,11 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
}
// Show Alt URI for Draft/Sent
if (isset($comp_alt_string))
- $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n";
+ $menu_row .= getButton('submit', $new_button, $comp_alt_string, $on_click) . "\n";
- $menu_row .= getButton('SUBMIT', 'smaction_reply', _("Reply"), $on_click) . "\n";
- $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
- $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click);
+ $menu_row .= getButton('submit', 'smaction_reply', _("Reply"), $on_click) . "\n";
+ $menu_row .= getButton('submit', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
+ $menu_row .= getButton('submit', 'smaction_forward', _("Forward"), $on_click);
if ($enable_forward_as_attachment)
$menu_row .= '' . _("As Attachment") .' '."\n";
@@ -648,10 +649,10 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
if (!(isset($passed_ent_id) && $passed_ent_id)) {
$menu_row .= addHidden('mailbox', $aMailbox['NAME']);
$menu_row .= addHidden('msg[0]', $passed_id);
- $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
+ $menu_row .= getButton('submit', 'delete', _("Delete"));
$menu_row .= '' . _("Bypass Trash");
} else {
- $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
+ $menu_row .= getButton('submit', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
}
$menu_row .= '';
@@ -676,7 +677,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed
}
$menu_row .= ' ';
- $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '';
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '';
}
$menu_row .= '';
@@ -849,7 +850,7 @@ $header = $message->header;
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
$final_recipient = '';
- if ((isset($identity)) && ($identity != 0)) //Main identity
+ if ((isset($identity)) && ($identity != 0)) //Main identity
$final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' ));
if ($final_recipient == '' )
$final_recipient = trim(getPref($data_dir, $username, 'email_address', '' ));
@@ -955,5 +956,4 @@ sqimap_logout($imapConnection);
$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
sqsession_register($mailbox_cache,'mailbox_cache');
?>
-