diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm index a7afe5087..f2e85a7c9 100755 --- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm +++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm @@ -891,6 +891,7 @@ FW_roomOverview($) ######################## # Show the overview of devices in one room +# room can be a room, all or Unsorted sub FW_showRoom() { @@ -903,6 +904,11 @@ FW_showRoom() FW_pO "
"; FW_pO ""; # Need for equal width of subtables + foreach my $ty (sort keys %FW_types) { + FW_pO "$ty
\n"; + } + + my $rf = ($FW_room ? "&room=$FW_room" : ""); # stay in the room my $row=1; foreach my $type (sort keys %FW_types) { @@ -997,7 +1003,13 @@ FW_fileList($) $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file my ($dir,$re) = ($1, $2); return if(!$re); - $re =~ s/%./\.*/g; + # note: this fails if the filenames of several FileLogs match the same regexp. + # This is the case e.g. fore + # /var/log/fhem/foo-%Y.log + # /var/log/fhem/foo-%Y-%m-%d.log + # I do not fix it because this could easily be avoided by using a different naming. + # BN 2012-04-22 + $re =~ s/%./\.*/g; my @ret; return @ret if(!opendir(DH, $dir)); while(my $f = readdir(DH)) {