extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

rework of fix for problem regarding send with bcc when using esync

Browse Source
This commit is contained in:
Klaus Leithoff 2016-10-19 10:01:38 +00:00
parent d3465e10a8
commit 7588c9a493
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/Mail.php
View File

@ -6974,10 +6974,9 @@ class Mail
* @param Mailer $mailer instance of SMTP Mailer object * @param Mailer $mailer instance of SMTP Mailer object
* @param string|ressource|Horde_Mime_Part $message string or resource containing the RawMessage / object Mail_mimeDecoded message (part)) * @param string|ressource|Horde_Mime_Part $message string or resource containing the RawMessage / object Mail_mimeDecoded message (part))
* @param boolean $force8bitOnPrimaryPart (default false. force transferEncoding and charset to 8bit/utf8 if we have a textpart as primaryPart) * @param boolean $force8bitOnPrimaryPart (default false. force transferEncoding and charset to 8bit/utf8 if we have a textpart as primaryPart)
* @param string &$bccAddresses (reference; default empty string; used to transport bcc addresses to the caller)
* @throws Exception\WrongParameter when the required Horde_Mail_Part not found * @throws Exception\WrongParameter when the required Horde_Mail_Part not found
*/ */
function parseRawMessageIntoMailObject(Mailer $mailer, $message, $force8bitOnPrimaryPart=false, &$bccAddresses='') function parseRawMessageIntoMailObject(Mailer $mailer, $message, $force8bitOnPrimaryPart=false)
{ {
if (is_string($message) || is_resource($message)) if (is_string($message) || is_resource($message))
{ {
@ -7012,11 +7011,15 @@ class Mail
//may be altered when retrieving the message e.g. from server //may be altered when retrieving the message e.g. from server
//error_log(__METHOD__.__LINE__.':'.$header.'->'.$val.'<->'.$mailer->getHeader('Content-Transfer-Encoding')); //error_log(__METHOD__.__LINE__.':'.$header.'->'.$val.'<->'.$mailer->getHeader('Content-Transfer-Encoding'));
break; break;
case 'Bcc':
case 'bcc':
//error_log(__METHOD__.__LINE__.':'.$header.'->'.$val);
$mailer->addBcc($val);
break;
default: default:
//error_log(__METHOD__.__LINE__.':'.$header.'->'.$val); //error_log(__METHOD__.__LINE__.':'.$header.'->'.$val);
if (strtolower($header)=='bcc') $bccAddresses .= $val;
$mailer->addHeader($header, $val, $overwrite); $mailer->addHeader($header, $val, $overwrite);
//error_log(__METHOD__.__LINE__.':'.'getHeader('.$header.')'.array2string($mailer->getHeader($header)).(strtolower($header)=='bcc'?$bccAddresses:'')); //error_log(__METHOD__.__LINE__.':'.'getHeader('.$header.')'.array2string($mailer->getHeader($header)));
} }
} }
} }

5
mail/inc/class.mail_zpush.inc.php
View File

@ -436,8 +436,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true; if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
// initialize the new Api\Mailer object for sending // initialize the new Api\Mailer object for sending
$mailObject = new Api\Mailer(self::$profileID); $mailObject = new Api\Mailer(self::$profileID);
$bccAddresses=''; $this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit);
$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit,$bccAddresses);
// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8 // Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
$mailObject->Sender = $activeMailProfile['ident_email']; $mailObject->Sender = $activeMailProfile['ident_email'];
$mailObject->setFrom($activeMailProfile['ident_email'],Mail::generateIdentityString($activeMailProfile,false)); $mailObject->setFrom($activeMailProfile['ident_email'],Mail::generateIdentityString($activeMailProfile,false));
@ -459,7 +458,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); $ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
} }
// BCC // BCC
foreach(Mail::parseAddressList(($bccAddresses?$bccAddresses:$mailObject->getHeader("Bcc"))) as $addressObject) { foreach($mailObject->getAddresses('bcc') as $addressObject) {
if (!$addressObject->valid) continue; if (!$addressObject->valid) continue;
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) ); ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal); //$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);