Rebase with develop

CHANGELOG.md

@@ -4,13 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.3.0](https://github.com/rdkcentral/webui/compare/1.2.1...1.3.0)
+
+- RDKB-61788 : Input elements blocked in WebUI can be bypassed in HCM mode [`#40`](https://github.com/rdkcentral/webui/pull/40)
+- RDKB-61758: Removed MoCA option in GUI in bridge mode. [`#66`](https://github.com/rdkcentral/webui/pull/66)
+- RDKB-62246 : Harden WebUI Login - Exclude for sky partner [`#64`](https://github.com/rdkcentral/webui/pull/64)
+- RDKB-61875: 320MHz BW is not greyed out for ax mode in 6G [`#60`](https://github.com/rdkcentral/webui/pull/60)
+- RDKB-62077: Failed to add Parental Control Managed Service with Alway… [`#63`](https://github.com/rdkcentral/webui/pull/63)
+- RDKB-62246 : Harden WebUI Login - Exclude sky dev [`3640651`](https://github.com/rdkcentral/webui/commit/3640651507fcc6b59a0de629aac7a067151da825)
+- RDKB-62077: Failed to add Parental Control Managed Service with AlwaysBlock enabled [`aeee8d9`](https://github.com/rdkcentral/webui/commit/aeee8d90f5d68201cd96a8fe9172a96f3845c02d)
+- RDKB-61875: 320MHz BW is not grayed out for ax mode in 6G [`0295e22`](https://github.com/rdkcentral/webui/commit/0295e22210c281a7a7b453cd94e54f18f63d296e)
+
 #### [1.2.1](https://github.com/rdkcentral/webui/compare/1.2.0...1.2.1)
 
+> 23 October 2025
+
 - RDKB-61864: Harden WebUI Login  [`#55`](https://github.com/rdkcentral/webui/pull/55)
 - XB9-429 : Upstream xb9 specific changes to github repo [`#56`](https://github.com/rdkcentral/webui/pull/56)
 - RDKB-61864: Harden WebUI Login [`3534844`](https://github.com/rdkcentral/webui/commit/3534844d4e06ee36d87cbc29fd4fd1b54d153a78)
 - RDKB-61864: Harden WebUI Login [`0899ebb`](https://github.com/rdkcentral/webui/commit/0899ebba7f8124222b6bf8e5bab0314da033cdce)
-- RDKB-61864: Update user_password_change.jst [`0c34471`](https://github.com/rdkcentral/webui/commit/0c3447130ef4f3e9472d63834304746b79a34486)
+- Add changelog for release [`9ebf271`](https://github.com/rdkcentral/webui/commit/9ebf2716a11c828f4a00b71e8f801c82c7c8be3c)
 
 #### [1.2.0](https://github.com/rdkcentral/webui/compare/1.1.2...1.2.0)
 

source/Styles/xb3/jst/includes/nav.jst

@@ -91,7 +91,11 @@ if (isset($_SESSION['lanMode']) && $_SESSION["lanMode"] == "bridge-static") {
 	$port_triggering  	= false;
 	$hs_port_forwarding = false;
 	$wizard		 		= false;
-	$MoCA				= true;
+	if (is_moca_supported()) {
+        $MoCA = true;
+	} else {
+        $MoCA = false;
+	}
 	$moca_diagnostics   = false;
 	$wifi_spec_analyzer	= false;
 }

source/Styles/xb3/jst/index.jst

@@ -389,11 +389,9 @@ if($webuiIsEnabled == "false"){
         <div class="form-btn"  id="login_btn">
                 <input type="submit" class="btn" value="Login" />
         </div>
-        <div class="form-row">
-                <?% if(!$isMSO) { ?>
-                        <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
-                <?% } ?>
-        </div>
+        <?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
+                <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
+        <?% } ?>
 <input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
 </form>
 </div>

source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst

@@ -33,6 +33,7 @@ $partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
 $Mesh_Enable 	= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable");
 $Mesh_State 	= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.State");
 $Mesh_Mode = ($Mesh_Enable == 'true' && $Mesh_State == 'Full')? true : false;
+$HCM_Mode = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MeshWifiOptimization.Mode");
 $OperatingChannelBandwidth ="";
 $RadioNumberOfEntries = getStr("Device.WiFi.RadioNumberOfEntries");
 if($RadioNumberOfEntries)
@@ -116,6 +117,7 @@ function security_mode($encrypt_mode, $encrypt_method) {
 }
 
 if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
+if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
 $response_message = '';
 //ssid 1,2 for all
 //ssid 3,4 for mso only
@@ -133,7 +135,7 @@ if ($i == 1 || $i == 2 || $i == 17) {
 			}
 		}
 		setStr("Device.WiFi.SSID."+$i+".Enable", $arConfig['radio_enable'], true);
-		if ("true" == $arConfig['radio_enable'] && (!$Mesh_Mode) )
+		if ("true" == $arConfig['radio_enable'] && (!$Mesh_Mode) && ($HCM_Mode != "Enable"))
 		{
 			$validation = true;
 			if(($arConfig['password_update']=="false") && ("mso" == $thisUser)){

source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst

@@ -33,6 +33,7 @@ $partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
 $Mesh_Enable 	= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable");
 $Mesh_State 	= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.State");
 $Mesh_Mode = ($Mesh_Enable == 'true' && $Mesh_State == 'Full')? true : false;
+$HCM_Mode = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MeshWifiOptimization.Mode");
 $OperatingChannelBandwidth ="";
 $RadioNumberOfEntries = getStr("Device.WiFi.RadioNumberOfEntries");
 if($RadioNumberOfEntries)
@@ -120,6 +121,7 @@ function security_mode($encrypt_mode, $encrypt_method) {
 }
 
 if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
+if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
 $response_message = '';
 //ssid 1,2 for all
 //ssid 3,4 for mso only
@@ -137,7 +139,7 @@ if ($i == 1 || $i == 2 || $i == 17) {
 			}
 		}
 		setStr("Device.WiFi.SSID."+$i+".Enable", $arConfig['radio_enable'], true);
-		if ("true" == $arConfig['radio_enable'] && (!$Mesh_Mode) )
+		if ("true" == $arConfig['radio_enable'] && (!$Mesh_Mode) && ($HCM_Mode != "Enable"))
 		{
 			$validation = true;
 			if(($arConfig['password_update']=="false") && ("mso" == $thisUser)){

source/Styles/xb6/jst/index.jst

@@ -346,11 +346,9 @@ if($webuiIsEnabled == "false"){
 	<div class="form-btn"  id="login_btn">
 		<input type="submit" class="btn" value="Login" />
 	</div>
-    <div class="form-row">
-                <?% if(!$isMSO) { ?>
-                        <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
-                <?% } ?>
-    </div>
+        <?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
+                <p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
+        <?% } ?>
 <input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
 </form>
 </div>