/** GET VARS */
sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
+/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
+$location = get_location();
+
/* --------------------- Specific Functions ------------------------------ */
function replyAllString($header) {
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode($draft_folder) .
+ Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) .
"&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes");
exit();
}
else {
if ($compose_new_win == '1') {
- Header("Location: compose.php?saved_draft=yes&session=$composesession");
+ Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
exit();
}
else {
- Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort".
"&startMessage=1¬e=".urlencode($draft_message));
exit();
}
} else {
sqWordWrap($line, $editor_size);
$newBody .= $line . "\n";
+
}
+
}
$body = $newBody;
- do_hook('compose_send');
+
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
}
unset($compose_messages[$session]);
if ( isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ).
+ Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ).
"&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes");
exit();
}
if ($compose_new_win == '1') {
- Header("Location: compose.php?mail_sent=yes");
+ Header("Location: $location/compose.php?mail_sent=yes");
}
else {
- Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
"&startMessage=1");
}
} else {
$use_signature, $composesession, $data_dir, $username,
$username, $key, $imapServerAddress, $imapPort, $compose_messages,
$composeMessage;
- global $languages, $squirrelmail_language;
+ global $languages, $squirrelmail_language;
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
switch ($action) {
case ('draft'):
$use_signature = FALSE;
+ $composeMessage->rfc822_header = $orig_header;
$send_to = decodeHeader($orig_header->getAddr_s('to'),false,true);
$send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true);
$send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
$subject = decodeHeader($orig_header->subject,false,true);
+// /* remember the references and in-reply-to headers in case of an reply */
+// $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
+// $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
$body_ary = explode("\n", $body);
$cnt = count($body_ary) ;
$body = '';
case ('forward'):
$send_to = '';
$subject = decodeHeader($orig_header->subject,false,true);
- if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
echo htmlspecialchars($em) . "\n";
}
}
+ echo '</option>';
for ($i = 1; $i < $idents; $i ++) {
$fn = getPref($data_dir, $username, 'full_name' . $i);
$em = getPref($data_dir, $username, 'email_address' . $i);
if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
} else {
- echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
- echo "\n\n".decodeHeader($body,false,true);
+ echo "\n\n".decodeHeader($body,false,false);
}
else {
- echo "\n\n".decodeHeader($body,false,true);
+ echo "\n\n".decodeHeader($body,false,false);
if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
}else{
- echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,true);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
}
}
else {
- echo decodeHeader($body,false,true);
+ echo decodeHeader($body,false,false);
}
echo '</textarea><br />' . "\n" .
' </td>' . "\n" .
$domain, $action, $default_move_to_sent, $move_to_sent;
global $imapServerAddress, $imapPort, $sent_folder, $key;
+ /* some browsers replace <space> 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 ??? */
+
+ $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);
}
if (!$from_mail) {
$from_mail = "$popuser@$domain";
- $full_name = '';
}
$rfc822_header->from = $rfc822_header->parseAddress($from_mail,true);
if ($full_name) {
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
+
+ /* Here you can modify the message structure just before we hand
+ it over to deliver */
+ do_hook('compose_send');
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');