R52168 - /branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php

Old eGW-svn
1

Author: leithoff
New Revision: 52168

URL: http://svn.stylite.de/viewvc/egroupware?rev=52168&view=rev
Log:
handle problem with broken/already set TransferEncoding when replacing Body text/plain or text/html for the merged versions of the bodyparts

Modified:
branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php

Modified: branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=52168&r1=52167&r2=52168&view=diff

— branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php Tue Mar 17 15:17:19 2015
@@ -6038,9 +6038,9 @@
$mailObject->addAddress(self::$idna2->encode($email),$mailObject->EncodeHeader($nfn));
$mailObject->addHeader(‘Subject’, $bo_merge->merge_string($Subject, $val, $e, ‘text/plain’, array(), self::$displayCharset));
//error_log(METHOD.’ (’.LINE.’) ‘.’ ContentType:’.$mailObject->BodyContentType);

  •   				if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset));

  •   				if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
  				//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));

  •   				if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset));

  •   				if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));

  				//error_log(__METHOD__.' ('.__LINE__.') '.array2string($mailObject));
  				// set a higher timeout for big messages

@@ -6076,9 +6076,9 @@
}
$mailObject->addHeader(‘Subject’, $bo_merge->merge_string($Subject, $val, $e, ‘text/plain’, array(), self::$displayCharset));
//error_log(METHOD.’ (’.LINE.’) ‘.’ ContentType:’.$mailObject->BodyContentType);

  •   				if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset));

  •   				if (!empty($Body)) $text_body->setContents($bo_merge->merge_string($Body, $val, $e, 'text/plain', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
  				//error_log(__METHOD__.' ('.__LINE__.') '.' Result:'.$mailObject->Body.' error:'.array2string($e));

  •   				if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset));

  •   				if (!empty($AltBody)) $html_body->setContents($bo_merge->merge_string($AltBody, $val, $e, 'text/html', array(), self::$displayCharset),array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
  				$_folder = $this->getDraftFolder();
  			}
  			if ($sendOK || $openAsDraft)

Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs