/**
* Deliver.class.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 contains all the functions needed to send messages through
if ($i == $entCount-1) $last = true;
}
if ($boundary && $last) {
- $s = "\r\n--".$boundary."--\r\n\r\n";
+ $s = "--".$boundary."--\r\n\r\n";
$length_raw += strlen($s);
if ($stream) {
$this->preWriteToStream($s);
} else {
$type0 = $message->rfc822_header->content_type->type0;
}
+
+ $body_part_trailing = $last = '';
switch ($type0) {
case 'text':
case 'message':
$this->preWriteToStream($body_part);
$this->writeToStream($stream, $body_part);
}
+ $last = $body_part;
} elseif ($message->att_local_name) {
$filename = $message->att_local_name;
$file = fopen ($filename, 'rb');
- while ($tmp = fgets($file, 4096)) {
- $length += $this->clean_crlf($tmp);
+ while ($body_part = fgets($file, 4096)) {
+ $length += $this->clean_crlf($body_part);
if ($stream) {
- $this->preWriteToStream($tmp);
- $this->writeToStream($stream, $tmp);
+ $this->preWriteToStream($body_part);
+ $this->writeToStream($stream, $body_part);
}
+ $last = $body_part;
}
fclose($file);
}
} elseif ($message->att_local_name) {
$filename = $message->att_local_name;
$file = fopen ($filename, 'rb');
+ $encoded = '';
while ($tmp = fread($file, 570)) {
- $encoded = chunk_split(base64_encode($tmp));
-
+ $body_part = chunk_split(base64_encode($tmp));
+ $length += $this->clean_crlf($body_part);
if ($stream) {
- $this->writeToStream($stream, $encoded);
+ $this->writeToStream($stream, $body_part);
}
}
fclose($file);
}
break;
}
- $body_part_trailing = "\r\n";
- $length += strlen($body_part_trailing);
- if ($stream) {
- $this->preWriteToStream($body_part_trailing);
- $this->writeToStream($stream, $body_part_trailing);
+ $body_part_trailing = '';
+ if ($last && substr($last,-1) != "\n") {
+ $body_part_trailing = "\r\n";
+ }
+ if ($body_part_trailing) {
+ $length += strlen($body_part_trailing);
+ if ($stream) {
+ $this->preWriteToStream($body_part_trailing);
+ $this->writeToStream($stream, $body_part_trailing);
+ }
}
}
$s = str_replace("\n", "\r\n", $s);
return strlen($s);
}
+
+ function strip_crlf(&$s) {
+ $s = str_replace("\r\n ", '', $s);
+ $s = str_replace("\r", '', $s);
+ $s = str_replace("\n", '', $s);
+ }
function preWriteToStream(&$s) {
}
}
function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
- global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
- global $version, $useSendmail, $username;
- global $HTTP_VIA, $HTTP_X_FORWARDED_FOR;
- global $REMOTE_HOST;
+ $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
+ $SERVER_NAME = $_SERVER['SERVER_NAME'];
+ $REMOTE_PORT = $_SERVER['REMOTE_PORT'];
+ if(isset($_SERVER['REMOTE_HOST'])) {
+ $REMOTE_HOST = $_SERVER['REMOTE_HOST'];
+ }
+ if(isset($_SERVER['HTTP_VIA'])) {
+ $HTTP_VIA = $_SERVER['HTTP_VIA'];
+ }
+ if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $HTTP_X_FORWARDED_FOR = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ }
+ global $version, $username;
$rn = "\r\n";
/* This creates an RFC 822 date */
- $date = date("D, j M Y H:i:s ", mktime()) . $this->timezone();
+ $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@' . $SERVER_NAME .'>';
$received_from = $REMOTE_ADDR;
}
if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
- if ($HTTP_X_FORWARDED_FOR == '') {
+ if (!isset($HTTP_X_FORWARDED_FOR) || $HTTP_X_FORWARDED_FOR == '') {
$HTTP_X_FORWARDED_FOR = 'unknown';
}
$received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
/* Insert the rest of the header fields */
$header[] = 'Message-ID: '. $message_id . $rn;
if ($reply_rfc822_header->message_id) {
- $header[] = 'In-Reply-To: '.$reply_rfc822_header->message_id . $rn;
+ $rep_message_id = $reply_rfc822_header->message_id;
+// $this->strip_crlf($message_id);
+ $header[] = 'In-Reply-To: '.$rep_message_id . $rn;
$references = $this->calculate_references($reply_rfc822_header);
$header[] = 'References: '.$references . $rn;
}
$header[] = "Date: $date" . $rn;
$header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
- $header[] = 'From: '. encodeHeader($rfc822_header->getAddr_s('from')) . $rn;
+ $header[] = 'From: '. $rfc822_header->getAddr_s('from',',',true) . $rn;
/* RFC2822 if from contains more then 1 address */
if (count($rfc822_header->from) > 1) {
- $header[] = 'Sender: '. encodeHeader($rfc822_header->getAddr_s('sender')) . $rn;
+ $header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',',',true) . $rn;
}
if (count($rfc822_header->to)) {
- $header[] = 'To: '. encodeHeader($rfc822_header->getAddr_s('to')) . $rn;
+ $header[] = 'To: '. $rfc822_header->getAddr_s('to',',',true) . $rn;
}
if (count($rfc822_header->cc)) {
- $header[] = 'Cc: '. encodeHeader($rfc822_header->getAddr_s('cc')) . $rn;
+ $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',',',true) . $rn;
}
if (count($rfc822_header->reply_to)) {
- $header[] = 'Reply-To: '. encodeHeader($rfc822_header->getAddr_s('reply_to')) . $rn;
+ $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: '. encodeHeader($rfc822_header->getAddr_s('bcc')) . $rn;
+ $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',',',true) . $rn;
if (!$bcc) {
$s = $this->foldLine($s, 78, str_pad('',4));
$raw_length += strlen($s);
}
}
/* Identify SquirrelMail */
- $header[] = "X-Mailer: SquirrelMail (version $version)" . $rn;
+ $header[] = 'User-Agent: SquirrelMail/' . $version . $rn;
/* Do the MIME-stuff */
- $header[] = "MIME-Version: 1.0" . $rn;
+ $header[] = 'MIME-Version: 1.0' . $rn;
$contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.
$rfc822_header->content_type->type1;
if (count($rfc822_header->content_type->properties)) {
for ($i = 0 ; $i < $cnt ; $i++) {
$hdr_s .= $this->foldLine($header[$i], 78, str_pad('',4));
}
+// $debug = "Debug: <123456789012345678901234567890123456789012345678901234567890123456789>\r\n";
+// $this->foldLine($debug, 78, str_pad('',4));
$header = $hdr_s;
$header .= $rn; /* One blank line to separate header and body */
$raw_length += strlen($header);
* function for cleanly folding of headerlines
*/
function foldLine($line, $length, $pre='') {
- $cnt = strlen($line);
- $res = '';
- if ($cnt > $length) {
- $fold_string = "\r\n " . $pre;
- $length -=strlen($fold_string);
- for ($i=0;$i<($cnt-$length);$i++) {
- $fold_pos = 0;
- /* first try to fold at delimiters */
- for ($j=($i+$length); $j>$i; --$j) {
- switch ($line{$j}) {
- case (','):
- case (';'): $fold_pos = $i = $j; break;
- default: break;
- }
- }
- if (!$fold_pos) { /* not succeed yet so we try at spaces & = */
- for ($j=($i+$length); $j>$i; $j--) {
- switch ($line{$j}) {
- case (' '):
- case ('='): $fold_pos = $i = $j; break;
- default: break;
- }
- }
- }
- if (!$fold_pos) { /* clean folding didn't work */
- $i = $j = $fold_pos = $i+$length;
- }
- $line = substr_replace($line,$line{$fold_pos}.$fold_string,
- $fold_pos,1);
- $cnt += strlen($fold_string);
- $i = $j + strlen($fold_string);
- }
- }
- return $line;
- }
-
+ $line = substr($line,0, -2);
+ $length -= 2; /* do not fold between \r and \n */
+ $cnt = strlen($line);
+ if ($cnt > $length) { /* try folding */
+ $fold_string = "\r\n " . $pre;
+ $bFirstFold = false;
+ $aFoldLine = array();
+ while (strlen($line) > $length) {
+ $fold = false;
+ /* handle encoded parts */
+ if (preg_match('/(=\?.+\?.+\?.+\?=)/',$line,$regs)) {
+ $fold_tmp = $regs[1];
+ $iPosEnc = strpos($line,$fold_tmp);
+ $iLengthEnc = strlen($fold_tmp);
+ if ($iPosEnc < $length && ($iPosEnc + $iLengthEnc > $length)) {
+ $fold = true;
+ /* fold just before the start of the encoded string */
+ $aFoldLine[] = substr($line,0,$iPosEnc);
+ $line = substr($line,$iPosEnc);
+ if (!$bFirstFold) {
+ $bFirstFold = true;
+ $length -= strlen($fold_string);
+ }
+ if ($iLengthEnc > $length) { /* place the encoded
+ string on a separate line and do not fold inside it*/
+ if ($iLengthEnc < (998 - strlen($fold_string))) {
+ $aFoldLine[] = substr($line,0,$iLengthEnc);
+ $line = substr($line,$iLengthEnc);
+ } else { /* line is too long, continue with normal folding */
+ $fold = false;
+ }
+ }
+ } else { /* the encoded string fits into the foldlength */
+ /*remainder */
+ $iPosEncEnd = $iPosEnc+$iLengthEnc;
+ $sLineRem = substr($line,$iPosEncEnd,$length - $iPosEncEnd);
+ if (!preg_match('/[=,;\s]/',$sLineRem)) {
+ /*impossible to fold clean in the next part -> fold after the enc string */
+ $aFoldLine[] = substr($line,0,$iPosEncEnd+1);
+ $line = substr($line,$iPosEncEnd+1);
+ $fold = true;
+ if (!$bFirstFold) {
+ $bFirstFold = true;
+ $length -= strlen($fold_string);
+ }
+ }
+ }
+ }
+ if (!$fold) {
+ $line_tmp = substr($line,0,$length);
+ $iFoldPos = false;
+ /* try to fold at logical places */
+ switch (true)
+ {
+ case ($iFoldPos = strrpos($line_tmp,',')): break;
+ case ($iFoldPos = strrpos($line_tmp,';')): break;
+ case ($iFoldPos = strrpos($line_tmp,' ')): break;
+ case ($iFoldPos = strrpos($line_tmp,'=')): break;
+ default: break;
+ }
+
+ if (!$iFoldPos) { /* clean folding didn't work */
+ $iFoldPos = $length;
+ }
+ $aFoldLine[] = substr($line,0,$iFoldPos+1);
+ $line = substr($line,$iFoldPos+1);
+ if (!$bFirstFold) {
+ $bFirstFold = true;
+ $length -= strlen($fold_string);
+ }
+ }
+ }
+ /*$reconstruct the line */
+ if ($line) {
+ $aFoldLine[] = $line;
+ }
+ $line = implode($fold_string,$aFoldLine);
+ }
+ return $line."\r\n";
+ }
function mimeBoundary () {
static $mimeBoundaryString;
function calculate_references($hdr) {
$refer = $hdr->references;
+ $message_id = $hdr->message_id;
+ $in_reply_to = $hdr->in_reply_to;
if (strlen($refer) > 2) {
- $refer .= ' ' . $hdr->message_id;
+ $refer .= ' ' . $message_id;
} else {
- if ($hdr->in_reply_to) {
- $refer .= $hdr->in_reply_to . ' ' . $hdr->message_id;
+ if ($in_reply_to) {
+ $refer .= $in_reply_to . ' ' . $message_id;
} else {
- $refer .= $hdr->message_id;
+ $refer .= $message_id;
}
}
trim($refer);
projects / squirrelmail.git / blobdiff