$Result = deliverMessage($composeMessage);
+ if ($Result)
+ $mail_sent = 'yes';
+ else
+ $mail_sent = 'no';
+
// NOTE: this hook changed in 1.5.2 from sending $Result and
// $composeMessage as args #2 and #3 to being in an array
// under arg #2
- do_hook('compose_send_after', $temp=array(&$Result, &$composeMessage));
+ do_hook('compose_send_after', $temp=array(&$Result, &$composeMessage, &$mail_sent));
if (! $Result) {
showInputForm($session);
exit();
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
- Header("Location: $location/compose.php?mail_sent=yes");
+ Header("Location: $location/compose.php?mail_sent=$mail_sent");
} else {
echo ' <br><br><div style="text-align: center;"><a href="' . $location
- . '/compose.php?mail_sent=yes">'
+ . '/compose.php?mail_sent=$mail_sent">'
. _("Return") . '</a></div>';
}
exit();
} else {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/right_main.php?mailbox=$urlMailbox".
- "&startMessage=$startMessage&mail_sent=yes");
+ "&startMessage=$startMessage&mail_sent=$mail_sent");
} else {
echo ' <br><br><div style="text-align: center;"><a href="' . $location
. "/right_main.php?mailbox=$urlMailbox"
- . "&startMessage=$startMessage&mail_sent=yes\">"
+ . "&startMessage=$startMessage&mail_sent=$mail_sent\">"
. _("Return") . '</a></div>';
}
exit();
} // End of file_uploads if-block
/* End of attachment code */
+//FIXME: no direct echoing to browser, no HTML output in core!
echo addHidden('username', $username).
addHidden('smaction', $action).
addHidden('mailbox', $mailbox);
so we can restore them in case of a session timeout.
*/
sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER);
+//FIXME: no direct echoing to browser, no HTML output in core!
echo addHidden('restoremessages', urlencode(serialize($compose_messages))).
addHidden('composesession', $composesession).
addHidden('querystring', $queryString).
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. */
+//FIXME: no direct echoing to browser, no HTML output in core!
echo '<p style="text-align:center">'
. _("Because PHP file uploads are turned off, you can not attach files to this message. Please see your system administrator for details.")
. "</p>\r\n";
$mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
- if ($use_javascript_addr_book) {
- $addr_book = " <script type=\"text/javascript\"><!--\n document.write(\"".
- " <input type=button value=\\\""._("Addresses").
- "\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
- " // --></script><noscript>\n".
- ' <input type="submit" name="html_addr_search" value="'.
- _("Addresses").'" />'.
- " </noscript>\n";
+ if ($use_javascript_addr_book && checkForJavascript()) {
+ $addr_book = addButton(_("Addresses"), null, array('onclick' => 'javascript:open_abook();'));
} else {
- $addr_book = ' <input type="submit" name="html_addr_search" value="'.
- _("Addresses").'" />' . "\n";
+ $addr_book = addSubmit(_("Addresses"), 'html_addr_search');
}
$oTemplate->assign('allow_priority', $default_use_priority==1);