holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* API/phpmailer: introduce optional parameter to InlineImageExists, to be able to determine if all attachments are inline, or only some; this will be used to decide on the mimetype of the message to be sent (multipart/ related (all) or mixed (some))

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-06 14:27:41 +00:00
parent 24604bdb5d
commit 7e00a006d7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.phpmailer.inc.php
View File

@ -1236,7 +1236,7 @@ class PHPMailer {
break; break;
case 'attachments': case 'attachments':
case 'alt_attachments': case 'alt_attachments':
if($this->InlineImageExists()){ if($this->InlineImageExists(true)){
$result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE); $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
} else { } else {
$result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
@ -1968,15 +1968,21 @@ class PHPMailer {
/** /**
* Returns true if an inline attachment is present. * Returns true if an inline attachment is present.
* @access public * @access public
* @param bool $matchall - matchall attachments to decide. Helpful if you want to decide this is a multipart/mixed or multipart/related mail
* @return bool * @return bool
*/ */
public function InlineImageExists() { public function InlineImageExists($matchall = false) {
$i=0;
foreach($this->attachment as $attachment) { foreach($this->attachment as $attachment) {
if ($attachment[6] == 'inline') { if ($attachment[6] == 'inline') {
if ($matchall) {
$i++;
} else {
return true; return true;
} }
} }
return false; }
return ($matchall?($i===count($this->attachment)):false);
} }
///////////////////////////////////////////////// /////////////////////////////////////////////////