Skip to content

Fixed unicode incompatibilites in quoted printable decode #111

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

Merged
merged 1 commit into from
Oct 23, 2021
Merged

Fixed unicode incompatibilites in quoted printable decode #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
CHANGELOG
=============================
* 4.9.0
* Upgraded quoted printable decode to newer version
* 4.8.0
* Upgraded unserialize to newer version
* 4.7.0
Expand Down
16 changes: 7 additions & 9 deletions js/D3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,15 +706,13 @@ var D3 =
return temp.toLowerCase();
},
quoted_printable_decode: function (str) {
var RFC2045Decode1 = /=\r\n/gm,
// Decodes all equal signs followed by two hex digits
RFC2045Decode2IN = /=([0-9A-F]{2})/gim, // the RFC states against decoding lower case encodings, but following apparent PHP behavior
// RFC2045Decode2IN = /=([0-9A-F]{2})/gm,

RFC2045Decode2OUT = function (sMatch, sHex) {
return String.fromCharCode(parseInt(sHex, 16));
};
return str.replace(RFC2045Decode1, '').replace(RFC2045Decode2IN, RFC2045Decode2OUT);
const RFC2045Decode1 = /=\r\n/gm;
const RFC2045Decode2IN = /=([0-9A-F]{2})/gim;
const RFC2045Decode2OUT = function (sMatch, sHex) {
return String.fromCharCode(parseInt(sHex, 16));
}

return D3.utf8_decode(str.replace(RFC2045Decode1, '').replace(RFC2045Decode2IN, RFC2045Decode2OUT));
},
quoted_printable_encode: function (str) {
var hexChars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'],
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "__MSG_extName__",
"version": "4.8.0",
"version": "4.9.0",
"description": "__MSG_extDescription__",
"options_ui": {
"page": "html/menu_ui.html",
Expand Down