mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
get inline images in mail working again
This commit is contained in:
parent
94c5194ab0
commit
86c3974d09
@ -310,6 +310,34 @@ class egw_mailer extends Horde_Mime_Mail
|
|||||||
return $this->addMimePart($part);
|
return $this->addMimePart($part);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds an embedded image or other inline attachment
|
||||||
|
*
|
||||||
|
* @param string $path Path to the attachment.
|
||||||
|
* @param string $cid Content ID of the attachment. Use this to identify
|
||||||
|
* the Id for accessing the image in an HTML form.
|
||||||
|
* @param string $name Overrides the attachment name.
|
||||||
|
* @param string $type File extension (MIME) type.
|
||||||
|
* @return integer part-number
|
||||||
|
*/
|
||||||
|
public function addEmbeddedImage($path, $cid, $name = '', $type = 'application/octet-stream')
|
||||||
|
{
|
||||||
|
// deprecated PHPMailer::AddEmbeddedImage($path, $cid, $name='', $encoding='base64', $type='application/octet-stream') call
|
||||||
|
if ($type === 'base64' || func_num_args() == 5)
|
||||||
|
{
|
||||||
|
$type = func_get_arg(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
$part_id = $this->addAttachment($path, $name, $type);
|
||||||
|
error_log(__METHOD__."('$path', '$cid', '$name', '$type') added with (temp.) part_id=$part_id");
|
||||||
|
|
||||||
|
$part = $this->_parts[$part_id];
|
||||||
|
$part->setDisposition('inline');
|
||||||
|
$part->setContentId($cid);
|
||||||
|
|
||||||
|
return $part_id;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a string or binary attachment (non-filesystem) to the list.
|
* Adds a string or binary attachment (non-filesystem) to the list.
|
||||||
*
|
*
|
||||||
@ -646,6 +674,8 @@ class egw_mailer extends Horde_Mime_Mail
|
|||||||
{
|
{
|
||||||
switch($name)
|
switch($name)
|
||||||
{
|
{
|
||||||
|
case '_bcc':
|
||||||
|
return $this->_bcc; // this is NOT PHPMailer compatibility, but quietening below log, if $this->_bcc is NOT set
|
||||||
case 'Sender':
|
case 'Sender':
|
||||||
return $this->getHeader('Return-Path');
|
return $this->getHeader('Return-Path');
|
||||||
case 'From':
|
case 'From':
|
||||||
|
Loading…
Reference in New Issue
Block a user