<?php
-
/**
* compose.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This code sends a mail.
*
* There are 4 modes of operation:
* - Send mail
* - Save As Draft
*
- * $Id$
+ * @copyright 1999-2017 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
-define('SM_PATH','../');
+/** This is the compose page */
+define('PAGE_NAME', 'compose');
+
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
+
+/* If email_address not set and admin wants us to ask user for it,
+ * redirect to options page. */
+if ( $ask_user_info && getPref($data_dir, $username,'email_address') == "" ) {
+ header("Location: " . get_location() . "/options.php?optpage=personal");
+ exit;
+}
/* 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 . 'functions/compose.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
-require_once(SM_PATH . 'functions/identity.php');
require_once(SM_PATH . 'functions/forms.php');
+require_once(SM_PATH . 'functions/identity.php');
+global $imap_stream_options; // in case not defined in config
/* --------------------- 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('delayed_errors', $delayed_errors, SQ_SESSION);
sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+// compose_messages only useful in SESSION when a forward-as-attachment
+// has been preconstructed for us and passed in via that mechanism; once
+// we have it, we can clear it from the SESSION
+sqsession_unregister('compose_messages');
+
+// Turn on delayed error handling in case we wind up redirecting below
+$oErrorHandler->setDelayedErrors(true);
+
/** SESSION/POST/GET VARS */
-sqgetGlobalVar('session',$session);
-sqgetGlobalVar('mailbox',$mailbox);
-if(!sqgetGlobalVar('identity',$identity)) {
+sqgetGlobalVar('send_button_count', $send_button_count, SQ_POST, 1, SQ_TYPE_INT);
+for ($i = 1; $i <= $send_button_count; $i++)
+ if (sqgetGlobalVar('send' . $i, $send, SQ_POST)) break;
+// Send can only be achieved by setting $_POST var. If Send = true then
+// retrieve other form fields from $_POST
+if (isset($send) && $send) {
+ $SQ_GLOBAL = SQ_POST;
+} else {
+ $SQ_GLOBAL = SQ_FORM;
+}
+sqgetGlobalVar('session',$session, $SQ_GLOBAL);
+sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL);
+sqgetGlobalVar('identity',$orig_identity, $SQ_GLOBAL);
+if(!sqgetGlobalVar('identity',$identity, $SQ_GLOBAL)) {
$identity=0;
}
-sqgetGlobalVar('send_to',$send_to);
-sqgetGlobalVar('send_to_cc',$send_to_cc);
-sqgetGlobalVar('send_to_bcc',$send_to_bcc);
-sqgetGlobalVar('subject',$subject);
-sqgetGlobalVar('body',$body);
-sqgetGlobalVar('mailprio',$mailprio);
-sqgetGlobalVar('request_mdn',$request_mdn);
-sqgetGlobalVar('request_dr',$request_dr);
-sqgetGlobalVar('html_addr_search',$html_addr_search);
-sqgetGlobalVar('mail_sent',$mail_sent);
-sqgetGlobalVar('passed_id',$passed_id);
-sqgetGlobalVar('passed_ent_id',$passed_ent_id);
-sqgetGlobalVar('send',$send);
-
-sqgetGlobalVar('attach',$attach);
-
-sqgetGlobalVar('draft',$draft);
-sqgetGlobalVar('draft_id',$draft_id);
-sqgetGlobalVar('ent_num',$ent_num);
-sqgetGlobalVar('saved_draft',$saved_draft);
-sqgetGlobalVar('delete_draft',$delete_draft);
-sqgetGlobalVar('startMessage',$startMessage);
+sqgetGlobalVar('send_to',$send_to, $SQ_GLOBAL);
+sqgetGlobalVar('send_to_cc',$send_to_cc, $SQ_GLOBAL);
+sqgetGlobalVar('send_to_bcc',$send_to_bcc, $SQ_GLOBAL);
+sqgetGlobalVar('subject',$subject, $SQ_GLOBAL);
+sqgetGlobalVar('body',$body, $SQ_GLOBAL);
+sqgetGlobalVar('mailprio',$mailprio, $SQ_GLOBAL);
+sqgetGlobalVar('request_mdn',$request_mdn, $SQ_GLOBAL);
+sqgetGlobalVar('request_dr',$request_dr, $SQ_GLOBAL);
+sqgetGlobalVar('html_addr_search',$html_addr_search, $SQ_GLOBAL);
+sqgetGlobalVar('mail_sent',$mail_sent, $SQ_GLOBAL);
+sqgetGlobalVar('passed_id',$passed_id, $SQ_GLOBAL, NULL, SQ_TYPE_BIGINT);
+sqgetGlobalVar('passed_ent_id',$passed_ent_id, $SQ_GLOBAL);
+sqgetGlobalVar('fwduid',$fwduid, $SQ_GLOBAL, '');
+
+sqgetGlobalVar('attach',$attach, SQ_POST);
+sqgetGlobalVar('draft',$draft, SQ_POST);
+sqgetGlobalVar('draft_id',$draft_id, $SQ_GLOBAL);
+sqgetGlobalVar('ent_num',$ent_num, $SQ_GLOBAL);
+sqgetGlobalVar('saved_draft',$saved_draft, SQ_FORM);
+
+if ( sqgetGlobalVar('delete_draft',$delete_draft) ) {
+ $delete_draft = (int)$delete_draft;
+}
+
+if ( sqgetGlobalVar('startMessage',$startMessage) ) {
+ $startMessage = (int)$startMessage;
+} else {
+ $startMessage = 1;
+}
+
/** 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('attachments', $attachments, SQ_POST);
if ( sqgetGlobalVar('return', $temp, SQ_POST) ) {
- $html_addr_search_done = 'Use Addresses';
+ $html_addr_search_done = 'Use Addresses';
}
/** GET VARS */
-sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
+if ( sqgetGlobalVar('account', $temp, SQ_GET) ) {
+ $iAccount = (int) $temp;
+} else {
+ $iAccount = 0;
+}
+
/** get smaction */
if ( !sqgetGlobalVar('smaction',$action) )
{
- if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply';
- if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all';
- if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward';
- if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment';
- if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft';
- if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
+ if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply';
+ if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all';
+ if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward';
+ if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment';
+ if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft';
+ if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new';
}
-sm_print_r($_POST);
-die();
-/* Location (For HTTP 1.1 Header("Location: ...") redirects) */
+sqgetGlobalVar('smtoken', $submitted_token, $SQ_GLOBAL, '');
+
+/**
+ * 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) */
$idents = get_identities();
/* --------------------- Specific Functions ------------------------------ */
function replyAllString($header) {
- global $include_self_reply_all, $idents;
- $excl_ar = array();
- /**
- * 1) Remove the addresses we'll be sending the message 'to'
- */
- $url_replytoall_avoid_addrs = '';
- if (isset($header->replyto)) {
- $excl_ar = $header->getAddr_a('replyto');
- }
- /**
- * 2) Remove our identities from the CC list (they still can be in the
- * TO list) only if $include_self_reply_all is turned off
- */
- if (!$include_self_reply_all) {
- foreach($idents as $id) {
- $excl_ar[strtolower(trim($id['email_address']))] = '';
+ global $include_self_reply_all, $idents;
+ $excl_ar = array();
+ /**
+ * 1) Remove the addresses we'll be sending the message 'to'
+ */
+ if (isset($header->reply_to)) {
+ $excl_ar = $header->getAddr_a('reply_to');
+ }
+ /**
+ * 2) Remove our identities from the CC list (they still can be in the
+ * TO list) only if $include_self_reply_all is turned off
+ */
+ if (!$include_self_reply_all) {
+ foreach($idents as $id) {
+ $excl_ar[strtolower(trim($id['email_address']))] = '';
}
- }
-
- /**
- * 3) get the addresses.
- */
- $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar);
-
- /**
- * 4) generate the string.
- */
- $url_replytoallcc = '';
- foreach( $url_replytoall_ar as $email => $personal) {
- if ($personal) {
- // if personal name contains address separator then surround
- // the personal name with double quotes.
- if (strpos($personal,',') !== false) {
- $personal = '"'.$personal.'"';
- }
- $url_replytoallcc .= ", $personal <$email>";
- } else {
- $url_replytoallcc .= ', '. $email;
- }
- }
- $url_replytoallcc = substr($url_replytoallcc,2);
-
- return $url_replytoallcc;
+ }
+
+ /**
+ * 3) get the addresses.
+ */
+ $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar);
+
+ /**
+ * 4) generate the string.
+ */
+ $url_replytoallcc = '';
+ foreach( $url_replytoall_ar as $email => $personal) {
+ if ($personal) {
+ // always quote personal name (can't just quote it if
+ // it contains a comma separator, since it might still
+ // be encoded)
+ $url_replytoallcc .= ", \"$personal\" <$email>";
+ } else {
+ $url_replytoallcc .= ', '. $email;
+ }
+ }
+ $url_replytoallcc = substr($url_replytoallcc,2);
+
+ return $url_replytoallcc;
}
+/**
+ * creates top line in reply citations
+ *
+ * Line style depends on user preferences.
+ * $orig_date argument is available only from 1.4.3 and 1.5.1 version.
+ * @param object $orig_from From: header object.
+ * @param integer $orig_date email's timestamp
+ * @return string reply citation
+ */
function getReplyCitation($orig_from, $orig_date) {
global $reply_citation_style, $reply_citation_start, $reply_citation_end;
- $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true);
-// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
+
+ if (!is_object($orig_from)) {
+ $sOrig_from = '';
+ } else {
+ $sOrig_from = decodeHeader($orig_from->getAddress(false),false,false,true);
+ }
+
/* First, return an empty string when no citation style selected. */
if (($reply_citation_style == '') || ($reply_citation_style == 'none')) {
return '';
}
/* Make sure our final value isn't an empty string. */
- if ($orig_from == '') {
+ if ($sOrig_from == '') {
return '';
}
/* Otherwise, try to select the desired citation style. */
switch ($reply_citation_style) {
case 'author_said':
- $start = '';
- $end = ' ' . _("said") . ':';
+ // i18n: %s is for author's name
+ $full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from);
break;
case 'quote_who':
- $start = '<' . _("quote") . ' ' . _("who") . '="';
+ $start = '<quote who="';
$end = '">';
+ $full_reply_citation = $start . $sOrig_from . $end;
break;
case 'date_time_author':
- $start = 'On ' . getLongDateString($orig_date) . ', ';
- $end = ' ' . _("said") . ':';
+ // i18n:
+ // The first %s is for date string, the second %s is for author's name.
+ // The date uses formating from "D, F j, Y g:i a" and "D, F j, Y H:i"
+ // translations.
+ // Example string:
+ // "On Sat, December 24, 2004 23:59, Santa wrote:"
+ // If you have to put author's name in front of date string, check comments about
+ // argument swapping at http://php.net/sprintf
+ $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $sOrig_from);
break;
case 'user-defined':
$start = $reply_citation_start .
- ($reply_citation_start == '' ? '' : ' ');
+ ($reply_citation_start == '' ? '' : ' ');
$end = $reply_citation_end;
+ $full_reply_citation = $start . $sOrig_from . $end;
break;
default:
return '';
}
- /* Build and return the citation string. */
- return ($start . $orig_from . $end . "\n");
+ /* Add line feed and return the citation string. */
+ return ($full_reply_citation . "\n");
}
+/**
+ * Creates header fields in forwarded email body
+ *
+ * $default_charset global must be set correctly before you call this function.
+ * @param object $orig_header
+ * @return $string
+ */
function getforwardHeader($orig_header) {
- global $editor_size;
-
- $display = array( _("Subject") => strlen(_("Subject")),
- _("From") => strlen(_("From")),
- _("Date") => strlen(_("Date")),
- _("To") => strlen(_("To")),
- _("Cc") => strlen(_("Cc")) );
- $maxsize = max($display);
- $indent = str_pad('',$maxsize+2);
- foreach($display as $key => $val) {
- $display[$key] = $key .': '. str_pad('', $maxsize - $val);
- }
- $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true);
- $from = str_replace(' ',' ',$from);
- $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true);
- $to = str_replace(' ',' ',$to);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $subject = str_replace(' ',' ',$subject);
- $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n". $display[_("Subject")] . $subject . "\n" .
- $display[_("From")] . $from . "\n" .
- $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
- $display[_("To")] . $to . "\n";
- if ($orig_header->cc != array() && $orig_header->cc !='') {
- $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true);
- $cc = str_replace(' ',' ',$cc);
- $bodyTop .= $display[_("Cc")] .$cc . "\n";
- }
- $bodyTop .= str_pad('', $editor_size -2 , '-') .
- "\n\n";
- return $bodyTop;
+ global $editor_size, $default_charset;
+
+ // using own strlen function in order to detect correct string length
+ $display = array( _("Subject") => sq_strlen(_("Subject"),$default_charset),
+ _("From") => sq_strlen(_("From"),$default_charset),
+ _("Date") => sq_strlen(_("Date"),$default_charset),
+ _("To") => sq_strlen(_("To"),$default_charset),
+ _("Cc") => sq_strlen(_("Cc"),$default_charset) );
+ $maxsize = max($display);
+ $indent = str_pad('',$maxsize+2);
+ foreach($display as $key => $val) {
+ $display[$key] = $key .': '. str_pad('', $maxsize - $val);
+ }
+ $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true);
+ $from = str_replace(' ',' ',$from);
+ $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true);
+ $to = str_replace(' ',' ',$to);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $subject = str_replace(' ',' ',$subject);
+
+ // using own str_pad function in order to create correct string pad
+ $bodyTop = sq_str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH,$default_charset) .
+ "\n". $display[_("Subject")] . $subject . "\n" .
+ $display[_("From")] . $from . "\n" .
+ $display[_("Date")] . getLongDateString( $orig_header->date, $orig_header->date_unparsed ). "\n" .
+ $display[_("To")] . $to . "\n";
+ if ($orig_header->cc != array() && $orig_header->cc !='') {
+ $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true);
+ $cc = str_replace(' ',' ',$cc);
+ $bodyTop .= $display[_("Cc")] .$cc . "\n";
+ }
+ $bodyTop .= str_pad('', $editor_size -2 , '-') .
+ "\n\n";
+ return $bodyTop;
}
/* ----------------------------------------------------------------------- */
* If the session is expired during a post this restores the compose session
* vars.
*/
+$session_expired = false;
if (sqsession_is_registered('session_expired_post')) {
sqgetGlobalVar('session_expired_post', $session_expired_post, SQ_SESSION);
/*
* extra check for username so we don't display previous post data from
* another user during this session.
*/
- if ($session_expired_post['username'] != $username) {
- unset($session_expired_post);
- sqsession_unregister('session_expired_post');
- session_write_close();
- } else {
- foreach ($session_expired_post as $postvar => $val) {
- if (isset($val)) {
- $$postvar = $val;
- } else {
- $$postvar = '';
+ if (!empty($session_expired_post['username'])
+ && $session_expired_post['username'] == $username) {
+ // 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',
+ 'subject', 'newmail', 'send_to_bcc', 'passed_id', 'mailbox',
+ 'from_htmladdr_search', 'identity', 'draft_id', 'delete_draft',
+ 'mailprio', 'edit_as_new', 'attachments', 'composesession',
+ 'request_mdn', 'request_dr', 'fwduid');
+
+ 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');
+
+ if (!empty($attachments))
+ $attachments = unserialize(urldecode($attachments));
+
sqsession_register($composesession,'composesession');
+
if (isset($send)) {
unset($send);
}
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
- displayPageHeader($color, $mailbox);
+ $sHeaderJs = (isset($sHeaderJs)) ? $sHeaderJs : '';
+ if (strpos($action, 'reply') !== false && $reply_focus) {
+ $sOnload = 'checkForm(\''.$replyfocus.'\');';
+ } else {
+ $sOnload = 'checkForm();';
+ }
+ displayPageHeader($color, $mailbox,$sHeaderJs,$sOnload);
}
showInputForm($session, false);
exit();
}
+
if (!isset($composesession)) {
$composesession = 0;
sqsession_register(0,'composesession');
+} else {
+ $composesession = (int)$composesession;
}
if (!isset($session) || (isset($newmessage) && $newmessage)) {
$composesession = $session;
sqsession_register($composesession,'composesession');
}
-if (!isset($compose_messages)) {
- $compose_messages = array();
-}
-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;
- $composeMessage->reply_rfc822_header = '';
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages,'compose_messages');
+if (!empty($compose_messages[$session])) {
+ $composeMessage = $compose_messages[$session];
} else {
- $composeMessage=$compose_messages[$session];
+ $composeMessage = new Message();
+ $rfc822_header = new Rfc822Header();
+ $composeMessage->rfc822_header = $rfc822_header;
+ $composeMessage->reply_rfc822_header = '';
+}
+
+// re-add attachments that were already in this message
+// FIXME: note that technically this is very bad form -
+// should never directly manipulate an object like this
+if (!empty($attachments)) {
+ $attachments = unserialize(urldecode($attachments));
+ if (!empty($attachments) && is_array($attachments))
+ $composeMessage->entities = $attachments;
}
-if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
+if (empty($mailbox)) {
$mailbox = 'INBOX';
}
if ($draft) {
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
/*
* Set $default_charset to correspond with the user's selection
* of language interface.
*/
set_my_charset();
- $composeMessage=$compose_messages[$session];
if (! deliverMessage($composeMessage, true)) {
showInputForm($session);
exit();
} else {
- unset($compose_messages[$session]);
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
- Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) .
- "&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes");
- exit();
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false, $imap_stream_options);
+ 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
+ // be submitted as string. docs state that it should be array.
+ sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true);
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imap_stream, $draft_folder, true);
+ }
+ sqimap_logout($imap_stream);
}
- else {
- if ($compose_new_win == '1') {
- Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
- exit();
+
+ $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 {
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
+ . '/compose.php?saved_sent=yes&session=' . $composesession . '">'
+ . _("Return") . '</a></div>';
}
- else {
- Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort".
- "&startMessage=1¬e=".urlencode($draft_message));
- exit();
+ exit();
+ } else {
+ if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+ header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
+ "&startMessage=1¬e=".urlencode($draft_message));
+ } else {
+//FIXME: DON'T ECHO HTML FROM CORE!
+ 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></div>';
}
+ exit();
}
}
}
if ($send) {
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
if (isset($_FILES['attachfile']) &&
- $_FILES['attachfile']['tmp_name'] &&
- $_FILES['attachfile']['tmp_name'] != 'none') {
+ $_FILES['attachfile']['tmp_name'] &&
+ $_FILES['attachfile']['tmp_name'] != 'none') {
$AttachFailure = saveAttachedFiles($session);
}
+
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 */
- }
- $urlMailbox = urlencode (trim($mailbox));
+ if ($mailbox == "All Folders") {
+ /* We entered compose via the search results page */
+ $mailbox = 'INBOX'; /* Send 'em to INBOX, that's safe enough */
+ }
+ $urlMailbox = urlencode($mailbox);
if (! isset($passed_id)) {
$passed_id = 0;
}
- /*
+ /**
* Set $default_charset to correspond with the user's selection
* of language interface.
*/
set_my_charset();
- /*
+ /**
* This is to change all newlines to \n
* We'll change them to \r\n later (in the sendMessage function)
*/
$body = str_replace("\r\n", "\n", $body);
$body = str_replace("\r", "\n", $body);
- /*
+ /**
* Rewrap $body so that no line is bigger than $editor_size
- * This should only really kick in the sqWordWrap function
- * if the browser doesn't support "VIRTUAL" as the wrap type.
*/
$body = explode("\n", $body);
$newBody = '';
foreach ($body as $line) {
if( $line <> '-- ' ) {
- $line = rtrim($line);
+ $line = rtrim($line);
}
- if (strlen($line) <= $editor_size + 1) {
+ if (sq_strlen($line, $default_charset) <= $editor_size + 1) {
$newBody .= $line . "\n";
} else {
- sqWordWrap($line, $editor_size);
+ sqWordWrap($line, $editor_size, $default_charset);
$newBody .= $line . "\n";
}
}
$body = $newBody;
- $composeMessage=$compose_messages[$session];
-
$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
+ $temp = array(&$Result, &$composeMessage, &$mail_sent);
+ do_hook('compose_send_after', $temp);
if (! $Result) {
showInputForm($session);
exit();
}
- unset($compose_messages[$session]);
+
+ /* if it is resumed draft, delete draft message */
if ( isset($delete_draft)) {
- Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ).
- "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes");
- exit();
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false, $imap_stream_options);
+ 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
+ // be submitted as string. docs state that it should be array.
+ sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true);
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imap_stream, $draft_folder, true);
+ }
+ sqimap_logout($imap_stream);
}
- if ($compose_new_win == '1') {
+ /*
+ * Store the error array in the session because they will be lost on a redirect
+ */
+ $oErrorHandler->saveDelayedErrors();
+ session_write_close();
- Header("Location: $location/compose.php?mail_sent=yes");
- }
- else {
- Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
- "&startMessage=$startMessage&mail_sent=yes");
+ if ($compose_new_win == '1') {
+ if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+ header("Location: $location/compose.php?mail_sent=$mail_sent");
+ } else {
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
+ . '/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=$mail_sent");
+ } else {
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo ' <br><br><div style="text-align: center;"><a href="' . $location
+ . "/right_main.php?mailbox=$urlMailbox"
+ . "&startMessage=$startMessage&mail_sent=$mail_sent\">"
+ . _("Return") . '</a></div>';
+ }
+ exit();
}
} else {
if ($compose_new_win == '1') {
displayPageHeader($color, $mailbox);
}
if (isset($AttachFailure)) {
- plain_error_message(_("Could not move/copy file. File not attached"),
- $color);
+ plain_error_message(_("Could not move/copy file. File not attached"),
+ $color);
}
checkInput(true);
showInputForm($session);
/* sqimap_logout($imapConnection); */
}
} elseif (isset($html_addr_search_done)) {
- if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
- }
- else {
- displayPageHeader($color, $mailbox);
- }
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+ }
+ else {
+ displayPageHeader($color, $mailbox);
+ }
if (isset($send_to_search) && is_array($send_to_search)) {
foreach ($send_to_search as $k => $v) {
}
}
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') {
+ $_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)) {
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ 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"), $color);
+ plain_error_message(_("Could not move/copy file. File not attached"));
}
- if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
- }
- else {
- displayPageHeader($color, $mailbox);
- }
showInputForm($session);
}
elseif (isset($sigappend)) {
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
$signature = $idents[$identity]['signature'];
$body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
+ compose_Header($color, $mailbox);
} else {
displayPageHeader($color, $mailbox);
}
showInputForm($session);
} elseif (isset($do_delete)) {
- if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
- }
- else {
- displayPageHeader($color, $mailbox);
- }
+
+ // validate security token
+ //
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+ } else {
+ displayPageHeader($color, $mailbox);
+ }
if (isset($delete) && is_array($delete)) {
- $composeMessage = $compose_messages[$session];
foreach($delete as $index) {
- $attached_file = $composeMessage->entities[$index]->att_local_name;
- unlink ($attached_file);
- unset ($composeMessage->entities[$index]);
+ if (!empty($composeMessage->entities) && isset($composeMessage->entities[$index])) {
+ $composeMessage->entities[$index]->purgeAttachments();
+ // FIXME: one person reported that unset() didn't do anything at all here, so this is a work-around... but it triggers PHP notices if the unset() doesn't work, which should be fixed... but bigger question is if unset() doesn't work here, what about everywhere else? Anyway, uncomment this if you think you need it
+ //$composeMessage->entities[$index] = NULL;
+ unset ($composeMessage->entities[$index]);
+ }
}
$new_entities = array();
foreach ($composeMessage->entities as $entity) {
$new_entities[] = $entity;
}
$composeMessage->entities = $new_entities;
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages, 'compose_messages');
}
showInputForm($session);
} else {
*/
if ($compose_new_win == '1') {
- compose_Header($color, $mailbox);
+ compose_Header($color, $mailbox);
} else {
- displayPageHeader($color, $mailbox);
+ displayPageHeader($color, $mailbox);
}
$newmail = true;
$values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session);
+ // forward as attachment - subject is in the message in session
+ //
+ if ($action == 'forward_as_attachment' && empty($values['subject']))
+ $subject = $composeMessage->rfc822_header->subject;
+
/* in case the origin is not read_body.php */
if (isset($send_to)) {
- $values['send_to'] = $send_to;
+ $values['send_to'] = $send_to;
}
if (isset($send_to_cc)) {
- $values['send_to_cc'] = $send_to_cc;
+ $values['send_to_cc'] = $send_to_cc;
}
if (isset($send_to_bcc)) {
- $values['send_to_bcc'] = $send_to_bcc;
+ $values['send_to_bcc'] = $send_to_bcc;
}
if (isset($subject)) {
- $values['subject'] = $subject;
+ $values['subject'] = $subject;
+ }
+ if (isset($mailprio)) {
+ $values['mailprio'] = $mailprio;
+ }
+ if (isset($orig_identity)) {
+ $values['identity'] = $orig_identity;
}
showInputForm($session, $values);
}
function getforwardSubject($subject)
{
if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
- (substr(strtolower($subject), 0, 5) != '[fwd:') &&
- (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
+ (substr(strtolower($subject), 0, 5) != '[fwd:') &&
+ (substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
}
return $subject;
/* This function is used when not sending or adding attachments */
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
global $editor_size, $default_use_priority, $body, $idents,
- $use_signature, $composesession, $data_dir, $username,
- $username, $key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage;
- global $languages, $squirrelmail_language, $default_charset;
+ $use_signature, $data_dir, $username,
+ $key, $imapServerAddress, $imapPort, $imap_stream_options,
+ $composeMessage, $body_quote, $request_mdn, $request_dr,
+ $mdn_user_support, $languages, $squirrelmail_language,
+ $default_charset, $do_not_reply_to_self;
+
+ /*
+ * Set $default_charset to correspond with the user's selection
+ * of language interface. $default_charset global is not correct,
+ * if message is composed in new window.
+ */
+ set_my_charset();
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
if ($passed_id) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0);
+ $imapConnection = sqimap_login($username, false, $imapServerAddress,
+ $imapPort, 0, $imap_stream_options);
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
/* redefine the messsage in case of message/rfc822 */
$message = $message->getEntity($passed_ent_id);
/* message is an entity which contains the envelope and type0=message
- * and type1=rfc822. The actual entities are childs from
- * $message->entities[0]. That's where the encoding and is located
- */
+ * and type1=rfc822. The actual entities are childs from
+ * $message->entities[0]. That's where the encoding and is located
+ */
$entities = $message->entities[0]->findDisplayEntity
- (array(), $alt_order = array('text/plain'));
+ (array(), $alt_order = array('text/plain'));
if (!count($entities)) {
$entities = $message->entities[0]->findDisplayEntity
- (array(), $alt_order = array('text/plain','html/plain'));
+ (array(), $alt_order = array('text/plain','text/html'));
}
$orig_header = $message->rfc822_header; /* here is the envelope located */
/* redefine the message for picking up the attachments */
} else {
$entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain'));
if (!count($entities)) {
- $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain'));
+ $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','text/html'));
}
$orig_header = $message->rfc822_header;
}
- $encoding = $message->header->encoding;
$type0 = $message->type0;
$type1 = $message->type1;
foreach ($entities as $ent) {
+ $msg = $message->getEntity($ent);
+ $type0 = $msg->type0;
+ $type1 = $msg->type1;
$unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent);
$body_part_entity = $message->getEntity($ent);
$bodypart = decodeBody($unencoded_bodypart,
- $body_part_entity->header->encoding);
+ $body_part_entity->header->encoding);
if ($type1 == 'html') {
$bodypart = str_replace("\n", ' ', $bodypart);
- $bodypart = preg_replace(array('/<p>/i','/<br\s*(\/)*>/i'), "\n", $bodypart);
+ $bodypart = preg_replace(array('/<\/?p>/i','/<div><\/div>/i','/<br\s*(\/)*>/i','/<\/?div>/i'), "\n", $bodypart);
$bodypart = str_replace(array(' ','>','<'),array(' ','>','<'),$bodypart);
$bodypart = strip_tags($bodypart);
-
}
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) {
if (mb_detect_encoding($bodypart) != 'ASCII') {
- $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
+ $bodypart = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $bodypart);
}
}
- if (isset($body_part_entity->header->parameters['charset'])) {
- $actual = $body_part_entity->header->parameters['charset'];
- } else {
- $actual = 'us-ascii';
- }
+ // charset encoding in compose form stuff
+ if (isset($body_part_entity->header->parameters['charset'])) {
+ $actual = $body_part_entity->header->parameters['charset'];
+ } else {
+ $actual = 'us-ascii';
+ }
- if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
- $bodypart = charset_decode($actual,$bodypart);
- }
+ if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
+ $bodypart = charset_convert($actual,$bodypart,$default_charset,false);
+ }
+ // end of charset encoding in compose
$body .= $bodypart;
}
} else {
$mailprio = '';
}
- //ClearAttachments($session);
- $identity = '';
$from_o = $orig_header->from;
+ if (is_array($from_o)) {
+ if (isset($from_o[0])) {
+ $from_o = $from_o[0];
+ }
+ }
if (is_object($from_o)) {
$orig_from = $from_o->getAddress();
} else {
if (count($idents) > 1) {
foreach($idents as $nr=>$data) {
$enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>';
- if($enc_from_name == $orig_from) {
- $identity = $nr;
- break;
- }
$identities[] = $enc_from_name;
}
$identity_match = $orig_header->findAddress($identities);
- if ($identity_match) {
+ if ($identity_match !== FALSE) {
$identity = $identity_match;
}
- // we need identiy here fore draft case #845290
- // echo $identity."leer";
}
switch ($action) {
- case ('draft'):
- $use_signature = FALSE;
- $composeMessage->rfc822_header = $orig_header;
- $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
- $send_from = $orig_header->getAddr_s('from');
- $send_from_parts = new AddressStructure();
- $send_from_parts = $orig_header->parseAddress($send_from);
- $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
- $identities = get_identities();
- if (count($identities) > 0) {
- foreach($identities as $iddata) {
- if ($send_from_add == $iddata['email_address']) {
- $identity = $iddata['index'];
- break;
- }
+ case ('draft'):
+ $use_signature = FALSE;
+ $composeMessage->rfc822_header = $orig_header;
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $send_from = $orig_header->getAddr_s('from');
+ $send_from_parts = new AddressStructure();
+ $send_from_parts = $orig_header->parseAddress($send_from);
+ $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
+ $identity = find_identity(array($send_from_add));
+ $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 */
+//FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination (drafts folder?); is this possible?
+ $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
+ $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
+ // rewrap the body to clean up quotations and line lengths
+ sqBodyWrap($body, $editor_size);
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+//TODO: completely unclear if should be using $compose_session instead of $session below
+ $compose_messages[$session] = $composeMessage;
+ sqsession_register($compose_messages,'compose_messages');
+ break;
+ case ('edit_as_new'):
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $mailprio = $orig_header->priority;
+ $orig_from = '';
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ // rewrap the body to clean up quotations and line lengths
+ sqBodyWrap($body, $editor_size);
+ break;
+ case ('forward'):
+ $send_to = '';
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
+ $body = getforwardHeader($orig_header) . $body;
+ // the logic for calling sqUnWordWrap here would be to allow the browser to wrap the lines
+ // forwarded message text should be as undisturbed as possible, so commenting out this call
+ // sqUnWordWrap($body);
+ $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+
+ //add a blank line after the forward headers
+ $body = "\n" . $body;
+ break;
+ case ('forward_as_attachment'):
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
+ $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $subject = str_replace('"', "'", $subject);
+ $subject = trim($subject);
+ if (substr(strtolower($subject), 0, 4) != 'fwd:') {
+ $subject = 'Fwd: ' . $subject;
}
- }
- $subject = decodeHeader($orig_header->subject,false,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 = '';
- for ($i=0; $i < $cnt; $i++) {
- if (!ereg("^[>\\s]*$", $body_ary[$i]) || !$body_ary[$i]) {
- sqWordWrap($body_ary[$i], $editor_size );
- $body .= $body_ary[$i] . "\n";
- }
- unset($body_ary[$i]);
- }
- sqUnWordWrap($body);
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- break;
- case ('edit_as_new'):
- $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true);
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $mailprio = $orig_header->priority;
- $orig_from = '';
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- sqUnWordWrap($body);
- break;
- case ('forward'):
- $send_to = '';
- $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
- $body = getforwardHeader($orig_header) . $body;
- sqUnWordWrap($body);
- $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
- $body = "\n" . $body;
- break;
- case ('forward_as_attachment'):
- $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
- $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
- $body = '';
- break;
- case ('reply_all'):
- if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) {
- $send_to = $orig_header->getAddr_s('mail_followup_to');
- } else {
- $send_to_cc = replyAllString($orig_header);
- $send_to_cc = decodeHeader($send_to_cc,false,false,true);
- }
- case ('reply'):
- // skip this if send_to was already set right above here
- if(!$send_to) {
- $send_to = $orig_header->reply_to;
- if (is_array($send_to) && count($send_to)) {
- $send_to = $orig_header->getAddr_s('reply_to');
- } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
- $send_to = $orig_header->getAddr_s('reply_to');
+ $body = '';
+ break;
+ case ('reply_all'):
+ if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) {
+ $send_to = $orig_header->getAddr_s('mail_followup_to');
} else {
- $send_to = $orig_header->getAddr_s('from');
+ $send_to_cc = replyAllString($orig_header);
+ $send_to_cc = decodeHeader($send_to_cc,false,false,true);
+ $send_to_cc = str_replace('""', '"', $send_to_cc);
}
- }
- $send_to = decodeHeader($send_to,false,false,true);
- $subject = decodeHeader($orig_header->subject,false,false,true);
- $subject = str_replace('"', "'", $subject);
- $subject = trim($subject);
- if (substr(strtolower($subject), 0, 3) != 're:') {
- $subject = 'Re: ' . $subject;
- }
- /* this corrects some wrapping/quoting problems on replies */
- $rewrap_body = explode("\n", $body);
- $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
- sqUnWordWrap($body); // unwrap and then reset it?!
- $body = '';
- $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
- foreach ($rewrap_body as $line) {
- if ($strip_sigs && substr($line,0,3) == '-- ') {
- break;
+ case ('reply'):
+ // skip this if send_to was already set right above here
+ if(!$send_to) {
+ $send_to = $orig_header->reply_to;
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = $orig_header->getAddr_s('reply_to', ',', FALSE, TRUE);
+ } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
+ $send_to = $orig_header->getAddr_s('reply_to', ',', FALSE, TRUE);
+ } else {
+ $send_to = $orig_header->getAddr_s('from', ',', FALSE, TRUE);
+ }
}
- sqWordWrap($line, ($editor_size));
- if (preg_match("/^(>+)/", $line, $matches)) {
- $gt = $matches[1];
- $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n";
- } else {
- $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n";
+ $send_to = decodeHeader($send_to,false,false,true);
+ $send_to = str_replace('""', '"', $send_to);
+
+
+ // If user doesn't want replies to her own messages
+ // going back to herself (instead send again to the
+ // original recipient of the message being replied to),
+ // then iterate through identities, checking if the TO
+ // field is one of them (if the reply is to ourselves)
+ //
+ // Note we don't bother if the original message doesn't
+ // have anything in the TO field itself (because that's
+ // what we use if we change the recipient to be that of
+ // the previous message)
+ //
+ if ($do_not_reply_to_self && !empty($orig_header->to)) {
+
+ $orig_to = '';
+
+ foreach($idents as $id) {
+
+ if (!empty($id['email_address'])
+ && strpos($send_to, $id['email_address']) !== FALSE) {
+
+ // if this is a reply-all, the original recipient
+ // is already in the CC field, so we can just blank
+ // the recipient (TO field) (as long as the CC field
+ // isn't empty that is)... but then move the CC into
+ // the TO, so TO isn't empty
+ //
+ if ($action == 'reply_all' && !empty($send_to_cc)) {
+ $orig_to = $send_to_cc;
+ $send_to_cc = '';
+ break;
+ }
+
+ $orig_to = $orig_header->to;
+ if (is_array($orig_to) && count($orig_to)) {
+ $orig_to = $orig_header->getAddr_s('to', ',', FALSE, TRUE);
+ } else if (is_object($orig_to)) { /* unneccesarry, just for failsafe purpose */
+ $orig_to = $orig_header->getAddr_s('to', ',', FALSE, TRUE);
+ } else {
+ $orig_to = '';
+ }
+ $orig_to = decodeHeader($orig_to,false,false,true);
+ $orig_to = str_replace('""', '"', $orig_to);
+
+ break;
+ }
+ }
+
+ // if the reply was addressed back to ourselves,
+ // we will send it to the TO of the previous message
+ //
+ if (!empty($orig_to)) {
+
+ $send_to = $orig_to;
+
+ // in this case, we also want to reset the FROM
+ // identity as well (it should match the original
+ // *FROM* header instead of TO or CC)
+ //
+ if (count($idents) > 1) {
+ $identity = '';
+ foreach($idents as $i => $id) {
+ if (!empty($id['email_address'])
+ && strpos($orig_from, $id['email_address']) !== FALSE) {
+ $identity = $i;
+ break;
+ }
+ }
+ }
+
+ }
+
}
- }
- $body = getReplyCitation($from , $orig_header->date) . $body;
- $composeMessage->reply_rfc822_header = $orig_header;
- break;
- default:
- break;
+
+ $subject = decodeHeader($orig_header->subject,false,false,true);
+ $subject = str_replace('"', "'", $subject);
+ $subject = trim($subject);
+ if (substr(strtolower($subject), 0, 3) != 're:') {
+ $subject = 'Re: ' . $subject;
+ }
+ /* this corrects some wrapping/quoting problems on replies */
+ $rewrap_body = explode("\n", $body);
+ $from = (is_array($orig_header->from) && !empty($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
+ $body = '';
+ $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
+ foreach ($rewrap_body as $line) {
+ if ($strip_sigs && rtrim($line, "\r\n") == '-- ') {
+ break;
+ }
+ if (preg_match("/^(>+)/", $line, $matches)) {
+ $gt = $matches[1];
+ $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n";
+ } else {
+ $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n";
+ }
+ }
+
+ //rewrap the body to clean up quotations and line lengths
+ $body = sqBodyWrap ($body, $editor_size);
+
+ $body = getReplyCitation($from , $orig_header->date) . $body;
+ $composeMessage->reply_rfc822_header = $orig_header;
+
+ break;
+ default:
+ break;
}
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages, 'compose_messages');
+//FIXME: we used to register $compose_messages in the session here, but not any more - so do we still need the session_write_close() and sqimap_logout() here? We probably need the IMAP logout, but what about the session closure?
session_write_close();
sqimap_logout($imapConnection);
}
$ret = array( 'send_to' => $send_to,
- 'send_to_cc' => $send_to_cc,
- 'send_to_bcc' => $send_to_bcc,
- 'subject' => $subject,
- 'mailprio' => $mailprio,
- 'body' => $body,
- 'identity' => $identity );
+ 'send_to_cc' => $send_to_cc,
+ 'send_to_bcc' => $send_to_bcc,
+ 'subject' => $subject,
+ 'mailprio' => $mailprio,
+ 'body' => $body,
+ 'identity' => $identity );
return ($ret);
} /* function newMail() */
+/**
+ * downloads attachments from original message, stores them in attachment directory and adds
+ * them to composed message.
+ * @param object $message
+ * @param object $composeMessage
+ * @param integer $passed_id
+ * @param mixed $entities
+ * @param mixed $imapConnection
+ * @return object
+ */
function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) {
- global $attachment_dir, $username, $data_dir, $squirrelmail_language;
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ global $squirrelmail_language, $languages, $username, $attachment_dir;
+
if (!count($message->entities) ||
- ($message->type0 == 'message' && $message->type1 == 'rfc822')) {
+ ($message->type0 == 'message' && $message->type1 == 'rfc822')) {
if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
- switch ($message->type0) {
- case 'message':
- if ($message->type1 == 'rfc822') {
- $filename = $message->rfc822_header->subject;
- if ($filename == "") {
- $filename = "untitled-".$message->entity_id;
+ switch ($message->type0) {
+ case 'message':
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject;
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id;
+ }
+ $filename .= '.eml';
+ } else {
+ $filename = $message->getFilename();
}
- $filename .= '.msg';
- } else {
- $filename = $message->getFilename();
- }
- break;
- default:
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
- $filename = $message->getFilename();
- break;
- }
- $filename = str_replace(' ', ' ', decodeHeader($filename));
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
- $filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
- }
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- while (file_exists($full_localfilename)) {
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- }
- $message->att_local_name = $full_localfilename;
-
- $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
- $full_localfilename);
-
- /* Write Attachment to file */
- $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
- fputs($fp, decodeBody(mime_fetch_body($imapConnection,
- $passed_id, $message->entity_id),
- $message->header->encoding));
- fclose ($fp);
+ break;
+ default:
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
+ $filename = $message->getFilename();
+ break;
+ }
+//FIXME: added three args to the following, so as to set the last one to TRUE, to mimick a fix in 1.4.21 (#2994865), but didn't test this (note that in 1.4.21, the 2nd and 3rd args are FALSE, but here in this code, they weren't being specified (thus defaulting to TRUE), so I don't know if that means this code is outdated and should have been changed to FALSE, FALSE or if this code is completely different and the addition of the TRUE for arg #4 is wrong
+ $filename = str_replace(' ', ' ', decodeHeader($filename, true, true, true));
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) {
+ $filename = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $filename);
+ }
+
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $localfilename = sq_get_attach_tempfile();
+ $message->att_local_name = $localfilename;
+
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $localfilename);
+
+ /* Write Attachment to file */
+ $fp = fopen ($hashed_attachment_dir . '/' . $localfilename, 'wb');
+ mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp);
+ fclose ($fp);
}
} else {
for ($i=0, $entCount=count($message->entities); $i<$entCount;$i++) {
}
function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
- $passed_ent_id='', $imapConnection) {
- global $attachments, $attachment_dir, $username, $data_dir;
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $passed_ent_id='', $imapConnection) {
if (!$passed_ent_id) {
$body_a = sqimap_run_command($imapConnection,
- 'FETCH '.$passed_id.' RFC822',
- TRUE, $response, $readmessage,
- TRUE);
+ 'FETCH '.$passed_id.' RFC822',
+ TRUE, $response, $readmessage,
+ TRUE);
} else {
$body_a = sqimap_run_command($imapConnection,
- 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
- TRUE, $response, $readmessage, TRUE);
+ 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
+ TRUE, $response, $readmessage, TRUE);
$message = $message->parent;
}
if ($response == 'OK') {
array_pop($body_a);
$body = implode('', $body_a) . "\r\n";
- $localfilename = GenerateRandomString(32, 'FILE', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
-
- $fp = fopen($full_localfilename, 'w');
+ global $username, $attachment_dir;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ $localfilename = sq_get_attach_tempfile();
+ $fp = fopen($hashed_attachment_dir . '/' . $localfilename, 'wb');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
- $full_localfilename);
+ $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+ $localfilename);
}
return $composeMessage;
}
function showInputForm ($session, $values=false) {
- global $send_to, $send_to_cc, $body, $startMessage,
- $passed_body, $color, $use_signature, $signature, $prefix_sig,
- $editor_size, $editor_height, $attachments, $subject, $newmail,
- $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
- $from_htmladdr_search, $location_of_buttons, $attachment_dir,
- $username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
- $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
- $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
- $username, $compose_messages, $composesession, $default_charset;
+ global $send_to, $send_to_cc, $send_to_bcc,
+ $body, $startMessage, $action, $attachments,
+ $use_signature, $signature, $prefix_sig, $session_expired,
+ $editor_size, $editor_height, $subject, $newmail,
+ $use_javascript_addr_book, $passed_id, $mailbox, $fwduid,
+ $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,
+ $composeMessage, $composesession, $default_charset,
+ $compose_onsubmit, $oTemplate, $oErrorHandler;
+
+ if (checkForJavascript()) {
+ $onfocus = ' onfocus="alreadyFocused=true;"';
+ $onfocus_array = array('onfocus' => 'alreadyFocused=true;');
+ }
+ else {
+ $onfocus = '';
+ $onfocus_array = array();
+ }
- $composeMessage = $compose_messages[$session];
if ($values) {
- $send_to = $values['send_to'];
- $send_to_cc = $values['send_to_cc'];
- $send_to_bcc = $values['send_to_bcc'];
- $subject = $values['subject'];
- $mailprio = $values['mailprio'];
- $body = $values['body'];
- $identity = (int) $values['identity'];
+ $send_to = $values['send_to'];
+ $send_to_cc = $values['send_to_cc'];
+ $send_to_bcc = $values['send_to_bcc'];
+ $subject = $values['subject'];
+ $mailprio = $values['mailprio'];
+ $body = $values['body'];
+ $identity = (int) $values['identity'];
} else {
- $send_to = decodeHeader($send_to, true, false);
- $send_to_cc = decodeHeader($send_to_cc, true, false);
- $send_to_bcc = decodeHeader($send_to_bcc, true, false);
+ $send_to = decodeHeader($send_to, true, false);
+ $send_to_cc = decodeHeader($send_to_cc, true, false);
+ $send_to_bcc = decodeHeader($send_to_bcc, true, false);
}
if ($use_javascript_addr_book) {
- echo "\n". '<SCRIPT LANGUAGE=JavaScript>'."\n<!--\n" .
- 'function open_abook() { ' . "\n" .
- ' var nwin = window.open("addrbook_popup.php","abookpopup",' .
- '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
- ' if((!nwin.opener) && (document.windows != null))' . "\n" .
- ' nwin.opener = document.windows;' . "\n" .
- "}\n" .
- "// -->\n</SCRIPT>\n\n";
+//FIXME: NO HTML IN CORE!
+ 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" .
+ ' if((!nwin.opener) && (document.windows != null))' . "\n" .
+ ' nwin.opener = document.windows;' . "\n" .
+ "}\n" .
+ "// -->\n</script>\n\n";
+ }
+
+//FIXME: NO HTML IN CORE!
+ echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
+ 'enctype="multipart/form-data"';
+
+ $compose_onsubmit = array();
+ 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
+ // 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".
+ // Onsubmit text is enclosed inside of double quotes, so plugins
+ // need to quote accordingly.
+ //
+ // Also, plugin authors should try to retain compatibility with
+ // the Compose Extras plugin by resetting its compose submit
+ // counter when preventing form submit. Use this code:
+ // if (your-code-here) { submit_count = 0; return false; }
+ //
+ if (checkForJavascript()) {
+ if (empty($compose_onsubmit))
+ $compose_onsubmit = array();
+ else if (!is_array($compose_onsubmit))
+ $compose_onsubmit = array($compose_onsubmit);
+
+ $onsubmit_text = '';
+ foreach ($compose_onsubmit as $text) {
+ $text = trim($text);
+ if (!empty($text)) {
+ if (substr($text, -1) != ';' && substr($text, -1) != '}')
+ $text .= '; ';
+ $onsubmit_text .= $text;
+ }
+ }
+
+ if (!empty($onsubmit_text))
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo ' onsubmit="' . $onsubmit_text . ' return true;"';
}
- echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
- 'enctype="multipart/form-data"';
- do_hook('compose_form');
+//FIXME: NO HTML IN CORE!
echo ">\n";
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo addHidden('smtoken', sm_generate_security_token());
+
+//FIXME: DON'T ECHO HTML FROM CORE!
echo addHidden('startMessage', $startMessage);
if ($action == 'draft') {
+//FIXME: DON'T ECHO HTML FROM CORE!
echo addHidden('delete_draft', $passed_id);
}
if (isset($delete_draft)) {
+//FIXME: DON'T ECHO HTML FROM CORE!
echo addHidden('delete_draft', $delete_draft);
}
if (isset($session)) {
+//FIXME: DON'T ECHO HTML FROM CORE!
echo addHidden('session', $session);
}
if (isset($passed_id)) {
+//FIXME: DON'T ECHO HTML FROM CORE!
echo addHidden('passed_id', $passed_id);
}
+ if (isset($fwduid)) {
+//FIXME: DON'T ECHO HTML FROM CORE!
+ echo addHidden('fwduid', $fwduid);
+ }
+
if ($saved_draft == 'yes') {
- echo '<BR><CENTER><B>'. _("Draft Saved").'</CENTER></B>';
+ $oTemplate->assign('note', _("Your draft has been saved."));
+ $oTemplate->display('note.tpl');
}
if ($mail_sent == 'yes') {
- echo '<BR><CENTER><B>'. _("Your Message has been sent.").'</CENTER></B>';
+ $oTemplate->assign('note', _("Your mail has been sent."));
+ $oTemplate->display('note.tpl');
}
- echo '<table align="center" cellspacing="0" border="0">' . "\n";
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";
+ $oTemplate->display('compose_newwin_close.tpl');
}
+
if ($location_of_buttons == 'top') {
+//FIXME: DON'T ECHO HTML FROM CORE!
showComposeButtonRow();
}
- /* display select list for identities */
+ $identities = array();
if (count($idents) > 1) {
- $ident_list = array();
- foreach($idents as $id => $data) {
- $ident_list[$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). '<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). '<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).'<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).
- ' </td>' . "\n" .
- ' </tr>' . "\n\n";
+ reset($idents);
+ foreach($idents as $id => $data) {
+ $identities[$id] = $data['full_name'].' <'.$data['email_address'].'>';
+ }
+ }
+
+ $oTemplate->assign('identities', $identities);
+ $oTemplate->assign('identity_def', $identity);
+ $oTemplate->assign('input_onfocus', 'onfocus="'.join(' ', $onfocus_array).'"');
+
+ $oTemplate->assign('to', sm_encode_html_special_chars($send_to));
+ $oTemplate->assign('cc', sm_encode_html_special_chars($send_to_cc));
+ $oTemplate->assign('bcc', sm_encode_html_special_chars($send_to_bcc));
+ $oTemplate->assign('subject', sm_encode_html_special_chars($subject));
+
+ // access keys...
+ //
+ global $accesskey_compose_to, $accesskey_compose_cc,
+ $accesskey_compose_identity, $accesskey_compose_bcc,
+ $accesskey_compose_subject;
+ $oTemplate->assign('accesskey_compose_identity', $accesskey_compose_identity);
+ $oTemplate->assign('accesskey_compose_to', $accesskey_compose_to);
+ $oTemplate->assign('accesskey_compose_cc', $accesskey_compose_cc);
+ $oTemplate->assign('accesskey_compose_bcc', $accesskey_compose_bcc);
+ $oTemplate->assign('accesskey_compose_subject', $accesskey_compose_subject);
+
+ $oTemplate->display('compose_header.tpl');
if ($location_of_buttons == 'between') {
+//FIXME: DON'T ECHO HTML FROM CORE!
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">';
- }
- 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">';
- }
-
+ $body_str = '';
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
$signature = $idents[$identity]['signature'];
if ($sig_first == '1') {
+ /*
+ * FIXME: test is specific to ja_JP translation implementation.
+ * This test might apply incorrect conversion to other translations, but
+ * use of 7bit iso-2022-jp charset in other translations might have other
+ * 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".sm_encode_html_special_chars(decodeHeader($body,false,false));
+ } else {
+ $body_str = "\n\n".sm_encode_html_special_chars(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 {
+ $body_str = sm_encode_html_special_chars(decodeHeader($body,false,false));
}
- }
- else {
- echo 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');
+
+ // access keys...
+ //
+ global $accesskey_compose_body, $accesskey_compose_send;
+ $oTemplate->assign('accesskey_compose_body', $accesskey_compose_body);
+ $oTemplate->assign('accesskey_compose_send', $accesskey_compose_send);
+
+ $oTemplate->display ('compose_body.tpl');
if ($location_of_buttons == 'bottom') {
+//FIXME: DON'T ECHO HTML FROM CORE!
showComposeButtonRow();
- } else {
- echo ' <tr>' . "\n" .
- html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" .
- ' <input type="submit" name="send" value="' . _("Send") . '" />' . "\n" .
- ' <br /><br />' . "\n" .
- ' </td>' . "\n" .
- ' </tr>' . "\n";
}
+ // composeMessage can be empty when coming from a restored session
+ if (is_object($composeMessage) && $composeMessage->entities)
+ $attach_array = $composeMessage->entities;
+ if ($session_expired && !empty($attachments) && is_array($attachments))
+ $attach_array = $attachments;
+
/* This code is for attachments */
- if ((bool) ini_get('file_uploads')) {
-
- /* Calculate the max size for an uploaded file.
- * This is advisory for the user because we can't actually prevent
- * people to upload too large files. */
- $sizes = array();
- /* php.ini vars which influence the max for uploads */
- $configvars = array('post_max_size', 'memory_limit', 'upload_max_filesize');
- foreach($configvars as $var) {
- /* skip 0 or empty values */
- if( $size = getByteSize(ini_get($var)) ) {
- $sizes[] = $size;
+ if ((bool) ini_get('file_uploads')) {
+
+ /* Calculate the max size for an uploaded file.
+ * This is advisory for the user because we can't actually prevent
+ * people to upload too large files. */
+ $sizes = array();
+ /* php.ini vars which influence the max for uploads */
+ $configvars = array('post_max_size', 'memory_limit', 'upload_max_filesize');
+ foreach($configvars as $var) {
+ /* skip 0 or empty values, and -1 which means 'unlimited' */
+ if( $size = getByteSize(ini_get($var)) ) {
+ if ( $size != '-1' ) {
+ $sizes[] = $size;
+ }
+ }
}
- }
- if(count($sizes) > 0) {
- $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')';
- } else {
- $maxsize = '';
- }
- echo addHidden('MAX_FILE_SIZE', min( $sizes ));
- 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();
- if ($composeMessage->entities) {
- foreach ($composeMessage->entities as $key => $attachment) {
- $attached_file = $attachment->att_local_name;
- if ($attachment->att_local_name || $attachment->body_part) {
- $attached_filename = decodeHeader($attachment->mime_header->getParameter('name'));
- $type = $attachment->mime_header->type0.'/'.
+ $attach = array();
+ global $username, $attachment_dir;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ if (!empty($attach_array)) {
+ foreach ($attach_array as $key => $attachment) {
+ $attached_file = $attachment->att_local_name;
+ if ($attachment->att_local_name || $attachment->body_part) {
+ $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($hashed_attachment_dir . '/' . $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";
- } // End of file_uploads if-block
+
+ $max = min($sizes);
+ $oTemplate->assign('max_file_size', empty($max) ? -1 : $max);
+ $oTemplate->assign('attachments', $attach);
+
+ // access keys...
+ //
+ global $accesskey_compose_attach_browse, $accesskey_compose_attach,
+ $accesskey_compose_delete_attach;
+ $oTemplate->assign('accesskey_compose_attach_browse', $accesskey_compose_attach_browse);
+ $oTemplate->assign('accesskey_compose_attach', $accesskey_compose_attach);
+ $oTemplate->assign('accesskey_compose_delete_attach', $accesskey_compose_delete_attach);
+
+ $oTemplate->display('compose_attachments.tpl');
+ } // End of file_uploads if-block
/* End of attachment code */
- if ($compose_new_win == '1') {
- echo '</TABLE>'."\n";
- }
- echo '</TABLE>' . "\n" .
- 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.
- */
+ $oTemplate->assign('username', $username);
+ $oTemplate->assign('smaction', $action);
+ $oTemplate->assign('mailbox', $mailbox);
sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER);
- echo addHidden('restoremessages', serialize($compose_messages)).
- addHidden('composesession', $composesession).
- addHidden('querystring', $queryString).
- "</form>\n";
+ $oTemplate->assign('querystring', $queryString);
+ $oTemplate->assign('composesession', $composesession);
+ $oTemplate->assign('send_button_count', unique_widget_name('send', TRUE));
+ if (!empty($attach_array))
+ $oTemplate->assign('attachments', urlencode(serialize($attach_array)));
+
+ $aUserNotices = array();
+
+ // File uploads are off, so we didn't show that part of the form.
+ // To avoid bogus bug reports, tell the user why.
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. */
- echo 'Because PHP file uploads are turned off, you can not attach files ';
- echo "to this message. Please see your system administrator for details.\r\n";
+ $aUserNotices[] = _("Because PHP file uploads are turned off, you can not attach files to this message. Please see your system administrator for details.");
}
- do_hook('compose_bottom');
- echo '</BODY></HTML>' . "\n";
+ $oTemplate->assign('user_notices', $aUserNotices);
+
+ $oTemplate->display('compose_form_close.tpl');
+
+ if ($compose_new_win=='1') {
+ $oTemplate->display('compose_newwin_close.tpl');
+ }
+
+ $oErrorHandler->setDelayedErrors(false);
+ $oTemplate->display('footer.tpl');
}
function showComposeButtonRow() {
global $use_javascript_addr_book, $save_as_draft,
- $default_use_priority, $mailprio, $default_use_mdn,
- $request_mdn, $request_dr,
- $data_dir, $username;
+ $default_use_priority, $mailprio, $default_use_mdn,
+ $request_mdn, $request_dr,
+ $data_dir, $username;
+
+ global $oTemplate, $buffer_hook;
- 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);
+ $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(\"".
- " <input type=button value=\\\""._("Addresses").
- "\\\" onclick='javascript:open_abook();'>\");".
- " // --></SCRIPT><NOSCRIPT>\n".
- " <input type=submit name=\"html_addr_search\" value=\"".
- _("Addresses")."\">".
- " </NOSCRIPT>\n";
+ $address_book_button_attribs = array();
+ global $accesskey_compose_addresses;
+ if ($accesskey_compose_addresses != 'NONE')
+ $address_book_button_attribs['accesskey'] = $accesskey_compose_addresses;
+ if ($use_javascript_addr_book && checkForJavascript()) {
+ $addr_book = addButton(_("Addresses"),
+ null,
+ array_merge($address_book_button_attribs, array('onclick' => 'javascript:open_abook();')));
} else {
- echo ' <input type=submit name="html_addr_search" value="'.
- _("Addresses").'">' . "\n";
+ $addr_book = addSubmit(_("Addresses"), 'html_addr_search', $address_book_button_attribs);
}
- if ($save_as_draft) {
- echo ' <input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
- }
+ $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 ' <INPUT TYPE=submit NAME=send VALUE="'. _("Send") . '">' . "\n";
- do_hook('compose_button_row');
+ // access keys...
+ //
+ global $accesskey_compose_priority, $accesskey_compose_on_read,
+ $accesskey_compose_on_delivery, $accesskey_compose_signature,
+ $accesskey_compose_save_draft, $accesskey_compose_send;
+ $oTemplate->assign('accesskey_compose_priority', $accesskey_compose_priority);
+ $oTemplate->assign('accesskey_compose_on_read', $accesskey_compose_on_read);
+ $oTemplate->assign('accesskey_compose_on_delivery', $accesskey_compose_on_delivery);
+ $oTemplate->assign('accesskey_compose_signature', $accesskey_compose_signature);
+ $oTemplate->assign('accesskey_compose_save_draft', $accesskey_compose_save_draft);
+ $oTemplate->assign('accesskey_compose_send', $accesskey_compose_send);
- 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_cc, $send_to_bcc;
- if ($send_to == '' && $send_to_bcc == '') {
+ $send_to = trim($send_to);
+ $send_to_cc = trim($send_to_cc);
+ $send_to_bcc = trim($send_to_bcc);
+ if (empty($send_to) && empty($send_to_cc) && empty($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;
}
/* True if FAILURE */
function saveAttachedFiles($session) {
- global $_FILES, $attachment_dir, $attachments, $username,
- $data_dir, $compose_messages;
+ global $composeMessage, $username, $attachment_dir;
/* get out of here if no file was attached at all */
if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
}
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- while (file_exists($full_localfilename)) {
- $localfilename = GenerateRandomString(32, '', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- }
-
- // FIXME: we SHOULD prefer move_uploaded_file over rename because
- // m_u_f works better with restricted PHP installes (safe_mode, open_basedir)
- if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
- return true;
- }
+ $localfilename = sq_get_attach_tempfile();
+ $fullpath = $hashed_attachment_dir . '/' . $localfilename;
+
+ // m_u_f works better with restricted PHP installs (safe_mode, open_basedir),
+ // if that doesn't work, try a simple rename.
+ if (!sq_call_function_suppress_errors('move_uploaded_file', array($_FILES['attachfile']['tmp_name'], $fullpath))) {
+ if (!sq_call_function_suppress_errors('rename', array($_FILES['attachfile']['tmp_name'], $fullpath))) {
+ return true;
+ }
}
- $message = $compose_messages[$session];
$type = strtolower($_FILES['attachfile']['type']);
$name = $_FILES['attachfile']['name'];
- $message->initAttachment($type, $name, $full_localfilename);
- $compose_messages[$session] = $message;
- sqsession_register($compose_messages , 'compose_messages');
+ $composeMessage->initAttachment($type, $name, $localfilename);
}
-function ClearAttachments($composeMessage) {
- if ($composeMessage->att_local_name) {
- $attached_file = $composeMessage->att_local_name;
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- }
- for ($i=0, $entCount=count($composeMessage->entities);$i< $entCount; ++$i) {
- ClearAttachments($composeMessage->entities[$i]);
- }
-}
-
-/* parse values like 8M and 2k into bytes */
+/**
+ * Parse strings such as "8M" and "2k" into their corresponding size in bytes
+ *
+ * NOTE: This function only recognizes the suffixes "K", "M" and "G"
+ * and will probably break very easily if the given size is in
+ * some completely different format.
+ *
+ * @param string $ini_size The input string to be converted
+ *
+ * @return mixed Boolean FALSE if something went wrong (the value passed in
+ * was empty?, the suffix was not recognized?), otherwise, the
+ * converted size in bytes (just the number (as an integer),
+ * no unit identifier included)
+ *
+ */
function getByteSize($ini_size) {
if(!$ini_size) {
switch(strtoupper(substr($ini_size, -1))) {
case 'G':
- $bytesize = 1073741824;
- break;
+ $bytesize = 1073741824;
+ break;
case 'M':
- $bytesize = 1048576;
- break;
+ $bytesize = 1048576;
+ break;
case 'K':
- $bytesize = 1024;
- break;
+ $bytesize = 1024;
+ break;
+ default:
+ return FALSE;
}
return ($bytesize * (int)substr($ini_size, 0, -1));
}
-/* temporary function to make use of the deliver class.
- In the future the responsable 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.
-*/
-
-function deliverMessage($composeMessage, $draft=false) {
+/**
+ * temporary function to make use of the deliver class.
+ * 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.
+ *
+ * @param object $composeMessage The message being sent. Please note
+ * that it is passed by reference and
+ * will be returned modified, with additional
+ * headers, such as Message-ID, Date, In-Reply-To,
+ * References, and so forth.
+ *
+ * @return boolean FALSE if delivery failed, or some non-FALSE value
+ * upon success.
+ *
+ */
+function deliverMessage(&$composeMessage, $draft=false) {
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
- $username, $popuser, $usernamedata, $identity, $idents, $data_dir,
- $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
- $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 ??? */
- /* THEFIX: browsers don't replace space with nbsp. SM replaces
- space with nbsp when decodes headers. If problem still happens,
- use cleanup_nbsp() */
-
-// $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);
+ $username, $identity, $idents, $data_dir,
+ $request_mdn, $request_dr, $default_charset, $useSendmail,
+ $domain, $action, $default_move_to_sent, $move_to_sent,
+ $imapServerAddress, $imapPort, $imap_stream_options, $sent_folder, $key;
$rfc822_header = $composeMessage->rfc822_header;
$rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup'));
$rfc822_header->priority = $mailprio;
$rfc822_header->subject = $subject;
+
$special_encoding='';
if (strtolower($default_charset) == 'iso-2022-jp') {
if (mb_detect_encoding($body) == 'ASCII') {
}
$composeMessage->setBody($body);
- if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
- $popuser = $usernamedata[1];
- $domain = $usernamedata[2];
- unset($usernamedata);
- } else {
- $popuser = $username;
- }
$reply_to = '';
- $from_mail = $idents[$identity]['email_address'];
- $full_name = $idents[$identity]['full_name'];
$reply_to = $idents[$identity]['reply_to'];
- if (!$from_mail) {
- $from_mail = "$popuser@$domain";
- }
- $rfc822_header->from = $rfc822_header->parseAddress($from_mail,true);
- if ($full_name) {
- $from = $rfc822_header->from[0];
- if (!$from->host) $from->host = $domain;
- $full_name_encoded = encodeHeader($full_name);
- if ($full_name_encoded != $full_name) {
- $from_addr = $full_name_encoded .' <'.$from->mailbox.'@'.$from->host.'>';
- } else {
- $from_addr = '"'.$full_name .'" <'.$from->mailbox.'@'.$from->host.'>';
- }
- $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
- }
+ if ($reply_to && strpos($reply_to, '@') === FALSE)
+ $reply_to .= '@' . $domain;
+
+ $from_addr = build_from_header($identity);
+ $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
if ($reply_to) {
- $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true);
+ $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true);
}
/* Receipt: On Read */
if (isset($request_mdn) && $request_mdn) {
- $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true);
+ $rfc822_header->dnt = $rfc822_header->parseAddress($from_addr,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;
+ if (!empty($request_dr)) {
+//FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination; is this possible?
+ $rfc822_header->more_headers['Return-Receipt-To'] = $from_addr;
+ } 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();
}
if ($default_charset) {
$content_type->properties['charset']=$default_charset;
- }
+ }
}
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
+ if ($action == 'reply' || $action == 'reply_all') {
+ global $passed_id, $passed_ent_id;
+ $reply_id = $passed_id;
+ $reply_ent_id = $passed_ent_id;
+ } else {
+ $reply_id = '';
+ $reply_ent_id = '';
+ }
/* 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);
+//TODO: need to migrate to the following, but it neessitates changes in existing plugins, since the args are now an array
+ //$temp = array(&$composeMessage, &$draft);
+ //do_hook('compose_send', $temp);
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech;
+ global $smtpServerAddress, $smtpPort, $smtp_stream_options, $pop_before_smtp, $pop_before_smtp_host;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ if (empty($pop_before_smtp_host)) $pop_before_smtp_host = $smtpServerAddress;
get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
+ $smtpServerAddress, $smtpPort, $user, $pass, $authPop, $pop_before_smtp_host, $smtp_stream_options);
} elseif (!$draft) {
- require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
- global $sendmail_path;
- $deliver = new Deliver_SendMail();
- $stream = $deliver->initStream($composeMessage,$sendmail_path);
+ require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
+ 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,
- $imapPort, 0);
- if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
- require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
- $imap_deliver = new Deliver_IMAP();
- $length = $imap_deliver->mail($composeMessage);
- sqimap_append ($imap_stream, $draft_folder, $length);
- $imap_deliver->mail($composeMessage, $imap_stream);
- sqimap_append_done ($imap_stream, $draft_folder);
- sqimap_logout($imap_stream);
- unset ($imap_deliver);
- return $length;
+ global $draft_folder;
+ $imap_stream = sqimap_login($username, false, $imapServerAddress,
+ $imapPort, 0, $imap_stream_options);
+ if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
+ require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
+ $imap_deliver = new Deliver_IMAP();
+ $success = $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $draft_folder);
+ sqimap_logout($imap_stream);
+ unset ($imap_deliver);
+ $composeMessage->purgeAttachments();
+ return $success;
} else {
- $msg = '<br>Error: '._("Draft folder")." $draft_folder" . ' does not exist.';
- plain_error_message($msg, $color);
- return false;
+ $msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), sm_encode_html_special_chars($draft_folder));
+ plain_error_message($msg);
+ return false;
}
}
- $succes = false;
+ $success = false;
if ($stream) {
- $length = $deliver->mail($composeMessage, $stream);
- $succes = $deliver->finalizeStream($stream);
- }
- if (!$succes) {
- $msg = $deliver->dlv_msg . '<br>' .
- _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
- $deliver->dlv_server_msg;
- plain_error_message($msg, $color);
+ $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
+ $success = $deliver->finalizeStream($stream);
+ }
+ if (!$success) {
+ // $deliver->dlv_server_msg is not always server's reply
+ $msg = _("Message not sent.")
+ . "<br />\n"
+ . (isset($deliver->dlv_msg) ? $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:") . ' '
+ . (isset($deliver->dlv_ret_nr) ? $deliver->dlv_ret_nr . ' ' : '')
+ . nl2br(sm_encode_html_special_chars($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, $imap_stream_options);
+
+
+ // mark as replied or forwarded if applicable
+ //
+ global $what, $iAccount, $startMessage, $passed_id, $fwduid, $mailbox;
+
+ 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());
+ 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'])) {
+
+ // when forwarding as an attachment from the message
+ // list, passed_id is not used, need to get UID(s)
+ // from the query string
+ //
+ if (empty($passed_id) && !empty($fwduid))
+ $ids = explode('_', $fwduid);
+ else
+ $ids = array($passed_id);
+
+ $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, $ids, '$Forwarded', true, false);
+
+ foreach ($ids as $id) {
+ if (isset($aUpdatedMsgs[$id]['FLAGS'])) {
+ if (isset($aMailbox['MSG_HEADERS'][$id])) {
+ $aMailbox['MSG_HEADERS'][$id]['FLAGS'] = $aMsg['FLAGS'];
+ }
+ }
+ }
+ }
+ break;
+ }
+
+ /**
+ * Write mailbox with updated seen flag information back to cache.
+ */
+ if(isset($aUpdatedMsgs[$passed_id])) {
+ $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+ sqsession_register($mailbox_cache,'mailbox_cache');
+ }
- /* Move to sent code */
+ }
+
+
+ // move to sent folder
+ //
+ $move_to_sent = getPref($data_dir,$username,'move_to_sent');
if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {
$svr_allow_sent = true;
} else {
}
if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
- && sqimap_mailbox_exists( $imap_stream, $sent_folder)) {
+ && sqimap_mailbox_exists( $imap_stream, $sent_folder)) {
$fld_sent = true;
} else {
$fld_sent = false;
}
if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
- global $passed_id, $mailbox, $action;
if ($action == 'reply' || $action == 'reply_all') {
$save_reply_with_orig=getPref($data_dir,$username,'save_reply_with_orig');
if ($save_reply_with_orig) {
$sent_folder = $mailbox;
}
}
- sqimap_append ($imap_stream, $sent_folder, $length);
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
- $imap_deliver->mail($composeMessage, $imap_stream);
- sqimap_append_done ($imap_stream, $sent_folder);
+ $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id, $imap_stream, $sent_folder);
unset ($imap_deliver);
}
- global $passed_id, $mailbox, $action;
- ClearAttachments($composeMessage);
- if ($action == 'reply' || $action == 'reply_all') {
- sqimap_mailbox_select ($imap_stream, $mailbox);
- sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false);
- }
- sqimap_logout($imap_stream);
+
+
+ // final cleanup
+ //
+ $composeMessage->purgeAttachments();
+ sqimap_logout($imap_stream);
+
}
- return $succes;
+ return $success;
}
-
-?>
projects / squirrelmail.git / blobdiff