diff --git a/fhem/CHANGED b/fhem/CHANGED index 1a26f6933..bdf5ca8f2 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: Dashboard: fixed some perl warnings. + smallscreen styles are not destroying view any more.. - bugfix: Dashboard: text alignment issue for ios6touchpadstyle. - change: 57_CALVIEW: -update fpr modi-management -the modes now can be set with attribute modes diff --git a/fhem/FHEM/95_Dashboard.pm b/fhem/FHEM/95_Dashboard.pm index 36f8b9eb0..cf81458de 100644 --- a/fhem/FHEM/95_Dashboard.pm +++ b/fhem/FHEM/95_Dashboard.pm @@ -345,20 +345,20 @@ sub Dashboard_CGI($) my $ret = ''; my $name = $params[1]; - FW_pO '
'; + $ret = '
'; if ($name && defined($defs{$name})) { - $ret = Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef); - - FW_pO $ret; + $ret .= Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef); } else { - FW_pO 'Dashboard "' . $name . '" not found'; + $ret .= 'Dashboard "' . $name . '" not found'; } - FW_pO '
'; + $ret .= '
'; - return 0; + FW_pO $ret; + + return 1; } sub DashboardAsHtml($) @@ -546,26 +546,26 @@ sub BuildDashboardTab($$) for (my $i=0;$i<@temptabgroup;$i++) { my @stabgroup = split(":", trim($temptabgroup[$i])); - @index = grep { @groups[$_] eq @stabgroup[0] } (0 .. @groups-1); + @index = grep { $groups[$_] eq $stabgroup[0] } (0 .. @groups-1); if (@index > 0) { for (my $j=0; $j<@index;$j++) { - my $groupname = @groups[@index[$j]]; + my $groupname = @groups[$index[$j]]; if (@stabgroup > 1) { - $groupname .= ':' . @stabgroup[1]; + $groupname .= ':' . $stabgroup[1]; } push(@tabgroup,$groupname); } } else { - my $matchGroup = '^' . @stabgroup[0] . '$'; - @index = grep { @groups[$_] =~ m/$matchGroup/ } (0 .. @groups-1); + my $matchGroup = '^' . $stabgroup[0] . '$'; + @index = grep { $groups[$_] =~ m/$matchGroup/ } (0 .. @groups-1); if (@index > 0) { for (my $j=0; $j<@index;$j++) { - my $groupname = @groups[@index[$j]]; + my $groupname = @groups[$index[$j]]; if (@stabgroup > 1) { - $groupname .= ':' . @stabgroup[1]; + $groupname .= ':' . $stabgroup[1]; } push(@tabgroup,$groupname); }