/** 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();
}
}
$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 {
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 (!$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');