require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'class/deliver/Deliver.class.php');
require_once(SM_PATH . 'functions/addressbook.php');
+require_once(SM_PATH . 'functions/identity.php');
/* --------------------- Get globals ------------------------------------- */
/** COOKIE VARS */
sqgetGlobalVar('action',$action);
sqgetGlobalVar('session',$session);
sqgetGlobalVar('mailbox',$mailbox);
-sqgetGlobalVar('identity',$identity);
+if(!sqgetGlobalVar('identity',$identity)) {
+ $identity=0;
+}
sqgetGlobalVar('send_to',$send_to);
sqgetGlobalVar('send_to_cc',$send_to_cc);
sqgetGlobalVar('send_to_bcc',$send_to_bcc);
/** GET VARS */
sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
+/* 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, $username, $data_dir;
+ global $include_self_reply_all, $idents;
$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 = 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(trim($cur_email_address));
- $excl_ar[$cur_email_address] = '';
- }
- }
+ foreach($idents as $id) {
+ $excl_ar[strtolower(trim($id['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 = substr($url_replytoallcc,2);
+
return $url_replytoallcc;
}
$subject = decodeHeader($orig_header->subject,false,false);
$subject = str_replace(' ',' ',$subject);
$bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n\n". $display[_("Subject")] . $subject . "\n" .
+ "\n". $display[_("Subject")] . $subject . "\n" .
$display[_("From")] . $from . "\n" .
$display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
$display[_("To")] . $to . "\n";
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode($draft_folder) .
+ Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) .
"&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes");
exit();
}
else {
if ($compose_new_win == '1') {
- Header("Location: compose.php?saved_draft=yes&session=$composesession");
+ Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
exit();
}
else {
- Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort".
"&startMessage=1¬e=".urlencode($draft_message));
exit();
}
} else {
sqWordWrap($line, $editor_size);
$newBody .= $line . "\n";
+
}
+
}
$body = $newBody;
- do_hook('compose_send');
+
$composeMessage=$compose_messages[$session];
$Result = deliverMessage($composeMessage);
}
unset($compose_messages[$session]);
if ( isset($delete_draft)) {
- Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ).
+ Header("Location: $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");
+ Header("Location: $location/compose.php?mail_sent=yes");
}
else {
- Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
+ Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort".
"&startMessage=1");
}
} else {
showInputForm($session);
}
elseif (isset($sigappend)) {
- $idents = getPref($data_dir, $username, 'identities', 0);
- if ($idents > 1) {
- if ($identity == 'default') {
- $no = 'g';
- } else {
- $no = $identity;
- }
- $signature = getSig($data_dir, $username, $no);
- }
+ $signature = $idents[$identity]['signature'];
+
$body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
if (isset($send_to_bcc)) {
$values['send_to_bcc'] = $send_to_bcc;
}
+ if (isset($subject)) {
+ $values['subject'] = $subject;
+ }
showInputForm($session, $values);
}
/* 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,
+ 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;
$send_to = $send_to_cc = $send_to_bcc = $subject = $identity = '';
$mailprio = 3;
$bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart);
$bodypart = strip_tags($bodypart);
}
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ if (mb_detect_encoding($bodypart) != 'ASCII') {
+ $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
+ }
+ }
$body .= $bodypart;
}
if ($default_use_priority) {
//ClearAttachments($session);
$identity = '';
- $idents = getPref($data_dir, $username, 'identities');
$from_o = $orig_header->from;
if (is_object($from_o)) {
$orig_from = $from_o->getAddress();
} 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 && $i) {
- $identity = $i;
+ 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) {
$identity = $identity_match;
switch ($action) {
case ('draft'):
$use_signature = FALSE;
+ $composeMessage->rfc822_header = $orig_header;
$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);
+// /* 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 = '';
case ('forward'):
$send_to = '';
$subject = decodeHeader($orig_header->subject,false,true);
- if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
+ if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
$subject = '[Fwd: ' . $subject . ']';
if ( !in_array($message->entity_id, $entities) && $message->entity_id) {
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 = $message->getFilename();
- }
+ if ($message->type1 == 'rfc822') {
+ $filename = $message->rfc822_header->subject.'.eml';
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id.'.eml';
+ }
+ } else {
+ $filename = $message->getFilename();
+ }
break;
default:
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
$filename = $message->getFilename();
break;
}
$full_localfilename = "$hashed_attachment_dir/$localfilename";
}
$message->att_local_name = $full_localfilename;
- if (!$message->mime_header) { /* temporary hack */
- $message->mime_header = $message->header;
- }
+
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $full_localfilename);
- $composeMessage->addEntity($message);
-
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
TRUE, $response, $readmessage, $uid_support);
$message = $message->parent;
}
- if ($response = 'OK') {
+ if ($response == 'OK') {
$subject = encodeHeader($message->rfc822_header->subject);
array_shift($body_a);
$body = implode('', $body_a) . "\r\n";
$editor_size, $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, $draft_id, $delete_draft,
+ $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;
$mailprio = $values['mailprio'];
$body = $values['body'];
$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". '<SCRIPT LANGUAGE=JavaScript><!--' . "\n" .
+ 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" .
- '// --></SCRIPT>' . "\n\n";
+ "// -->\n</SCRIPT>\n\n";
}
echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
showComposeButtonRow();
}
- $idents = getPref($data_dir, $username, 'identities', 0);
- if ($idents > 1) {
- 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(getPref($data_dir, $username, 'full_name'));
- $em = getPref($data_dir, $username, 'email_address');
- if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
- }
- for ($i = 1; $i < $idents; $i ++) {
- echo '<option value="' . $i . '"';
- if (isset($identity) && $identity == $i) {
- echo ' SELECTED';
- }
- echo '>' . htmlspecialchars(getPref($data_dir, $username,
- 'full_name' . $i));
- $em = getPref($data_dir, $username, 'email_address' . $i);
- if ($em != '') {
- echo htmlspecialchars(' <' . $em . '>') . "\n";
+ /* display select list for identities */
+ if (count($idents) > 1) {
+ 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" ;
+ foreach($idents as $id=>$data) {
+ echo '<option value="'.$id.'"';
+ if($id == $identity) {
+ echo ' selected';
}
- echo '</option>';
+ echo '>'.htmlspecialchars($data['full_name'].' <'.$data['email_address'].'>').
+ "</option>\n";
}
+
echo '</select>' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ ' </td>' . "\n" .
+ ' </tr>' . "\n";
}
- echo ' <TR>' . "\n" .
- html_tag( 'td', '', 'right', $color[4], 'WIDTH="10%"' ) .
+ 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', '', '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" .
+ _("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" .
+ ' <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" .
+ _("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" .
+ ' <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" .
+ _("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";
+ 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">';
}
+
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);
- }
+ $signature = $idents[$identity]['signature'];
if ($sig_first == '1') {
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);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
- echo "\n\n".decodeHeader($body,false,true);
+ echo "\n\n".decodeHeader($body,false,false);
}
else {
- echo "\n\n".decodeHeader($body,false,true);
+ echo "\n\n".decodeHeader($body,false,false);
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,true);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false,false);
}
}
}
else {
- echo decodeHeader($body,false,true);
+ echo decodeHeader($body,false,false);
}
- 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>' . "\n" .
- html_tag( 'td', '', 'right', '', 'COLSPAN=2' ) . "\n" .
- ' <INPUT TYPE=SUBMIT NAME=send VALUE="' . _("Send") . '">' . "\n" .
- ' <BR><BR>' . "\n" .
- ' </TD>' . "\n" .
- ' </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 */
if ((bool) ini_get('file_uploads')) {
- echo ' <TR>' . "\n" .
- ' <TD COLSPAN=2>' . "\n" .
+
+ /* 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 '<INPUT TYPE="hidden" name="MAX_FILE_SIZE" value="'.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" .
+ ' <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" .
+ ' <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" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ $maxsize .
+ ' </td>' . "\n" .
+ ' </tr>' . "\n";
$s_a = array();
}
}
+/* parse values like 8M and 2k into bytes */
+function getByteSize($ini_size) {
+
+ if(!$ini_size) {
+ return FALSE;
+ }
+ $ini_size = trim($ini_size);
+
+ // if there's some kind of letter at the end of the string we need to multiply.
+ if(!is_numeric(substr($ini_size, -1))) {
+
+ switch(strtoupper(substr($ini_size, -1))) {
+ case 'G':
+ $bytesize = 1073741824;
+ break;
+ case 'M':
+ $bytesize = 1048576;
+ break;
+ case 'K':
+ $bytesize = 1024;
+ break;
+ }
+
+ return ($bytesize * (int)substr($ini_size, 0, -1));
+ }
+
+ return $ini_size;
+}
/* temporary function to make use of the deliver class.
function deliverMessage($composeMessage, $draft=false) {
global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
- $username, $popuser, $usernamedata, $identity, $data_dir,
+ $username, $popuser, $usernamedata, $identity, $idents, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,
- $domain, $action;
+ $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 ??? */
+
+ $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);
+
$rfc822_header = $composeMessage->rfc822_header;
$abook = addressbook_init(false, true);
$popuser = $username;
}
$reply_to = '';
- if (isset($identity) && $identity != 'default') {
- $from_mail = getPref($data_dir, $username,'email_address' . $identity);
- $full_name = getPref($data_dir, $username,'full_name' . $identity);
- $reply_to = getPref($data_dir, $username,'reply_to' . $identity);
- } else {
- $from_mail = getPref($data_dir, $username, 'email_address');
- $full_name = getPref($data_dir, $username, 'full_name');
- $reply_to = getPref($data_dir, $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";
- $full_name = '';
}
$rfc822_header->from = $rfc822_header->parseAddress($from_mail,true);
if ($full_name) {
array_unshift($composeMessage->entities, $message_body);
$content_type = new ContentType('multipart/mixed');
} else {
- $content_type = new ContentType('text/plain');
- }
- if ($default_charset) {
- $content_type->properties['charset']=$default_charset;
+ $content_type = new ContentType('text/plain');
+ if ($special_encoding) {
+ $rfc822_header->encoding = $special_encoding;
+ } else {
+ $rfc822_header->encoding = '8bit';
+ }
+ if ($default_charset) {
+ $content_type->properties['charset']=$default_charset;
+ }
}
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
+ /* Here you can modify the message structure just before we hand
+ it over to deliver */
+ do_hook('compose_send');
+
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
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);
+ $move_to_sent = getPref($data_dir,$username,'move_to_sent');
+ $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+ /* Move to sent code */
+ if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) {
+ $svr_allow_sent = true;
+ } else {
+ $svr_allow_sent = false;
+ }
+
+ if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none'))
+ && sqimap_mailbox_exists( $imap_stream, $sent_folder)) {
+ $fld_sent = true;
+ } else {
+ $fld_sent = false;
+ }
+
+ if ((isset($move_to_sent) && ($move_to_sent != 0)) || (!isset($move_to_sent))) {
+ $lcl_allow_sent = true;
+ } else {
+ $lcl_allow_sent = false;
+ }
+
+ if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) {
+ 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);
+ sqimap_append_done ($imap_stream, $sent_folder);
unset ($imap_deliver);
}
global $passed_id, $mailbox, $action;
projects / squirrelmail.git / blobdiff