From 6d35c91aae0f5bf0946ee6cf49e90a75d32821f1 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 22 Feb 2022 18:34:39 +0000
Subject: [PATCH] FHEMWEB/SVG: fixing "encoding unicode" features (Forum
 #126088)

git-svn-id: https://svn.fhem.de/fhem/trunk@25730 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 3 ++-
 fhem/FHEM/98_SVG.pm     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 84de17257..951e4e342 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -638,6 +638,7 @@ FW_finishRead($$$)
       $compressed = "Content-Encoding: gzip\r\n";
     }
   }
+  $FW_encodedByPlugin = undef;
 
   my $length = length($FW_RET);
   my $expires = ($cacheable ?
@@ -1002,10 +1003,10 @@ FW_answerCall($)
     foreach my $k (reverse sort keys %{$data{FWEXT}}) {
       my $h = $data{FWEXT}{$k};
       next if($arg !~ m/^$k/);
-      $FW_encodedByPlugin = 1;
       $FW_contentFunc = $h->{CONTENTFUNC};
       next if($h !~ m/HASH/ || !$h->{FUNC});
       #Returns undef as FW_RETTYPE if it already sent a HTTP header
+      $FW_encodedByPlugin = 1;
       no strict "refs";
       ($FW_RETTYPE, $FW_RET) = &{$h->{FUNC}}($arg);
       if(defined($FW_RETTYPE) && $FW_RETTYPE =~ m,text/html,) {
diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm
index f46610448..69a332f58 100644
--- a/fhem/FHEM/98_SVG.pm
+++ b/fhem/FHEM/98_SVG.pm
@@ -554,7 +554,7 @@ EOF
     $ret .= 
     "FW_cmd('$sl', function(arg){" .<<"EOF";
       FW_okDialog(arg);
-    });
+    }); // {
   });
   setTimeout(function(){
     \$("table.internals div[informid=$gpfEsc-GPLOTFILE]")
@@ -1219,6 +1219,7 @@ SVG_doShowLog($$$$;$)
     }
 
   }
+  $FW_RET = Encode::encode('UTF-8', $FW_RET) if($unicodeEncoding);
   return ($FW_RETTYPE, $FW_RET);
 
 }