diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index e317eedde..56a365604 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -3520,9 +3520,9 @@ FW_log($$) b=>$length ); - $fmt =~ s/%([^" ]*)/defined($cp{$1}) ? $cp{$1} : "%$1"/ge; $fmt =~ s/%\{([^" ]*)\}/ - defined($FW_httpheader{$1}) ? $FW_httpheader{$1} : "%{$1}" /gex; + defined($FW_httpheader{$1}) ? $FW_httpheader{$1} : "-" /gex; + $fmt =~ s/%([^" ]*)/defined($cp{$1}) ? $cp{$1} : "-"/ge; my $ld = AttrVal($FW_wname, "logDevice", undef); CallFn($ld, "LogFn", $defs{$ld}, $fmt) if($defs{$ld}); diff --git a/fhem/FHEM/96_allowed.pm b/fhem/FHEM/96_allowed.pm index 1aa11a6cd..4489303d8 100644 --- a/fhem/FHEM/96_allowed.pm +++ b/fhem/FHEM/96_allowed.pm @@ -191,7 +191,7 @@ allowed_Authenticate($$$$) return &$doReturn(1, 1) if($pwok); - my $msg = AttrVal($aName, "basicAuthMsg", "FHEM: login required"); + my $msg = AttrVal($aName, "basicAuthMsg", "Login required"); $cl->{".httpAuthHeader"} = "HTTP/1.1 401 Authorization Required\r\n". "WWW-Authenticate: Basic realm=\"$msg\"\r\n"; return &$doReturn(2, $secret);