From 8a0c10089bd7626b31fd605e176decbb6cfd5d9e Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 28 Dec 2012 11:38:27 +0000 Subject: [PATCH] Sorting devices by alias if present (by Boris, modified) git-svn-id: https://svn.fhem.de/fhem/trunk@2373 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 0c00582fd..1c9ff0a0f 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1084,9 +1084,8 @@ FW_showRoom() FW_pO ""; FW_pO ""; - foreach my $d (sort @devs) { - next if(!$group{$g}{$d}); - + foreach my $d (sort { lc(AttrVal($a,"alias",$a)) cmp + lc(AttrVal($b,"alias",$b)) } keys %{$group{$g}}) { my $type = $defs{$d}{TYPE}; pF "\n", ($row&1)?"odd":"even"; @@ -1745,8 +1744,8 @@ FW_calcWeblink($$) #klaus fixed range day, week, month or year if($fr eq "day" || $fr eq "week" || $fr eq "month" || $fr eq "year" ) { $frx=$fr; - } - else { + + } else { my @range = split(" ", $fr); my @t = localtime; $FW_devs{$d}{from} = ResolveDateWildcards($range[0], @t);