* eMail: fixed bug for not getting multiple unnamed attachments, while saving a mail to infolog or tracker

This commit is contained in:
Klaus Leithoff 2011-06-09 11:15:53 +00:00
parent e12e0d8fb5
commit 58a39a67a8

View File

@ -2318,6 +2318,9 @@
static function getFileNameFromStructure(&$structure) static function getFileNameFromStructure(&$structure)
{ {
static $namecounter;
if (is_null($namecounter)) $namecounter = 0;
if(isset($structure->parameters['NAME'])) { if(isset($structure->parameters['NAME'])) {
return self::decode_header($structure->parameters['NAME']); return self::decode_header($structure->parameters['NAME']);
} elseif(isset($structure->dparameters['FILENAME'])) { } elseif(isset($structure->dparameters['FILENAME'])) {
@ -2327,7 +2330,8 @@
} elseif ( isset($structure->filename) && !empty($structure->filename) && $structure->filename != 'NIL') { } elseif ( isset($structure->filename) && !empty($structure->filename) && $structure->filename != 'NIL') {
return self::decode_header($structure->filename); return self::decode_header($structure->filename);
} else { } else {
return lang("unknown").($structure->subType ? ".".$structure->subType : ""); $namecounter++;
return lang("unknown").$namecounter.($structure->subType ? ".".$structure->subType : "");
} }
} }