From 096e14e89a1f0e69fea8678d61a5ab7c268b86f2 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 16 Mar 2013 17:26:27 +0000 Subject: [PATCH] %L patch from Mattias git-svn-id: https://svn.fhem.de/fhem/trunk@2929 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index a6c7dbe65..f3677c086 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1184,6 +1184,7 @@ FW_fileList($) $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file my ($dir,$re) = ($1, $2); return if(!$re); + $dir =~ s/%L/$attr{global}{logdir}/g if($dir =~ m/%/ && $attr{global}{logdir}); # %L present and log directory defined $re =~ s/%./[A-Za-z0-9]*/g; # logfile magic (%Y, etc) my @ret; return @ret if(!opendir(DH, $dir)); @@ -1281,6 +1282,7 @@ FW_logWrapper($) if(defined($type) && $type eq "text") { $defs{$d}{logfile} =~ m,^(.*)/([^/]*)$,; # Dir and File my $path = "$1/$file"; + $path =~ s/%L/$attr{global}{logdir}/g if($path =~ m/%/ && $attr{global}{logdir}); # %L present and log directory defined $path = AttrVal($d,"archivedir","") . "/$file" if(!-f $path); FW_pO "
";