Hi,
sorry that may solution takes so long time…
But here it is:
I introduced a new function:
/**
Copy a headerline, including any lines below that belong to the header.
**/
protected function copy_header( $headers, $header_to_copy )
{
$returnValue = array();
$header_to_find = $this->strtolower( $header_to_copy ) . ':';
$just_skipped = false;
$header_half_found = false; // this is set to get also the next line
$lines = array_filter( explode( "\n", $headers ) );
foreach ( $lines as $line )
{
if ($header_half_found)
{
$returnValue[] = $line;
$header_half_found = false;
continue;
}
if ( $just_skipped )
{
if ( $line[0] == ' ' || $line[0] == "\t" )
continue;
else
$just_skipped = false;
}
if ( strpos( $this->strtolower($line), $header_to_find ) === 0 )
{
$returnValue[] = $line;
if(strrpos($line, "; ", -2) !== false || strrpos($line, ";", -1) !== false )
{
$header_half_found = true;
}
}
else
$just_skipped = true;
}
return implode( "\n", $returnValue ) . "\n\n";
}
and here is my changed process queue method:
protected function queue_message( $options )
{
$msgno = $options['msgno'];
$settings = $options['settings'];
// Fetch the message
$structure = $options['structure'];
// Reports = undeliverable. Too bad. Don't queue it.
if ( $structure->subtype == 'report' )
return;
$subject = $options['headerinfo']->subject;
$subject = iconv_mime_decode($subject,0,"UTF-8"); // mb_encode_mimeheader leaves underscores, therefore imap_utf8
if ( $settings->subject_line_prefix != '' )
{
$prefix = $settings->subject_line_prefix;
if ( strpos( $subject, $prefix ) === false )
$subject = $prefix . $subject;
}
if ( $settings->subject_line_suffix != '' )
{
$suffix = $settings->subject_line_suffix;
if ( strpos( $subject, $suffix ) === false )
$subject .= $suffix;
}
mb_internal_encoding('UTF-8');
$subject = mb_encode_mimeheader( $subject, 'UTF-8' ) ;
$headers = trim( $options['header'] );
$headers_to_copy = array('From', 'Content-type');
foreach ( $headers_to_copy as $header_to_copy )
$header[] = $this->copy_header($headers, $header_to_copy);
// Remove stuff from the header that would conflict with our new headers.
$headers_to_remove = array('to', 'delivered-to', 'reply-to', 'bcc', 'cc', 'subject', 'precedence',
'X-policyd-weight', 'Received', 'X-Yahoo-Newman-Property', 'X-Yahoo-Newman-Id',
'X-YMail-OSG', 'X-Mailer', 'Message-ID', 'Date', 'MIME-Version', 'DKIM-Signature', 'DomainKey-Signature',
'In-Reply-To', 'References', 'X-RocketYMMF', 'Content-type', 'From');
foreach ( $headers_to_remove as $header_to_remove )
$headers = $this->remove_header( $headers, $header_to_remove);
// Add our reply to.
$headers = "Reply-To: " . $settings->reply_to . "\n" . $headers;
// Our message is just bulk.
$headers = "Precedence: bulk\n" . $headers;
$headers = $header[0].$header[1].$headers;
$headers = str_replace("\n\n", "\n", $headers);
$headers = str_replace("\r\n", "\n", $headers);
$headers = trim( $headers );
$body = "";
$body = $body.$options['body'];
$body = str_replace("\n\n", "\n", $body);
$body = str_replace("\r\n", "\n", $body);
$body = trim($body);
$mail_data = array(
'headers' => $headers,
'body' => $body,
'reply_to' => array( $settings->reply_to => $settings->list_name ),
'subject' => $subject,
);
$readers = array_filter( explode("\n", $settings->readers) );
foreach($readers as $reader)
{
$reader = trim( $reader );
if ( !is_email($reader) )
{
$this->log( 'queue', sprintf(
$this->_( '<em>%s</em> is not a valid email address in <em>%s</em>.' ),
$reader,
$settings->list_name
) );
continue;
}
$this->log( 'queue', sprintf(
$this->_( '<em>%s</em> added to mail queue for <em>%s</em>.' ),
$reader,
$settings->list_name
) );
$mail_data['to'] = array($reader);
$this->sql_add_to_queue(array(
'mail_data' => $mail_data,
));
}
}
The Problem wasn’t Hotmail… it was that a boundary was set in two lines and the code abvoe fix it.
A User has also reported problems via sending withz Mozilla Thunderbrid and this is also fixed…
