/**
* Deliver.class.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains all the functions needed to send messages through
* a delivery backend.
*
- * $Id$
- *
+ * @version $Id$
* @author Marc Groot Koerkamp
* @package squirrelmail
*/
if ($boundary && $message->entity_id && count($message->entities)) {
if (strpos($boundary,'_part_')) {
$boundary = substr($boundary,0,strpos($boundary,'_part_'));
+
+ // the next four lines use strrev to reverse any nested boundaries
+ // as a workaround for Courier-IMAP, which will stop parsing
+ // when it sees the original outer boundary string and ignore
+ // our "_part_..." addition to that string. a bug report has been
+ // made, but in the meantime...
+ //
+ } else if (strpos($boundary,'_trap_')) {
+ $boundary = substr(strrev($boundary),0,strpos(strrev($boundary),'_part_'));
}
- $boundary_new = $boundary . '_part_'.$message->entity_id;
+ $boundary_new = strrev($boundary . '_part_'.$message->entity_id);
} else {
$boundary_new = $boundary;
}
case 'message':
if ($message->body_part) {
$body_part = $message->body_part;
+ // remove NUL characters
+ $body_part = str_replace("\0",'',$body_part);
$length += $this->clean_crlf($body_part);
if ($stream) {
$this->preWriteToStream($body_part);
} elseif ($message->att_local_name) {
$filename = $message->att_local_name;
$file = fopen ($filename, 'rb');
- $encoded = '';
while ($tmp = fread($file, 570)) {
$body_part = chunk_split(base64_encode($tmp));
$length += $this->clean_crlf($body_part);
$contenttype = 'Content-Type: '. $mime_header->type0 .'/'.
$mime_header->type1;
if (count($message->entities)) {
- $contenttype .= ";\r\n " . 'boundary="'.$boundary.'"';
+ $contenttype .= ';' . 'boundary="'.$boundary.'"';
}
if (isset($mime_header->parameters['name'])) {
$contenttype .= '; name="'.
$header[] = $contenttype . $rn;
if ($mime_header->description) {
- $header[] .= 'Content-Description: ' . $mime_header->description . $rn;
+ $header[] = 'Content-Description: ' . $mime_header->description . $rn;
}
if ($mime_header->encoding) {
- $encoding = $mime_header->encoding;
- $header[] .= 'Content-Transfer-Encoding: ' . $mime_header->encoding . $rn;
+ $header[] = 'Content-Transfer-Encoding: ' . $mime_header->encoding . $rn;
} else {
if ($mime_header->type0 == 'text' || $mime_header->type0 == 'message') {
- $header[] .= 'Content-Transfer-Encoding: 8bit' . $rn;
+ $header[] = 'Content-Transfer-Encoding: 8bit' . $rn;
} else {
- $header[] .= 'Content-Transfer-Encoding: base64' . $rn;
+ $header[] = 'Content-Transfer-Encoding: base64' . $rn;
}
}
if ($mime_header->id) {
- $header[] .= 'Content-ID: ' . $mime_header->id . $rn;
+ $header[] = 'Content-ID: ' . $mime_header->id . $rn;
}
if ($mime_header->disposition) {
$disposition = $mime_header->disposition;
$header[] = $contentdisp . $rn;
}
if ($mime_header->md5) {
- $header[] .= 'Content-MD5: ' . $mime_header->md5 . $rn;
+ $header[] = 'Content-MD5: ' . $mime_header->md5 . $rn;
}
if ($mime_header->language) {
- $header[] .= 'Content-Language: ' . $mime_header->language . $rn;
+ $header[] = 'Content-Language: ' . $mime_header->language . $rn;
}
$cnt = count($header);
* @return string $header
*/
function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
- global $domain, $version, $username;
+ global $domain, $version, $username, $skip_SM_header;
/* if server var SERVER_NAME not available, use $domain */
if(!sqGetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER)) {
$date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
/* Create a message-id */
$message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
- $message_id .= time() . '.squirrel@' . $REMOTE_ADDR .'>';
+ $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>';
/* Make an RFC822 Received: line */
if (isset($REMOTE_HOST)) {
$received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
$received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
}
$header = array();
- $header[] = "Received: from $received_from" . $rn;
- $header[] = " (SquirrelMail authenticated user $username);" . $rn;
- $header[] = " by $SERVER_NAME with HTTP;" . $rn;
- $header[] = " $date" . $rn;
+ if ( !isset($skip_SM_header) || !$skip_SM_header )
+ {
+ $header[] = "Received: from $received_from" . $rn;
+ $header[] = " (SquirrelMail authenticated user $username)" . $rn;
+ $header[] = " by $SERVER_NAME with HTTP;" . $rn;
+ $header[] = " $date" . $rn;
+ }
/* Insert the rest of the header fields */
$header[] = 'Message-ID: '. $message_id . $rn;
if ($reply_rfc822_header->message_id) {
}
$header[] = "Date: $date" . $rn;
$header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
- $header[] = 'From: '. $rfc822_header->getAddr_s('from',',',true) . $rn;
- /* RFC2822 if from contains more then 1 address */
+ $header[] = 'From: '. $rfc822_header->getAddr_s('from',",$rn ",true) . $rn;
+
+ // folding address list [From|To|Cc|Bcc] happens by using ",$rn<space>" as delimiter
+ // Do not use foldLine for that.
+
+ // RFC2822 if from contains more then 1 address
if (count($rfc822_header->from) > 1) {
$header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',',',true) . $rn;
}
if (count($rfc822_header->to)) {
- $header[] = 'To: '. $rfc822_header->getAddr_s('to',',',true) . $rn;
+ $header[] = 'To: '. $rfc822_header->getAddr_s('to',",$rn ",true) . $rn;
}
if (count($rfc822_header->cc)) {
- $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',',',true) . $rn;
+ $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',",$rn ",true) . $rn;
}
if (count($rfc822_header->reply_to)) {
$header[] = 'Reply-To: '. $rfc822_header->getAddr_s('reply_to',',',true) . $rn;
/* Sendmail should return true. Default = false */
$bcc = $this->getBcc();
if (count($rfc822_header->bcc)) {
- $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',',',true) . $rn;
+ $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',",$rn ",true) . $rn;
if (!$bcc) {
- $s = $this->foldLine($s, 78, str_pad('',4));
$raw_length += strlen($s);
} else {
$header[] = $s;
}
$header[] = $contenttype . $rn;
if ($encoding = $rfc822_header->encoding) {
- $header[] .= 'Content-Transfer-Encoding: ' . $encoding . $rn;
+ $header[] = 'Content-Transfer-Encoding: ' . $encoding . $rn;
}
if ($rfc822_header->dnt) {
$dnt = $rfc822_header->getAddr_s('dnt');
switch($rfc822_header->priority)
{
case 1:
- $header[] = 'X-Priority: 1 (Highest)'.$rn;
- $header[] = 'Importance: High'. $rn; break;
- case 3:
- $header[] = 'X-Priority: 3 (Normal)'.$rn;
- $header[] = 'Importance: Normal'. $rn; break;
+ $header[] = 'X-Priority: 1 (Highest)'.$rn;
+ $header[] = 'Importance: High'. $rn; break;
case 5:
- $header[] = 'X-Priority: 5 (Lowest)'.$rn;
- $header[] = 'Importance: Low'. $rn; break;
+ $header[] = 'X-Priority: 5 (Lowest)'.$rn;
+ $header[] = 'Importance: Low'. $rn; break;
default: break;
}
}
}
$hdr_s .= $sLine;
break;
+ case 'To':
+ case 'Cc':
+ case 'Bcc':
+ case 'From':
+ $hdr_s .= $header[$i];
+ break;
default: $hdr_s .= $this->foldLine($header[$i], 78, str_pad('',4)); break;
}
}