mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update PHPMailer.php

This commit is contained in:
Mariusz Krzaczkowski 2025-10-02 10:19:16 +02:00 committed by GitHub
parent da0212d7d4
commit b135f4f284
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PHPMailer.php
View File

@ -4386,27 +4386,18 @@ class PHPMailer
* @param string $basedir Absolute path to a base directory to prepend to relative paths to images * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
* @param bool|callable $advanced Whether to use the internal HTML to text converter * @param bool|callable $advanced Whether to use the internal HTML to text converter
* or your own custom converter * or your own custom converter
* @param string $cid_domain Domain part used in generated Content-ID.
* If empty, a fallback value will be used.
* You can set your own, but it must be in the format "@host.domain",
* as defined in RFC2392 section 2, or it will be ignored.
* {@see https://datatracker.ietf.org/doc/html/rfc2392#section-2}
* @return string The transformed message body * @return string The transformed message body
* *
* @throws Exception * @throws Exception
* *
* @see PHPMailer::html2text() * @see PHPMailer::html2text()
*/ */
public function msgHTML($message, $basedir = '', $advanced = false, $cid_domain = '') public function msgHTML($message, $basedir = '', $advanced = false)
{ {
$cid_domain_valid = false; $cid_domain = '@phpmailer.0';
if ($cid_domain !== '' && strpos($cid_domain, '@') === 0) { if (filter_var($this->From, FILTER_VALIDATE_EMAIL)) {
//prepend with a character to create valid RFC822 string in order to validate //prepend with a character to create valid RFC822 string in order to validate
$cid_domain_valid = filter_var('a'.$cid_domain, FILTER_VALIDATE_EMAIL); $cid_domain = substr( $this->From, strpos( $this->From, '@') + 1);
}
if (!$cid_domain_valid) {
$cid_domain = '@phpmailer.0';
} }
preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images); preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images);