<?php
-
/**
* compose.php
*
* - Send mail
* - Save As Draft
*
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2006 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/imap_messages.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
require_once(SM_PATH . 'functions/forms.php');
require_once(SM_PATH . 'functions/identity.php');
/* --------------------- Get globals ------------------------------------- */
-/** COOKIE VARS */
-sqgetGlobalVar('key', $key, SQ_COOKIE);
/** SESSION VARS */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
-sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
+
+// Turn on delayed error handling in case we wind up redirecting below
+$oErrorHandler->setDelayedErrors(true);
/** SESSION/POST/GET VARS */
sqgetGlobalVar('session',$session);
sqgetGlobalVar('draft_id',$draft_id);
sqgetGlobalVar('ent_num',$ent_num);
sqgetGlobalVar('saved_draft',$saved_draft);
-sqgetGlobalVar('delete_draft',$delete_draft);
+
+if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
+ $delete_draft = (int)$delete_draft;
+}
+
if ( sqgetGlobalVar('startMessage',$startMessage) ) {
$startMessage = (int)$startMessage;
} else {
/** POST VARS */
-sqgetGlobalVar('sigappend', $sigappend, SQ_POST);
-sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST);
-sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST);
-sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST);
-sqgetGlobalVar('do_delete', $do_delete, SQ_POST);
-sqgetGlobalVar('delete', $delete, SQ_POST);
-sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST);
+sqgetGlobalVar('sigappend', $sigappend, SQ_POST);
+sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST);
+sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST);
+sqgetGlobalVar('addr_search_cancel', $html_addr_search_cancel, SQ_POST);
+sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST);
+sqgetGlobalVar('do_delete', $do_delete, SQ_POST);
+sqgetGlobalVar('delete', $delete, SQ_POST);
+sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST);
if ( sqgetGlobalVar('return', $temp, SQ_POST) ) {
$html_addr_search_done = 'Use Addresses';
}
if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
}
+/**
+ * Here we decode the data passed in from mailto.php.
+ */
+if ( sqgetGlobalVar('mailtodata', $mailtodata, SQ_GET) ) {
+ $trtable = array('to' => 'send_to',
+ 'cc' => 'send_to_cc',
+ 'bcc' => 'send_to_bcc',
+ 'body' => 'body',
+ 'subject' => 'subject');
+ $mtdata = unserialize($mailtodata);
+
+ foreach ($trtable as $f => $t) {
+ if ( !empty($mtdata[$f]) ) {
+ $$t = $mtdata[$f];
+ }
+ }
+ unset($mailtodata,$mtdata, $trtable);
+}
+
/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
$location = get_location();
/* Identities (fetch only once) */
$sOrig_from = decodeHeader($orig_from->getAddress(false),false,false,true);
}
-// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
-
/* First, return an empty string when no citation style selected. */
if (($reply_citation_style == '') || ($reply_citation_style == 'none')) {
return '';
$full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from);
break;
case 'quote_who':
- // FIXME: do we have to translate xml formating?
- $start = '<' . _("quote") . ' ' . _("who") . '="';
+ $start = '<quote who="';
$end = '">';
$full_reply_citation = $start . $sOrig_from . $end;
break;
sqsession_unregister('session_expired_post');
session_write_close();
} else {
- foreach ($session_expired_post as $postvar => $val) {
- if (isset($val)) {
- $$postvar = $val;
- } else {
- $$postvar = '';
+ // these are the vars that we can set from the expired composed session
+ $compo_var_list = array ( 'send_to', 'send_to_cc','body','startMessage',
+ 'passed_body','use_signature','signature','attachments','subject','newmail',
+ 'send_to_bcc', 'passed_id', 'mailbox', 'from_htmladdr_search', 'identity',
+ 'draft_id', 'delete_draft', 'mailprio', 'edit_as_new', 'compose_messsages',
+ 'composesession', 'request_mdn', 'request_dr');
+
+ foreach ($compo_var_list as $var) {
+ if ( isset($session_expired_post[$var]) && !isset($$var) ) {
+ $$var = $session_expired_post[$var];
}
}
+
$compose_messages = unserialize(urldecode($restoremessages));
sqsession_register($compose_messages,'compose_messages');
sqsession_register($composesession,'composesession');
if (!isset($composesession)) {
$composesession = 0;
sqsession_register(0,'composesession');
+} else {
+ $composesession = (int)$composesession;
}
if (!isset($session) || (isset($newmessage) && $newmessage)) {
}
if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) {
- /* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */
$composeMessage = new Message();
$rfc822_header = new Rfc822Header();
$composeMessage->rfc822_header = $rfc822_header;
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false);
sqimap_mailbox_select($imap_stream, $draft_folder);
// force bypass_trash=true because message should be saved when deliverMessage() returns true.
// in current implementation of sqimap_msgs_list_flag() single message id can
}
sqimap_logout($imap_stream);
}
+
+ $oErrorHandler->saveDelayedErrors();
session_write_close();
+
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
} else {
- echo ' <br><br><
center><a href="' . $location
+ echo ' <br><br><
div style="text-align: center;"><a href="' . $location
. '/compose.php?saved_sent=yes&session=' . $composesession . '">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
} else {
Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
"&startMessage=1¬e=".urlencode($draft_message));
} else {
- echo ' <br><br><
center><a href="' . $location
+ echo ' <br><br><
div style="text-align: center;"><a href="' . $location
. '/right_main.php?mailbox=' . urlencode($draft_folder)
. '&startMessage=1&note=' . urlencode($draft_message) .'">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
}
if (checkInput(false) && !isset($AttachFailure)) {
if ($mailbox == "All Folders") {
/* We entered compose via the search results page */
- $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+ $mailbox = 'INBOX'; /* Send 'em to INBOX, that's safe enough */
}
$urlMailbox = urlencode (trim($mailbox));
if (! isset($passed_id)) {
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
- do_hook('compose_send_after', $Result, $composeMessage);
+
+ // 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));
if (! $Result) {
showInputForm($session);
exit();
}
unset($compose_messages[$session]);
-
+
/* if it is resumed draft, delete draft message */
if ( isset($delete_draft)) {
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false);
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false);
sqimap_mailbox_select($imap_stream, $draft_folder);
// bypass_trash=true because message should be saved when deliverMessage() returns true.
// in current implementation of sqimap_msgs_list_flag() single message id can
}
sqimap_logout($imap_stream);
}
+ /*
+ * Store the error array in the session because they will be lost on a redirect
+ */
+ $oErrorHandler->saveDelayedErrors();
session_write_close();
+
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/compose.php?mail_sent=yes");
} else {
- echo ' <br><br><
center><a href="' . $location
+ echo ' <br><br><
div style="text-align: center;"><a href="' . $location
. '/compose.php?mail_sent=yes">'
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
} else {
Header("Location: $location/right_main.php?mailbox=$urlMailbox".
"&startMessage=$startMessage&mail_sent=yes");
} else {
- echo ' <br><br><
center><a href="' . $location
+ echo ' <br><br><
div style="text-align: center;"><a href="' . $location
. "/right_main.php?mailbox=$urlMailbox"
. "&startMessage=$startMessage&mail_sent=yes\">"
- . _("Return") . '</a></center>';
+ . _("Return") . '</a></div>';
}
exit();
}
}
}
showInputForm($session);
-} elseif (isset($html_addr_search)) {
+} elseif (isset($html_addr_search) && !isset($html_addr_search_cancel)) {
if (isset($_FILES['attachfile']) &&
$_FILES['attachfile']['tmp_name'] &&
$_FILES['attachfile']['tmp_name'] != 'none') {
if(saveAttachedFiles($session)) {
- plain_error_message(_("Could not move/copy file. File not attached"), $color);
+ plain_error_message(_("Could not move/copy file. File not attached"));
}
}
/*
*/
include_once('./addrbook_search_html.php');
} elseif (isset($attach)) {
- if (saveAttachedFiles($session)) {
- plain_error_message(_("Could not move/copy file. File not attached"), $color);
- }
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
displayPageHeader($color, $mailbox);
}
+ if (saveAttachedFiles($session)) {
+ plain_error_message(_("Could not move/copy file. File not attached"));
+ }
showInputForm($session);
}
elseif (isset($sigappend)) {
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
global $editor_size, $default_use_priority, $body, $idents,
$use_signature, $data_dir, $username,
- $username, $key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage, $body_quote;
+ $key, $imapServerAddress, $imapPort, $compose_messages,
+ $composeMessage, $body_quote, $request_mdn, $request_dr,
+ $default_use_mdn, $mdn_user_support;
global $languages, $squirrelmail_language, $default_charset;
/*
$mailprio = 3;
if ($passed_id) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapConnection = sqimap_login($username, false, $imapServerAddress,
$imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
$type1 = $msg->type1;
$unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent);
$body_part_entity = $message->getEntity($ent);
- $bodypart = decodeBody($unencoded_bodypart,
+ $bodypart = decodeBody($unencoded_bodypart,
$body_part_entity->header->encoding);
if ($type1 == 'html') {
$bodypart = str_replace("\n", ' ', $bodypart);
}
}
$subject = decodeHeader($orig_header->subject,false,false,true);
+
+ // Remember the receipt settings
+ $request_mdn = $mdn_user_support && !empty($orig_header->dnt) ? '1' : '0';
+ $request_dr = $mdn_user_support && !empty($orig_header->drnt) ? '1' : '0';
+
/* 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;
$from_htmladdr_search, $location_of_buttons, $attachment_dir,
$username, $data_dir, $identity, $idents, $delete_draft,
$mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
- $username, $compose_messages, $composesession, $default_charset,
- $compose_onsubmit;
+ $compose_messages, $composesession, $default_charset,
+ $compose_onsubmit, $oTemplate, $oErrorHandler;
if (checkForJavascript()) {
$onfocus = ' onfocus="alreadyFocused=true;"';
}
if ($use_javascript_addr_book) {
- echo "\n". '<script language="JavaScript">'."\n<!--\n" .
+ echo "\n". '<script type="text/javascript">'."\n<!--\n" .
'function open_abook() { ' . "\n" .
' var nwin = window.open("addrbook_popup.php","abookpopup",' .
'"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
'enctype="multipart/form-data"';
$compose_onsubmit = array();
- do_hook('compose_form');
+ global $null;
+ do_hook('compose_form', $null);
// Plugins that use compose_form hook can add an array entry
// to the globally scoped $compose_onsubmit; we add them up
- // here and format the form tag's full onsubmit handler.
- // Each plugin should use "return false" if they need to
+ // here and format the form tag's full onsubmit handler.
+ // Each plugin should use "return false" if they need to
// stop form submission but otherwise should NOT use "return
// true" to give other plugins the chance to do what they need
// to do; SquirrelMail itself will add the final "return true".
// need to quote accordingly.
if (checkForJavascript()) {
$onsubmit_text = ' onsubmit="';
- if (empty($compose_onsubmit))
+ if (empty($compose_onsubmit))
$compose_onsubmit = array();
- else if (!is_array($compose_onsubmit))
+ else if (!is_array($compose_onsubmit))
$compose_onsubmit = array($compose_onsubmit);
foreach ($compose_onsubmit as $text) {
$text = trim($text);
- if (substr($text, -1) != ';' && substr($text, -1) != '}')
+ if (substr($text, -1) != ';' && substr($text, -1) != '}')
$text .= '; ';
$onsubmit_text .= $text;
}
echo $onsubmit_text . ' return true;"';
}
-
+
echo ">\n";
}
if ($saved_draft == 'yes') {
- echo '<br /><center><b>'. _("Draft Saved").'</center></b>';
+ $oTemplate->assign('note', _("Draft Saved"));
+ $oTemplate->display('note.tpl');
}
if ($mail_sent == 'yes') {
- echo '<br /><center><b>'. _("Your Message has been sent.").'</center></b>';
+ $oTemplate->assign('note', _("Your message has been sent."));
+ $oTemplate->display('note.tpl');
}
if ($compose_new_win == '1') {
- echo '<table align="center" bgcolor="'.$color[0].'" width="100%" border="0">'."\n" .
- ' <tr><td></td>'.html_tag( 'td', '', 'right' ).
- '<input type="button" name="Close" onclick="return self.close()" value="'.
- _("Close").'" /></td></tr>'."\n";
- } else {
- echo '<table align="center" cellspacing="0" border="0">' . "\n";
+ $oTemplate->display('compose_newwin_close.tpl');
}
+
if ($location_of_buttons == 'top') {
showComposeButtonRow();
}
- /* display select list for identities */
+ $identities = array();
if (count($idents) > 1) {
- $ident_list = array();
+ reset($idents);
foreach($idents as $id => $data) {
- $ident_list[$id] =
- $data['full_name'].' <'.$data['email_address'].'>';
+ $identities[$id] = $data['full_name'].' <'.$data['email_address'].'>';
}
- echo ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- _("From:") . '</td>' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- ' '.
- addSelect('identity', $ident_list, $identity, TRUE);
-
- echo ' </td>' . "\n" .
- ' </tr>' . "\n";
- }
-
- echo ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- _("To") . ':</td>' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- addInput('send_to', $send_to, 60, 0, $onfocus_array). '<br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n" .
- ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- _("Cc") . ':</td>' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '<br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n" .
- ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- _("Bcc") . ':</td>' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'<br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n" .
- ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- _("Subject") . ':</td>' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) . "\n";
- echo ' '.addInput('subject', $subject, 60, 0, $onfocus_array).
- ' </td>' . "\n" .
- ' </tr>' . "\n\n";
+ }
+
+ $oTemplate->assign('identities', $identities);
+ $oTemplate->assign('identity_def', $identity);
+ $oTemplate->assign('input_onfocus', 'onfocus="'.join(' ', $onfocus_array).'"');
+
+ $oTemplate->assign('to', htmlspecialchars($send_to));
+ $oTemplate->assign('cc', htmlspecialchars($send_to_cc));
+ $oTemplate->assign('bcc', htmlspecialchars($send_to_bcc));
+ $oTemplate->assign('subject', htmlspecialchars($subject));
+
+ $oTemplate->display('compose_header.tpl');
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
- /* why this distinction? */
- if ($compose_new_win == '1') {
- echo ' <tr>' . "\n" .
- ' <td bgcolor="' . $color[0] . '" colspan="2" align="center">' . "\n" .
- ' <textarea name="body" id="body" rows="' . (int)$editor_height .
- '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
- }
- else {
- echo ' <tr>' . "\n" .
- ' <td bgcolor="' . $color[4] . '" colspan="2">' . "\n" .
- ' <textarea name="body" id="body" rows="' . (int)$editor_height .
- '" cols="' . (int)$editor_size . '" wrap="virtual"' . $onfocus . '>';
- }
-
+ $body_str = '';
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
$signature = $idents[$identity]['signature'];
* issues too.
*/
if ($default_charset == 'iso-2022-jp') {
- echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
+ $body_str = "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
} else {
- echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
+ $body_str = "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
- echo "\n\n".htmlspecialchars(decodeHeader($body,false,false));
- }
- else {
- echo "\n\n".htmlspecialchars(decodeHeader($body,false,false));
+ $body_str .= "\n\n".htmlspecialchars(decodeHeader($body,false,false));
+ } else {
+ $body_str = "\n\n".htmlspecialchars(decodeHeader($body,false,false));
// FIXME: test is specific to ja_JP translation implementation. See above comments.
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,false);
+ $body_str .= "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
+ } else {
+ $body_str .= "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
}
} else {
- echo htmlspecialchars(decodeHeader($body,false,false));
+ $body_str = htmlspecialchars(decodeHeader($body,false,false));
}
- echo '</textarea><br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n";
-
+ $oTemplate->assign('editor_width', (int)$editor_size);
+ $oTemplate->assign('editor_height', (int)$editor_height);
+ $oTemplate->assign('input_onfocus', 'onfocus="'.join(' ', $onfocus_array).'"');
+ $oTemplate->assign('body', $body_str);
+ $oTemplate->assign('show_bottom_send', $location_of_buttons!='bottom');
+
+ $oTemplate->display ('compose_body.tpl');
+
if ($location_of_buttons == 'bottom') {
showComposeButtonRow();
- } else {
- echo ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" .
- ' ' . addSubmit(_("Send"), 'send').
- ' <br /><br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n";
}
/* This code is for attachments */
}
}
- if(count($sizes) > 0) {
- $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')';
- echo addHidden('MAX_FILE_SIZE', min( $sizes ));
- } else {
- $maxsize = '';
- }
- echo ' <tr>' . "\n" .
- ' <td colspan="2">' . "\n" .
- ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.
- ' border="0" bgcolor="'.$color[9].'">' . "\n" .
- ' <tr>' . "\n" .
- ' <td>' . "\n" .
- ' <table width="100%" cellpadding="3" cellspacing="0" align="center"'.
- ' border="0">' . "\n" .
- ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', '', 'valign="middle"' ) .
- _("Attach:") . '</td>' . "\n" .
- html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
- ' <input name="attachfile" size="48" type="file" />' . "\n" .
- ' <input type="submit" name="attach"' .
- ' value="' . _("Add") .'" />' . "\n" .
- $maxsize .
- ' </td>' . "\n" .
- ' </tr>' . "\n";
-
- $s_a = array();
+ $attach = array();
if ($composeMessage->entities) {
foreach ($composeMessage->entities as $key => $attachment) {
$attached_file = $attachment->att_local_name;
$attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
$type = $attachment->mime_header->type0.'/'.
$attachment->mime_header->type1;
-
- $s_a[] = '<table bgcolor="'.$color[0].
- '" border="0"><tr><td>'.
- addCheckBox('delete[]', FALSE, $key).
- "</td><td>\n" . $attached_filename .
- '</td><td>-</td><td> ' . $type . '</td><td>('.
- show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
+
+ $a = array();
+ $a['Key'] = $key;
+ $a['FileName'] = $attached_filename;
+ $a['ContentType'] = $type;
+ $a['Size'] = filesize($attached_file);
+ $attach[$key] = $a;
}
}
}
- if (count($s_a)) {
- foreach ($s_a as $s) {
- echo '<tr>' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .'</td></tr>';
- }
- echo '<tr><td colspan="2"><input type="submit" name="do_delete" value="' .
- _("Delete selected attachments") . "\" />\n" .
- '</td></tr>';
- }
- echo ' </table>' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n" .
- ' </table>' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n";
+
+ $max = min($sizes);
+ $oTemplate->assign('max_file_size', empty($max) ? -1 : $max);
+ $oTemplate->assign('attachments', $attach);
+
+ $oTemplate->display('compose_attachments.tpl');
} // End of file_uploads if-block
/* End of attachment code */
- echo '</table>' . "\n" .
- addHidden('username', $username).
- addHidden('smaction', $action).
- addHidden('mailbox', $mailbox);
+
+ echo 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.
. "</p>\r\n";
}
- do_hook('compose_bottom');
- echo '</body></html>' . "\n";
+ do_hook('compose_bottom', $null);
+
+ if ($compose_new_win=='1') {
+ $oTemplate->display('compose_newwin_close.tpl');
+ }
+
+ $oErrorHandler->setDelayedErrors(false);
+ $oTemplate->display('footer.tpl');
}
$request_mdn, $request_dr,
$data_dir, $username;
- echo ' <tr>' . "\n" .
- ' <td></td>' . "\n" .
- ' <td>' . "\n";
- if ($default_use_priority) {
- if(!isset($mailprio)) {
- $mailprio = '3';
- }
- echo ' ' . _("Priority") .
- addSelect('mailprio', array(
- '1' => _("High"),
- '3' => _("Normal"),
- '5' => _("Low") ), $mailprio, TRUE);
+ global $oTemplate, $buffer_hook;
+
+ if ($default_use_priority) {
+ $priorities = array('1'=>_("High"), '3'=>_("Normal"), '5'=>_("Low"));
+ $priority = isset($mailprio) ? $mailprio : 3;
+ } else {
+ $priorities = array();
+ $priority = NULL;
}
+
$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");
- }
- }
- echo ' </td>' . "\n" .
- ' </tr>' . "\n" .
- ' <tr>' . "\n" .
- ' <td></td>' . "\n" .
- ' <td>' . "\n" .
- ' <input type="submit" name="sigappend" value="' . _("Signature") . '" />' . "\n";
if ($use_javascript_addr_book) {
- echo " <script language=\"JavaScript\"><!--\n document.write(\"".
+ $addr_book = " <script type=\"text/javascript\"><!--\n document.write(\"".
" <input type=button value=\\\""._("Addresses").
"\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
" // --></script><noscript>\n".
_("Addresses").'" />'.
" </noscript>\n";
} else {
- echo ' <input type="submit" name="html_addr_search" value="'.
+ $addr_book = ' <input type="submit" name="html_addr_search" value="'.
_("Addresses").'" />' . "\n";
}
- if ($save_as_draft) {
- echo ' <input type="submit" name ="draft" value="' . _("Save Draft") . "\" />\n";
- }
-
- echo ' <input type="submit" name="send" value="'. _("Send") . '" />' . "\n";
- do_hook('compose_button_row');
+ $oTemplate->assign('allow_priority', $default_use_priority==1);
+ $oTemplate->assign('priority_list', $priorities);
+ $oTemplate->assign('current_priority', $priority);
+
+ $oTemplate->assign('notifications_enabled', $mdn_user_support==1);
+ $oTemplate->assign('read_receipt', $request_mdn=='1');
+ $oTemplate->assign('delivery_receipt', $request_dr=='1');
+
+ $oTemplate->assign('drafts_enabled', $save_as_draft);
+ $oTemplate->assign('address_book_button', $addr_book);
- echo ' </td>' . "\n" .
- ' </tr>' . "\n\n";
+ $oTemplate->display('compose_buttons.tpl');
}
function checkInput ($show) {
* using $show=false, and then when i'm ready to display the error
* message, show=true
*/
- global $body, $send_to, $send_to_bcc, $subject, $color;
+ global $send_to, $send_to_bcc;
if ($send_to == '' && $send_to_bcc == '') {
if ($show) {
- plain_error_message(_("You have not filled in the \"To:\" field."), $color);
+ plain_error_message(_("You have not filled in the \"To:\" field."));
}
return false;
}
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
- // FIXME: we SHOULD prefer move_uploaded_file over rename because
- // m_u_f works better with restricted PHP installs (safe_mode, open_basedir)
- if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
+ // m_u_f works better with restricted PHP installs (safe_mode, open_basedir),
+ // if that doesn't work, try a simple rename.
+ if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
+ if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
return true;
}
}
/**
* temporary function to make use of the deliver class.
- * In the future the responsable backend should be automaticly loaded
+ * In the future the responsible backend should be automaticly loaded
* and conf.pl should show a list of available backends.
* The message also should be constructed by the message class.
*/
/* Receipt: On Read */
if (isset($request_mdn) && $request_mdn) {
$rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true);
+ } elseif (isset($rfc822_header->dnt)) {
+ unset($rfc822_header->dnt);
}
+
/* Receipt: On Delivery */
if (isset($request_dr) && $request_dr) {
$rfc822_header->more_headers['Return-Receipt-To'] = $from_mail;
+ } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) {
+ unset($rfc822_header->more_headers['Return-Receipt-To']);
}
+
/* multipart messages */
if (count($composeMessage->entities)) {
$message_body = new Message();
$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 */
- $hookReturn = do_hook('compose_send', $composeMessage);
- /* Get any changes made by plugins to $composeMessage. */
- if ( is_object($hookReturn[1]) ) {
- $composeMessage = $hookReturn[1];
- }
+ it over to deliver; plugin authors note that $composeMessage
+ is sent and modified by reference since 1.5.2 */
+ do_hook('compose_send', $composeMessage);
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$smtpServerAddress, $smtpPort, $user, $pass, $authPop);
} elseif (!$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
- global $sendmail_path;
- $deliver = new Deliver_SendMail();
+ global $sendmail_path, $sendmail_args;
+ // Check for outdated configuration
+ if (!isset($sendmail_args)) {
+ if ($sendmail_path=='/var/qmail/bin/qmail-inject') {
+ $sendmail_args = '';
+ } else {
+ $sendmail_args = '-i -t';
+ }
+ }
+ $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args));
$stream = $deliver->initStream($composeMessage,$sendmail_path);
} elseif ($draft) {
global $draft_folder;
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
- $imap_stream = sqimap_login($username, $key, $imapServerAddress,
+ $imap_stream = sqimap_login($username, false, $imapServerAddress,
$imapPort, 0);
if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$composeMessage->purgeAttachments();
return $length;
} else {
- $msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder);
- plain_error_message($msg, $color);
+ $msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), htmlspecialchars($draft_folder));
+ plain_error_message($msg);
return false;
}
}
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br />' .
- _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
- $deliver->dlv_server_msg;
- plain_error_message($msg, $color);
+ // $deliver->dlv_server_msg is not always server's reply
+ $msg = _("Message not sent.") . "<br />\n" .
+ $deliver->dlv_msg;
+ if (!empty($deliver->dlv_server_msg)) {
+ // add 'server replied' part only when it is not empty.
+ // Delivery error can be generated by delivery class itself
+ $msg.='<br />' .
+ _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+ nl2br(htmlspecialchars($deliver->dlv_server_msg));
+ }
+ plain_error_message($msg);
} else {
unset ($deliver);
$move_to_sent = getPref($data_dir,$username,'move_to_sent');
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
/* Move to sent code */
if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {
global $passed_id, $mailbox, $action, $what, $iAccount,$startMessage;
$composeMessage->purgeAttachments();
- if ($action == 'reply' || $action == 'reply_all') {
+ if ($action=='reply' || $action=='reply_all' || $action=='forward' || $action=='forward_as_attachment') {
+ require(SM_PATH . 'functions/mailbox_display.php');
$aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array());
- //sqimap_mailbox_select ($imap_stream, $mailbox);
- $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false);
- if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) {
- /**
- * Only update the cached headers if the header is
- * cached.
- */
- if (isset($aMailbox['MSG_HEADERS'][$passed_id])) {
- $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS'];
+ switch($action) {
+ case 'reply':
+ case 'reply_all':
+ // check if we are allowed to set the \\Answered flag
+ if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) {
+ $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false);
+ if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) {
+ /**
+ * Only update the cached headers if the header is
+ * cached.
+ */
+ if (isset($aMailbox['MSG_HEADERS'][$passed_id])) {
+ $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS'];
+ }
+ }
+ }
+ break;
+ case 'forward':
+ case 'forward_as_attachment':
+ // check if we are allowed to set the $Forwarded flag (RFC 4550 paragraph 2.8)
+ if (in_array('$forwarded',$aMailbox['PERMANENTFLAGS'], true) ||
+ in_array('\\*',$aMailbox['PERMANENTFLAGS'])) {
+
+ $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '$Forwarded', true, false);
+ if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) {
+ if (isset($aMailbox['MSG_HEADERS'][$passed_id])) {
+ $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS'];
+ }
+ }
}
+ break;
}
+
/**
* Write mailbox with updated seen flag information back to cache.
*/
- $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
- sqsession_register($mailbox_cache,'mailbox_cache');
+ if(isset($aUpdatedMsgs[$passed_id])) {
+ $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+ sqsession_register($mailbox_cache,'mailbox_cache');
+ }
+
+ sqimap_logout($imap_stream);
}
- sqimap_logout($imap_stream);
}
return $success;
}
-
?>
projects / squirrelmail.git / blobdiff