Skip to content

Commit 61ad3f2

Browse files
Nithishkumar-TNithishkumar-T
committed
Merge branch 'release/1.0.2'
2 parents 8d6eb2f + f16877e commit 61ad3f2

File tree

5 files changed

+124
-32
lines changed

5 files changed

+124
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.0.2](https://github.com/rdkcentral/webui/compare/1.0.1...1.0.2)
8+
9+
- RDKCOM-5316: RDKBDEV-3172 REFPLTB-3437: Adding Blocked sites under Parental [`#15`](https://github.com/rdkcentral/webui/pull/15)
10+
- RDKB-58524: Changes to enable config of 165 channel for 6GHz [`#9`](https://github.com/rdkcentral/webui/pull/9)
11+
- XER10-1251 : [XER10_UK][Secure GUI]Default gateway ip not redirecting. [`#8`](https://github.com/rdkcentral/webui/pull/8)
12+
- RDKB-60107: Captive Portal is looping after FR [`#7`](https://github.com/rdkcentral/webui/pull/7)
13+
- Merge tag '1.0.1' into develop [`ff5a15c`](https://github.com/rdkcentral/webui/commit/ff5a15ca5de2cf2b663ccc6bf070e106941801d0)
14+
- Update captiveportal.jst [`881fc30`](https://github.com/rdkcentral/webui/commit/881fc30c8e761720f1032a1807421da4546070ca)
15+
- Update index.jst [`2b84402`](https://github.com/rdkcentral/webui/commit/2b844028bc5373da29d0c5cefc0cad7a5bb97353)
16+
717
#### [1.0.1](https://github.com/rdkcentral/webui/compare/1.0.0...1.0.1)
818

19+
> 22 August 2025
20+
921
- RDKCOM-5360 RDKBNETWOR-63: Incorrect MAP-T Sharing Ratio and .. [`#10`](https://github.com/rdkcentral/webui/pull/10)
1022
- RDKB-59618: Observed Mac filter setting is not working in mso page [`#3`](https://github.com/rdkcentral/webui/pull/3)
1123
- RDKCOM-5360: RDKBNETWOR-63: Incorrect MAP-T Sharing Ratio and .. [`6425239`](https://github.com/rdkcentral/webui/commit/642523972acc13b1aeecb5b8b1e3b225391bd904)
24+
- Updating Changelog.md [`2ab8588`](https://github.com/rdkcentral/webui/commit/2ab85882fe3df243e5632fbeeea7c3c3390f6b5b)
1225
- Merge tag '1.0.0' into develop [`c86754d`](https://github.com/rdkcentral/webui/commit/c86754d349ba3928cb53db9013533bcbdd2da4a0)
1326

1427
#### 1.0.0

‎source/Styles/xb3/jst/actionHandler/ajaxSet_add_blockedSite.jst‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ if( array_key_exists('URL', $blockedSiteInfo) ) {
6868
}
6969
}
7070
if ($result == ""){
71-
addTblObj("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite.");
72-
$idArr = explode(",", getInstanceIds("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite."));
73-
$index = array_pop($idArr);
71+
// Getting the instance id directly from addTblObj as, addTblObj() returns the correct instance value.
72+
// Since for 64 bit, the array alignment varies and array_pop($idArr) gets corrupted.
73+
$index = addTblObj("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite.");
74+
// $idArr = explode(",", getInstanceIds("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite."));
75+
// $index = array_pop($idArr);
7476
if ($blockedSiteInfo['alwaysBlock'] == 'true'){
7577
$paramArray =
7678
[
@@ -103,9 +105,11 @@ if( array_key_exists('URL', $blockedSiteInfo) ) {
103105
];
104106
$retStatus1 = DmExtSetStrsWithRootObj($rootObjName, true, $paramArray);
105107
if($timeData[3]){
106-
addTblObj($rootObjName);
107-
$IDs=explode(",",getInstanceIDs($rootObjName));
108-
$index=$IDs[count($IDs)-1];
108+
// Getting the instance id directly from addTblObj as, addTblObj() returns the correct instance value.
109+
// Since for 64 bit, the array alignment varies and $IDs[count($IDs)-1] gets corrupted.
110+
$index=addTblObj($rootObjName);
111+
// $IDs=explode(",",getInstanceIDs($rootObjName));
112+
// $index=$IDs[count($IDs)-1];
109113
$paramArray =
110114
[
111115
[$objPrefix+$index+".Site", "string", $blockedSiteInfo['URL']],
@@ -165,9 +169,11 @@ else{
165169
}
166170
}
167171
if ($result == ""){
168-
addTblObj("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite.");
169-
$idArr = explode(",", getInstanceIds("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite."));
170-
$index = array_pop($idArr);
172+
// Getting the instance id directly from addTblObj as, addTblObj() returns the correct instance value.
173+
// Since for 64 bit, the array alignment varies array_pop($idArr) gets corrupted.
174+
$index = addTblObj("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite.");
175+
// $idArr = explode(",", getInstanceIds("Device.X_Comcast_com_ParentalControl.ManagedSites.BlockedSite."));
176+
// $index = array_pop($idArr);
171177
if ($blockedSiteInfo['alwaysBlock'] == 'true'){
172178
$paramArray =
173179
[
@@ -200,9 +206,11 @@ else{
200206
];
201207
$retStatus1 = DmExtSetStrsWithRootObj($rootObjName, true, $paramArray);
202208
if($timeData[3]){
203-
addTblObj($rootObjName);
204-
$IDs=explode(",",getInstanceIDs($rootObjName));
205-
$index=$IDs[count($IDs)-1];
209+
// Getting the instance id directly from addTblObj as, addTblObj() returns the correct instance value.
210+
// Since for 64 bit, the array alignment varies and $IDs[count($IDs)-1] gets corrupted.
211+
$index=addTblObj($rootObjName);
212+
// $IDs=explode(",",getInstanceIDs($rootObjName));
213+
// $index=$IDs[count($IDs)-1];
206214
$paramArray =
207215
[
208216
[$objPrefix+$index+".Site", "string", $blockedSiteInfo['Keyword']],

‎source/Styles/xb3/jst/captiveportal.jst‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -346,30 +346,48 @@ $(document).ready(function(){
346346
var network5_name = addslashes($("#WiFi5_Name").val());
347347
var network5_password = addslashes($("#WiFi5_Password").val());
348348
var jsConfig;
349+
var retryToSave = true;
350+
var retryCount = 0;
349351
if($("#dualSettings").css('display') == "block" && !$("#selectSettings" ).is(":checked")){
350352
jsConfig = '{"dualband":"true", "network_name":"'+network_name+'", "network_password":"'+network_password+'", "network5_name":"'+network5_name+'", "network5_password":"'+network5_password+'", "phoneNumber":"'+EMS_mobileNumber()+'"}';
351353
}
352354
else {
353355
jsConfig = '{"dualband":"false", "network_name":"'+network_name+'", "network_password":"'+network_password+'", "phoneNumber":"'+EMS_mobileNumber()+'"}';
354356
}
355-
$.ajax({
356-
type: "POST",
357-
url: "actionHandler/ajaxSet_wireless_network_configuration_redirection.jst",
358-
data: { rediection_Info: jsConfig,csrfp_token: token },
359-
success: function (msg, status, jqXHR) {
360-
//msg is the response
361-
msg = JSON.parse(msg);
362-
if(msg[0] == "outOfCaptivePortal")
363-
{
364-
setTimeout(function(){
365-
location.href="index.jst";
366-
}, 10000);
357+
function postConfig(){
358+
$.ajax({
359+
type: "POST",
360+
url: "actionHandler/ajaxSet_wireless_network_configuration_redirection.jst",
361+
data: { rediection_Info: jsConfig, csrfp_token: token },
362+
success: function (msg, status, jqXHR) {
363+
//msg is the response
364+
msg = JSON.parse(msg);
365+
if(msg[0] == "outOfCaptivePortal") {
366+
setTimeout(function(){
367+
location.href="index.jst";
368+
}, 10000);
369+
}
370+
if(connectionType != "WiFi"){
371+
setTimeout(function(){ goToReady(); }, 25000);
372+
}
373+
},
374+
error: function(xhr, status, error) {
375+
// Handle error
376+
console.log("Captiveportal AJAX Error:", error);
377+
console.log("Captiveportal Retrying to Save. retryCount:"+retryCount);
378+
if(retryToSave) {
379+
if(retryCount === 3) {
380+
retryToSave = false;
381+
}
382+
//Increment retryCount
383+
retryCount++;
384+
//retry after 3 sec
385+
setTimeout(function(){ postConfig(); }, 3000);
386+
}
367387
}
368-
}
369-
});
370-
if(connectionType != "WiFi"){
371-
setTimeout(function(){ goToReady(); }, 25000);
388+
});
372389
}
390+
postConfig();
373391
}
374392
var NameTimeout, PasswordTimeout, Name5Timeout, Password5Timeout, phoneNumberTimeout, agreementTimeout;
375393
function messageHandler(target, topMessage, bottomMessage){

‎source/Styles/xb6/jst/index.jst‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,32 @@ $psmMode = $DeviceControl_value['psmMode'];
9696
$LanGwIPv6 = $ipv6addr;
9797
}
9898
}
99+
100+
//$LanGwIPv6
101+
$LanGwIP = [];
102+
$LanGwIP['localAddr'] = '';
103+
$LanGwIP['globalAddr'] = '';
104+
$LanGwIP['ulaAddr'] = '';
105+
if(strpos($partnerId, "sky-") !== false) {
106+
$lan_ip = [];
107+
$bin = exec("which ifconfig");
108+
$xbin=$bin[0].replace(/ /g,'').replace(/\n/g,'');
109+
$out = exec($xbin+" brlan0");
110+
for($k in $out){
111+
$v = $out[$k];
112+
if (strpos($v, 'inet6 addr')){
113+
$tmp = explode('Scope', $v);
114+
$tmp = explode('addr:', $tmp[0]);
115+
$tmp = explode('%', $tmp[1]);
116+
$tmp = explode('/', $tmp[0]);
117+
if(strpos($v, 'inet6 addr: fe80')) $LanGwIP['localAddr'] = trim($tmp[0]);
118+
else if(strpos($v, 'inet6 addr: 2')) $LanGwIP['globalAddr'] = trim($tmp[0]);
119+
else $LanGwIP['ulaAddr'] = trim($tmp[0]);
120+
}
121+
}
122+
$LanGwIPv6 = $LanGwIP['ulaAddr'];
123+
}
124+
99125
if(!$isMSO) {
100126
setStr("Device.DeviceInfo.X_RDKCENTRAL-COM_UI_ACCESS","ui_access",true);
101127
//If Cloud redirection is set, then everything through local GW should be redirected
@@ -104,6 +130,23 @@ if(!$isMSO) {
104130
header("Location: $Cloud_WebURL");
105131
exit(0);
106132
}*/
133+
134+
$SERVER_ADDR = $_SERVER['SERVER_ADDR'];
135+
$ip_addr = strpos($SERVER_ADDR, ":") == false ? $LanGwIPv4 : $LanGwIPv6 ;
136+
$SecWebUI = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SecureWebUI.Enable");
137+
$LocFqdn = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SecureWebUI.LocalFqdn");
138+
if(strpos($partnerId, "sky-") !== false) {
139+
if (strcmp($SecWebUI, "true")==0) {
140+
if (strcmp($url, $LocFqdn)!=0) {
141+
if( (strcmp($url,$ip_addr)==0) || isLocalIPv6($url) )
142+
header('Location:https://'+$LocFqdn);
143+
}
144+
else if ((strcmp($url, $LocFqdn)==0) && ($_SERVER["SERVER_PORT"]=="80"))
145+
header('Location:https://'+$LocFqdn);
146+
}
147+
}
148+
149+
107150
if(!strcmp($CaptivePortalEnable, "true")) {
108151
$SERVER_ADDR = $_SERVER['SERVER_ADDR'];
109152
$ip_addr = strpos($SERVER_ADDR, ":") == false ? $LanGwIPv4 : $LanGwIPv6 ;

‎source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -893,15 +893,25 @@ function init_form()
893893
}
894894
else{ //AboveControlChannel or Auto
895895
//$("#channel_number [value='40'],[value='48'],[value='56'],[value='64'],[value='104'],[value='112'],[value='136'],[value='153'],[value='161']").prop("disabled", true);
896-
$("#channel_number").find("<?% if(!$isPartnerSky) echo("[value='116'],"); ?>[value='140'],[value='144'],[value='165']").prop("disabled", true).prop("selected", false);
896+
if ("6" == radio_band) {
897+
$("#channel_number").find("<?% if(!$isPartnerSky) echo("[value='116'],"); ?>[value='140'],[value='144']").prop("disabled", true).prop("selected", false);
898+
} else {
899+
$("#channel_number").find("<?% if(!$isPartnerSky) echo("[value='116'],"); ?>[value='140'],[value='144'],[value='165']").prop("disabled", true).prop("selected", false);
900+
}
897901
}
898902
}
899903
}
900904
else if ("160MHz" == channel_bandwidth){
901-
$("#channel_number").find("[value='132'],[value='136'],[value='140'],[value='144'],[value='149'],[value='153'],[value='157'],[value='161'],[value='165']").prop("disabled", true).prop("selected", false);
905+
if ("6" == radio_band) {
906+
$("#channel_number").find("[value='132'],[value='136'],[value='140'],[value='144'],[value='149'],[value='153'],[value='157'],[value='161']").prop("disabled", true).prop("selected", false);
907+
} else {
908+
$("#channel_number").find("[value='132'],[value='136'],[value='140'],[value='144'],[value='149'],[value='153'],[value='157'],[value='161'],[value='165']").prop("disabled", true).prop("selected", false);
909+
}
902910
}
903-
// NOT 20MHz, disable channel 165
904-
$("#channel_number").find("[value='165']").prop("disabled", true).prop("selected", false);
911+
if ("6" != radio_band) {
912+
// NOT 20MHz, disable channel 165
913+
$("#channel_number").find("[value='165']").prop("disabled", true).prop("selected", false);
914+
}
905915
}
906916
else {
907917
//if Channel Bandwidth is 20MHz DFS Channels (Channels 50 - 144) should be greyed out

0 commit comments

Comments
 (0)