extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 16:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* email: fix for text/html attachment was not recognized (neither in list, nor in preview or display) if it is the one and only part of the mail; preparational function for Link2Attachment feature

Browse Source
This commit is contained in:
Klaus Leithoff 2011-11-21 16:33:29 +00:00
parent 7efd0f6ff0
commit 778935ff72
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -2873,7 +2873,7 @@ class felamimail_bo
if (self::$debug) _debug_array($structure);
$attachments = array();
// this kind of messages contain only the attachment and no body
if($structure->type == 'APPLICATION' || $structure->type == 'AUDIO' || $structure->type == 'VIDEO' || $structure->type == 'IMAGE')
if($structure->type == 'APPLICATION' || $structure->type == 'AUDIO' || $structure->type == 'VIDEO' || $structure->type == 'IMAGE' || ($structure->type == 'TEXT' && $structure->disposition == 'ATTACHMENT') )
{
$newAttachment = array();
$newAttachment['name'] = $this->getFileNameFromStructure($structure,$_uid,$structure->partID);
@ -4383,6 +4383,65 @@ class felamimail_bo
return $message;
}
/**
* processURL2InlineImages - parses a html text for images, and adds them as inline attachment
* we do not use the functionality of the phpmailer here, as phpmailers functionality requires
* files to be present within the filesystem, which we do not require as we make this happen
* (we load the file, and store it temporarily for the use of attaching it to the file send
* @param object $_mailObject instance of the egw_mailer/phpmailer Object to be used
* @param string $_html2parse the html to parse and to be altered, if conditions meet
* @return void
*/
static function processURL2InlineImages(&$_mailObject, &$_html2parse)
{
preg_match_all("/(src|background)=\"(.*)\"/Ui", $_html2parse, $images);
if(isset($images[2])) {
foreach($images[2] as $i => $url) {
$basedir = '';
//error_log(__METHOD__.__LINE__.$url);
//error_log(__METHOD__.__LINE__.$GLOBALS['egw_info']['server']['webserver_url']);
//error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw_info']['user']));
// do not change urls for absolute images (thanks to corvuscorax)
//if (!preg_match('#^[A-z]+://#',$url)) {
//error_log(__METHOD__.__LINE__.' -> '.$i.': '.array2string($images));
$filename = basename($url);
$directory = dirname($url);
($directory == '.')?$directory='':'';
$cid = 'cid:' . md5($filename);
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$mimeType = $_mailObject->_mime_types($ext);
if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
$myUrl = $directory.$filename;
if ($myUrl[0]=='/') // local path -> we only path's that are available via http/https (or vfs)
{
$basedir = ($_SERVER['HTTPS']?'https://':'http://'.$_SERVER['HTTP_HOST']);
if (strpos($myUrl,'webdav.php') !== false) // we have a webdav link, so we build a vfs/sqlfs link of it.
{
egw_vfs::load_wrapper('vfs');
list($garbage,$vfspart) = explode('webdav.php',$myUrl,2);
$myUrl = $vfspart;
$basedir = 'vfs://default';
}
}
if ( strlen($basedir) > 1 && substr($basedir,-1) != '/' && $myUrl[0]!='/') { $basedir .= '/'; }
//error_log(__METHOD__.__LINE__.$basedir.$myUrl);
$data = file_get_contents($basedir.urldecode($myUrl));
if ($data)
{
$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
$tmpfile = fopen($attachment_file,'w');
fwrite($tmpfile,$data);
fclose($tmpfile);
//error_log(__METHOD__.__LINE__.' '.$url.' -> '.$basedir.$myUrl. ' TmpFile:'.$tmpfile);
if ( $_mailObject->AddEmbeddedImage($attachment_file, md5($filename), $filename, 'base64',$mimeType) ) {
$_html2parse = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $_html2parse);
}
}
//}
}
}
}
/**
* importMessageToMergeAndSend
*

2
felamimail/inc/class.uiwidgets.inc.php
View File

@ -1162,6 +1162,7 @@ $j(document).ready(function() {
$header['mimetype'] == 'multipart/related' ||
$header['mimetype'] == 'multipart/report' ||
$header['mimetype'] == 'text/calendar' ||
$header['mimetype'] == 'text/html' ||
substr($header['mimetype'],0,11) == 'application' ||
substr($header['mimetype'],0,5) == 'audio' ||
substr($header['mimetype'],0,5) == 'video' ||
@ -1529,6 +1530,7 @@ $j(document).ready(function() {
$headerData['mimetype'] == 'multipart/related' ||
$headerData['mimetype'] == 'multipart/report' ||
$headerData['mimetype'] == 'text/calendar' ||
$headerData['mimetype'] == 'text/html' ||
substr($headerData['mimetype'],0,11) == 'application' ||
substr($headerData['mimetype'],0,5) == 'audio' ||
substr($headerData['mimetype'],0,5) == 'video' ||