FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

%L patch from Mattias

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2929 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-03-16 17:26:27 +00:00
parent a134f31fc8
commit 096e14e89a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1184,6 +1184,7 @@ FW_fileList($)
$fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file
my ($dir,$re) = ($1, $2); my ($dir,$re) = ($1, $2);
return if(!$re); 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) $re =~ s/%./[A-Za-z0-9]*/g; # logfile magic (%Y, etc)
my @ret; my @ret;
return @ret if(!opendir(DH, $dir)); return @ret if(!opendir(DH, $dir));
@ -1281,6 +1282,7 @@ FW_logWrapper($)
if(defined($type) && $type eq "text") { if(defined($type) && $type eq "text") {
$defs{$d}{logfile} =~ m,^(.*)/([^/]*)$,; # Dir and File $defs{$d}{logfile} =~ m,^(.*)/([^/]*)$,; # Dir and File
my $path = "$1/$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); $path = AttrVal($d,"archivedir","") . "/$file" if(!-f $path);
FW_pO "<div id=\"content\">"; FW_pO "<div id=\"content\">";