From a69db4b61f3b676844c5a2e614a55075c3d63bd6 Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Fri, 13 Aug 2021 12:17:26 +0200
Subject: [PATCH] [gui] Fixed mime handling of gb2312 encoding

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 webui/system/helper/mime.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webui/system/helper/mime.php b/webui/system/helper/mime.php
index b4f835ef..384a851b 100644
--- a/webui/system/helper/mime.php
+++ b/webui/system/helper/mime.php
@@ -205,6 +205,8 @@ class Piler_Mime_Decode {
       for($i=0; $i<count(self::HEADER_FIELDS); $i++) {
          if(!isset($headers[self::HEADER_FIELDS[$i]])) { $headers[self::HEADER_FIELDS[$i]] = ''; }
 
+         $headers[self::HEADER_FIELDS[$i]] = preg_replace("/gb2312/i", "GBK", $headers[self::HEADER_FIELDS[$i]]);
+
          $headers[self::HEADER_FIELDS[$i]] = iconv_mime_decode($headers[self::HEADER_FIELDS[$i]], ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
       }
 
@@ -325,6 +327,9 @@ class Piler_Mime_Decode {
       }
 
       if(isset($headers['content-type']['charset'])) {
+         if($headers['content-type']['charset'] == 'gb2312') {
+            $headers['content-type']['charset'] = 'GBK';
+         }
          $body = iconv($headers['content-type']['charset'], 'utf-8' . '//IGNORE', $body);
       }