utils: refactor rfc1522_to_html

by reusing the utf8 decoding logic of decode_rfc1522

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index 463de6d7ba0bb32a536a9d7a38a6645be03cfe86..e20fc9183779b47df1974859326ab4a6463cc31b 100644 (file)
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -1135,25 +1135,8 @@ sub decode_rfc1522 {
 sub rfc1522_to_html {
     my ($enc) = @_;
 
-    my $res = '';
-
-    return '' if !$enc;
-
-    eval {
-       foreach my $r (MIME::Words::decode_mimewords($enc)) {
-           my ($d, $cs) = @$r;
-           if ($d) {
-               if ($cs) {
-                   $res .= encode('UTF-8', decode($cs, $d));
-               } else {
-                   $res .= $d;
-               }
-           }
-       }
-       $res = encode_entities(decode('UTF-8', $res));
-    };
-
-    $res = $enc if $@;
+    my $res = eval { encode_entities(decode_rfc1522($enc)) };
+    return $enc if $@;
 
     return $res;
 }