X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=a76e7e65abdc9ac9ad2650bd07880fcbc8bbeba6;hb=7e2ddf11abed8b8a93bc437fde95cfeba987a091;hp=3b59fbaf0abc563f2314fceb51d48c2ab2815110;hpb=c6f28eb1fd0a7e7de3eb16ba8e786e04d75ca6d1;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index 3b59fbaf..a76e7e65 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,5 +1,4 @@
AssignDelayedErrors($delayed_errors);
- sqsession_unregister("delayed_errors");
-}
+
+// Turn on delayed error handling in case we wind up redirecting below
+$oErrorHandler->setDelayedErrors(true);
/** SESSION/POST/GET VARS */
sqgetGlobalVar('session',$session);
@@ -85,13 +78,14 @@ if ( sqgetGlobalVar('startMessage',$startMessage) ) {
/** 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';
}
@@ -305,6 +299,7 @@ if (sqsession_is_registered('session_expired_post')) {
foreach ($compo_var_list as $var) {
if ( isset($session_expired_post[$var]) && !isset($$var) ) {
$$var = $session_expired_post[$var];
+ }
}
$compose_messages = unserialize(urldecode($restoremessages));
@@ -381,7 +376,7 @@ if ($draft) {
$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
@@ -392,10 +387,10 @@ if ($draft) {
}
sqimap_logout($imap_stream);
}
- if (count($oErrorHandler->aErrors)) {
- sqsession_register($oErrorHandler->aErrors,"delayed_errors");
- }
+
+ $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");
@@ -480,7 +475,7 @@ if ($send) {
/* 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
@@ -494,10 +489,9 @@ if ($send) {
/*
* Store the error array in the session because they will be lost on a redirect
*/
- if (count($oErrorHandler->aErrors)) {
- sqsession_register($oErrorHandler->aErrors,"delayed_errors");
- }
+ $oErrorHandler->saveDelayedErrors();
session_write_close();
+
if ($compose_new_win == '1') {
if ( !isset($pageheader_sent) || !$pageheader_sent ) {
Header("Location: $location/compose.php?mail_sent=yes");
@@ -565,7 +559,7 @@ if ($send) {
}
}
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') {
@@ -687,7 +681,8 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
global $editor_size, $default_use_priority, $body, $idents,
$use_signature, $data_dir, $username,
$key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage, $body_quote;
+ $composeMessage, $body_quote, $request_mdn, $request_dr,
+ $default_use_mdn, $mdn_user_support;
global $languages, $squirrelmail_language, $default_charset;
/*
@@ -701,7 +696,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$mailprio = 3;
if ($passed_id) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress,
+ $imapConnection = sqimap_login($username, false, $imapServerAddress,
$imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
@@ -742,7 +737,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$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);
@@ -831,6 +826,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
}
}
$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;
@@ -1041,7 +1041,7 @@ function showInputForm ($session, $values=false) {
$username, $data_dir, $identity, $idents, $delete_draft,
$mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first,
$compose_messages, $composesession, $default_charset,
- $compose_onsubmit, $oTemplate;
+ $compose_onsubmit, $oTemplate, $oErrorHandler;
if (checkForJavascript()) {
$onfocus = ' onfocus="alreadyFocused=true;"';
@@ -1130,90 +1130,45 @@ function showInputForm ($session, $values=false) {
}
if ($saved_draft == 'yes') {
- echo '
'. _("Draft Saved").'
';
+ $oTemplate->assign('note', _("Draft Saved"));
+ $oTemplate->display('note.tpl');
}
if ($mail_sent == 'yes') {
- echo '
'. _("Your Message has been sent.").'
';
+ $oTemplate->assign('note', _("Your message has been sent."));
+ $oTemplate->display('note.tpl');
}
if ($compose_new_win == '1') {
- echo ''."\n" .
- ' | '.html_tag( 'td', '', 'right' ).
- '
'."\n";
- } else {
- echo '' . "\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 ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- '' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- ' '.
- addSelect('identity', $ident_list, $identity, TRUE);
-
- echo ' ' . "\n" .
- '
' . "\n";
- }
-
- echo ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
- ':' . "\n" .
- html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
- addInput('send_to', $send_to, 60, 0, $onfocus_array). '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- ':' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- ':' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) .
- addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'
' . "\n" .
- ' ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
- html_tag( 'td', '', 'right', $color[4] ) .
- ':' . "\n" .
- html_tag( 'td', '', 'left', $color[4] ) . "\n";
- echo ' '.addInput('subject', $subject, 60, 0, $onfocus_array).
- ' ' . "\n" .
- '
' . "\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();
}
- /**
- * When message is compose in new window, different colors are used.
- */
- if ($compose_new_win == '1') {
- echo ' ' . "\n" .
- ' ' . "\n" .
- ' |
' . "\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.
@@ -1358,6 +1276,12 @@ function showInputForm ($session, $values=false) {
}
do_hook('compose_bottom');
+
+ if ($compose_new_win=='1') {
+ $oTemplate->display('compose_newwin_close.tpl');
+ }
+
+ $oErrorHandler->setDelayedErrors(false);
$oTemplate->display('footer.tpl');
}
@@ -1368,38 +1292,20 @@ function showComposeButtonRow() {
$request_mdn, $request_dr,
$data_dir, $username;
- echo ' ' . "\n" .
- ' | ' . "\n" .
- ' ' . "\n";
- if ($default_use_priority) {
- if(!isset($mailprio)) {
- $mailprio = '3';
- }
- echo ' : '.
- 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') .
- '' .
- addCheckBox('request_dr', $request_dr == '1', '1') .
- '';
- }
- }
- echo ' | ' . "\n" .
- '
' . "\n" .
- ' ' . "\n" .
- ' | ' . "\n" .
- ' ' . "\n" .
- ' ' . "\n";
if ($use_javascript_addr_book) {
- echo " \n";
} else {
- echo ' ' . "\n";
}
- if ($save_as_draft) {
- echo ' \n";
- }
-
- echo ' ' . "\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 ' | ' . "\n" .
- '
' . "\n\n";
+ $oTemplate->display('compose_buttons.tpl');
}
function checkInput ($show) {
@@ -1570,11 +1479,17 @@ function deliverMessage($composeMessage, $draft=false) {
/* 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();
@@ -1608,7 +1523,7 @@ function deliverMessage($composeMessage, $draft=false) {
$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);
@@ -1642,7 +1557,7 @@ function deliverMessage($composeMessage, $draft=false) {
} 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');
@@ -1680,7 +1595,7 @@ function deliverMessage($composeMessage, $draft=false) {
} 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)) {
@@ -1747,4 +1662,4 @@ function deliverMessage($composeMessage, $draft=false) {
}
return $success;
}
-?>
+?>
\ No newline at end of file