/**
* 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.
/* 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/date.php');
require_once(SM_PATH . 'functions/mime.php');
-//require_once(SM_PATH . 'functions/smtp.php');
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
+require_once(SM_PATH . 'functions/addressbook.php');
/* --------------------- Get globals ------------------------------------- */
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
-
-if (isset($_POST['return'])) {
- $html_addr_search_done = 'Use Addresses';
-}
-if ( isset($_SESSION['composesession']) ) {
- $composesession = $_SESSION['composesession'];
-}
-sqextractGlobalVar('action');
-sqextractGlobalVar('session');
-sqextractGlobalVar('mailbox');
-sqextractGlobalVar('identity');
-sqextractGlobalVar('send_to');
-sqextractGlobalVar('send_to_cc');
-sqextractGlobalVar('send_to_bcc');
-sqextractGlobalVar('subject');
-sqextractGlobalVar('body');
-sqextractGlobalVar('mailprio');
-sqextractGlobalVar('request_mdn');
-sqextractGlobalVar('request_dr');
-sqextractGlobalVar('html_addr_search');
-sqextractGlobalVar('mail_sent');
-sqextractGlobalVar('passed_id');
-sqextractGlobalVar('passed_ent_id');
-
-if ( isset($_POST['sigappend']) ) {
- $sigappend = $_POST['sigappend'];
-}
-/* From addressbook search */
-if ( isset($_POST['from_htmladdr_search']) ) {
- $from_htmladdr_search = $_POST['from_htmladdr_search'];
-}
-if ( isset($_POST['addr_search_done']) ) {
- $html_addr_search_done = $_POST['addr_search_done'];
-}
-if ( isset($_POST['send_to_search']) ) {
- $send_to_search = &$_POST['send_to_search'];
+/** COOKIE VARS */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+
+/** SESSION VARS */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+
+sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
+sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+
+/** SESSION/POST/GET VARS */
+sqgetGlobalVar('action',$action);
+sqgetGlobalVar('session',$session);
+sqgetGlobalVar('mailbox',$mailbox);
+sqgetGlobalVar('identity',$identity);
+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);
+
+
+/** 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);
+if ( sqgetGlobalVar('return', $temp, SQ_POST) ) {
+ $html_addr_search_done = 'Use Addresses';
}
-/* Attachments */
-sqextractGlobalVar('attach');
-if ( isset($_POST['do_delete']) ) {
- $do_delete = $_POST['do_delete'];
-}
-if ( isset($_POST['delete']) ) {
- $delete = &$_POST['delete'];
-}
-if ( isset($_POST['attachments']) ) {
- $attachments = &$_POST['attachments'];
-}
-elseif ( isset($_SESSION['attachments'])) {
- $attachments = &$_SESSION['attachments'];
-}
-
-/* Forward message as attachment */
-if ( isset($_GET['attachedmessages']) ) {
- $attachedmessages = $_GET['attachedmessages'];
-}
-
-/* Drafts */
-sqextractGlobalVar('draft');
-sqextractGlobalVar('draft_id');
-sqextractGlobalVar('ent_num');
-sqextractGlobalVar('saved_draft');
-sqextractGlobalVar('delete_draft');
-
-$key = $_COOKIE['key'];
+/** GET VARS */
+sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
/* --------------------- Specific Functions ------------------------------ */
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);
return $url_replytoallcc;
}
+function getReplyCitation($orig_from) {
+ global $reply_citation_style, $reply_citation_start, $reply_citation_end;
+ $orig_from = decodeHeader($orig_from->getAddress(false),false,false);
+// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
+ /* First, return an empty string when no citation style selected. */
+ if (($reply_citation_style == '') || ($reply_citation_style == 'none')) {
+ return '';
+ }
+
+ /* Make sure our final value isn't an empty string. */
+ if ($orig_from == '') {
+ return '';
+ }
+
+ /* Otherwise, try to select the desired citation style. */
+ switch ($reply_citation_style) {
+ case 'author_said':
+ $start = '';
+ $end = ' ' . _("said") . ':';
+ break;
+ case 'quote_who':
+ $start = '<' . _("quote") . ' ' . _("who") . '="';
+ $end = '">';
+ break;
+ case 'user-defined':
+ $start = $reply_citation_start .
+ ($reply_citation_start == '' ? '' : ' ');
+ $end = $reply_citation_end;
+ break;
+ default:
+ return '';
+ }
+
+ /* Build and return the citation string. */
+ return ($start . $orig_from . $end . "\n");
+}
+
function getforwardHeader($orig_header) {
global $editor_size;
$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);
+ $from = str_replace(' ',' ',$from);
+ $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false);
+ $to = str_replace(' ',' ',$to);
+ $subject = decodeHeader($orig_header->subject,false,false);
+ $subject = str_replace(' ',' ',$subject);
$bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n". $display[_("Subject")] .
- decodeHeader($orig_header->subject) . "\n" .
- $display[_("From")] .
- decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" .
- $display[_("Date")] .
- getLongDateString( $orig_header->date ). "\n" .
- $display[_("To")] .
- decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n";
- if ($orig_header->cc != array() && $orig_header->cc !='') {
- $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";
+ "\n\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);
+ $cc = str_replace(' ',' ',$cc);
+ $bodyTop .= $display[_("Cc")] .$cc . "\n";
}
$bodyTop .= str_pad('', $editor_size -2 , '-') .
- "\n";
+ "\n\n";
return $bodyTop;
}
/* ----------------------------------------------------------------------- */
-/* OLD: should be adapted to composeMessage */
-
/*
* If the session is expired during a post this restores the compose session
* vars.
*/
-//$session_expired = false;
-if (session_is_registered('session_expired_post')) {
- global $session_expired_post, $session_expired;
+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');
- 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 = '';
}
showInputForm($session, false);
exit();
}
-
if (!isset($composesession)) {
$composesession = 0;
sqsession_register(0,'composesession');
$composesession = $session;
sqsession_register($composesession,'composesession');
}
-
if (!isset($compose_messages)) {
$compose_messages = array();
}
$mailbox = 'INBOX';
}
-if (isset($draft)) {
- /*
- * Set $default_charset to correspond with the user's selection
- * of language interface.
- */
- set_my_charset();
- $composeMessage=$compose_messages[$session];
- $Result = sendMessage($composeMessage, true);
-
- if (! sendMessage($composeMessage, true)) {
+if ($draft) {
+ /*
+ * 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)) {
}
}
-if (isset($send)) {
+if ($send) {
if (isset($_FILES['attachfile']) &&
$_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 (! 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 {
"&startMessage=1");
}
} else {
- /*
- *$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- * $imapPort, 0);
- */
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
}
if (isset($delete) && is_array($delete)) {
$composeMessage = $compose_messages[$session];
foreach($delete as $index) {
- $attached_file = $composeMessage->entities[$index]->att_local_name;
+ $attached_file = $composeMessage->entities[$index]->att_local_name;
unlink ($attached_file);
- unset ($composeMessage->entities[$index]);
+ 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');
-// setPref($data_dir, $username, 'attachments', serialize($attachments));
+ $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 (isset($send_to_bcc)) {
$values['send_to_bcc'] = $send_to_bcc;
}
+ if (isset($subject)) {
+ $values['subject'] = $subject;
+ }
showInputForm($session, $values);
}
global $editor_size, $default_use_priority, $body,
$use_signature, $composesession, $data_dir, $username,
$username, $key, $imapServerAddress, $imapPort, $compose_messages,
- $composeMessage;
+ $composeMessage;
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-
+
$body = '';
if ($passed_ent_id) {
/* redefine the messsage in case of message/rfc822 */
}
$orig_header = $message->rfc822_header;
}
-
+
$encoding = $message->header->encoding;
$type0 = $message->type0;
$type1 = $message->type1;
$bodypart = decodeBody($unencoded_bodypart,
$body_part_entity->header->encoding);
if ($type1 == 'html') {
+ $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart);
$bodypart = strip_tags($bodypart);
}
$body .= $bodypart;
} else {
$orig_from = '';
}
+ $identities = array();
if (!empty($idents) && $idents > 1) {
+ $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) {
+ $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) {
case ('draft'):
$use_signature = FALSE;
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
-
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
+ $subject = decodeHeader($orig_header->subject,false,true);
$body_ary = explode("\n", $body);
$cnt = count($body_ary) ;
$body = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
break;
case ('edit_as_new'):
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true);
+ $subject = decodeHeader($orig_header->subject,false,true);
$mailprio = $orig_header->priority;
$orig_from = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
break;
case ('forward'):
$send_to = '';
- $subject = decodeHeader($orig_header->subject);
- if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ $subject = decodeHeader($orig_header->subject,false,true);
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
$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);
break;
case ('reply_all'):
$send_to_cc = replyAllString($orig_header);
+ $send_to_cc = decodeHeader($send_to_cc,false,true);
case ('reply'):
$send_to = $orig_header->reply_to;
- if (is_object($send_to)) {
- $send_to = decodeHeader($send_to->getAddr_s('reply_to'));
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */
+ $send_to = $orig_header->getAddr_s('reply_to');
} else {
- $send_to = decodeHeader($orig_header->getAddr_s('from'));
+ $send_to = $orig_header->getAddr_s('from');
}
- $subject = decodeHeader($orig_header->subject);
+ $send_to = decodeHeader($send_to,false,true);
+ $subject = decodeHeader($orig_header->subject,false,true);
$subject = str_replace('"', "'", $subject);
$subject = trim($subject);
if (substr(strtolower($subject), 0, 3) != 're:') {
}
/* this corrects some wrapping/quoting problems on replies */
$rewrap_body = explode("\n", $body);
-
- $body = getReplyCitation($orig_header->from->personal);
+ $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
+ sqUnWordWrap($body);
+ $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]);
}
+ $body = getReplyCitation($from) . $body;
$composeMessage->reply_rfc822_header = $orig_header;
+
break;
- default:
+ default:
break;
}
- $compose_messages[$session] = $composeMessage;
- sqsession_register($compose_messages, 'compose_messages');
-
+ $compose_messages[$session] = $composeMessage;
+ sqsession_register($compose_messages, 'compose_messages');
+ session_write_close();
sqimap_logout($imapConnection);
}
$ret = array( 'send_to' => $send_to,
if (!count($message->entities) ||
($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 = decodeHeader($message->rfc822_header->subject.'.eml');
+ switch ($message->type0) {
+ case 'message':
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject.'.eml';
if ($filename == "") {
$filename = "untitled-".$message->entity_id.'.eml';
}
- } else {
- $filename = decodeHeader($message->getFilename());
+ } else {
+ $filename = $message->getFilename();
}
- break;
- default:
- $filename = decodeHeader($message->getFilename());
- break;
- }
+ break;
+ default:
+ $filename = $message->getFilename();
+ break;
+ }
+ $filename = decodeHeader($filename);
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
- function_exists($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;
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
-
- $composeMessage->addEntity($message);
-
+ $message->att_local_name = $full_localfilename;
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
+
+ $composeMessage->addEntity($message);
+
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
$composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection);
}
}
-// setPref($data_dir, $username, 'attachments', serialize($attachments));
return $composeMessage;
}
$fp = fopen( $full_localfilename, 'w');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
- $full_localfilename);
+ $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+ $full_localfilename);
}
return $composeMessage;
}
$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 = decodeHeader($subject, false);
if ($values) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
$subject = $values['subject'];
$mailprio = $values['mailprio'];
$body = $values['body'];
- $identity = $values['identity'];
+ $identity = (int) $values['identity'];
+ } else {
+ $send_to = decodeHeader($send_to);
+ $send_to_cc = decodeHeader($send_to_cc);
+ $send_to_bcc = decodeHeader($send_to_bcc);
}
if ($use_javascript_addr_book) {
echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
'ENCTYPE="multipart/form-data"';
do_hook("compose_form");
-
echo ">\n";
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><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
+ ' <TR><TD></TD>'. html_tag( 'td', '', 'right' ) . '<INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
}
if ($location_of_buttons == 'top') {
showComposeButtonRow();
}
+ /* display select list for identities */
$idents = getPref($data_dir, $username, 'identities', 0);
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'));
+ $fn = getPref($data_dir, $username, 'full_name');
$em = getPref($data_dir, $username, 'email_address');
+ echo ' <tr>' . "\n" .
+ html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
+ _("From:") . '</td>' . "\n" .
+ html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
+ ' <select name="identity">' . "\n" .
+ ' <option value="default">' .
+ htmlspecialchars($fn);
if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
+ if($fn != '') {
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ } else {
+ echo htmlspecialchars($em) . "\n";
+ }
}
for ($i = 1; $i < $idents; $i ++) {
+ $fn = getPref($data_dir, $username, 'full_name' . $i);
+ $em = getPref($data_dir, $username, 'email_address' . $i);
+
echo '<option value="' . $i . '"';
if (isset($identity) && $identity == $i) {
- echo ' SELECTED';
+ echo ' selected';
}
- echo '>' . htmlspecialchars(getPref($data_dir, $username,
- 'full_name' . $i));
- $em = getPref($data_dir, $username, 'email_address' . $i);
+ echo '>' . htmlspecialchars($fn);
if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
+ if($fn != '') {
+ echo htmlspecialchars(' <' . $em . '>') . "\n";
+ } else {
+ echo htmlspecialchars($em) . "\n";
+ }
}
echo '</option>';
}
echo '</select>' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
- }
- echo ' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' . "\n" .
- _("To:") .
- ' </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
- ' <INPUT TYPE=text NAME="send_to" VALUE="' .
- 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" .
- ' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
- 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" .
- ' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
- htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
- '</TD></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>' . "\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%"' ) .
+ ' <input type="text" name="send_to" value="' .
+ $send_to . '" size="60" /><br />' . "\n" .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n" .
+ ' <tr>' . "\n" .
+ html_tag( 'td', '', 'right', $color[4] ) .
+ _("CC:") . '</td>' . "\n" .
+ html_tag( 'td', '', 'left', $color[4] ) .
+ ' <input type="text" name="send_to_cc" size="60" value="' .
+ $send_to_cc . '" /><br />' . "\n" .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n" .
+ ' <tr>' . "\n" .
+ html_tag( 'td', '', 'right', $color[4] ) .
+ _("BCC:") . '</td>' . "\n" .
+ html_tag( 'td', '', 'left', $color[4] ) .
+ ' <input type="text" name="send_to_bcc" value="' .
+ $send_to_bcc . '" size="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 ' <input type="text" name="subject" size="60" value="' .
+ $subject . '" />' . "\n" .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n\n";
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
+
+ /* why this distinction? */
if ($compose_new_win == '1') {
echo ' <TR>' . "\n" .
' <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
' <TEXTAREA NAME=body 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);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false);
}
- echo "\n\n".htmlspecialchars($body);
+ echo "\n\n".decodeHeader($body,false,true);
}
else {
- echo "\n\n".htmlspecialchars($body);
- if ($charset == 'iso-2022-jp') {
+ echo "\n\n".decodeHeader($body,false,true);
+ 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);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,true);
}
}
}
else {
- echo htmlspecialchars($body);
+ echo decodeHeader($body,false,true);
}
- echo '</TEXTAREA><BR>' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ echo '</textarea><br />' . "\n" .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n";
+
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" .
+ html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\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')) {
+
+ /* 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(count($sizes) > 0) {
+ $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')';
+ } else {
+ $maxsize = '';
+ }
+
+ echo ' <tr>' . "\n" .
+ ' <td colspan="2">' . "\n" .
+ ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.
+ ' border="0" bgcolor="'.$color[9].'">' . "\n" .
+ ' <tr>' . "\n" .
+ ' <td>' . "\n" .
+ ' <table width="100%" cellpadding="3" cellspacing="0" align="center"'.
+ ' border="0">' . "\n" .
+ ' <tr>' . "\n" .
+ html_tag( 'td', '', 'right', '', 'valign="middle"' ) .
+ _("Attach:") . '</td>' . "\n" .
+ html_tag( 'td', '', 'left', '', 'valign="middle"' ) .
+ ' <input name="attachfile" size="48" type="file" />' . "\n" .
+ ' <input type="submit" name="attach"' .
+ ' value="' . _("Add") .'">' . "\n" .
+ $maxsize .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n";
$s_a = array();
- foreach ($composeMessage->entities as $key => $attachment) {
+ 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.'/'.
- $attachment->mime_header->type1;
- $s_a[] = '<input type="checkbox" name="delete[]" value="' .
- $key . "\">\n" . $attached_filename . ' - ' . $type .
- ' ('.show_readable_size( filesize( $attached_file ) )
- . ')<br>'."\n";
+ 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><input type="checkbox" name="delete[]" value="' .
+ $key . "\"></td><td>\n" . $attached_filename .
+ '</td><td>-</td><td> ' . $type . '</td><td>('.
+ show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
}
+ }
}
if (count($s_a)) {
foreach ($s_a as $s) {
- echo '<tr><td align=left colspan="2" bgcolor="' . $color[0] . '">'.$s.'</td></tr>';
+ 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></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" .
- '</FORM>';
+ "\">\n";
+ /*
+ store the complete ComposeMessages array in a hidden input value
+ so we can restore them in case of a session timeout.
+ */
+ sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER);
+ 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="' . $queryString . "\">\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 "\n <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) {
global $_FILES, $attachment_dir, $attachments, $username,
$data_dir, $compose_messages;
+ /* get out of here if no file was attached at all */
+ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
+ return true;
+ }
+
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$localfilename = GenerateRandomString(32, '', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
$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 (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;
- }
- }
+ }
}
$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');
}
function ClearAttachments($composeMessage) {
}
}
+/* parse values like 8M and 2k into bytes */
+function getByteSize($ini_size) {
+ if(!$ini_size) return FALSE;
-function getReplyCitation($orig_from) {
- global $reply_citation_style, $reply_citation_start, $reply_citation_end;
-
- /* 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 == '') {
- return '';
- }
+ $ini_size = trim($ini_size);
- /* Otherwise, try to select the desired citation style. */
- switch ($reply_citation_style) {
- case 'author_said':
- $start = '';
- $end = ' ' . _("said") . ':';
- break;
- case 'quote_who':
- $start = '<' . _("quote") . ' ' . _("who") . '="';
- $end = '">';
- break;
- case 'user-defined':
- $start = $reply_citation_start .
- ($reply_citation_start == '' ? '' : ' ');
- $end = $reply_citation_end;
- break;
- default:
- return '';
+ switch(strtoupper(substr($ini_size, -1))) {
+ case 'G':
+ $bytesize = 1073741824;
+ break;
+ case 'M':
+ $bytesize = 1048576;
+ break;
+ case 'K':
+ $bytesize = 1024;
+ break;
+ default:
+ $bytesize = 1;
}
- /* Build and return the citation string. */
- return ($start . $orig_from . $end . "\n");
+ $bytesize *= (int)substr($ini_size, 0, -1);
+
+ return $bytesize;
}
+
/* 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 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,
- $domain, $action;
+ $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
+ $domain, $action;
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 (strtolower($default_charset) == 'iso-2022-jp') {
if (mb_detect_encoding($body) == 'ASCII') {
- $special_encoding = '8bit';
+ $special_encoding = '8bit';
} else {
$body = mb_convert_encoding($body, 'JIS');
$special_encoding = '7bit';
$rfc822_header->from = $rfc822_header->parseAddress($from_mail,true);
if ($full_name) {
$from = $rfc822_header->from[0];
- if (!$from->host) $from->host = $domain;
- $from_addr = $full_name .' <'.$from->mailbox.'@'.$from->host.'>';
+ 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) {
/* multipart messages */
if (count($composeMessage->entities)) {
$message_body = new Message();
- $message_body->body_part = $composeMessage->body_part;
- $composeMessage->body_part = '';
- $mime_header = new MessageHeader;
- $mime_header->type0 = 'text';
- $mime_header->type1 = 'plain';
- if ($special_encoding) {
- $mime_header->encoding = $special_encoding;
- } else {
- $mime_header->encoding = 'us-ascii';
- }
- if ($default_charset) {
- $mime_header->parameters['charset'] = $default_charset;
- }
- $message_body->mime_header = $mime_header;
+ $message_body->body_part = $composeMessage->body_part;
+ $composeMessage->body_part = '';
+ $mime_header = new MessageHeader;
+ $mime_header->type0 = 'text';
+ $mime_header->type1 = 'plain';
+ if ($special_encoding) {
+ $mime_header->encoding = $special_encoding;
+ } else {
+ $mime_header->encoding = '8bit';
+ }
+ if ($default_charset) {
+ $mime_header->parameters['charset'] = $default_charset;
+ }
+ $message_body->mime_header = $mime_header;
array_unshift($composeMessage->entities, $message_body);
- $content_type = new ContentType('multipart/mixed');
+ $content_type = new ContentType('multipart/mixed');
} else {
- $content_type = new ContentType('text/plain');
+ $content_type = new ContentType('text/plain');
}
if ($default_charset) {
- $content_type->properties['charset']=$default_charset;
+ $content_type->properties['charset']=$default_charset;
}
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
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);
- } else {
- $user = '';
- $pass = '';
- }
- $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
- $stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $authPop);
+ require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
+ $deliver = new Deliver_SMTP();
+ global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech;
+
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
+ } else {
+ 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, $user, $pass, $authPop);
} elseif (!$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
global $sendmail_path;
$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);
- sqimap_logout($imap_stream);
- unset ($imap_deliver);
-
- }
- return $length;
+ 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;
+ } else {
+ $msg = '<br>Error: '._("Draft folder")." $draft_folder" . ' does not exist.';
+ plain_error_message($msg, $color);
+ return false;
+ }
}
$succes = false;
if ($stream) {
- $length = $deliver->mail($composeMessage, $stream);
- $succes = $deliver->finalizeStream($stream);
+ $length = $deliver->mail($composeMessage, $stream);
+ $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);
$imap_stream = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
- if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
- 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);
- 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', true);
- }
- sqimap_logout($imap_stream);
+ if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
+ 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);
+ 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', true);
+ }
+ sqimap_logout($imap_stream);
}
return $succes;
}
projects / squirrelmail.git / blobdiff