From 2c99dcce7b011289b43619f07dc20cf546b4950e Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Thu, 1 Nov 2018 10:34:37 +0000 Subject: [PATCH] 01_FHEMWEB.pm: add forbiddenroom (Forum #92615) git-svn-id: https://svn.fhem.de/fhem/trunk@17657 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index d1da47eda..0835b1b76 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -165,6 +165,7 @@ FHEMWEB_Initialize($) editFileList:textField-long endPlotNow:1,0 endPlotToday:1,0 + forbiddenroom fwcompress:0,1 hiddengroup hiddengroupRegexp @@ -1515,9 +1516,8 @@ FW_roomOverview($) my ($cmd) = @_; %FW_hiddenroom = (); - foreach my $r (split(",",AttrVal($FW_wname, "hiddenroom", ""))) { - $FW_hiddenroom{$r} = 1; - } + map { $FW_hiddenroom{$_}=1 } split(",",AttrVal($FW_wname,"hiddenroom", "")); + map { $FW_hiddenroom{$_}=1 } split(",",AttrVal($FW_wname,"forbiddenroom","")); ############## # LOGO @@ -1821,9 +1821,8 @@ FW_sortIndex($) sub FW_showRoom() { - return 0 if(!$FW_room); -# ($FW_hiddenroom{$FW_room} && -# AttrVal($FW_wname, "defaultRoom", "") ne $FW_room)); #92433 + return 0 if(!$FW_room || + AttrVal($FW_wname,"forbiddenroom","") =~ m/\b$FW_room\b/); %FW_hiddengroup = (); foreach my $r (split(",",AttrVal($FW_wname, "hiddengroup", ""))) { @@ -3639,6 +3638,13 @@ FW_widgetOverride($$)
+ +
  • forbiddenroom
    + just like hiddenroom (see below), but accessing the room or the + detailed view via direct URL is prohibited. +
  • +
    +
  • hiddengroup
    Comma separated list of groups to "hide", i.e. not to show in any room @@ -3657,7 +3663,7 @@ FW_widgetOverride($$)
  • hiddenroom
    Comma separated list of rooms to "hide", i.e. not to show. Special values are input, detail and save, in which case the input areas, link - to the detailed views or save button is hidden (although each aspect + to the detailed views or save button are hidden (although each aspect still can be addressed through URL manipulation).
    The list can also contain values from the additional "Howto/Wiki/FAQ" block. @@ -4342,6 +4348,12 @@ FW_widgetOverride($$) am aktuellen Tag, sonst wird die aktuelle Woche/Monat angezeigt.

  • + +
  • forbiddenroom
    + Wie hiddenroom, aber der Zugriff auf die Raum- oder Detailansicht + über direkte URL-Eingabe wird unterbunden. +

  • +
  • fwcompress
    Aktiviert die HTML Datenkompression (Standard ist 1, also ja, 0 stellt