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;
}
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='') {
+ $line = substr($line,0, -2);
+ $length -= 2; /* don not fold between \r and \n */
$cnt = strlen($line);
$res = '';
+ $fold=false;
if ($cnt > $length) {
$fold_string = "\r\n " . $pre;
- $length -=strlen($fold_string);
+ if ($fold) {
+ $length -=(strlen($fold_string)+2);
+ }
for ($i=0;$i<($cnt-$length);$i++) {
$fold_pos = 0;
/* first try to fold at delimiters */
$line = substr_replace($line,$line{$fold_pos}.$fold_string,
$fold_pos,1);
$cnt += strlen($fold_string);
- $i = $j + strlen($fold_string);
+ if (!$fold) {
+ $length -=(strlen($fold_string)+2);
+ }
+ $fold = true;
+ $i = $j + strlen($fold_string)+1;
}
}
- return $line;
+ /* debugging code
+ $debug = $line;
+ $debug = str_replace("\r","\\r", $debug);
+ $debug = str_replace("\n","\\n", $debug);
+ */
+ return $line."\r\n";
}
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