X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=2c5317f434c8d85d19b53f56beed63450775379d;hb=45c1ed84f88a3e3a9e3d0959642b88f1225bac45;hp=35d370d4ce4986ddd07d1c486c816f7fac101edb;hpb=5b9716de4c46a80d15bf369d7f05021ced6340b2;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index 35d370d4..2c5317f4 100644 --- a/src/compose.php +++ b/src/compose.php @@ -15,9 +15,10 @@ * - Save As Draft * * $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -30,6 +31,7 @@ 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'); +require_once(SM_PATH . 'functions/identity.php'); /* --------------------- Get globals ------------------------------------- */ /** COOKIE VARS */ @@ -45,10 +47,12 @@ sqgetGlobalVar('composesession', $composesession, SQ_SESSION); sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION); /** SESSION/POST/GET VARS */ -sqgetGlobalVar('action',$action); +sqgetGlobalVar('smaction',$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); @@ -70,7 +74,7 @@ sqgetGlobalVar('draft_id',$draft_id); sqgetGlobalVar('ent_num',$ent_num); sqgetGlobalVar('saved_draft',$saved_draft); sqgetGlobalVar('delete_draft',$delete_draft); - +sqgetGlobalVar('startMessage',$startMessage); /** POST VARS */ sqgetGlobalVar('sigappend', $sigappend, SQ_POST); @@ -87,10 +91,15 @@ if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { /** 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' @@ -104,43 +113,40 @@ function replyAllString($header) { * 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']))] = ''; + } } - /** + /** * 3) get the addresses. */ $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); - /** + /** * 4) generate the string. */ $url_replytoallcc = ''; foreach( $url_replytoall_ar as $email => $personal) { if ($personal) { - $url_replytoallcc .= ", \"$personal\" <$email>"; + // if personal name contains address separator then surround + // the personal name with double quotes. + if (strpos($personal,',') !== false) { + $personal = '"'.$personal.'"'; + } + $url_replytoallcc .= ", $personal <$email>"; } else { - $url_replytoallcc .= ', '. $email; + $url_replytoallcc .= ', '. $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); + $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); // $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')) { @@ -163,7 +169,7 @@ function getReplyCitation($orig_from) { $end = '">'; break; case 'user-defined': - $start = $reply_citation_start . + $start = $reply_citation_start . ($reply_citation_start == '' ? '' : ' '); $end = $reply_citation_end; break; @@ -179,20 +185,20 @@ function getforwardHeader($orig_header) { global $editor_size; $display = array( _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), + _("From") => strlen(_("From")), + _("Date") => strlen(_("Date")), + _("To") => strlen(_("To")), _("Cc") => strlen(_("Cc")) ); $maxsize = max($display); $indent = str_pad('',$maxsize+2); foreach($display as $key => $val) { $display[$key] = $key .': '. str_pad('', $maxsize - $val); } - $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); + $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true); $from = str_replace(' ',' ',$from); - $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false); + $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true); $to = str_replace(' ',' ',$to); - $subject = decodeHeader($orig_header->subject,false,false); + $subject = decodeHeader($orig_header->subject,false,false,true); $subject = str_replace(' ',' ',$subject); $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . "\n". $display[_("Subject")] . $subject . "\n" . @@ -200,8 +206,8 @@ function getforwardHeader($orig_header) { $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); + $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); + $cc = str_replace(' ',' ',$cc); $bodyTop .= $display[_("Cc")] .$cc . "\n"; } $bodyTop .= str_pad('', $editor_size -2 , '-') . @@ -211,12 +217,12 @@ function getforwardHeader($orig_header) { /* ----------------------------------------------------------------------- */ /* - * If the session is expired during a post this restores the compose session + * If the session is expired during a post this restores the compose session * vars. */ 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. */ @@ -261,10 +267,10 @@ if (!isset($composesession)) { if (!isset($session) || (isset($newmessage) && $newmessage)) { sqsession_unregister('composesession'); - $session = "$composesession" +1; + $session = "$composesession" +1; $composesession = $session; sqsession_register($composesession,'composesession'); -} +} if (!isset($compose_messages)) { $compose_messages = array(); } @@ -275,7 +281,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL) $composeMessage->rfc822_header = $rfc822_header; $composeMessage->reply_rfc822_header = ''; $compose_messages[$session] = $composeMessage; - sqsession_register($compose_messages,'compose_messages'); + sqsession_register($compose_messages,'compose_messages'); } else { $composeMessage=$compose_messages[$session]; } @@ -299,17 +305,17 @@ if ($draft) { $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(); } @@ -360,10 +366,12 @@ if ($send) { } else { sqWordWrap($line, $editor_size); $newBody .= $line . "\n"; + } + } $body = $newBody; - do_hook('compose_send'); + $composeMessage=$compose_messages[$session]; $Result = deliverMessage($composeMessage); @@ -371,19 +379,19 @@ if ($send) { showInputForm($session); exit(); } - unset($compose_messages[$session]); + 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". - "&startMessage=1"); + Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". + "&startMessage=$startMessage&mail_sent=yes"); } } else { if ($compose_new_win == '1') { @@ -457,15 +465,8 @@ if ($send) { 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); @@ -500,7 +501,7 @@ elseif (isset($sigappend)) { } else { /* * This handles the default case as well as the error case - * (they had the same code) --> if (isset($smtpErrors)) + * (they had the same code) --> if (isset($smtpErrors)) */ if ($compose_new_win == '1') { @@ -515,15 +516,15 @@ elseif (isset($sigappend)) { $passed_ent_id = ''; } if (!isset($passed_id)) { - $passed_id = ''; + $passed_id = ''; } if (!isset($mailbox)) { $mailbox = ''; - } + } if (!isset($action)) { $action = ''; } - + $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session); /* in case the origin is not read_body.php */ @@ -546,14 +547,23 @@ exit(); /**************** Only function definitions go below *************/ +function getforwardSubject($subject) +{ + if ((substr(strtolower($subject), 0, 4) != 'fwd:') && + (substr(strtolower($subject), 0, 5) != '[fwd:') && + (substr(strtolower($subject), 0, 6) != '[ fwd:')) { + $subject = '[Fwd: ' . $subject . ']'; + } + return $subject; +} /* This function is used when not sending or adding attachments */ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { - global $editor_size, $default_use_priority, $body, + 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; + global $languages, $squirrelmail_language, $default_charset; $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; @@ -564,7 +574,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se 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 */ @@ -591,7 +601,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } $orig_header = $message->rfc822_header; } - + $encoding = $message->header->encoding; $type0 = $message->type0; $type1 = $message->type1; @@ -601,8 +611,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $bodypart = decodeBody($unencoded_bodypart, $body_part_entity->header->encoding); if ($type1 == 'html') { - $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart); + $bodypart = str_replace("\n", ' ', $bodypart); + $bodypart = preg_replace(array('/
/i','/
/i'), "\n", $bodypart);
+ $bodypart = str_replace(array(' ','>','<'),array(' ','>','<'),$bodypart);
$bodypart = strip_tags($bodypart);
+
}
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
@@ -610,6 +623,17 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
}
}
+
+ if (isset($body_part_entity->header->parameters['charset'])) {
+ $actual = $body_part_entity->header->parameters['charset'];
+ } else {
+ $actual = 'us-ascii';
+ }
+
+ if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
+ $bodypart = charset_decode($actual,$bodypart);
+ }
+
$body .= $bodypart;
}
if ($default_use_priority) {
@@ -623,41 +647,56 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
//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;
}
+ // we need identiy here fore draft case #845290
+ // echo $identity."leer";
}
switch ($action) {
case ('draft'):
$use_signature = FALSE;
- $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);
+ $composeMessage->rfc822_header = $orig_header;
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true,true);
+ $send_from = $orig_header->getAddr_s('from');
+ $send_from_parts = new AddressStructure();
+ $send_from_parts = $orig_header->parseAddress($send_from);
+ $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
+ $identities = get_identities();
+ if (count($identities) > 0) {
+ foreach($identities as $iddata) {
+ if ($send_from_add == $iddata['email_address']) {
+ $identity = $iddata['index'];
+ break;
+ }
+ }
+ }
+ $subject = decodeHeader($orig_header->subject,false,true,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 = '';
@@ -672,10 +711,10 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
break;
case ('edit_as_new'):
- $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);
+ $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true,true);
+ $subject = decodeHeader($orig_header->subject,false,true,true);
$mailprio = $orig_header->priority;
$orig_from = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
@@ -683,35 +722,38 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
break;
case ('forward'):
$send_to = '';
- $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 . ']';
- }
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,true,true));
$body = getforwardHeader($orig_header) . $body;
sqUnWordWrap($body);
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
$body = "\n" . $body;
break;
case ('forward_as_attachment'):
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,true,true));
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
$body = '';
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_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');
+ if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) {
+ $send_to = $orig_header->getAddr_s('mail_followup_to');
} else {
- $send_to = $orig_header->getAddr_s('from');
+ $send_to_cc = replyAllString($orig_header);
+ $send_to_cc = decodeHeader($send_to_cc,false,true,true);
+ }
+ case ('reply'):
+ // skip this if send_to was already set right above here
+ if(!$send_to) {
+ $send_to = $orig_header->reply_to;
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else {
+ $send_to = $orig_header->getAddr_s('from');
+ }
}
- $send_to = decodeHeader($send_to,false,true);
- $subject = decodeHeader($orig_header->subject,false,true);
+ $send_to = decodeHeader($send_to,false,true,true);
+ $subject = decodeHeader($orig_header->subject,false,true,true);
$subject = str_replace('"', "'", $subject);
$subject = trim($subject);
if (substr(strtolower($subject), 0, 3) != 're:') {
@@ -720,18 +762,20 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
/* this corrects some wrapping/quoting problems on replies */
$rewrap_body = explode("\n", $body);
$from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from;
- sqUnWordWrap($body);
+ sqUnWordWrap($body); // unwrap and then reset it?!
$body = '';
- $cnt = count($rewrap_body);
- for ($i=0;$i<$cnt;$i++) {
- sqWordWrap($rewrap_body[$i], ($editor_size));
- if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+ $strip_sigs = getPref($data_dir, $username, 'strip_sigs');
+ foreach ($rewrap_body as $line) {
+ if ($strip_sigs && substr($line,0,3) == '-- ') {
+ break;
+ }
+ sqWordWrap($line, ($editor_size));
+ if (preg_match("/^(>+)/", $line, $matches)) {
$gt = $matches[1];
- $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
+ $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n";
} else {
- $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
+ $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n";
}
- unset($rewrap_body[$i]);
}
$body = getReplyCitation($from) . $body;
$composeMessage->reply_rfc822_header = $orig_header;
@@ -759,26 +803,30 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) {
global $attachment_dir, $username, $data_dir, $squirrelmail_language;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- if (!count($message->entities) ||
+ 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 = $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;
+ if ($filename == "") {
+ $filename = "untitled-".$message->entity_id;
+ }
+ $filename .= '.msg';
+ } else {
+ $filename = $message->getFilename();
+ }
break;
default:
+ if (!$message->mime_header) { /* temporary hack */
+ $message->mime_header = $message->header;
+ }
$filename = $message->getFilename();
break;
}
- $filename = decodeHeader($filename);
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ $filename = str_replace(' ', ' ', decodeHeader($filename));
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
$filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
}
@@ -789,12 +837,10 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
$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);
-
+
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $full_localfilename);
+
/* Write Attachment to file */
$fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb');
fputs($fp, decodeBody(mime_fetch_body($imapConnection,
@@ -810,17 +856,17 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
return $composeMessage;
}
-function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
+function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$passed_ent_id='', $imapConnection) {
global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
- $body_a = sqimap_run_command($imapConnection,
+ $body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' RFC822',
- TRUE, $response, $readmessage,
+ TRUE, $response, $readmessage,
$uid_support);
} else {
- $body_a = sqimap_run_command($imapConnection,
+ $body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
TRUE, $response, $readmessage, $uid_support);
$message = $message->parent;
@@ -828,29 +874,30 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
if ($response == 'OK') {
$subject = encodeHeader($message->rfc822_header->subject);
array_shift($body_a);
+ array_pop($body_a);
$body = implode('', $body_a) . "\r\n";
-
+
$localfilename = GenerateRandomString(32, 'FILE', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
-
- $fp = fopen( $full_localfilename, 'w');
+
+ $fp = fopen($full_localfilename, 'w');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.eml',
+ $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
$full_localfilename);
}
return $composeMessage;
}
function showInputForm ($session, $values=false) {
- global $send_to, $send_to_cc, $body,
+ global $send_to, $send_to_cc, $body, $startMessage,
$passed_body, $color, $use_signature, $signature, $prefix_sig,
$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,
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
$username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
@@ -859,7 +906,7 @@ function showInputForm ($session, $values=false) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
$send_to_bcc = $values['send_to_bcc'];
- $subject = $values['subject'];
+ $subject = $values['subject'];
$mailprio = $values['mailprio'];
$body = $values['body'];
$identity = (int) $values['identity'];
@@ -868,24 +915,26 @@ function showInputForm ($session, $values=false) {
$send_to_cc = decodeHeader($send_to_cc);
$send_to_bcc = decodeHeader($send_to_bcc);
}
-
+
if ($use_javascript_addr_book) {
- echo "\n". '' . "\n\n";
+ "// -->\n\n\n";
}
- echo "\n" . '