fix problem with importing messages accidently introduced with r49578

This commit is contained in:
Klaus Leithoff 2014-12-04 09:26:30 +00:00
parent 3130609ed4
commit d983fd23b8

View File

@ -6188,6 +6188,7 @@ class emailadmin_imapbase
{ {
$structure = $message; $structure = $message;
} }
//self::$debug=true;
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($structure)); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($structure));
//_debug_array($structure); //_debug_array($structure);
//exit; //exit;
@ -6313,6 +6314,9 @@ error_log(__METHOD__.__LINE__.$mailObject->EncodeHeader($mailObject->SecureHeade
$seemsToBePlainMessage = true; $seemsToBePlainMessage = true;
} }
$this->createBodyFromStructure($mailObject, $structure, $parenttype=null); $this->createBodyFromStructure($mailObject, $structure, $parenttype=null);
unset($mailObject->sentHeader);
unset($mailObject->sentBody);
$mailObject->SetMessageType();
$mailObject->CreateHeader(); // this sets the boundary stufff $mailObject->CreateHeader(); // this sets the boundary stufff
//echo "Boundary:".$mailObject->FetchBoundary(1).'<br>'; //echo "Boundary:".$mailObject->FetchBoundary(1).'<br>';
//$boundary =''; //$boundary ='';
@ -6327,10 +6331,11 @@ error_log(__METHOD__.__LINE__.$mailObject->EncodeHeader($mailObject->SecureHeade
$Header .= $mailObject->GetMailMIME(); $Header .= $mailObject->GetMailMIME();
} }
$Body = $mailObject->getMessageBody(); // this is a method of the egw_mailer/phpmailer class $Body = $mailObject->getMessageBody(); // this is a method of the egw_mailer/phpmailer class
//_debug_array($Header); //self::$debug=false;
//_debug_array($Body); // _debug_array($Header);
//_debug_array($mailObject); // _debug_array($Body);
//exit; // _debug_array($mailObject);
// exit;
} }
/** /**