Skip to content

Fixes and Cleanup #37

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 11 commits into from
Nov 3, 2025
Merged

Fixes and Cleanup #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4842a7
Update .gitattributes
Martinski4GitHub Oct 26, 2025
604cd47
Merge pull request #32 from Martinski4GitHub/develop
Martinski4GitHub Oct 26, 2025
4f1f814
Removed Tomato JS Dependencies
Martinski4GitHub Oct 30, 2025
1b79200
Merge pull request #33 from Martinski4GitHub/develop
Martinski4GitHub Oct 30, 2025
9800b30
Updated Version
Martinski4GitHub Oct 31, 2025
37a849f
Merge pull request #34 from Martinski4GitHub/develop
Martinski4GitHub Oct 31, 2025
a792a1e
Fixes and Improvements.
Martinski4GitHub Nov 2, 2025
22a0e33
Merge pull request #35 from Martinski4GitHub/develop
Martinski4GitHub Nov 2, 2025
0937a06
Updated date string
Martinski4GitHub Nov 3, 2025
8ac630c
Merge pull request #36 from Martinski4GitHub/develop
Martinski4GitHub Nov 3, 2025
78ecc24
Merge branch 'master' into develop
Martinski4GitHub Nov 3, 2025
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
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
* text eol=lf
*.sh text eol=lf
*.md text eol=lf
*.asp text eol=lf
*.js text eol=lf
*.css text eol=lf
*.config.example text eol=lf
*.gz binary
*.png binary
*.jpg binary
*.jpeg binary
*.zip binary
*.tar.gz binary
61 changes: 24 additions & 37 deletions Advanced_DHCP_Content.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@ thead.collapsible-jquery {
<script language="JavaScript" type="text/javascript" src="/popup.js"></script>
<script language="JavaScript" type="text/javascript" src="/help.js"></script>
<script language="JavaScript" type="text/javascript" src="/ext/shared-jy/detect.js"></script>
<script language="JavaScript" type="text/javascript" src="/tmhist.js"></script>
<script language="JavaScript" type="text/javascript" src="/tmmenu.js"></script>
<script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
<script language="JavaScript" type="text/javascript" src="/validator.js"></script>
<script language="JavaScript" type="text/javascript" src="/base64.js"></script>
<script>

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

const actionScriptPrefix = "start_YazDHCP";
Expand Down Expand Up @@ -733,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 @@ -982,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 @@ -1011,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 @@ -1083,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 @@ -1096,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 @@ -1231,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 @@ -1292,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 @@ -1353,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 @@ -1363,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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# YazDHCP

## v1.2.1
## v1.2.2

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

## About

Expand Down
Loading