Skip to content

Fix encoding from Windows-based software products (follow-up) #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix encoding from Windows-based software products (follow-up) #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91f0f11
Update ParserTest.php
kira0269 Jan 25, 2023
4796abd
Update Charset.php
kira0269 Jan 25, 2023
998c5ad
Merge branch 'main' into patch-1
eXorus Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/Charset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,23 @@ public function decodeCharset($encodedString, $charset)
if ($charset == 'utf-8' || $charset == 'us-ascii') {
return $encodedString;
}

// Handle gb2312 from Windows-based software products
if ($charset === 'gb2312') {
// Disable E_NOTICE errors to ignore E_NOTICE possibly triggered by iconv()
$currentErrorReporting = error_reporting();
error_reporting($currentErrorReporting & ~E_NOTICE);

$result = iconv($charset, 'utf-8', $encodedString);

error_reporting($currentErrorReporting);

if ($result) {
return $result;
}

$charset = 'gbk'; // If decoding from gb2312 failed, use gbk instead
}

if (function_exists('mb_convert_encoding')) {
if ($charset == 'iso-2022-jp') {
Expand Down
2 changes: 1 addition & 1 deletion tests/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,7 @@ public function testCharsetSupportedAsAnAlias()
$Parser = new Parser();
$Parser->setPath($file);
$this->assertEquals('<foo@bar.de>', $Parser->getHeader('from'));
$this->assertStringContainsString('次の受信者またはグル?プへの配信に失?', $Parser->getMessageBody('text'));
$this->assertStringContainsString('次の受信者またはグループへの配信に失敗しました:', $Parser->getMessageBody('text'));
}

public function testCharsetNotSupportedByMBString()
Expand Down
Loading