FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

Fixing 0 status problem

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1482 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-04-24 11:01:10 +00:00
parent 974306afd7
commit f6b90fd334
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -1000,10 +1000,11 @@ FW_fileList($)
my ($dir,$re) = ($1, $2); my ($dir,$re) = ($1, $2);
return if(!$re); return if(!$re);
# note: this fails if the filenames of several FileLogs match the same regexp. # note: this fails if the filenames of several FileLogs match the same regexp.
# This is the case e.g. fore # This is the case e.g. for
# /var/log/fhem/foo-%Y.log # /var/log/fhem/foo-%Y.log
# /var/log/fhem/foo-%Y-%m-%d.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. # I do not fix it because this could easily be avoided by using a different
# naming.
# BN 2012-04-22 # BN 2012-04-22
$re =~ s/%./\.*/g; $re =~ s/%./\.*/g;
my @ret; my @ret;
@ -1872,10 +1873,10 @@ FW_dev2image($)
return $icon if(!$name || !$defs{$name}); return $icon if(!$name || !$defs{$name});
my ($type, $state) = ($defs{$name}{TYPE}, $defs{$name}{STATE}); my ($type, $state) = ($defs{$name}{TYPE}, $defs{$name}{STATE});
return $icon if(!$type || !$state); return $icon if(!$type || !defined($state));
$state =~ s/ .*//; # Want to be able to have icons for "on-for-timer xxx" $state =~ s/ .*//; # Want to be able to have icons for "on-for-timer xxx"
$icon = $FW_icons{$state} if($FW_icons{$state}); # on.png $icon = $FW_icons{$state} if(defined($FW_icons{$state}));# on.png
$icon = $FW_icons{$type} if($FW_icons{$type}); # FS20.png $icon = $FW_icons{$type} if($FW_icons{$type}); # FS20.png
$icon = $FW_icons{"$type.$state"} if($FW_icons{"$type.$state"}); # FS20.on.png $icon = $FW_icons{"$type.$state"} if($FW_icons{"$type.$state"}); # FS20.on.png
$icon = $FW_icons{$name} if($FW_icons{$name}); # lamp.png $icon = $FW_icons{$name} if($FW_icons{$name}); # lamp.png