extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-25 06:43:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: improving of the fetching of cids; match cid to filename if the attempt to match the cid failed

Browse Source
This commit is contained in:
Klaus Leithoff 2011-06-09 13:50:51 +00:00
parent e72cd51f8e
commit 72a015bf06
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
felamimail/inc/class.bofelamimail.inc.php
View File

@ -1268,19 +1268,39 @@
// fetch a specific attachment from a message
function getAttachmentByCID($_uid, $_cid, $_part)
{
// some static variables to avoid fetching the same mail multiple times
static $uid,$part,$attachments,$structure;
if ($_uid != $uid || $_part != $part)
{
$attachments = $this->getMessageAttachments($uid=$_uid, $part=$_part);
$structure = null;
}
$partID = false;
#error_log("getAttachmentByCID:$_uid, $_cid, $_part");
$attachments = $this->getMessageAttachments($_uid, $_part);
foreach($attachments as $attachment) {
//error_log(__METHOD__.'Attachment#'.print_r($attachment,true).'#');
//error_log(__METHOD__.'CID#'.print_r($_cid,true).'#');
if(isset($attachment['cid']) && (strpos($attachment['cid'], $_cid) !== false || strpos($_cid, $attachment['cid']) !== false)) {
//list($cidname,$cidrest) = explode('@',$_cid,2);
//error_log("getAttachmentByCID:$_uid ($cidname -> $cidrest), $_cid, $_part");
foreach($attachments as $attachment)
{
//error_log(print_r($attachment,true));
if(isset($attachment['cid']) && (strpos($attachment['cid'], $_cid) !== false || strpos($_cid, $attachment['cid']) !== false))
{
$partID = $attachment['partID'];
break;
}
}
#error_log( "PARTID:$_cid $partID<bR>"); #exit;
if ($partID == false)
{
foreach($attachments as $attachment)
{
// if the former did not match try matching the cid to the name of the attachment
if(isset($attachment['cid']) && isset($attachment['name']) && (strpos($attachment['name'], $_cid) !== false || strpos($_cid, $attachment['name']) !== false))
{
$partID = $attachment['partID'];
break;
}
}
}
//error_log( "Cid:$_cid PARTID:$partID<bR>"); #exit;
if($partID == false) {
return false;