fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-19 18:32:52 +09:00
Code Issues Projects Releases Packages Wiki Activity

Reset Message-ID in case send() is called multiple times

Browse source
This commit is contained in:
Kijin Sung 2016-05-13 11:34:46 +09:00
parent bdd00fe6b7
commit 0b20f3f5c7
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/framework/mail.php
View file

@ -542,6 +542,12 @@ class Mail
*/
public function send()
{
// Reset Message-ID in case send() is called multiple times.
$random = substr(hash('sha256', mt_rand() . microtime() . getmypid()), 0, 32);
$sender = $this->message->getFrom(); reset($sender);
$id = $random . '@' . (preg_match('/^(.+)@([^@]+)$/', key($sender), $matches) ? $matches[2] : 'swift.generated');
$this->message->getHeaders()->get('Message-ID')->setId($id);
$output = \ModuleHandler::triggerCall('mail.send', 'before', $this);
if(!$output->toBool())
{