/**
* compose.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This code sends a mail.
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
+require_once(SM_PATH . 'functions/addressbook.php');
/* --------------------- Get globals ------------------------------------- */
$username = $_SESSION['username'];
function replyAllString($header) {
global $include_self_reply_all, $username, $data_dir;
- $excl_arr = array();
+ $excl_ar = array();
/**
* 1) Remove the addresses we'll be sending the message 'to'
*/
* TO list) only if $include_self_reply_all is turned off
*/
if (!$include_self_reply_all) {
- $email_address = trim(getPref($data_dir, $username, 'email_address'));
+ $email_address = strtolower(trim(getPref($data_dir, $username, 'email_address')));
$excl_ar[$email_address] = '';
-
$idents = getPref($data_dir, $username, 'identities');
if ($idents != '' && $idents > 1) {
+ $first_id = false;
for ($i = 1; $i < $idents; $i ++) {
$cur_email_address = getPref($data_dir, $username,
'email_address' . $i);
- $cur_email_address = strtolower($cur_email_address);
- $excl_ar[$cur_email_address] = '';
+ $cur_email_address = strtolower(trim($cur_email_address));
+ $excl_ar[$cur_email_address] = '';
}
}
}
$url_replytoallcc = '';
foreach( $url_replytoall_ar as $email => $personal) {
if ($personal) {
- $url_replytoallcc .= ", \"$personal\" <$email>";
+ $url_replytoallcc .= ", \"$personal\" <$email>";
} else {
- $url_replytoallcc .= ', '. $email;
+ $url_replytoallcc .= ', '. $email;
}
}
$url_replytoallcc = substr($url_replytoallcc,2);
}
/* ----------------------------------------------------------------------- */
-/* OLD: should be adapted to composeMessage */
-
/*
* If the session is expired during a post this restores the compose session
* vars.
*/
-//$session_expired = false;
-sqsession_unregister('session_expired_post');
-if (false && session_is_registered('session_expired_post')) {
- global $session_expired_post, $session_expired;
+if (sqsession_is_registered('session_expired_post')) {
+ $session_expired_post = $_SESSION['session_expired_post'];
/*
* 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');
- sqsession_unregister('session_expired');
+ session_write_close();
} else {
foreach ($session_expired_post as $postvar => $val) {
if (isset($val)) {
$$postvar = '';
}
}
+ $compose_messages = unserialize(urldecode($restoremessages));
+ sqsession_register($compose_messages,'compose_messages');
+ sqsession_register($composesession,'composesession');
if (isset($send)) {
unset($send);
}
$session_expired = true;
}
+ unset($session_expired_post);
sqsession_unregister('session_expired_post');
- sqsession_unregister('session_expired');
+ session_write_close();
if (!isset($mailbox)) {
$mailbox = '';
}
-
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
} else {
$composesession = $session;
sqsession_register($composesession,'composesession');
}
-
if (!isset($compose_messages)) {
$compose_messages = array();
}
*/
set_my_charset();
$composeMessage=$compose_messages[$session];
- if (! sendMessage($composeMessage, true)) {
+ 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)) {
$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 (! isset($passed_id)) {
$passed_id = 0;
$body = $newBody;
do_hook('compose_send');
$composeMessage=$compose_messages[$session];
- $Result = sendMessage($composeMessage);
+
+ $Result = deliverMessage($composeMessage);
if (! $Result) {
showInputForm($session);
exit();
}
+ unset($compose_messages[$session]);
if ( isset($delete_draft)) {
Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ).
"&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes");
exit();
}
if ($compose_new_win == '1') {
+
Header("Location: compose.php?mail_sent=yes");
}
else {
$composeMessage->entities = $new_entities;
$compose_messages[$session] = $composeMessage;
sqsession_register($compose_messages, 'compose_messages');
-// setPref($data_dir, $username, 'attachments', serialize($attachments));
}
showInputForm($session);
} else {
} else {
$orig_from = '';
}
+ $identities = array();
if (!empty($idents) && $idents > 1) {
- for ($i = 1; $i < $idents; $i++) {
- $enc_from_name = '"'.
- getPref($data_dir,
- $username,
- 'full_name' . $i) .
- '" <' . getPref($data_dir, $username,
- 'email_address' . $i) . '>';
- if ($enc_from_name == $orig_from) {
+ $identities[] = '"'. getPref($data_dir, $username, 'full_name')
+ . '" <' . getPref($data_dir, $username, 'email_address') . '>';
+ for ($i = 1; $i < $idents; $i++) {
+ $enc_from_name = '"'.
+ getPref($data_dir, $username, 'full_name' . $i) .
+ '" <' .
+ getPref($data_dir, $username, 'email_address' . $i) . '>';
+ if ($enc_from_name == $orig_from && $i) {
$identity = $i;
break;
}
+ $identities[] = $enc_from_name;
}
+ $identity_match = $orig_header->findAddress($identities);
+ if ($identity_match) {
+ $identity = $identity_match;
+ }
}
switch ($action) {
$body = getforwardHeader($orig_header) . $body;
sqUnWordWrap($body);
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
+ $body = "\n" . $body;
break;
case ('forward_as_attachment'):
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
$send_to_cc = replyAllString($orig_header);
case ('reply'):
$send_to = $orig_header->reply_to;
- if (is_object($send_to)) {
- $send_to = decodeHeader($send_to->getAddr_s('reply_to'));
- } else {
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+ } else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */
+ $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+ } else {
$send_to = decodeHeader($orig_header->getAddr_s('from'));
}
$subject = decodeHeader($orig_header->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;
+ $from = (is_array($orig_header->from)) ?
+ $orig_header->from[0] : $orig_header->from;
$body = getReplyCitation($from->getAddress(false));
-
+ sqUnWordWrap($body);
$cnt = count($rewrap_body);
for ($i=0;$i<$cnt;$i++) {
-// sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+ sqWordWrap($rewrap_body[$i], ($editor_size));
if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
$gt = $matches[1];
- $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
+ $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
} else {
- $body .= '> ' . $rewrap_body[$i] . "\n";
+ $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
}
unset($rewrap_body[$i]);
}
}
$compose_messages[$session] = $composeMessage;
sqsession_register($compose_messages, 'compose_messages');
-
+ session_write_close();
sqimap_logout($imapConnection);
}
$ret = array( 'send_to' => $send_to,
$username, $data_dir, $identity, $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;
+ $username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
$subject = $values['subject'];
$mailprio = $values['mailprio'];
$body = $values['body'];
- $identity = $values['identity'];
+ $identity = (int) $values['identity'];
}
if ($use_javascript_addr_book) {
if ($idents > 1) {
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
- "\n" .
- _("From:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
- '<select name=identity>' . "\n" .
- '<option value=default>' .
- htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+ _("From:") . '</TD>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ ' <select name=identity>' . "\n" .
+ ' <option value=default>' .
+ htmlspecialchars(getPref($data_dir, $username, 'full_name'));
$em = getPref($data_dir, $username, 'email_address');
if ($em != '') {
echo htmlspecialchars(' <' . $em . '>') . "\n";
' </TR>' . "\n";
}
echo ' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' . "\n" .
- _("To:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
+ _("To:") . '</TD>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
' <INPUT TYPE=text NAME="send_to" VALUE="' .
- htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
+ htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
- _("CC:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ _("CC:") . '</TD>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
- htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
+ htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
- _("BCC:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ _("BCC:") . '</TD>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
- htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
- '</TD></TR>' . "\n" .
+ htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n" .
' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
- _("Subject:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
- echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
- htmlspecialchars($subject) . '">';
- echo '</td></tr>' . "\n\n";
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' .
+ _("Subject:") . '</TD>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
+ echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+ htmlspecialchars($subject) . '">' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n\n";
if ($location_of_buttons == 'between') {
showComposeButtonRow();
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
' <TEXTAREA NAME=body ROWS=20 COLS="' .
- $editor_size . '" WRAP="VIRTUAL">';
+ $editor_size . '" WRAP="VIRTUAL">';
}
else {
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
' <TEXTAREA NAME=body ROWS=20 COLS="' .
- $editor_size . '" WRAP="VIRTUAL">';
+ $editor_size . '" WRAP="VIRTUAL">';
}
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
+ if ($idents > 1) {
+ if ($identity == 'default') {
+ $no = 'g';
+ } else {
+ $no = $identity;
+ }
+ $signature = getSig($data_dir, $username, $no);
+ }
+
if ($sig_first == '1') {
- if ($charset == 'iso-2022-jp') {
+ 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":'').htmlspecialchars($signature);
}
else {
echo "\n\n".htmlspecialchars($body);
- if ($charset == 'iso-2022-jp') {
+ 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":'').htmlspecialchars($signature);
if ($location_of_buttons == 'bottom') {
showComposeButtonRow();
} else {
- echo ' <TR><TD COLSPAN=2 ALIGN=RIGHT>' .
- ' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '">' .
- ' <BR><BR>' .
- ' </TD></TR>' . "\n";
+ echo ' <TR>' . "\n" .
+ ' <TD COLSPAN=2 ALIGN=RIGHT>' . "\n" .
+ ' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '">' . "\n" .
+ ' <BR><BR>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
}
/* This code is for attachments */
- echo '<table width="100%" cellpadding="0" cellspacing="4" align="center" border="0">' .
- ' <tr><td>' .
- ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">' .
- ' <tr><td>' .
- ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">' .
- ' <TR>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
- _("Attach:") .
- ' </TD>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
- ' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
- ' <input type="submit" name="attach"' .
- ' value="' . _("Add") .'">' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ if ((bool) ini_get('file_uploads')) {
+ 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" .
+ ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' .
+ _("Attach:") . '</TD>' . "\n" .
+ ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+ ' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
+ ' <input type="submit" name="attach"' .
+ ' value="' . _("Add") .'">' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
$s_a = array();
_("Delete selected attachments") . "\">\n" .
'</td></tr>';
}
- echo ' </table></td></tr>' .
- ' </table>' .
- ' </td></tr>';
-
+ echo ' </table>' . "\n" .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n" .
+ ' </TABLE>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
+ } // End of file_uploads if-block
/* End of attachment code */
if ($compose_new_win == '1') {
echo '</TABLE>'."\n";
}
+
echo '</TABLE>' . "\n" .
'<input type="hidden" name="username" value="'. $username . "\">\n" .
- '<input type=hidden name=action value=' . $action . ">\n" .
+ '<input type=hidden name=action value="' . $action . "\">\n" .
'<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
"\">\n";
+ /*
+ store the complete ComposeMessages array in a hidden input value
+ so we can restore them in case of a session timeout.
+ */
+ echo '<input type=hidden name=restoremessages value="' . urlencode(serialize($compose_messages)) . "\">\n";
+ echo '<input type=hidden name=composesession value="' . $composesession . "\">\n";
+ echo '<input type=hidden name=querystring value="' . $_SERVER['QUERY_STRING'] . "\">\n";
echo '</FORM>';
+ 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";
+ }
+
+
do_hook('compose_bottom');
echo '</BODY></HTML>' . "\n";
}
$request_mdn, $request_dr,
$data_dir, $username;
- echo " <TR><TD>\n</TD><TD>\n";
+ echo ' <TR>' . "\n" .
+ ' <TD></TD>' . "\n" .
+ ' <TD>' . "\n";
if ($default_use_priority) {
if(!isset($mailprio)) {
$mailprio = "3";
}
- echo _("Priority") .': <select name="mailprio">'.
+ echo ' ' . _("Priority") .': <select name="mailprio">'.
'<option value="1"'.($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
'<option value="3"'.($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
'<option value="5"'.($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
- "</select>";
+ '</select>' . "\n";
}
$mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
if ($default_use_mdn) {
if ($mdn_user_support) {
- echo "\n\t". _("Receipt") .': '.
+ echo ' ' . _("Receipt") .': '.
'<input type="checkbox" name="request_mdn" value=1'.
($request_mdn=='1'?' checked':'') .'>'. _("On Read").
' <input type="checkbox" name="request_dr" value=1'.
}
}
- echo " </td></tr>\n <TR><td>\n </td><td>\n" .
- "\n <INPUT TYPE=SUBMIT NAME=\"sigappend\" VALUE=\"". _("Signature") . "\">\n";
+ 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=\"".
+ 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";
+ " </NOSCRIPT>\n";
} else {
- echo " <input type=submit name=\"html_addr_search\" value=\"".
- _("Addresses")."\">";
+ echo ' <input type=submit name="html_addr_search" value="'.
+ _("Addresses").'">' . "\n";
}
if ($save_as_draft) {
- echo '<input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
+ echo ' <input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
}
- echo '<INPUT TYPE=submit NAME=send VALUE="'. _("Send") . "\">\n";
+ echo ' <INPUT TYPE=submit NAME=send VALUE="'. _("Send") . '">' . "\n";
do_hook('compose_button_row');
- echo " </TD></TR>\n\n";
+ echo ' </TD>' . "\n" .
+ ' </TR>' . "\n\n";
}
function checkInput ($show) {
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
- if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- if (function_exists("move_uploaded_file")) {
- if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
- return true;
- }
- } else {
- if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
- return true;
- }
- }
+ if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
+ return true;
}
+
$message = $compose_messages[$session];
$type = strtolower($_FILES['attachfile']['type']);
$name = $_FILES['attachfile']['name'];
The message also should be constructed by the message class.
*/
-function sendMessage($composeMessage, $draft=false) {
+function deliverMessage($composeMessage, $draft=false) {
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
$username, $popuser, $usernamedata, $identity, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,
global $imapServerAddress, $imapPort, $sent_folder, $key;
$rfc822_header = $composeMessage->rfc822_header;
- $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain);
- $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain);
- $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain);
+
+ $abook = addressbook_init(false, true);
+
+ $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup'));
+ $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup'));
+ $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 ($full_name) {
$from = $rfc822_header->from[0];
if (!$from->host) $from->host = $domain;
- $from_addr = $full_name .' <'.$from->mailbox.'@'.$from->host.'>';
+ $from_addr = '"'.$full_name .'" <'.$from->mailbox.'@'.$from->host.'>';
$rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
}
if ($reply_to) {
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
- if ($use_authenticated_smtp) {
- global $key, $onetimepad;
- $user = $username;
- $pass = OneTimePadDecrypt($key, $onetimepad);
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech;
+
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
} else {
- $user = '';
- $pass = '';
+ global $key, $onetimepad;
+ $user = $username;
+ $pass = OneTimePadDecrypt($key, $onetimepad);
}
+
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
$stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $authPop);
+ $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
} elseif (!$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
global $sendmail_path;
$length = $imap_deliver->mail($composeMessage);
sqimap_append ($imap_stream, $draft_folder, $length);
$imap_deliver->mail($composeMessage, $imap_stream);
- sqimap_append_done ($imap_stream);
+ sqimap_append_done ($imap_stream, $draft_folder);
sqimap_logout($imap_stream);
unset ($imap_deliver);
return $length;
$succes = $deliver->finalizeStream($stream);
}
if (!$succes) {
- $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ $msg = $deliver->dlv_msg . '<br>' .
+ _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+ $deliver->dlv_server_msg;
plain_error_message($msg, $color);
} else {
unset ($deliver);
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);
+ sqimap_append_done ($imap_stream, $sent_folder);
unset ($imap_deliver);
}
global $passed_id, $mailbox, $action;
projects / squirrelmail.git / blobdiff