From 24ea23f6cecd3c06daed3e3c7d7ec76eb2acb428 Mon Sep 17 00:00:00 2001
From: Jens Maus <mail@jens-maus.de>
Date: Thu, 15 Oct 2026 06:52:41 +0000
Subject: [PATCH] webui: show the internal device channels on request

This applies OpenCCU rootfs patch 0133-WebUI-Fix-InternalIDExposure.patch:

- The device view of "Status und Bedienung" gets a footer button that
  toggles the existing ShowInternalDeviceChannels action. While it is
  enabled, the MAINTENANCE channels of HmIP devices are shown, otherwise
  only those of the central units. This replaces the device-specific
  rules for HmIPW and some other devices.
- The device channel view also lists the enabled internal channels while
  the button is enabled, and no longer hides channels that are not yet
  configured.
- The function and room views, the alarm messages and the favorite
  editor also list the enabled internal channels.
---
 src/webui/rega/www/esp/functions.fn           | 44 ++-----------------
 .../rega/www/pages/tabs/control/devices.htm   | 33 ++++++++++++++
 .../www/pages/tabs/control/hdevichannels.htm  | 18 +++++++-
 .../www/pages/tabs/control/hfuncchannels.htm  | 11 ++++-
 .../www/pages/tabs/control/hroomchannels.htm  | 11 ++++-
 .../pages/tabs/statusviews/alarmMessages.htm  | 14 +++++-
 src/webui/rega/www/pages/tabs/user/newFav.htm | 22 +++++++++-
 7 files changed, 104 insertions(+), 49 deletions(-)

diff --git a/src/webui/rega/www/esp/functions.fn b/src/webui/rega/www/esp/functions.fn
index a81b8ad9..76888d9f 100644
--- a/src/webui/rega/www/esp/functions.fn
+++ b/src/webui/rega/www/esp/functions.fn
@@ -398,52 +398,14 @@ function ::showHideHmIPChannel() {
   if (bShowChannel == true) {
 
     ! Interface HmIP-RF and HmIP-Wired
-    if (chn.HssType().Find("MAINTENANCE") != -1) {
+    if ( (chn.HssType().Find("MAINTENANCE") != -1) && ((system.IsSessionVar("sessionSIDC") == false) || (system.GetSessionVar("sessionSIDC") != "1")) ) {
       ! Don't show the maintenance channel of the new HmIP devices
       ! This is necessary because the name of such a channel of an HmIP device
       !   can be MAINTENANCE_BAT_BL, MAINTENANCE_BAT_EL, MAINTENANCE_BAT_CL and so on
       ! For BidCos-RF this isn't necessary
 
-      integer devFwMajor = 0;
-      Call("/esp/functions.fn::getFirmwareVersion()");
-
-      if ((oDevHssType.Substr(0,6) == "HmIPW-")
-        || (oDevHssType == "HmIP-DRSI1")
-        || (oDevHssType == "HmIP-DRSI4")
-        || (oDevHssType == "HmIP-DRG-DALI")
-        || ((oDevHssType == "HmIP-BSL") && (devFwMajor >= 2))
-        || (oDevHssType == "HmIP-WGD")
-        || (oDevHssType == "HmIP-WGD-PL")
-        || (oDevHssType == "HmIP-UDI-PB2")
-        || (oDevHssType == "HmIP-UDI-PB2-A")
-        || (oDevHssType == "HmIP-UDI-SMI55")
-        || (oDevHssType == "HmIP-UDI-SMI55-A")
-        || (oDevHssType == "HmIP-DRBLI4")
-        ) {
-
-        object chnParam;
-        ! A HmIPW-* device with a control for the parameter IDENTIFY_TARGET_LEVEL (MAINTENANCE channel)
-        ! should be visible. So it's possible to use the identify function of HmIPW-devices.
-        chnParam = dom.GetObject("HmIP-RF."#chn.Address()#".IDENTIFY_TARGET_LEVEL");
-
-        ! A HmIPW-* device with a control for the parameter ERROR_POWER_SHORT_CIRCUIT_BUS_1 (MAINTENANCE channel)
-        ! should be visible. This is the DRAP.
-        if (!chnParam) {
-          chnParam = dom.GetObject("HmIP-RF."#chn.Address()#".ERROR_POWER_SHORT_CIRCUIT_BUS_1");
-        }
-
-        if (chnParam) {
-          string controlName = chnParam.MetaData("CONTROL");
-          if (! controlName) {
-            bShowChannel = false;
-          }
-        } else {
-          bShowChannel = false;
-        }
-      } else {
-        if ((oDevHssType != "HmIP-CCU3") && (oDevHssType != "HmIP-HAP")  && (oDevHssType != "HmIP-HAP-A")  && (oDevHssType != "HmIP-HAP2") && (oDevHssType != "HmIP-HAP2-A") && (oDevHssType != "HmIP-HAP-B1")  && (oDevHssType != "HmIP-HAP JS1") && (oDevHssType != "RPI-RF-MOD")) {
-          bShowChannel = false;
-        }
+      if ((oDevHssType != "HmIP-CCU3") && (oDevHssType != "HmIP-HAP")  && (oDevHssType != "HmIP-HAP-A")  && (oDevHssType != "HmIP-HAP2") && (oDevHssType != "HmIP-HAP2-A") && (oDevHssType != "HmIP-HAP-B1")  && (oDevHssType != "HmIP-HAP JS1") && (oDevHssType != "RPI-RF-MOD")) {
+        bShowChannel = false;
       }
 
       ! Necessary to be able to learn the codes of keypads and finger print sensors
diff --git a/src/webui/rega/www/pages/tabs/control/devices.htm b/src/webui/rega/www/pages/tabs/control/devices.htm
index 75ddbe8f..fb09ce6d 100644
--- a/src/webui/rega/www/pages/tabs/control/devices.htm
+++ b/src/webui/rega/www/pages/tabs/control/devices.htm
@@ -222,6 +222,38 @@
 </script>
 
 <script type="text/javascript">
+  ShowInternalDeviceChannels = function()
+  {
+    var url = '/esp/system.htm?sid='+SessionId;
+    var pb = "";
+    pb += 'string action = "ShowInternalDeviceChannels";';
+    var opt =
+    {
+      postBody: pb,
+      onComplete: function(t)
+      {
+        if(dbg){alert(t.responseText);}
+        reloadPage();
+      }
+    };
+    new Ajax.Request(url,opt);
+  };
+
+  <%
+    string sInternalBtnText = "";
+    if( system.GetSessionVar("sessionSIDC") == "1" )
+    {
+        !sInternalBtnText = "aus";
+        sInternalBtnText = "footerBtnHideInternalDeviceChannels";
+    }
+    else
+    {
+        !sInternalBtnText = "ein";
+        sInternalBtnText = "footerBtnShowInternalDeviceChannels";
+    }
+    Write("var internalBtnText = '"#sInternalBtnText#"';");
+  %>
+
   var s = "";
 
   var mouseOpts =
@@ -242,6 +274,7 @@
   s += "<tr>";
   s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton' onclick='WebUI.goBack()'>"+translateKey("footerBtnPageBack")+"</div></td>";
   s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton CLASS03911' onclick='fltDL.clearFilters();updateDevTable();fltHD.clearFilters();updateTable();clearInputLeft();'>"+translateKey('footerBtnResetFilter')+"</div></td>";
+  s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton CLASS04905' onclick='ShowInternalDeviceChannels()'>"+translateKey(internalBtnText)+"</div></td>";
   s += "</tr>";
   s += "</table>";
   
diff --git a/src/webui/rega/www/pages/tabs/control/hdevichannels.htm b/src/webui/rega/www/pages/tabs/control/hdevichannels.htm
index 391ac60d..c2a608b3 100644
--- a/src/webui/rega/www/pages/tabs/control/hdevichannels.htm
+++ b/src/webui/rega/www/pages/tabs/control/hdevichannels.htm
@@ -140,8 +140,22 @@
     object device = dom.GetObject(system.GetVar("id"));
     if (device) {
       if (device.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = "";
+        if( system.IsSessionVar("sessionSIDC") ) {
+          if( system.GetSessionVar("sessionSIDC") == "1" ) {
+           sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+          }
+        }
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
         string tmp;
-        foreach(tmp, oUser.UserTempViewIDs().EnumIDs()) {
+        foreach(tmp, sEnumUserIDs) {
           object chn = dom.GetObject(tmp);
           object oDev = dom.GetObject(chn.Device());
           string oDevHssType = oDev.HssType();
@@ -179,7 +193,7 @@
           } else {
             Call("/esp/functions.fn::showHideHmIPChannel()");
           }
-          if( bShow && chn.ReadyConfig() && oDev.ReadyConfig() && bShowChannel )
+          if( bShow && oDev.ReadyConfig() && bShowChannel )
           {
             string trId = device.ID()#tmp;
             boolean showExtDesc = false;
diff --git a/src/webui/rega/www/pages/tabs/control/hfuncchannels.htm b/src/webui/rega/www/pages/tabs/control/hfuncchannels.htm
index 13f68a90..6507ef9e 100644
--- a/src/webui/rega/www/pages/tabs/control/hfuncchannels.htm
+++ b/src/webui/rega/www/pages/tabs/control/hfuncchannels.htm
@@ -120,8 +120,17 @@
     object func = dom.GetObject(system.GetVar("id"));
     if (func) {
       if (func.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
         string tmp;
-        foreach(tmp, oUser.UserTempViewIDs().EnumEnabledIDs()) {
+        foreach(tmp, sEnumUserIDs) {
           string trId = func.ID()#tmp;
           Write("<tr id='"#trId#"'>");
           object chn = dom.GetObject(tmp);
diff --git a/src/webui/rega/www/pages/tabs/control/hroomchannels.htm b/src/webui/rega/www/pages/tabs/control/hroomchannels.htm
index e56fb650..49647b28 100644
--- a/src/webui/rega/www/pages/tabs/control/hroomchannels.htm
+++ b/src/webui/rega/www/pages/tabs/control/hroomchannels.htm
@@ -125,8 +125,17 @@
     {
       if (room.Visible())
       {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
         string tmp;
-        foreach(tmp, oUser.UserTempViewIDs().EnumEnabledIDs()) 
+        foreach(tmp, sEnumUserIDs)
         {
           object chn = dom.GetObject(tmp);
           object oDev = dom.GetObject(chn.Device());
diff --git a/src/webui/rega/www/pages/tabs/statusviews/alarmMessages.htm b/src/webui/rega/www/pages/tabs/statusviews/alarmMessages.htm
index c09aae9d..e52f6001 100644
--- a/src/webui/rega/www/pages/tabs/statusviews/alarmMessages.htm
+++ b/src/webui/rega/www/pages/tabs/statusviews/alarmMessages.htm
@@ -117,9 +117,19 @@
 </tr>
 <%
   integer iAlCount = 0;
-    
+
+  string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+  string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+  if( sEnumUserInternalIDs != "" ) {
+    if( sEnumUserIDs != "" ) {
+      sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+    } else {
+      sEnumUserIDs = sEnumUserInternalIDs;
+    }
+  }
+
   string sSVID;
-  foreach( sSVID, oUser.UserTempViewIDs().EnumIDs() )
+  foreach( sSVID, sEnumUserIDs )
   {
     object oSV = dom.GetObject( sSVID );
     if( oSV )
diff --git a/src/webui/rega/www/pages/tabs/user/newFav.htm b/src/webui/rega/www/pages/tabs/user/newFav.htm
index b7659ba5..ca07de03 100644
--- a/src/webui/rega/www/pages/tabs/user/newFav.htm
+++ b/src/webui/rega/www/pages/tabs/user/newFav.htm
@@ -222,7 +222,16 @@
               string sUsedIndex;
               integer iIndex = 0;
               integer iDoublePos = 0;
-              foreach( sID, oUser.UserTempViewIDs().EnumIDs() )
+              string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+              string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+              if( sEnumUserInternalIDs != "" ) {
+                if( sEnumUserIDs != "" ) {
+                  sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+                } else {
+                  sEnumUserIDs = sEnumUserInternalIDs;
+                }
+              }
+              foreach(sID, sEnumUserIDs )
               {                 
                 iIndex = iIndex + 1;
 !               object oTmp = dom.GetObject( sID );
@@ -464,7 +473,16 @@
         WriteLine("Cursor.set(Cursor.NORMAL);");
         WriteLine("</script>");
       }  
-      foreach(sID, oUser.UserTempViewIDs().EnumIDs() )    
+      string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+      string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+      if( sEnumUserInternalIDs != "" ) {
+        if( sEnumUserIDs != "" ) {
+          sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+        } else {
+          sEnumUserIDs = sEnumUserInternalIDs;
+        }
+      }
+      foreach(sID, sEnumUserIDs )
       {
         !Vars für Filterung
         string sName = "";