From 20f9abafe959f3e1a251b4fed9ce9370718b2449 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@egroupware.org>
Date: Tue, 18 Oct 2016 13:59:32 +0000
Subject: [PATCH] * Mail: fix problem regarding send with bcc when using esync

---
 api/src/Mail.php                  |  5 ++++-
 mail/inc/class.mail_zpush.inc.php | 13 ++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/api/src/Mail.php b/api/src/Mail.php
index 9b78a7f4e9..cb6075d926 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -6973,9 +6973,10 @@ class Mail
 	 * @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 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
 	 */
-	function parseRawMessageIntoMailObject(Mailer $mailer, $message, $force8bitOnPrimaryPart=false)
+	function parseRawMessageIntoMailObject(Mailer $mailer, $message, $force8bitOnPrimaryPart=false, &$bccAddresses='')
 	{
 		if (is_string($message) || is_resource($message))
 		{
@@ -7012,7 +7013,9 @@ class Mail
 							break;
 						default:
 							//error_log(__METHOD__.__LINE__.':'.$header.'->'.$val);
+							if (strtolower($header)=='bcc') $bccAddresses .= $val;
 							$mailer->addHeader($header, $val, $overwrite);
+							//error_log(__METHOD__.__LINE__.':'.'getHeader('.$header.')'.array2string($mailer->getHeader($header)).(strtolower($header)=='bcc'?$bccAddresses:''));
 					}
 				}
 			}
diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index 8714b2b4e6..cdba3466ad 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -420,17 +420,15 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		if (Api\Translation::detect_encoding($sigTextPlain)!='ascii') $force8bit=true;
 		// initialize the new Api\Mailer object for sending
 		$mailObject = new Api\Mailer(self::$profileID);
-
-		$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit);
+		$bccAddresses='';
+		$this->mail->parseRawMessageIntoMailObject($mailObject,$smartdata->mime,$force8bit,$bccAddresses);
 		// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
 		$mailObject->Sender  = $activeMailProfile['ident_email'];
 		$mailObject->setFrom($activeMailProfile['ident_email'],Mail::generateIdentityString($activeMailProfile,false));
 		$mailObject->addHeader('X-Mailer', 'mail-Activesync');
 
-
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
-
 		foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) );
@@ -445,7 +443,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach(Mail::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
+		foreach(Mail::parseAddressList(($bccAddresses?$bccAddresses:$mailObject->getHeader("Bcc"))) as $addressObject) {
 			if (!$addressObject->valid) continue;
 			ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) );
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
@@ -786,8 +784,9 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
-				$BCCmail='';
-				if (count($mailAddr)>0) $BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
+				//$BCCmail='';
+				if (count($mailAddr)>0) $mailObject->forceBccHeader();
+				//$BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
 				foreach($folderArray as $folderName) {
 					if($this->mail->isSentFolder($folderName)) {
 						$flags = '\\Seen';