Skip to content

Fixes and Improvements. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martinski4GitHub merged 1 commit into from
Nov 2, 2025
Merged

Fixes and Improvements. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 24 additions & 35 deletions Advanced_DHCP_Content.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ thead.collapsible-jquery {
<script>

/**----------------------------------------**/
/** Modified by Martinski W. [2025-Oct-27] **/
/** Modified by Martinski W. [2025-Nov-01] **/
/**----------------------------------------**/

const actionScriptPrefix = "start_YazDHCP";
Expand Down Expand Up @@ -731,7 +731,7 @@ function FileSelectionHandler (fileSelDialog)
let actionScriptVal = actionScriptPrefix + 'restoreIcons_reqNum_' + theFileIndex;
document.formScriptActions.action_script.value = actionScriptVal;
document.formScriptActions.submit();
setTimeout(GetCustomUserIconsStatus, 3000);
setTimeout(GetCustomUserIconsStatus, 5000);
}
else
{
Expand Down Expand Up @@ -980,19 +980,16 @@ function GetCustomUserIconsStatus()
});
}

/**----------------------------------------**/
/** Modified by Martinski W. [2025-Nov-01] **/
/**----------------------------------------**/
function GetCustomUserIconsConfig()
{
$.ajax({
url: '/ext/YazDHCP/CustomUserIconsConfig.htm',
dataType: 'text',
error: function(xhr)
{
if (customUserIcons.initState)
{
customUserIcons.initState = false;
CheckUserIconFiles();
return false;
}
if (customUserIcons.numTries < customUserIcons.maxTries)
{
customUserIcons.numTries += 1;
Expand All @@ -1009,13 +1006,6 @@ function GetCustomUserIconsConfig()
},
success: function(data)
{
if (customUserIcons.initState)
{
customUserIcons.initState = false;
CheckUserIconFiles();
return false;
}

var settings = data.split('\n');
settings = settings.filter(Boolean);
let linesCount = settings.length;
Expand Down Expand Up @@ -1081,7 +1071,7 @@ function BackUpUserIconFiles()
let actionScriptVal = actionScriptPrefix + 'backupIcons';
document.formScriptActions.action_script.value = actionScriptVal;
document.formScriptActions.submit();
setTimeout(GetCustomUserIconsStatus, 3000);
setTimeout(GetCustomUserIconsStatus, 5000);
}

function RestoreUserIconFiles()
Expand All @@ -1094,15 +1084,7 @@ function RestoreUserIconFiles()
let actionScriptVal = actionScriptPrefix + 'restoreIcons_reqList';
document.formScriptActions.action_script.value = actionScriptVal;
document.formScriptActions.submit();
setTimeout(GetCustomUserIconsBackupList, 3000);
}

function CheckUserIconFiles()
{
let actionScriptVal = actionScriptPrefix + 'checkIcons';
document.formScriptActions.action_script.value = actionScriptVal;
document.formScriptActions.submit();
setTimeout(GetCustomUserIconsConfig, 1000);
setTimeout(GetCustomUserIconsBackupList, 5000);
}

/**-------------------------------------**/
Expand Down Expand Up @@ -1229,12 +1211,12 @@ function AllowGuestNetworkReservations(forminput)
if (inputvalue === 'true')
{
SetAllowGuestNetReservationsStatus ('ENABLED');
actionScriptVal = actionScriptPrefix + 'enableGuestNetReservations';
actionScriptVal = actionScriptPrefix + 'enableGNetReservations';
}
else if (inputvalue === 'false')
{
SetAllowGuestNetReservationsStatus ('DISABLED');
actionScriptVal = actionScriptPrefix + 'disableGuestNetReservations';
actionScriptVal = actionScriptPrefix + 'disableGNetReservations';
}

document.formScriptActions.action_script.value = actionScriptVal;
Expand Down Expand Up @@ -1290,16 +1272,24 @@ function SetAllowGuestNetReservationsStatus(theStatus)
}

/**-------------------------------------**/
/** Added by Martinski W. [2025-Sep-05] **/
/** Added by Martinski W. [2025-Nov-01] **/
/**-------------------------------------**/
function Check_GuestNetwork_SubnetInfo()
function SendMultipleCheckRequests()
{
if (isInitialLoading)
{ SetAllowGuestNetReservationsStatus ('LOADING'); }

let actionScriptVal = actionScriptPrefix + 'checkGuestNetReservations';
document.formScriptActions.action_script.value = actionScriptVal;
if (customUserIcons.initState)
{ customUserIcons.initState = false; }

let actionScript1 = actionScriptPrefix + 'checkUserIcons';
let actionScript2 = actionScriptPrefix + 'checkGNetReservations';
let actionScripts = actionScript1 + ' ; ' + actionScript2;

document.formScriptActions.action_script.value = actionScripts;
document.formScriptActions.submit();

setTimeout(GetCustomUserIconsConfig, 6000);
setTimeout(StartGuestNetCheckInterval, 8000);
}

Expand Down Expand Up @@ -1351,7 +1341,7 @@ vpn_fusion_support = false;
var faq_href = "https://nw-dlcdnet.asus.com/support/forward.html?model=&type=Faq&lang="+ui_lang+"&kw=&num=101";

/**----------------------------------------**/
/** Modified by Martinski W. [2025-Sep-05] **/
/** Modified by Martinski W. [2025-Nov-01] **/
/**----------------------------------------**/
function initial()
{
Expand All @@ -1361,11 +1351,10 @@ function initial()

isInitialLoading = true;
LoadCustomSettings();
Get_DHCP_LeaseConfig();
GetCustomUserIconsConfig();
ScriptUpdateLayout();
AddEventHandlers();
Check_GuestNetwork_SubnetInfo();
Get_DHCP_LeaseConfig();
SendMultipleCheckRequests();

d3.csv("/ext/YazDHCP/DHCP_clients.htm").then(function(data){
if (data.length > 0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## v1.2.2

### Updated on 2025-Oct-30
### Updated on 2025-Nov-02

## About

Expand Down
Loading