Message id support

givanz · givanz · commit 9a43e3ee13ba · 2024-10-18T15:24:33.000+03:00
diff --git a/system/mail/smtp.php b/system/mail/smtp.php
@@ -71,6 +71,7 @@ public function send() {
 		}
 
 		$serverName = ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? getenv('SERVER_NAME'));
+		$messageId  = base_convert(str_replace(['.', ' '], '', microtime()), 10, 36) . '.' . base_convert(bin2hex(openssl_random_pseudo_bytes(8)), 16, 36) . substr($this->option['from'], strrpos($this->option['from'], '@'));
 
 		$boundary = '----=_NextPart_' . md5(time());
 
@@ -86,6 +87,7 @@ public function send() {
 			$header .= 'Reply-To: =?UTF-8?B?' . base64_encode($this->option['reply_to']) . '?= <' . $this->option['reply_to'] . '>' . EOL;
 		}
 
+		$header .= 'Message-ID: <' . $messageId . '>' . PHP_EOL;
 		$header .= 'Return-Path: ' . $this->option['from'] . EOL;
 		$header .= 'X-Mailer: PHP/' . phpversion() . EOL;
 		$header .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"' . EOL . EOL;

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public function send() {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`$serverName = ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? getenv('SERVER_NAME'));`
	`74`	`+ $messageId = base_convert(str_replace(['.', ' '], '', microtime()), 10, 36) . '.' . base_convert(bin2hex(openssl_random_pseudo_bytes(8)), 16, 36) . substr($this->option['from'], strrpos($this->option['from'], '@'));`
`74`	`75`
`75`	`76`	`$boundary = '----=_NextPart_' . md5(time());`
`76`	`77`
`@@ -86,6 +87,7 @@ public function send() {`
`86`	`87`	`$header .= 'Reply-To: =?UTF-8?B?' . base64_encode($this->option['reply_to']) . '?= <' . $this->option['reply_to'] . '>' . EOL;`
`87`	`88`	`}`
`88`	`89`
	`90`	`+ $header .= 'Message-ID: <' . $messageId . '>' . PHP_EOL;`
`89`	`91`	`$header .= 'Return-Path: ' . $this->option['from'] . EOL;`
`90`	`92`	`$header .= 'X-Mailer: PHP/' . phpversion() . EOL;`
`91`	`93`	`$header .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"' . EOL . EOL;`