Merge pull request #376 from nekufa/master

barbushin · web-flow · commit df0798f7214b · 2019-09-04T21:11:26.000+08:00
ContentId based attachment key calculation
diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
@@ -1093,7 +1093,7 @@ public function downloadAttachment($dataInfo, $params, $partStructure, $mailId,
             $fileName = $fileName;
         }
 
-        $attachmentId = sha1($fileName);
+        $attachmentId = sha1($fileName.$partStructure->id);
 
         $attachment = new IncomingMailAttachment();
         $attachment->id = $attachmentId;

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ public function downloadAttachment($dataInfo, $params, $partStructure, $mailId,`
`1093`	`1093`	`$fileName = $fileName;`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`		`- $attachmentId = sha1($fileName);`
	`1096`	`+ $attachmentId = sha1($fileName.$partStructure->id);`
`1097`	`1097`
`1098`	`1098`	`$attachment = new IncomingMailAttachment();`
`1099`	`1099`	`$attachment->id = $attachmentId;`