From a4c2da3cad255badd06a67054a496c11929363d5 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 2 Mar 2020 16:42:53 +0000
Subject: [PATCH] fhem.pl: add Logdir(), and use it in FHEMWEB.pm (Forum
 #108865)

git-svn-id: https://svn.fhem.de/fhem/trunk@21337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 6 +++---
 fhem/fhem.pl            | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index de6f82a7d..995004a4d 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2114,8 +2114,8 @@ sub
 FW_fileList($;$)
 {
   my ($fname,$mtime) = @_;
-  $fname =~ s/%L/$attr{global}{logdir}/g #Forum #89744
-        if($fname =~ m/%/ && $attr{global}{logdir});
+  my $logdir = Logdir();
+  $fname =~ s/%L/$logdir/g; #Forum #89744
   $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file
   my ($dir,$re) = ($1, $2);
   return $fname if(!$re);
@@ -2336,7 +2336,7 @@ FW_fileNameToPath($)
   } elsif($name =~ m/.*gplot$/) {
     return "$FW_gplotdir/$name";
   } elsif($name =~ m/.*log$/) {
-    return AttrVal("global", "logdir", "log")."/$name";
+    return Logdir()."/$name";
   } else {
     return "$MW_dir/$name";
   }
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index abc5c42ca..01f9a9341 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -3485,6 +3485,12 @@ FmtDateTimeRFC1123($)
 }
 
 
+sub
+Logdir()
+{
+  return AttrVal("global","logdir", AttrVal("global","modpath","")."/log");
+}
+
 #####################################
 sub
 ResolveDateWildcards($@)
@@ -3494,8 +3500,7 @@ ResolveDateWildcards($@)
   my ($f, @t) = @_;
   return $f if(!$f);
   return $f if($f !~ m/%/);     # Be fast if there is no wildcard
-  my $logdir = AttrVal("global","logdir",
-               AttrVal("global","modpath","")."/log");
+  my $logdir = Logdir();
   $f =~ s/%L/$logdir/g;
   return strftime($f,@t);
 }