X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=d1df5c2bbf6385fe8cdaaba653de06f11ab64f71;hp=88ab70776a040a69bb62f2adb68e3eb1a8297641;hb=46f2284fbb63ffe6f1b5c3e73e3633201688622a;hpb=1c0448203d530bb106f879620cdea54d0ec97a01 diff --git a/src/compose.php b/src/compose.php index 88ab7077..d1df5c2b 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,7 +3,7 @@ /** * compose.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code sends a mail. @@ -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. */ @@ -31,6 +32,7 @@ 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'); +require_once(SM_PATH . 'functions/forms.php'); /* --------------------- Get globals ------------------------------------- */ /** COOKIE VARS */ @@ -46,12 +48,12 @@ 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); if(!sqgetGlobalVar('identity',$identity)) { $identity=0; } +sqgetGlobalVar('custom_from',$custom_from); sqgetGlobalVar('send_to',$send_to); sqgetGlobalVar('send_to_cc',$send_to_cc); sqgetGlobalVar('send_to_bcc',$send_to_bcc); @@ -73,7 +75,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); @@ -90,6 +92,17 @@ if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { /** GET VARS */ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET); +/** get smaction */ +if ( !sqgetGlobalVar('smaction',$action) ) +{ + if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply'; + if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all'; + if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward'; + if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment'; + if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft'; + if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new'; +} + /* Location (For HTTP 1.1 Header("Location: ...") redirects) */ $location = get_location(); /* Identities (fetch only once) */ @@ -128,6 +141,11 @@ function replyAllString($header) { $url_replytoallcc = ''; foreach( $url_replytoall_ar as $email => $personal) { if ($personal) { + // if personal name contains address separator then surround + // the personal name with double quotes. + if (strpos($personal,',') !== false) { + $personal = '"'.$personal.'"'; + } $url_replytoallcc .= ", $personal <$email>"; } else { $url_replytoallcc .= ', '. $email; @@ -138,9 +156,9 @@ function replyAllString($header) { return $url_replytoallcc; } -function getReplyCitation($orig_from) { +function getReplyCitation($orig_from, $orig_date) { global $reply_citation_style, $reply_citation_start, $reply_citation_end; - $orig_from = decodeHeader($orig_from->getAddress(false),false,false); + $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')) { @@ -162,6 +180,10 @@ function getReplyCitation($orig_from) { $start = '<' . _("quote") . ' ' . _("who") . '="'; $end = '">'; break; + case 'date_time_author': + $start = 'On ' . getLongDateString($orig_date) . ', '; + $end = ' ' . _("said") . ':'; + break; case 'user-defined': $start = $reply_citation_start . ($reply_citation_start == '' ? '' : ' '); @@ -188,11 +210,11 @@ function getforwardHeader($orig_header) { 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,7 +222,7 @@ 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 = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); $cc = str_replace(' ',' ',$cc); $bodyTop .= $display[_("Cc")] .$cc . "\n"; } @@ -373,7 +395,7 @@ if ($send) { showInputForm($session); exit(); } - unset($compose_messages[$session]); + unset($compose_messages[$session]); if ( isset($delete_draft)) { Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); @@ -385,7 +407,7 @@ if ($send) { } else { Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + "&startMessage=$startMessage&mail_sent=yes"); } } else { if ($compose_new_win == '1') { @@ -541,6 +563,15 @@ 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='') { @@ -548,7 +579,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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; @@ -596,8 +627,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'])) {
@@ -605,6 +639,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) {
@@ -640,16 +685,31 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
if ($identity_match) {
$identity = $identity_match;
}
+ // we need identiy here fore draft case #845290
+ // echo $identity."leer";
}
switch ($action) {
case ('draft'):
$use_signature = FALSE;
$composeMessage->rfc822_header = $orig_header;
- $send_to = decodeHeader($orig_header->getAddr_s('to'),false,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,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $send_from = $orig_header->getAddr_s('from');
+ $send_from_parts = new AddressStructure();
+ $send_from_parts = $orig_header->parseAddress($send_from);
+ $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host;
+ $identities = get_identities();
+ if (count($identities) > 0) {
+ foreach($identities as $iddata) {
+ if ($send_from_add == $iddata['email_address']) {
+ $identity = $iddata['index'];
+ break;
+ }
+ }
+ }
+ $subject = decodeHeader($orig_header->subject,false,false,true);
// /* remember the references and in-reply-to headers in case of an reply */
$composeMessage->rfc822_header->more_headers['References'] = $orig_header->references;
$composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to;
@@ -667,10 +727,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,false,true);
+ $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true);
+ $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
$mailprio = $orig_header->priority;
$orig_from = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
@@ -678,35 +738,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,false,true));
$body = getforwardHeader($orig_header) . $body;
sqUnWordWrap($body);
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
$body = "\n" . $body;
break;
case ('forward_as_attachment'):
+ $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true));
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection);
$body = '';
break;
case ('reply_all'):
- $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,false,true);
}
- $send_to = decodeHeader($send_to,false,true);
- $subject = decodeHeader($orig_header->subject,false,true);
+ case ('reply'):
+ // skip this if send_to was already set right above here
+ if(!$send_to) {
+ $send_to = $orig_header->reply_to;
+ if (is_array($send_to) && count($send_to)) {
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */
+ $send_to = $orig_header->getAddr_s('reply_to');
+ } else {
+ $send_to = $orig_header->getAddr_s('from');
+ }
+ }
+ $send_to = decodeHeader($send_to,false,false,true);
+ $subject = decodeHeader($orig_header->subject,false,false,true);
$subject = str_replace('"', "'", $subject);
$subject = trim($subject);
if (substr(strtolower($subject), 0, 3) != 're:') {
@@ -715,20 +778,22 @@ 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;
+ $body = getReplyCitation($from , $orig_header->date) . $body;
$composeMessage->reply_rfc822_header = $orig_header;
break;
@@ -760,10 +825,11 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
switch ($message->type0) {
case 'message':
if ($message->type1 == 'rfc822') {
- $filename = $message->rfc822_header->subject.'.eml';
+ $filename = $message->rfc822_header->subject;
if ($filename == "") {
- $filename = "untitled-".$message->entity_id.'.eml';
+ $filename = "untitled-".$message->entity_id;
}
+ $filename .= '.msg';
} else {
$filename = $message->getFilename();
}
@@ -775,7 +841,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
$filename = $message->getFilename();
break;
}
- $filename = decodeHeader($filename);
+ $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);
@@ -788,7 +854,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
}
$message->att_local_name = $full_localfilename;
- $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
+ $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename,
$full_localfilename);
/* Write Attachment to file */
@@ -808,17 +874,17 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$passed_ent_id='', $imapConnection) {
- global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
+ global $attachments, $attachment_dir, $username, $data_dir;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
$body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' RFC822',
TRUE, $response, $readmessage,
- $uid_support);
+ TRUE);
} else {
$body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
- TRUE, $response, $readmessage, $uid_support);
+ TRUE, $response, $readmessage, TRUE);
$message = $message->parent;
}
if ($response == 'OK') {
@@ -833,16 +899,16 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$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,
+ $editor_size, $editor_height, $attachments, $subject, $newmail,
$use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
$from_htmladdr_search, $location_of_buttons, $attachment_dir,
$username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
@@ -851,7 +917,6 @@ function showInputForm ($session, $values=false) {
$username, $compose_messages, $composesession, $default_charset;
$composeMessage = $compose_messages[$session];
-
if ($values) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
@@ -861,9 +926,9 @@ function showInputForm ($session, $values=false) {
$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);
+ $send_to = decodeHeader($send_to, true, false);
+ $send_to_cc = decodeHeader($send_to_cc, true, false);
+ $send_to_bcc = decodeHeader($send_to_bcc, true, false);
}
if ($use_javascript_addr_book) {
@@ -877,33 +942,35 @@ function showInputForm ($session, $values=false) {
"// -->\n\n\n";
}
- echo "\n" . '