X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=5b8dc135d406940c1f72ec27a2ea5b3d3e1bbe8c;hb=7e4850ff5cbe4ed0c681b8a64e0741d0a95b2f63;hp=c946388e2d53484a1172624fad7521b487c22915;hpb=0a2c3218acf2baa344d3ffd1c88c74cc1cca2740;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index c946388e..5b8dc135 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -195,7 +195,7 @@ function getforwardHeader($orig_header) {
$subject = decodeHeader($orig_header->subject,false,false);
$subject = str_replace(' ',' ',$subject);
$bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n\n". $display[_("Subject")] . $subject . "\n" .
+ "\n". $display[_("Subject")] . $subject . "\n" .
$display[_("From")] . $from . "\n" .
$display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
$display[_("To")] . $to . "\n";
@@ -536,6 +536,9 @@ elseif (isset($sigappend)) {
if (isset($send_to_bcc)) {
$values['send_to_bcc'] = $send_to_bcc;
}
+ if (isset($subject)) {
+ $values['subject'] = $subject;
+ }
showInputForm($session, $values);
}
@@ -905,73 +908,85 @@ function showInputForm ($session, $values=false) {
showComposeButtonRow();
}
+ /* display select list for identities */
$idents = getPref($data_dir, $username, 'identities', 0);
if ($idents > 1) {
- echo '
' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
- _("From:") . '' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
- '
' . "\n";
}
- echo ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
+ echo '
' . "\n" .
+ html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("To:") . '' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
- '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
+ '
' . "\n" .
+ ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("CC:") . '' . "\n" .
+ _("CC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("BCC:") . '' . "\n" .
+ _("BCC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
- _("Subject:") . '' . "\n" .
+ _("Subject:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) . "\n";
- echo ' ' . "\n" .
- ' ' . "\n" .
- '
' . "\n\n";
+ echo ' ' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n\n";
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
+ /* why this distinction? */
if ($compose_new_win == '1') {
echo ' ' . "\n" .
' ' . "\n" .
@@ -984,6 +999,7 @@ function showInputForm ($session, $values=false) {
' ' . "\n" .
- ' | ' . "\n" .
- '
' . "\n";
+ echo '
' . "\n" .
+ ' ' . "\n" .
+ ' ' . "\n";
if ($location_of_buttons == 'bottom') {
showComposeButtonRow();
} else {
- echo ' ' . "\n" .
- html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n";
+ echo ' ' . "\n" .
+ html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" .
+ ' ' . "\n" .
+ '
' . "\n" .
+ ' ' . "\n" .
+ '
' . "\n";
}
/* This code is for attachments */