X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=2e9724f31e2fc792469135f548d26ae40234a2f3;hb=d4f20027c5fc4d0d8ff6ad724c941b78a321bfa4;hp=7f1d6809b9b2654037e7f77feb5356a3edf2bfb8;hpb=fe868193d60150226a596984dac9eaa337b1e6ff;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index 7f1d6809..2e9724f3 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -14,11 +14,14 @@
* - Send mail
* - Save As Draft
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -580,6 +583,13 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$composeMessage;
global $languages, $squirrelmail_language, $default_charset;
+ /*
+ * Set $default_charset to correspond with the user's selection
+ * of language interface. $default_charset global is not correct,
+ * if message is composed in new window.
+ */
+ set_my_charset();
+
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
@@ -646,7 +656,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
}
if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
- $bodypart = charset_decode($actual,$bodypart);
+ $bodypart = charset_convert($actual,$bodypart,$default_charset);
}
$body .= $bodypart;
@@ -983,11 +993,11 @@ function showInputForm ($session, $values=false) {
/* display select list for identities */
if (count($idents) > 1) {
- $ident_list = array();
- foreach($idents as $id => $data) {
- $ident_list[$id] =
- $data['full_name'].' <'.$data['email_address'].'>';
- }
+ $ident_list = array();
+ foreach($idents as $id => $data) {
+ $ident_list[$id] =
+ $data['full_name'].' <'.$data['email_address'].'>';
+ }
echo '
' . "\n" .
html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
_("From:") . '' . "\n" .
@@ -1010,14 +1020,14 @@ function showInputForm ($session, $values=false) {
html_tag( 'td', '', 'right', $color[4] ) .
_("CC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_cc', $send_to_cc, 60). '
' . "\n" .
+ addInput('send_to_cc', $send_to_cc, 60). '
' . "\n" .
' ' . "\n" .
'
' . "\n" .
' ' . "\n" .
html_tag( 'td', '', 'right', $color[4] ) .
_("BCC:") . '' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_bcc', $send_to_bcc, 60).'
' . "\n" .
+ addInput('send_to_bcc', $send_to_bcc, 60).'
' . "\n" .
' ' . "\n" .
'
' . "\n" .
' ' . "\n" .
@@ -1138,8 +1148,8 @@ function showInputForm ($session, $values=false) {
$s_a[] = ''.
- addCheckBox('delete[]', FALSE, $key).
- " | \n" . $attached_filename .
+ addCheckBox('delete[]', FALSE, $key).
+ " | \n" . $attached_filename .
' | - | ' . $type . ' | ('.
show_readable_size( filesize( $attached_file ) ) . ') |
'."\n";
}
@@ -1166,18 +1176,18 @@ function showInputForm ($session, $values=false) {
}
echo '' . "\n" .
- addHidden('username', $username).
- addHidden('smaction', $action).
- addHidden('mailbox', $mailbox);
+ addHidden('username', $username).
+ addHidden('smaction', $action).
+ addHidden('mailbox', $mailbox);
/*
store the complete ComposeMessages array in a hidden input value
so we can restore them in case of a session timeout.
*/
sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER);
echo addHidden('restoremessages', serialize($compose_messages)).
- addHidden('composesession', $composesession).
- addHidden('querystring', $queryString).
- "\n";
+ addHidden('composesession', $composesession).
+ addHidden('querystring', $queryString).
+ "\n";
if (!(bool) ini_get('file_uploads')) {
/* File uploads are off, so we didn't show that part of the form.
To avoid bogus bug reports, tell the user why. */
@@ -1205,16 +1215,16 @@ function showComposeButtonRow() {
}
echo ' ' . _("Priority") .
addSelect('mailprio', array(
- '1' => _("High"),
- '3' => _("Normal"),
- '5' => _("Low") ), $mailprio, TRUE);
+ '1' => _("High"),
+ '3' => _("Normal"),
+ '5' => _("Low") ), $mailprio, TRUE);
}
$mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
if ($default_use_mdn) {
if ($mdn_user_support) {
echo ' ' . _("Receipt") .': '.
- addCheckBox('request_mdn', $request_mdn == '1', '1'). _("On Read").
- addCheckBox('request_dr', $request_dr == '1', '1'). _("On Delivery");
+ addCheckBox('request_mdn', $request_mdn == '1', '1'). _("On Read").
+ addCheckBox('request_dr', $request_dr == '1', '1'). _("On Delivery");
}
}
@@ -1356,18 +1366,6 @@ function deliverMessage($composeMessage, $draft=false) {
$domain, $action, $default_move_to_sent, $move_to_sent;
global $imapServerAddress, $imapPort, $sent_folder, $key;
- /* some browsers replace by nonbreaking spaces
- by replacing them back to spaces addressparsing works */
- /* FIXME: How to handle in case of other charsets where "\240"
- is not a non breaking space ??? */
- /* THEFIX: browsers don't replace space with nbsp. SM replaces
- space with nbsp when decodes headers. If problem still happens,
- use cleanup_nbsp() */
-
-// $send_to = str_replace("\240",' ',$send_to);
-// $send_to_cc = str_replace("\240",' ',$send_to_cc);
-// $send_to_bcc = str_replace("\240",' ',$send_to_bcc);
-
$rfc822_header = $composeMessage->rfc822_header;
$abook = addressbook_init(false, true);