From db71623b749e889352bd43451e2708b064c83089 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 15 Dec 2025 23:26:53 -0800 Subject: [PATCH 01/14] Fine-Tuning Code Just some simple fine-tuning. --- README.md | 4 ++-- scmerlin.sh | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 0269d31..a0f73c9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin -## v2.5.47 -### Updated on 2025-Dec-12 +## v2.5.48 +### Updated on 2025-Dec-15 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index c54fce5..0a720e3 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2025-Dec-12 +# Last Modified: 2025-Dec-15 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -32,9 +32,9 @@ ### Start of script variables ### readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" -readonly SCM_VERSION="v2.5.47" -readonly SCRIPT_VERSION="v2.5.47" -readonly SCRIPT_VERSTAG="25121220" +readonly SCM_VERSION="v2.5.48" +readonly SCRIPT_VERSION="v2.5.48" +readonly SCRIPT_VERSTAG="25121520" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -2892,7 +2892,6 @@ _Menu_Services_() done "$exitMenu" && return 0 - ScriptHeader _Menu_Services_ } @@ -2910,7 +2909,7 @@ _Menu_OpenVPN_() if _CheckFor_OpenVPN_Clients_Available_ then printf " ${BOLDUNDERLN}${GRNct}OpenVPN Clients${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the OpenVPN Client)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Client)${CLRct}\n\n" vpnClientNum=1 while [ "$vpnClientNum" -lt 6 ] do @@ -2936,7 +2935,7 @@ _Menu_OpenVPN_() if _CheckFor_OpenVPN_Servers_Available_ then printf "\n ${BOLDUNDERLN}${GRNct}OpenVPN Servers${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the OpenVPN Server)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Server)${CLRct}\n\n" vpnServerNum=1 while [ "$vpnServerNum" -lt 3 ] do @@ -3002,7 +3001,6 @@ _Menu_OpenVPN_() done "$exitMenu" && return 0 - ScriptHeader _Menu_OpenVPN_ } @@ -3020,7 +3018,7 @@ _Menu_WireGuard_() if _CheckFor_WireGuard_Clients_Available_ then printf " ${BOLDUNDERLN}${GRNct}WireGuard Clients${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the WireGuard Client)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Client)${CLRct}\n\n" vpnClientNum=1 while [ "$vpnClientNum" -lt 6 ] do @@ -3047,7 +3045,7 @@ _Menu_WireGuard_() if _CheckFor_WireGuard_Servers_Available_ then printf "\n ${BOLDUNDERLN}${GRNct}WireGuard Server${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting the option will restart the WireGuard Server)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting the option will restart the Server)${CLRct}\n\n" vpnServerNum=1 ## Currently only ONE WireGuard Server is available ## if _IsWireGuard_Server_Configured_ "$vpnServerNum" then @@ -3116,7 +3114,6 @@ _Menu_WireGuard_() done "$exitMenu" && return 0 - ScriptHeader _Menu_WireGuard_ } @@ -3311,7 +3308,6 @@ _Menu_RouterUtilities_() done "$exitMenu" && return 0 - ScriptHeader _Menu_RouterUtilities_ } @@ -3406,7 +3402,6 @@ _Menu_ToggleOptions_() done "$exitMenu" && return 0 - ScriptHeader _Menu_ToggleOptions_ } From 5069277f8e9fbf97a18bd66ef9bc5927872e389d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 20:37:30 +0000 Subject: [PATCH 02/14] Bump actions/checkout from 6.0.1 to 6.0.2 in the all-actions group Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 6.0.1 to 6.0.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 74864b4..5fecb20 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -19,7 +19,7 @@ jobs: steps: # 1--- Check out master so we tag the exact merge commit - name: Checkout source code - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 ref: 'master' From 0602454413e76fd43a34ee6638430bac458047db Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Wed, 18 Feb 2026 01:18:59 -0800 Subject: [PATCH 03/14] New Functionality Initial code to support automatic script updates via AMTM. --- README.md | 2 +- scmerlin.sh | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a0f73c9..3e4777d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin ## v2.5.48 -### Updated on 2025-Dec-15 +### Updated on 2026-Feb-18 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index 0a720e3..f845eac 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2025-Dec-15 +# Last Modified: 2026-Feb-18 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="25121520" +readonly SCRIPT_VERSTAG="26021800" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -102,6 +102,9 @@ readonly branchxStr_TAG="[Branch: $SCRIPT_BRANCH]" readonly versionDev_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}" readonly versionMod_TAG="$SCRIPT_VERSION on $ROUTER_MODEL" +# To support automatic script updates from AMTM # +doScriptUpdateFromAMTM=true + ##-------------------------------------## ## Added by Martinski W. [2025-May-17] ## ##-------------------------------------## @@ -1167,9 +1170,11 @@ Update_Version() localver="$(echo "$updatecheckresult" | cut -f2 -d',')" serverver="$(echo "$updatecheckresult" | cut -f3 -d',')" - if [ "$isupdate" = "version" ]; then + if [ "$isupdate" = "version" ] + then Print_Output true "New version of $SCRIPT_NAME available - $serverver" "$PASS" - elif [ "$isupdate" = "md5" ]; then + elif [ "$isupdate" = "md5" ] + then Print_Output true "MD5 hash of $SCRIPT_NAME does not match - hotfix available - $serverver" "$PASS" fi @@ -1246,6 +1251,23 @@ Update_Version() fi } +##-------------------------------------## +## Added by Martinski W. [2026-Feb-18] ## +##-------------------------------------## +ScriptUpdateFromAMTM() +{ + if ! "$doScriptUpdateFromAMTM" + then + printf "Automatic script updates via AMTM are currently disabled.\n\n" + return 1 + fi + if [ $# -gt 0 ] && [ "$1" = "check" ] + then return 0 + fi + Update_Version force unattended + return "$?" +} + ##----------------------------------------## ## Modified by Martinski W. [2025-Feb-11] ## ##----------------------------------------## @@ -3950,7 +3972,7 @@ then fi ##----------------------------------------## -## Modified by Martinski W. [2025-Oct-19] ## +## Modified by Martinski W. [2026-Feb-18] ## ##----------------------------------------## case "$1" in install) @@ -4225,6 +4247,11 @@ case "$1" in Update_Version force exit 0 ;; + amtmupdate) + shift + ScriptUpdateFromAMTM "$@" + exit "$?" + ;; postupdate) Create_Dirs Create_Symlinks From e7dbea2da15c5dbae07cdc728a9c9614f1510377 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Tue, 3 Mar 2026 11:19:07 -0500 Subject: [PATCH 04/14] Allow Disabling of Dropdown Submenus Initial commit to support disabling of Dropdown Sub-Menus from scMerlin --- README.md | 2 +- scmerlin.sh | 125 +++++++++++++++++++++++++++++++++++++---------- scmerlin_www.asp | 21 +++++++- scmerlin_www.js | 34 +++++++++++++ 4 files changed, 155 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 3e4777d..51a4740 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin ## v2.5.48 -### Updated on 2026-Feb-18 +### Updated on 2026-Mar-03 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index f845eac..87ea840 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2026-Feb-18 +# Last Modified: 2026-Mar-03 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -46,6 +46,7 @@ readonly SHARED_WEB_DIR="$SCRIPT_WEBPAGE_DIR/shared-jy" readonly TEMP_MENU_TREE="/tmp/menuTree.js" readonly NTP_WATCHDOG_FILE="$SCRIPT_DIR/.watchdogenabled" readonly TAIL_TAINTED_FILE="$SCRIPT_DIR/.tailtaintdnsenabled" +readonly WEBUI_DROPDOWN_FILE="$SCRIPT_DIR/.webui_dropdown_submenus" ##----------------------------------------## ## Modified by Martinski W. [2024-Jun-07] ## @@ -1109,6 +1110,72 @@ function GenerateSiteMap(showurls) EOF } +##---------------------------------------## +## Added by ExtremeFiretop [2026-Mar-03] ## +##---------------------------------------## +WebUI_DropdownSubMenus() +{ + + case "$1" in + enable) + touch "$WEBUI_DROPDOWN_FILE" + WebUI_DropdownSubMenus apply >/dev/null 2>&1 + ;; + disable) + rm -f "$WEBUI_DROPDOWN_FILE" + WebUI_DropdownSubMenus apply >/dev/null 2>&1 + ;; + apply) + # Ensure we have a working copy to edit + if [ ! -f /tmp/index_style.css ]; then + cp -fp /www/index_style.css /tmp/ 2>/dev/null + fi + + # Remove any prior dropdown CSS rules (yours or legacy) + if [ -f /tmp/index_style.css ]; then + sed -i '/dropdown-content/d' /tmp/index_style.css + fi + + # Base dropdown CSS (always present) + { + echo ".dropdown-content {top: 0px; left: 185px; "\ +"visibility: hidden; position: absolute; "\ +"background-color: #3a4042; min-width: 165px; "\ +"box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); "\ +"z-index: 1000;}" + echo ".dropdown-content a {padding: 6px 8px; "\ +"text-decoration: none; display: block; height: 100%; "\ +"min-height: 20px; max-height: 40px; font-weight: bold; "\ +"text-shadow: 1px 1px 0px black; "\ +"font-family: Verdana, MS UI Gothic, MS P Gothic, "\ +"Microsoft Yahei UI, sans-serif; font-size: 12px; "\ +"border: 1px solid #6B7071;}" + echo ".dropdown-content a:hover {background-color: #77a5c6;}" + } >> /tmp/index_style.css + + # Enabled: show on hover + if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + echo ".dropdown:hover .dropdown-content "\ +"{visibility: visible;}" >> /tmp/index_style.css + else + # Disabled: prevent click-toggle from making it appear + echo ".dropdown-content {display: none;}" >> /tmp/index_style.css + fi + + # Bind-mount updated CSS into WebUI + umount /www/index_style.css 2>/dev/null + mount -o bind /tmp/index_style.css /www/index_style.css + ;; + status) + if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + echo "ENABLED" + else + echo "DISABLED" + fi + ;; + esac +} + ##----------------------------------------## ## Modified by Martinski W. [2025-May-17] ## ##----------------------------------------## @@ -1445,6 +1512,7 @@ Create_Symlinks() ln -s "$NTP_WATCHDOG_FILE" "$SCRIPT_WEB_DIR/watchdogenabled.htm" 2>/dev/null ln -s "$NTP_READY_CHECK_CONF" "$SCRIPT_WEB_DIR/${NTP_READY_CHECK_FILE}.htm" 2>/dev/null ln -s "$TAIL_TAINTED_FILE" "$SCRIPT_WEB_DIR/tailtaintdnsenabled.htm" 2>/dev/null + ln -s "$WEBUI_DROPDOWN_FILE" "$SCRIPT_WEB_DIR/webuidropdownenabled.htm" 2>/dev/null if [ ! -d "$SHARED_WEB_DIR" ]; then ln -s "$SHARED_DIR" "$SHARED_WEB_DIR" 2>/dev/null @@ -1699,30 +1767,13 @@ Mount_WebUI() cp -fp /www/index_style.css /tmp/ fi - if ! grep -q '.menu_Addons' /tmp/index_style.css ; then - echo ".menu_Addons { background: url(ext/shared-jy/addons.png); background-size: contain; }" >> /tmp/index_style.css - fi - - if grep -q '.menu_Addons' /tmp/index_style.css && ! grep -q 'url(ext/shared-jy/addons.png); background-size: contain;' /tmp/index_style.css; then - sed -i 's/addons.png);/addons.png); background-size: contain;/' /tmp/index_style.css - fi - - if grep -q '.dropdown-content {display: block;}' /tmp/index_style.css ; then - sed -i '/dropdown-content/d' /tmp/index_style.css - fi - - if ! grep -q '.dropdown-content {visibility: visible;}' /tmp/index_style.css - then - { - echo ".dropdown-content {top: 0px; left: 185px; visibility: hidden; position: absolute; background-color: #3a4042; min-width: 165px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); z-index: 1000;}" - echo ".dropdown-content a {padding: 6px 8px; text-decoration: none; display: block; height: 100%; min-height: 20px; max-height: 40px; font-weight: bold; text-shadow: 1px 1px 0px black; font-family: Verdana, MS UI Gothic, MS P Gothic, Microsoft Yahei UI, sans-serif; font-size: 12px; border: 1px solid #6B7071;}" - echo ".dropdown-content a:hover {background-color: #77a5c6;}" - echo ".dropdown:hover .dropdown-content {visibility: visible;}" - } >> /tmp/index_style.css - fi - - umount /www/index_style.css 2>/dev/null - mount -o bind /tmp/index_style.css /www/index_style.css + # Apply (enable/disable) WebUI dropdown sub-menus based on saved setting + # NOTE: This function handles: + # - Removing any prior dropdown CSS rules + # - Adding base dropdown CSS + # - Adding hover-to-show rule only when enabled + # - Bind-mounting /tmp/index_style.css to /www/index_style.css + WebUI_DropdownSubMenus apply if [ ! -f "$TEMP_MENU_TREE" ]; then cp -fp /www/require/modules/menuTree.js "$TEMP_MENU_TREE" @@ -3374,6 +3425,15 @@ _Menu_ToggleOptions_() printf " ${GRNct}dns${CLRct}. Toggle dnsmasq tainted watchdog script\n" printf " Currently: ${TAILTAINT_DNS_STATUS}\n\n" + if [ "$(WebUI_DropdownSubMenus status)" = "ENABLED" ] + then + WEBUI_DROPDOWN_STATUS="${GRNct}ENABLED${CLRct}" + else + WEBUI_DROPDOWN_STATUS="${REDct}DISABLED${CLRct}" + fi + printf " ${GRNct}wui${CLRct}. Toggle WebUI dropdown sub-menus\n" + printf " Currently: ${WEBUI_DROPDOWN_STATUS}\n\n" + printf " ${GRNct}e${CLRct}. Return to Main Menu\n" printf "\n${menuSepStr}\n\n" @@ -3412,6 +3472,16 @@ _Menu_ToggleOptions_() fi break ;; + wui) + printf "\n" + WEBUI_DROPDOWN_STATUS="$(WebUI_DropdownSubMenus status)" + if [ "$WEBUI_DROPDOWN_STATUS" = "ENABLED" ] + then WebUI_DropdownSubMenus disable + elif [ "$WEBUI_DROPDOWN_STATUS" = "DISABLED" ] + then WebUI_DropdownSubMenus enable + fi + break + ;; e) exitMenu=true break ;; @@ -4005,6 +4075,11 @@ case "$1" in settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_DNSmasqWatchdog//")"; settingstate="$(echo "$settingstate" | tr 'A-Z' 'a-z')" TailTaintDNSmasq "$settingstate" + elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}_WebUIDropdowns" + then + settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_WebUIDropdowns//")"; + settingstate="$(echo "$settingstate" | tr 'A-Z' 'a-z')" + WebUI_DropdownSubMenus "$settingstate" elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}servicerestart" then rm -f "$SCRIPT_WEB_DIR/detect_service.js" diff --git a/scmerlin_www.asp b/scmerlin_www.asp index f55a307..766a1e0 100644 --- a/scmerlin_www.asp +++ b/scmerlin_www.asp @@ -531,7 +531,7 @@ function update_temperatures() } /* End firmware functions */ -var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} +var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIDropdownsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuidropdownenabled.htm",dataType:"text",cache:false,error:function(){document.form.scMerlin_WebUIDropdowns.value="Disable",$("#scMerlin_WebUIDropdowns_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIDropdowns.value="Enable",$("#scMerlin_WebUIDropdowns_Status").text("Currently: ENABLED")}})}function Save_WebUIDropdowns(){document.form.action_script.value="start_scmerlin_WebUIDropdowns"+document.form.scMerlin_WebUIDropdowns.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",false),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_WebUIDropdownsEnabled_File,4e3)}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} @@ -660,6 +660,25 @@ var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[ + + + +Enable WebUI dropdown sub-menus
+ +Yes +No +       + +      + + + diff --git a/scmerlin_www.js b/scmerlin_www.js index 074caef..629505f 100644 --- a/scmerlin_www.js +++ b/scmerlin_www.js @@ -88,6 +88,7 @@ function initial() Get_NTPWatchdogEnabled_File(); Get_NTPReadyCheck_Option(); Get_DNSmasqWatchdogEnabled_File(); + Get_WebUIDropdownsEnabled_File(); update_temperatures(); update_wanuptime(); update_sysinfo(); @@ -377,6 +378,39 @@ function Get_DNSmasqWatchdogEnabled_File() }); } +function Get_WebUIDropdownsEnabled_File() +{ + $.ajax({ + url: "/ext/scmerlin/webuidropdownenabled.htm", + dataType: "text", + cache: false, + error: function(){ + document.form.scMerlin_WebUIDropdowns.value = "Disable"; + $("#scMerlin_WebUIDropdowns_Status").text("Currently: DISABLED"); + }, + success: function(){ + document.form.scMerlin_WebUIDropdowns.value = "Enable"; + $("#scMerlin_WebUIDropdowns_Status").text("Currently: ENABLED"); + } + }); +} + +function Save_WebUIDropdowns() +{ + document.form.action_script.value = + "start_scmerlin_WebUIDropdowns" + document.form.scMerlin_WebUIDropdowns.value; + + document.form.action_wait.value = 4; + + $("#auto_refresh").prop("checked", false); + if (tmout != null) clearTimeout(tmout); + + showLoading(); + document.form.submit(); + + setTimeout(Get_WebUIDropdownsEnabled_File, 4000); +} + /**-------------------------------------**/ /** Added by Martinski W. [2024-Apr-29] **/ /**-------------------------------------**/ From 725b694433b33667a64b48987a1f42731d37f18d Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Tue, 3 Mar 2026 21:16:03 -0500 Subject: [PATCH 05/14] Actually detach state.js modifications Actually detach state.js modifications --- scmerlin.sh | 275 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 202 insertions(+), 73 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index 87ea840..9d2b69a 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -770,42 +770,14 @@ Update_Check() echo "$doupdate,$localver,$serverver" } -##----------------------------------------## -## Modified by Martinski W. [2025-May-17] ## -##----------------------------------------## -AppendTo_statejs_3004_() +##------------------------------------------## +## Modified by ExtremeFiretop [2026-Mar-03] ## +##------------------------------------------## +AppendTo_statejs_Sitemap_3004_() { - cat << 'EOF' + cat << 'EOF' +/*BEGIN:SCMERLIN_SITEMAP*/ var myMenu = []; -function AddDropdowns() -{ - if (myMenu.length == 0) - { - setTimeout(AddDropdowns,1000); - return; - } - for (var i = 0; i < myMenu.length; i++) - { - var sitemapstring = '
'; - for(var i2 = 0; i2 < myMenu[i].tabs.length; i2++){ - if(myMenu[i].tabs[i2].tabName == '__HIDE__'){ - continue; - } - var tabname = myMenu[i].tabs[i2].tabName; - var taburl = myMenu[i].tabs[i2].url; - if(tabname == '__INHERIT__'){ - tabname = taburl.split('.')[0]; - } - if(taburl.indexOf('redirect.htm') != -1){ - taburl = '/ext/shared-jy/redirect.htm'; - } - sitemapstring += ''+tabname+''; - } - document.getElementsByClassName(myMenu[i].index)[0].parentElement.parentElement.parentElement.parentElement.parentElement.innerHTML += sitemapstring; - document.getElementsByClassName(myMenu[i].index)[0].parentElement.parentElement.parentElement.parentElement.parentElement.classList.add('dropdown'); - } -} - function GenerateSiteMap(showurls) { myMenu = []; @@ -899,16 +871,57 @@ function GenerateSiteMap(showurls) return sitemapstring; } GenerateSiteMap(false); +/*END:SCMERLIN_SITEMAP*/ +EOF +} + +##------------------------------------------## +## Modified by ExtremeFiretop [2026-Mar-03] ## +##------------------------------------------## +AppendTo_statejs_Dropdowns_3004_() +{ + cat << 'EOF' +/*BEGIN:SCMERLIN_DROPDOWNS*/ +function AddDropdowns() +{ + if (myMenu.length == 0) + { + setTimeout(AddDropdowns,1000); + return; + } + for (var i = 0; i < myMenu.length; i++) + { + var sitemapstring = '
'; + for(var i2 = 0; i2 < myMenu[i].tabs.length; i2++){ + if(myMenu[i].tabs[i2].tabName == '__HIDE__'){ + continue; + } + var tabname = myMenu[i].tabs[i2].tabName; + var taburl = myMenu[i].tabs[i2].url; + if(tabname == '__INHERIT__'){ + tabname = taburl.split('.')[0]; + } + if(taburl.indexOf('redirect.htm') != -1){ + taburl = '/ext/shared-jy/redirect.htm'; + } + sitemapstring += ''+tabname+''; + } + document.getElementsByClassName(myMenu[i].index)[0].parentElement.parentElement.parentElement.parentElement.parentElement.innerHTML += sitemapstring; + document.getElementsByClassName(myMenu[i].index)[0].parentElement.parentElement.parentElement.parentElement.parentElement.classList.add('dropdown'); + } +} AddDropdowns(); +/*END:SCMERLIN_DROPDOWNS*/ EOF } -##---------------------------------------## -## Added by ExtremeFiretop [2025-May-15] ## -##---------------------------------------## -AppendTo_statejs_3006_() +##------------------------------------------## +## Modified by ExtremeFiretop [2026-Mar-03] ## +##------------------------------------------## +AppendTo_statejs_Sitemap_3006_() { - cat << 'EOF' + cat << 'EOF' +/*BEGIN:SCMERLIN_SITEMAP*/ function GenerateSiteMap(showurls) { myMenu = []; @@ -974,6 +987,17 @@ function GenerateSiteMap(showurls) } return sitemapstring; } +/*END:SCMERLIN_SITEMAP*/ +EOF +} + +##------------------------------------------## +## Modified by ExtremeFiretop [2026-Mar-03] ## +##------------------------------------------## +AppendTo_statejs_Dropdowns_3006_() +{ + cat << 'EOF' +/*BEGIN:SCMERLIN_DROPDOWNS*/ (function(){ if (window._stateEnhancedInjected) return; window._stateEnhancedInjected = true; @@ -1107,9 +1131,71 @@ function GenerateSiteMap(showurls) injectDropdowns(); }); })(); +/*END:SCMERLIN_DROPDOWNS*/ EOF } +AppendTo_statejs_3004_() +{ + AppendTo_statejs_Sitemap_3004_ + if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + AppendTo_statejs_Dropdowns_3004_ + fi +} + +AppendTo_statejs_3006_() +{ + AppendTo_statejs_Sitemap_3006_ + if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + AppendTo_statejs_Dropdowns_3006_ + fi +} + +##----------------------------------------## +## Added by ExtremeFiretop [2026-Mar-03] ## +##----------------------------------------## +Patch_StateJS() +{ + local TMP_STATE_JS="/tmp/state.js" + local sitemapPage="NONE" + + # Only makes sense on Merlin with /www/state.js present + [ -f /www/state.js ] || return 0 + + # Try to find the currently mounted Sitemap page (userXX.asp) + [ -f "$TEMP_MENU_TREE" ] && sitemapPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + + # Always rebuild from the *real* state.js (unmounted) + umount /www/state.js 2>/dev/null + cp -f /www/state.js "$TMP_STATE_JS" 2>/dev/null || return 1 + + # Inject Sitemap link into bottom bar if we know the page + if echo "$sitemapPage" | grep -qE "^user[0-9]+\.asp$" + then + sed -i 's~~Sitemap<\/a>\ \|\ ~' \ + "$TMP_STATE_JS" + fi + + # Append scMerlin injected blocks: + { + echo '/*BEGIN:SCMERLIN_INJECT*/' + if [ "$fwInstalledBaseVers" = "3004" ] + then + AppendTo_statejs_Sitemap_3004_ + [ -f "$WEBUI_DROPDOWN_FILE" ] && AppendTo_statejs_Dropdowns_3004_ + else + # default to 3006 behavior + AppendTo_statejs_Sitemap_3006_ + [ -f "$WEBUI_DROPDOWN_FILE" ] && AppendTo_statejs_Dropdowns_3006_ + fi + echo '/*END:SCMERLIN_INJECT*/' + } >> "$TMP_STATE_JS" + + # Re-bind into WebUI + mount -o bind "$TMP_STATE_JS" /www/state.js + return 0 +} + ##---------------------------------------## ## Added by ExtremeFiretop [2026-Mar-03] ## ##---------------------------------------## @@ -1120,10 +1206,12 @@ WebUI_DropdownSubMenus() enable) touch "$WEBUI_DROPDOWN_FILE" WebUI_DropdownSubMenus apply >/dev/null 2>&1 + Patch_StateJS >/dev/null 2>&1 ;; disable) rm -f "$WEBUI_DROPDOWN_FILE" WebUI_DropdownSubMenus apply >/dev/null 2>&1 + Patch_StateJS >/dev/null 2>&1 ;; apply) # Ensure we have a working copy to edit @@ -1131,7 +1219,7 @@ WebUI_DropdownSubMenus() cp -fp /www/index_style.css /tmp/ 2>/dev/null fi - # Remove any prior dropdown CSS rules (yours or legacy) + # Remove any prior dropdown CSS rules if [ -f /tmp/index_style.css ]; then sed -i '/dropdown-content/d' /tmp/index_style.css fi @@ -1176,53 +1264,94 @@ WebUI_DropdownSubMenus() esac } -##----------------------------------------## -## Modified by Martinski W. [2025-May-17] ## -##----------------------------------------## +##------------------------------------------## +## Modified by ExtremeFiretop [2026-Mar-03] ## +##------------------------------------------## Upgrade_StateJS() { - local TMP_STATE_JS="/tmp/state.js" - [ -f "$TMP_STATE_JS" ] || return 0 + local TMP_STATE_JS="/tmp/state.js" + [ -f "$TMP_STATE_JS" ] || return 0 + + # + # Bootstrap/migrate dropdown preference: + # If state.js already contains dropdowns code but the marker file doesn't exist + # (older versions), create the marker so updates don't "start disabled". + # + if [ ! -f "$WEBUI_DROPDOWN_FILE" ] + then + if grep -qE '^[[:space:]]*window\._scmDropdownsEnabled[[:space:]]*=[[:space:]]*1' \ + "$TMP_STATE_JS" 2>/dev/null || \ + grep -qF 'BEGIN:SCMERLIN_DROPDOWNS' "$TMP_STATE_JS" 2>/dev/null || \ + grep -qF 'function injectDropdowns()' "$TMP_STATE_JS" 2>/dev/null || \ + grep -qF 'AddDropdowns();' "$TMP_STATE_JS" 2>/dev/null + then + touch "$WEBUI_DROPDOWN_FILE" 2>/dev/null + fi + fi - if [ "$fwInstalledBaseVers" = "3006" ] && \ - grep -q '^var myMenu = \[\];$' "$TMP_STATE_JS" - then - umount /www/state.js 2>/dev/null + # If new split markers exist, just remove & re-append based on current state. + if grep -q 'BEGIN:SCMERLIN_SITEMAP' "$TMP_STATE_JS" 2>/dev/null || \ + grep -q 'BEGIN:SCMERLIN_DROPDOWNS' "$TMP_STATE_JS" 2>/dev/null + then + umount /www/state.js 2>/dev/null - # Remove previous code # - sed -i '/^var myMenu = \[\];$/,/^AddDropdowns();$/d' "$TMP_STATE_JS" + sed -i '/\/\*BEGIN:SCMERLIN_SITEMAP\*\//,/\/\*END:SCMERLIN_SITEMAP\*\//d' \ + "$TMP_STATE_JS" + sed -i '/\/\*BEGIN:SCMERLIN_DROPDOWNS\*\//,/\/\*END:SCMERLIN_DROPDOWNS\*\//d' \ + "$TMP_STATE_JS" - # Append new 3006 code # - AppendTo_statejs_3006_ >> "$TMP_STATE_JS" + if [ "$fwInstalledBaseVers" = "3004" ] + then + AppendTo_statejs_3004_ >> "$TMP_STATE_JS" + else + AppendTo_statejs_3006_ >> "$TMP_STATE_JS" + fi - mount -o bind /tmp/state.js /www/state.js + mount -o bind "$TMP_STATE_JS" /www/state.js + return 0 + fi - elif [ "$fwInstalledBaseVers" = "3006" ] && \ - ! grep -q 'write them straight to cache' "$TMP_STATE_JS" - then - umount /www/state.js 2>/dev/null + # ---- Legacy upgrade paths below ---- - # Remove old block starting at GenerateSiteMap() through EOF - sed -i '/^function GenerateSiteMap(showurls)/,$d' "$TMP_STATE_JS" + if [ "$fwInstalledBaseVers" = "3006" ] && \ + grep -q '^var myMenu = \[\];$' "$TMP_STATE_JS" + then + umount /www/state.js 2>/dev/null - # Reinject the 3006 specific code - AppendTo_statejs_3006_ >> "$TMP_STATE_JS" + # Remove previous code # + sed -i '/^var myMenu = \[\];$/,/^AddDropdowns();$/d' "$TMP_STATE_JS" - mount -o bind /tmp/state.js /www/state.js + # Append new (split-aware) 3006 code # + AppendTo_statejs_3006_ >> "$TMP_STATE_JS" - elif [ "$fwInstalledBaseVers" = "3004" ] && \ - grep -q 'function injectDropdowns()' "$TMP_STATE_JS" - then - umount /www/state.js 2>/dev/null + mount -o bind "$TMP_STATE_JS" /www/state.js - # Remove the 3006 code # - sed -i '/^function GenerateSiteMap(showurls)/,$d' "$TMP_STATE_JS" + elif [ "$fwInstalledBaseVers" = "3006" ] && \ + ! grep -q 'write them straight to cache' "$TMP_STATE_JS" + then + umount /www/state.js 2>/dev/null - # Append previous code # - AppendTo_statejs_3004_ >> "$TMP_STATE_JS" + # Remove old block starting at GenerateSiteMap() through EOF + sed -i '/^function GenerateSiteMap(showurls)/,$d' "$TMP_STATE_JS" - mount -o bind /tmp/state.js /www/state.js - fi + # Reinject the 3006 specific code + AppendTo_statejs_3006_ >> "$TMP_STATE_JS" + + mount -o bind "$TMP_STATE_JS" /www/state.js + + elif [ "$fwInstalledBaseVers" = "3004" ] && \ + grep -q 'function injectDropdowns()' "$TMP_STATE_JS" + then + umount /www/state.js 2>/dev/null + + # Remove the 3006 code # + sed -i '/^function GenerateSiteMap(showurls)/,$d' "$TMP_STATE_JS" + + # Append previous code # + AppendTo_statejs_3004_ >> "$TMP_STATE_JS" + + mount -o bind "$TMP_STATE_JS" /www/state.js + fi } ##------------------------------------------## From 050493e61dbd3bb391f1ba13ff51536cac297b1f Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Fri, 6 Mar 2026 22:33:37 -0500 Subject: [PATCH 06/14] Include Unload of Sitemap.asp Include Unload of Sitemap.asp --- scmerlin.sh | 188 ++++++++++++++++++++++++++++++----------------- scmerlin_www.asp | 14 ++-- scmerlin_www.js | 20 ++--- 3 files changed, 139 insertions(+), 83 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index 9d2b69a..515a4ac 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -46,7 +46,7 @@ readonly SHARED_WEB_DIR="$SCRIPT_WEBPAGE_DIR/shared-jy" readonly TEMP_MENU_TREE="/tmp/menuTree.js" readonly NTP_WATCHDOG_FILE="$SCRIPT_DIR/.watchdogenabled" readonly TAIL_TAINTED_FILE="$SCRIPT_DIR/.tailtaintdnsenabled" -readonly WEBUI_DROPDOWN_FILE="$SCRIPT_DIR/.webui_dropdown_submenus" +readonly WEBUI_MODS_FILE="$SCRIPT_DIR/.webui_modifications" ##----------------------------------------## ## Modified by Martinski W. [2024-Jun-07] ## @@ -1138,7 +1138,7 @@ EOF AppendTo_statejs_3004_() { AppendTo_statejs_Sitemap_3004_ - if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + if [ -f "$WEBUI_MODS_FILE" ]; then AppendTo_statejs_Dropdowns_3004_ fi } @@ -1146,7 +1146,7 @@ AppendTo_statejs_3004_() AppendTo_statejs_3006_() { AppendTo_statejs_Sitemap_3006_ - if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + if [ -f "$WEBUI_MODS_FILE" ]; then AppendTo_statejs_Dropdowns_3006_ fi } @@ -1163,30 +1163,44 @@ Patch_StateJS() [ -f /www/state.js ] || return 0 # Try to find the currently mounted Sitemap page (userXX.asp) - [ -f "$TEMP_MENU_TREE" ] && sitemapPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + if [ -f "$TEMP_MENU_TREE" ] + then + sitemapPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + fi - # Always rebuild from the *real* state.js (unmounted) + # Always rebuild from the real, unmounted state.js umount /www/state.js 2>/dev/null cp -f /www/state.js "$TMP_STATE_JS" 2>/dev/null || return 1 + # + # If WebUI modifications are disabled, bind back a clean/stock state.js + # with NO scMerlin injections at all. + # + if [ ! -f "$WEBUI_MODS_FILE" ] + then + mount -o bind "$TMP_STATE_JS" /www/state.js + return 0 + fi + # Inject Sitemap link into bottom bar if we know the page if echo "$sitemapPage" | grep -qE "^user[0-9]+\.asp$" then - sed -i 's~~Sitemap<\/a>\ \|\ ~' \ + sed -i \ + 's~~Sitemap<\/a>\ \|\ ~' \ "$TMP_STATE_JS" fi - # Append scMerlin injected blocks: + # Append scMerlin injected blocks { echo '/*BEGIN:SCMERLIN_INJECT*/' if [ "$fwInstalledBaseVers" = "3004" ] then AppendTo_statejs_Sitemap_3004_ - [ -f "$WEBUI_DROPDOWN_FILE" ] && AppendTo_statejs_Dropdowns_3004_ + AppendTo_statejs_Dropdowns_3004_ else - # default to 3006 behavior + # Default to 3006 behavior AppendTo_statejs_Sitemap_3006_ - [ -f "$WEBUI_DROPDOWN_FILE" ] && AppendTo_statejs_Dropdowns_3006_ + AppendTo_statejs_Dropdowns_3006_ fi echo '/*END:SCMERLIN_INJECT*/' } >> "$TMP_STATE_JS" @@ -1199,18 +1213,19 @@ Patch_StateJS() ##---------------------------------------## ## Added by ExtremeFiretop [2026-Mar-03] ## ##---------------------------------------## -WebUI_DropdownSubMenus() +Apply_WebUI_Modifications() { - case "$1" in enable) - touch "$WEBUI_DROPDOWN_FILE" - WebUI_DropdownSubMenus apply >/dev/null 2>&1 + touch "$WEBUI_MODS_FILE" + Apply_WebUI_Modifications apply >/dev/null 2>&1 + Mount_WebUI >/dev/null 2>&1 Patch_StateJS >/dev/null 2>&1 ;; disable) - rm -f "$WEBUI_DROPDOWN_FILE" - WebUI_DropdownSubMenus apply >/dev/null 2>&1 + rm -f "$WEBUI_MODS_FILE" + Apply_WebUI_Modifications apply >/dev/null 2>&1 + Mount_WebUI >/dev/null 2>&1 Patch_StateJS >/dev/null 2>&1 ;; apply) @@ -1242,7 +1257,7 @@ WebUI_DropdownSubMenus() } >> /tmp/index_style.css # Enabled: show on hover - if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + if [ -f "$WEBUI_MODS_FILE" ]; then echo ".dropdown:hover .dropdown-content "\ "{visibility: visible;}" >> /tmp/index_style.css else @@ -1255,7 +1270,7 @@ WebUI_DropdownSubMenus() mount -o bind /tmp/index_style.css /www/index_style.css ;; status) - if [ -f "$WEBUI_DROPDOWN_FILE" ]; then + if [ -f "$WEBUI_MODS_FILE" ]; then echo "ENABLED" else echo "DISABLED" @@ -1277,7 +1292,7 @@ Upgrade_StateJS() # If state.js already contains dropdowns code but the marker file doesn't exist # (older versions), create the marker so updates don't "start disabled". # - if [ ! -f "$WEBUI_DROPDOWN_FILE" ] + if [ ! -f "$WEBUI_MODS_FILE" ] then if grep -qE '^[[:space:]]*window\._scmDropdownsEnabled[[:space:]]*=[[:space:]]*1' \ "$TMP_STATE_JS" 2>/dev/null || \ @@ -1285,7 +1300,7 @@ Upgrade_StateJS() grep -qF 'function injectDropdowns()' "$TMP_STATE_JS" 2>/dev/null || \ grep -qF 'AddDropdowns();' "$TMP_STATE_JS" 2>/dev/null then - touch "$WEBUI_DROPDOWN_FILE" 2>/dev/null + touch "$WEBUI_MODS_FILE" 2>/dev/null fi fi @@ -1641,7 +1656,7 @@ Create_Symlinks() ln -s "$NTP_WATCHDOG_FILE" "$SCRIPT_WEB_DIR/watchdogenabled.htm" 2>/dev/null ln -s "$NTP_READY_CHECK_CONF" "$SCRIPT_WEB_DIR/${NTP_READY_CHECK_FILE}.htm" 2>/dev/null ln -s "$TAIL_TAINTED_FILE" "$SCRIPT_WEB_DIR/tailtaintdnsenabled.htm" 2>/dev/null - ln -s "$WEBUI_DROPDOWN_FILE" "$SCRIPT_WEB_DIR/webuidropdownenabled.htm" 2>/dev/null + ln -s "$WEBUI_MODS_FILE" "$SCRIPT_WEB_DIR/webuimodsenabled.htm" 2>/dev/null if [ ! -d "$SHARED_WEB_DIR" ]; then ln -s "$SHARED_DIR" "$SHARED_WEB_DIR" 2>/dev/null @@ -1874,77 +1889,118 @@ ${ENDIN_MenuAddOnsTag}" "$TEMP_MENU_TREE" ##----------------------------------------## Mount_WebUI() { - realpage="" + local realpage="" sitemapMountedPage="NONE" + local restartHttpd=false sitemapAction="" + Print_Output true "Mounting WebUI tabs for $SCRIPT_NAME" "$PASS" + LOCKFILE=/tmp/addonwebui.lock FD=386 eval exec "$FD>$LOCKFILE" flock -x "$FD" + Get_WebUI_Page "$SCRIPT_DIR/scmerlin_www.asp" if [ "$MyWebPage" = "NONE" ] then - Print_Output true "**ERROR** Unable to mount $SCRIPT_NAME WebUI page, exiting" "$CRIT" + Print_Output true \ + "**ERROR** Unable to mount $SCRIPT_NAME WebUI page, exiting" \ + "$CRIT" flock -u "$FD" return 1 fi - cp -fp "$SCRIPT_DIR/scmerlin_www.asp" "$SCRIPT_WEBPAGE_DIR/$MyWebPage" - echo "$SCRIPT_NAME" > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" + + cp -fp "$SCRIPT_DIR/scmerlin_www.asp" \ + "$SCRIPT_WEBPAGE_DIR/$MyWebPage" + echo "$SCRIPT_NAME" \ + > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" if [ "$(uname -o)" = "ASUSWRT-Merlin" ] then - if [ ! -f /tmp/index_style.css ]; then + if [ ! -f /tmp/index_style.css ] + then cp -fp /www/index_style.css /tmp/ fi - # Apply (enable/disable) WebUI dropdown sub-menus based on saved setting - # NOTE: This function handles: - # - Removing any prior dropdown CSS rules - # - Adding base dropdown CSS - # - Adding hover-to-show rule only when enabled - # - Bind-mounting /tmp/index_style.css to /www/index_style.css - WebUI_DropdownSubMenus apply + # Apply CSS/menu behavior based on saved setting + Apply_WebUI_Modifications apply - if [ ! -f "$TEMP_MENU_TREE" ]; then + if [ ! -f "$TEMP_MENU_TREE" ] + then cp -fp /www/require/modules/menuTree.js "$TEMP_MENU_TREE" fi - sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" + # Always remove any existing scMerlin main page entry first + sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" _CreateMenuAddOnsSection_ - - sed -i "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/i {url: \"$MyWebPage\", tabName: \"$SCRIPT_NAME\"}," "$TEMP_MENU_TREE" + sed -i \ + "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/i {url: \"$MyWebPage\", tabName: \"$SCRIPT_NAME\"}," \ + "$TEMP_MENU_TREE" realpage="$MyWebPage" - if [ -f "$SCRIPT_DIR/sitemap.asp" ] + # + # Always clean up any previously-mounted Sitemap page and its menuTree + # entry first, so the current WUI toggle state fully controls it. + # + sitemapMountedPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + if [ -n "$sitemapMountedPage" ] && \ + [ "$sitemapMountedPage" != "NONE" ] + then + sed -i "\\~$sitemapMountedPage~d" "$TEMP_MENU_TREE" + rm -f "$SCRIPT_WEBPAGE_DIR/$sitemapMountedPage" 2>/dev/null + rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$sitemapMountedPage" | cut -f1 -d'.').title" \ + 2>/dev/null + restartHttpd=true + sitemapAction="removed" + fi + + # + # Only mount/add Sitemap when WebUI modifications are ENABLED. + # + if [ -f "$WEBUI_MODS_FILE" ] && [ -f "$SCRIPT_DIR/sitemap.asp" ] then Get_WebUI_Page "$SCRIPT_DIR/sitemap.asp" if [ "$MyWebPage" = "NONE" ] then - Print_Output true "**ERROR** Unable to mount $SCRIPT_NAME Sitemap page, exiting" "$CRIT" + Print_Output true \ + "**ERROR** Unable to mount $SCRIPT_NAME Sitemap page, exiting" \ + "$CRIT" flock -u "$FD" return 1 fi - cp -fp "$SCRIPT_DIR/sitemap.asp" "$SCRIPT_WEBPAGE_DIR/$MyWebPage" - sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" - sed -i "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/a {url: \"$MyWebPage\", tabName: \"Sitemap\"}," "$TEMP_MENU_TREE" - - umount /www/state.js 2>/dev/null - cp -f /www/state.js /tmp/ - sed -i 's~~Sitemap<\/a>\ \|\ ~' /tmp/state.js - - # Append custom code to 'state.js' file # - if [ "$fwInstalledBaseVers" = "3004" ] - then AppendTo_statejs_3004_ >> /tmp/state.js - else AppendTo_statejs_3006_ >> /tmp/state.js - fi - mount -o bind /tmp/state.js /www/state.js + cp -fp "$SCRIPT_DIR/sitemap.asp" \ + "$SCRIPT_WEBPAGE_DIR/$MyWebPage" + echo "Sitemap" \ + > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" + sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" + sed -i \ + "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/a {url: \"$MyWebPage\", tabName: \"Sitemap\"}," \ + "$TEMP_MENU_TREE" Print_Output true "Mounted Sitemap page as $MyWebPage" "$PASS" + restartHttpd=true + sitemapAction="added" fi umount /www/require/modules/menuTree.js 2>/dev/null mount -o bind "$TEMP_MENU_TREE" /www/require/modules/menuTree.js + + # state.js is now fully handled here + Patch_StateJS + + if "$restartHttpd" + then + /sbin/service restart_httpd >/dev/null 2>&1 + if [ "$sitemapAction" = "removed" ] + then + Print_Output true "Restarted httpd after removing Sitemap page" "$PASS" + elif [ "$sitemapAction" = "added" ] + then + Print_Output true "Restarted httpd after adding Sitemap page" "$PASS" + fi + fi fi + flock -u "$FD" Print_Output true "Mounted $SCRIPT_NAME WebUI page as $realpage" "$PASS" } @@ -3554,14 +3610,14 @@ _Menu_ToggleOptions_() printf " ${GRNct}dns${CLRct}. Toggle dnsmasq tainted watchdog script\n" printf " Currently: ${TAILTAINT_DNS_STATUS}\n\n" - if [ "$(WebUI_DropdownSubMenus status)" = "ENABLED" ] + if [ "$(Apply_WebUI_Modifications status)" = "ENABLED" ] then - WEBUI_DROPDOWN_STATUS="${GRNct}ENABLED${CLRct}" + WEBUI_MODS_STATUS="${GRNct}ENABLED${CLRct}" else - WEBUI_DROPDOWN_STATUS="${REDct}DISABLED${CLRct}" + WEBUI_MODS_STATUS="${REDct}DISABLED${CLRct}" fi - printf " ${GRNct}wui${CLRct}. Toggle WebUI dropdown sub-menus\n" - printf " Currently: ${WEBUI_DROPDOWN_STATUS}\n\n" + printf " ${GRNct}wui${CLRct}. Toggle WebUI modifications\n" + printf " Currently: ${WEBUI_MODS_STATUS}\n\n" printf " ${GRNct}e${CLRct}. Return to Main Menu\n" printf "\n${menuSepStr}\n\n" @@ -3603,11 +3659,11 @@ _Menu_ToggleOptions_() ;; wui) printf "\n" - WEBUI_DROPDOWN_STATUS="$(WebUI_DropdownSubMenus status)" - if [ "$WEBUI_DROPDOWN_STATUS" = "ENABLED" ] - then WebUI_DropdownSubMenus disable - elif [ "$WEBUI_DROPDOWN_STATUS" = "DISABLED" ] - then WebUI_DropdownSubMenus enable + WEBUI_MODS_STATUS="$(Apply_WebUI_Modifications status)" + if [ "$WEBUI_MODS_STATUS" = "ENABLED" ] + then Apply_WebUI_Modifications disable + elif [ "$WEBUI_MODS_STATUS" = "DISABLED" ] + then Apply_WebUI_Modifications enable fi break ;; @@ -4204,11 +4260,11 @@ case "$1" in settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_DNSmasqWatchdog//")"; settingstate="$(echo "$settingstate" | tr 'A-Z' 'a-z')" TailTaintDNSmasq "$settingstate" - elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}_WebUIDropdowns" + elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}_WebUIMods" then - settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_WebUIDropdowns//")"; + settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_WebUIMods//")"; settingstate="$(echo "$settingstate" | tr 'A-Z' 'a-z')" - WebUI_DropdownSubMenus "$settingstate" + Apply_WebUI_Modifications "$settingstate" elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}servicerestart" then rm -f "$SCRIPT_WEB_DIR/detect_service.js" diff --git a/scmerlin_www.asp b/scmerlin_www.asp index 766a1e0..171f437 100644 --- a/scmerlin_www.asp +++ b/scmerlin_www.asp @@ -531,7 +531,7 @@ function update_temperatures() } /* End firmware functions */ -var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIDropdownsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuidropdownenabled.htm",dataType:"text",cache:false,error:function(){document.form.scMerlin_WebUIDropdowns.value="Disable",$("#scMerlin_WebUIDropdowns_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIDropdowns.value="Enable",$("#scMerlin_WebUIDropdowns_Status").text("Currently: ENABLED")}})}function Save_WebUIDropdowns(){document.form.action_script.value="start_scmerlin_WebUIDropdowns"+document.form.scMerlin_WebUIDropdowns.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",false),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_WebUIDropdownsEnabled_File,4e3)}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} +var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIModsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuimodsenabled.htm",dataType:"text",cache:false,error:function(){document.form.scMerlin_WebUIMods.value="Disable",$("#scMerlin_WebUIMods_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIMods.value="Enable",$("#scMerlin_WebUIMods_Status").text("Currently: ENABLED")}})}function Save_WebUIMods(){document.form.action_script.value="start_scmerlin_WebUIMods"+document.form.scMerlin_WebUIMods.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",false),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_WebUIModsEnabled_File,4e3)}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} @@ -667,16 +667,16 @@ var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[ **---------------------------------------** --> -Enable WebUI dropdown sub-menus
+Enable WebUI modifications
-Yes -No +Yes +No        - + title="Apply and save selected option for WebUI modifications" name="button">       - + diff --git a/scmerlin_www.js b/scmerlin_www.js index 629505f..82384ca 100644 --- a/scmerlin_www.js +++ b/scmerlin_www.js @@ -88,7 +88,7 @@ function initial() Get_NTPWatchdogEnabled_File(); Get_NTPReadyCheck_Option(); Get_DNSmasqWatchdogEnabled_File(); - Get_WebUIDropdownsEnabled_File(); + Get_WebUIModsEnabled_File(); update_temperatures(); update_wanuptime(); update_sysinfo(); @@ -378,27 +378,27 @@ function Get_DNSmasqWatchdogEnabled_File() }); } -function Get_WebUIDropdownsEnabled_File() +function Get_WebUIModsEnabled_File() { $.ajax({ - url: "/ext/scmerlin/webuidropdownenabled.htm", + url: "/ext/scmerlin/webuimodsenabled.htm", dataType: "text", cache: false, error: function(){ - document.form.scMerlin_WebUIDropdowns.value = "Disable"; - $("#scMerlin_WebUIDropdowns_Status").text("Currently: DISABLED"); + document.form.scMerlin_WebUIMods.value = "Disable"; + $("#scMerlin_WebUIMods_Status").text("Currently: DISABLED"); }, success: function(){ - document.form.scMerlin_WebUIDropdowns.value = "Enable"; - $("#scMerlin_WebUIDropdowns_Status").text("Currently: ENABLED"); + document.form.scMerlin_WebUIMods.value = "Enable"; + $("#scMerlin_WebUIMods_Status").text("Currently: ENABLED"); } }); } -function Save_WebUIDropdowns() +function Save_WebUIMods() { document.form.action_script.value = - "start_scmerlin_WebUIDropdowns" + document.form.scMerlin_WebUIDropdowns.value; + "start_scmerlin_WebUIMods" + document.form.scMerlin_WebUIMods.value; document.form.action_wait.value = 4; @@ -408,7 +408,7 @@ function Save_WebUIDropdowns() showLoading(); document.form.submit(); - setTimeout(Get_WebUIDropdownsEnabled_File, 4000); + setTimeout(Get_WebUIModsEnabled_File, 4000); } /**-------------------------------------**/ From 673b32075a44935fd58e301baf0aa3b220c0dcaa Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Mon, 9 Mar 2026 08:00:56 -0400 Subject: [PATCH 07/14] Unload any changes to css when disabling Unload any changes to css when disabling --- scmerlin.sh | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index 515a4ac..f3e48f9 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2026-Mar-03 +# Last Modified: 2026-Mar-09 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="26021800" +readonly SCRIPT_VERSTAG="26030908" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -1211,7 +1211,7 @@ Patch_StateJS() } ##---------------------------------------## -## Added by ExtremeFiretop [2026-Mar-03] ## +## Added by ExtremeFiretop [2026-Mar-09] ## ##---------------------------------------## Apply_WebUI_Modifications() { @@ -1220,26 +1220,37 @@ Apply_WebUI_Modifications() touch "$WEBUI_MODS_FILE" Apply_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 - Patch_StateJS >/dev/null 2>&1 ;; disable) rm -f "$WEBUI_MODS_FILE" - Apply_WebUI_Modifications apply >/dev/null 2>&1 + + # Restore the real stock index_style.css + umount /www/index_style.css 2>/dev/null + rm -f /tmp/index_style.css 2>/dev/null + Mount_WebUI >/dev/null 2>&1 - Patch_StateJS >/dev/null 2>&1 ;; apply) - # Ensure we have a working copy to edit - if [ ! -f /tmp/index_style.css ]; then - cp -fp /www/index_style.css /tmp/ 2>/dev/null - fi + # + # Always start from the real stock file. + # If /www/index_style.css is currently bind-mounted, + # unmount it first so the copy below is clean. + # + umount /www/index_style.css 2>/dev/null + + cp -fp /www/index_style.css /tmp/index_style.css 2>/dev/null || return 1 - # Remove any prior dropdown CSS rules - if [ -f /tmp/index_style.css ]; then - sed -i '/dropdown-content/d' /tmp/index_style.css + # + # If WebUI mods are disabled, keep stock CSS live and + # discard the temp modified copy. + # + if [ ! -f "$WEBUI_MODS_FILE" ] + then + rm -f /tmp/index_style.css 2>/dev/null + return 0 fi - # Base dropdown CSS (always present) + # Base dropdown CSS { echo ".dropdown-content {top: 0px; left: 185px; "\ "visibility: hidden; position: absolute; "\ @@ -1254,19 +1265,10 @@ Apply_WebUI_Modifications() "Microsoft Yahei UI, sans-serif; font-size: 12px; "\ "border: 1px solid #6B7071;}" echo ".dropdown-content a:hover {background-color: #77a5c6;}" + echo ".dropdown:hover .dropdown-content {visibility: visible;}" } >> /tmp/index_style.css - # Enabled: show on hover - if [ -f "$WEBUI_MODS_FILE" ]; then - echo ".dropdown:hover .dropdown-content "\ -"{visibility: visible;}" >> /tmp/index_style.css - else - # Disabled: prevent click-toggle from making it appear - echo ".dropdown-content {display: none;}" >> /tmp/index_style.css - fi - - # Bind-mount updated CSS into WebUI - umount /www/index_style.css 2>/dev/null + # Bind-mount modified CSS into WebUI mount -o bind /tmp/index_style.css /www/index_style.css ;; status) From 121d6abc2dd229de985994aa003e617b85673bcf Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Mon, 9 Mar 2026 11:07:15 -0400 Subject: [PATCH 08/14] Bug Fixes and Cleanup Uninstall Bug Fixes Cleanup the uninstall --- scmerlin.sh | 118 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 89 insertions(+), 29 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index f3e48f9..cee735e 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -1223,34 +1223,56 @@ Apply_WebUI_Modifications() ;; disable) rm -f "$WEBUI_MODS_FILE" - - # Restore the real stock index_style.css - umount /www/index_style.css 2>/dev/null - rm -f /tmp/index_style.css 2>/dev/null - + Apply_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 ;; apply) - # - # Always start from the real stock file. - # If /www/index_style.css is currently bind-mounted, - # unmount it first so the copy below is clean. - # - umount /www/index_style.css 2>/dev/null + local keepAddonsCss=false - cp -fp /www/index_style.css /tmp/index_style.css 2>/dev/null || return 1 + # Always work from a writable temp copy if one does not exist yet + if [ ! -f /tmp/index_style.css ] + then + umount /www/index_style.css 2>/dev/null + cp -fp /www/index_style.css /tmp/index_style.css \ + 2>/dev/null || return 1 + fi + + # Strip scMerlin dropdown CSS unconditionally first + sed -i '/\.dropdown-content/d' /tmp/index_style.css + sed -i '/\.dropdown:hover[[:space:]]*\.dropdown-content/d' \ + /tmp/index_style.css + + # Decide whether .menu_Addons CSS should remain + if [ -f "$TEMP_MENU_TREE" ] && \ + grep -qF 'index: "menu_Addons"' "$TEMP_MENU_TREE" + then + keepAddonsCss=true + fi - # - # If WebUI mods are disabled, keep stock CSS live and - # discard the temp modified copy. - # + # If WebUI mods are disabled, do not re-add dropdown CSS if [ ! -f "$WEBUI_MODS_FILE" ] then - rm -f /tmp/index_style.css 2>/dev/null + if "$keepAddonsCss" && \ + grep -qF '.menu_Addons { background:' /tmp/index_style.css + then + umount /www/index_style.css 2>/dev/null + mount -o bind /tmp/index_style.css /www/index_style.css + else + rm -f /tmp/index_style.css 2>/dev/null + umount /www/index_style.css 2>/dev/null + fi return 0 fi - # Base dropdown CSS + # WebUI mods enabled: ensure Addons icon CSS exists if Addons menu exists + if "$keepAddonsCss" && \ + ! grep -qF '.menu_Addons { background:' /tmp/index_style.css + then + echo ".menu_Addons { background: url(ext/shared-jy/addons.png); background-size: contain;}" \ + >> /tmp/index_style.css + fi + + # Re-add dropdown CSS { echo ".dropdown-content {top: 0px; left: 185px; "\ "visibility: hidden; position: absolute; "\ @@ -1268,11 +1290,12 @@ Apply_WebUI_Modifications() echo ".dropdown:hover .dropdown-content {visibility: visible;}" } >> /tmp/index_style.css - # Bind-mount modified CSS into WebUI + umount /www/index_style.css 2>/dev/null mount -o bind /tmp/index_style.css /www/index_style.css ;; status) - if [ -f "$WEBUI_MODS_FILE" ]; then + if [ -f "$WEBUI_MODS_FILE" ] + then echo "ENABLED" else echo "DISABLED" @@ -3836,6 +3859,7 @@ Menu_Install() fi Create_Dirs + touch "$WEBUI_MODS_FILE" Create_Symlinks Shortcut_Script create Set_Version_Custom_Settings local "$SCRIPT_VERSION" @@ -3974,7 +3998,9 @@ Menu_Uninstall() eval exec "$FD>$LOCKFILE" flock -x "$FD" - local doResetWebGUI=false doResetStyle=false + local doResetWebGUI=false + local keepAddonsCss=false + local restartHttpd=false if [ -f "$SCRIPT_DIR/sitemap.asp" ] then @@ -3984,40 +4010,74 @@ Menu_Uninstall() [ -f "$TEMP_MENU_TREE" ] then doResetWebGUI=true + restartHttpd=true sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" rm -f "$SCRIPT_WEBPAGE_DIR/$MyWebPage" + rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" fi fi + Get_WebUI_Page "$SCRIPT_DIR/scmerlin_www.asp" if [ -n "$MyWebPage" ] && \ [ "$MyWebPage" != "NONE" ] && \ [ -f "$TEMP_MENU_TREE" ] then doResetWebGUI=true + restartHttpd=true sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" rm -f "$SCRIPT_WEBPAGE_DIR/$MyWebPage" rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" fi - _FindandRemoveMenuAddOnsSection_ && doResetStyle=true + _FindandRemoveMenuAddOnsSection_ + + if [ -f "$TEMP_MENU_TREE" ] && \ + grep -qF 'index: "menu_Addons"' "$TEMP_MENU_TREE" + then + keepAddonsCss=true + fi if "$doResetWebGUI" then umount /www/require/modules/menuTree.js 2>/dev/null mount -o bind "$TEMP_MENU_TREE" /www/require/modules/menuTree.js - if "$doResetStyle" && [ -f /tmp/index_style.css ] && \ + fi + + if [ -f /tmp/index_style.css ] + then + sed -i '/\.dropdown-content/d' /tmp/index_style.css + sed -i '/\.dropdown:hover[[:space:]]*\.dropdown-content/d' \ + /tmp/index_style.css + + if "$keepAddonsCss" && \ grep -qF '.menu_Addons { background:' /tmp/index_style.css then + umount /www/index_style.css 2>/dev/null + mount -o bind /tmp/index_style.css /www/index_style.css + restartHttpd=true + else rm -f /tmp/index_style.css umount /www/index_style.css 2>/dev/null + restartHttpd=true fi - if [ -f /tmp/state.js ] && \ - grep -qE 'function GenerateSiteMap|function AddDropdowns' /tmp/state.js - then - rm -f /tmp/state.js - umount /www/state.js 2>/dev/null - fi + else + umount /www/index_style.css 2>/dev/null fi + + if [ -f /tmp/state.js ] && \ + grep -qE 'function GenerateSiteMap|function AddDropdowns|function injectDropdowns|BEGIN:SCMERLIN_' /tmp/state.js + then + rm -f /tmp/state.js + umount /www/state.js 2>/dev/null + restartHttpd=true + fi + + if "$restartHttpd" + then + /sbin/service restart_httpd >/dev/null 2>&1 + Print_Output true "Restarted httpd after removing WebUI modifications" "$PASS" + fi + flock -u "$FD" rm -rf "$SCRIPT_WEB_DIR" 2>/dev/null From 609a9ad89eac2aa98acb65ea749e9645ff57e922 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Fri, 13 Mar 2026 12:57:58 -0400 Subject: [PATCH 09/14] Gate AJAX Loops when restarting WebUI Gate AJAX Loops when restarting WebUI --- scmerlin_www.asp | 19 ++++++++++++++++--- scmerlin_www.js | 20 +++++++++++++------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/scmerlin_www.asp b/scmerlin_www.asp index 171f437..d419917 100644 --- a/scmerlin_www.asp +++ b/scmerlin_www.asp @@ -118,6 +118,9 @@ function JFFS_GetUsageInfo() /* Taken from firmware WebUI, Tools_SysInfo.asp */ function update_sysinfo(e) { + if (window._scmPauseAjax) + return; + $.ajax({ url: '/ajax_sysinfo.asp', dataType: 'script', @@ -399,6 +402,9 @@ function lineForWan(idx, sysNow) function update_wanuptime() { + if (window._scmPauseAjax) + return; + // -------- fast local path (NVRAM) -------- // if (!wu_useFallback) { @@ -485,14 +491,20 @@ function update_wanuptime() /**----------------------------------------**/ function update_temperatures() { + if (window._scmPauseAjax) + return; + $.ajax({ url: '/ajax_coretmp.asp', dataType: 'script', error: function(xhr){ - update_temperatures(); + if (!window._scmPauseAjax) + setTimeout(update_temperatures, 3000); }, success: function(response) { + if (window._scmPauseAjax) + return; code = '2.4 GHz: ' + GetTemperatureValue ('2.4GHz') + ''; if (band_5GHz_2_supported) @@ -525,13 +537,14 @@ function update_temperatures() code +='  -  CPU: ' + parseInt(CPUTemp) +'°C'; } document.getElementById('temp_td').innerHTML = code; - setTimeout(update_temperatures, 3000); + if (!window._scmPauseAjax) + setTimeout(update_temperatures, 3000); } }); } /* End firmware functions */ -var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIModsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuimodsenabled.htm",dataType:"text",cache:false,error:function(){document.form.scMerlin_WebUIMods.value="Disable",$("#scMerlin_WebUIMods_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIMods.value="Enable",$("#scMerlin_WebUIMods_Status").text("Currently: ENABLED")}})}function Save_WebUIMods(){document.form.action_script.value="start_scmerlin_WebUIMods"+document.form.scMerlin_WebUIMods.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",false),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_WebUIModsEnabled_File,4e3)}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} +var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var i=0;i",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIModsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuimodsenabled.htm",dataType:"text",cache:false,error:function(){document.form.scMerlin_WebUIMods.value="Disable",$("#scMerlin_WebUIMods_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIMods.value="Enable",$("#scMerlin_WebUIMods_Status").text("Currently: ENABLED")}})}function Save_WebUIMods(){$("#auto_refresh").prop("checked",false),null!=tmout&&clearTimeout(tmout),"undefined"!=typeof WaitMsgPopupBox&&WaitMsgPopupBox.CloseMsg(),window._scmPauseAjax=!0,document.form.action_script.value="start_scmerlin_WebUIMods"+document.form.scMerlin_WebUIMods.value,document.form.action_wait.value=8,showLoading(),document.form.submit()}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,i,o=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var i=window["Chart"+e];null!=i&&i.destroy();var o=document.getElementById("canvasChart"+e).getContext("2d");i=new Chart(o,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=i} diff --git a/scmerlin_www.js b/scmerlin_www.js index 82384ca..727288a 100644 --- a/scmerlin_www.js +++ b/scmerlin_www.js @@ -397,18 +397,24 @@ function Get_WebUIModsEnabled_File() function Save_WebUIMods() { - document.form.action_script.value = - "start_scmerlin_WebUIMods" + document.form.scMerlin_WebUIMods.value; + $("#auto_refresh").prop("checked", false); - document.form.action_wait.value = 4; + if (tmout != null) + clearTimeout(tmout); - $("#auto_refresh").prop("checked", false); - if (tmout != null) clearTimeout(tmout); + if (typeof WaitMsgPopupBox !== 'undefined') + WaitMsgPopupBox.CloseMsg(); + + /* stop/pause recurring AJAX refreshes while httpd is being restarted */ + window._scmPauseAjax = true; + + document.form.action_script.value = + "start_scmerlin_WebUIMods" + + document.form.scMerlin_WebUIMods.value; + document.form.action_wait.value = 8; showLoading(); document.form.submit(); - - setTimeout(Get_WebUIModsEnabled_File, 4000); } /**-------------------------------------**/ From 8e403514a14661b2126a22932741bcfbb117ded8 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 15 Mar 2026 10:38:41 -0700 Subject: [PATCH 10/14] Fix and Code Improvements - Added a tooltip to the "Enable additional WebUI modifications" option to explain what's being enabled or disabled, and to let users know that they will be logged out of the WebUI to restart the web server. - Fixed "parameter not set" error message when selecting to see the WAN Uptime on the CLI menu. - Added syslog message to show the add-on version number at startup. - Minor code improvements. --- README.md | 2 +- scmerlin.sh | 179 +++++++++++++++++++++++------------------------ scmerlin_www.asp | 24 ++++--- scmerlin_www.js | 26 ++++++- 4 files changed, 127 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 51a4740..435bd3d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin ## v2.5.48 -### Updated on 2026-Mar-03 +### Updated on 2026-Mar-15 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index cee735e..65e8cc0 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2026-Mar-09 +# Last Modified: 2026-Mar-15 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="26030908" +readonly SCRIPT_VERSTAG="26031509" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -43,6 +43,7 @@ readonly SCRIPT_WEB_DIR="$SCRIPT_WEBPAGE_DIR/$SCRIPT_NAME_LOWER" readonly SHARED_DIR="/jffs/addons/shared-jy" readonly SHARED_REPO="https://raw.githubusercontent.com/AMTM-OSR/shared-jy/master" readonly SHARED_WEB_DIR="$SCRIPT_WEBPAGE_DIR/shared-jy" +readonly TMP_STATE_JS="/tmp/state.js" readonly TEMP_MENU_TREE="/tmp/menuTree.js" readonly NTP_WATCHDOG_FILE="$SCRIPT_DIR/.watchdogenabled" readonly TAIL_TAINTED_FILE="$SCRIPT_DIR/.tailtaintdnsenabled" @@ -1156,25 +1157,17 @@ AppendTo_statejs_3006_() ##----------------------------------------## Patch_StateJS() { - local TMP_STATE_JS="/tmp/state.js" local sitemapPage="NONE" - # Only makes sense on Merlin with /www/state.js present [ -f /www/state.js ] || return 0 - # Try to find the currently mounted Sitemap page (userXX.asp) - if [ -f "$TEMP_MENU_TREE" ] - then - sitemapPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" - fi - - # Always rebuild from the real, unmounted state.js + # Always rebuild from the original 'state.js' file # umount /www/state.js 2>/dev/null cp -f /www/state.js "$TMP_STATE_JS" 2>/dev/null || return 1 # - # If WebUI modifications are disabled, bind back a clean/stock state.js - # with NO scMerlin injections at all. + # If WebUI modifications are DISABLED, bind mount a clean/stock + # state.js file WITHOUT any custom scMerlin modifications at all. # if [ ! -f "$WEBUI_MODS_FILE" ] then @@ -1182,7 +1175,13 @@ Patch_StateJS() return 0 fi - # Inject Sitemap link into bottom bar if we know the page + # Find the currently mounted Sitemap webpage # + if [ -f "$TEMP_MENU_TREE" ] + then + sitemapPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + fi + + # Inject Sitemap link into bottom bar if we know the webpage # if echo "$sitemapPage" | grep -qE "^user[0-9]+\.asp$" then sed -i \ @@ -1190,7 +1189,7 @@ Patch_StateJS() "$TMP_STATE_JS" fi - # Append scMerlin injected blocks + # Append scMerlin injected blocks # { echo '/*BEGIN:SCMERLIN_INJECT*/' if [ "$fwInstalledBaseVers" = "3004" ] @@ -1198,14 +1197,14 @@ Patch_StateJS() AppendTo_statejs_Sitemap_3004_ AppendTo_statejs_Dropdowns_3004_ else - # Default to 3006 behavior + # For 3006 F/W behavior # AppendTo_statejs_Sitemap_3006_ AppendTo_statejs_Dropdowns_3006_ fi echo '/*END:SCMERLIN_INJECT*/' } >> "$TMP_STATE_JS" - # Re-bind into WebUI + # Bind mount for WebUI # mount -o bind "$TMP_STATE_JS" /www/state.js return 0 } @@ -1213,17 +1212,17 @@ Patch_StateJS() ##---------------------------------------## ## Added by ExtremeFiretop [2026-Mar-09] ## ##---------------------------------------## -Apply_WebUI_Modifications() +Extra_WebUI_Modifications() { case "$1" in enable) touch "$WEBUI_MODS_FILE" - Apply_WebUI_Modifications apply >/dev/null 2>&1 + Extra_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 ;; disable) rm -f "$WEBUI_MODS_FILE" - Apply_WebUI_Modifications apply >/dev/null 2>&1 + Extra_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 ;; apply) @@ -1309,7 +1308,6 @@ Apply_WebUI_Modifications() ##------------------------------------------## Upgrade_StateJS() { - local TMP_STATE_JS="/tmp/state.js" [ -f "$TMP_STATE_JS" ] || return 0 # @@ -1914,7 +1912,7 @@ ${ENDIN_MenuAddOnsTag}" "$TEMP_MENU_TREE" ##----------------------------------------## Mount_WebUI() { - local realpage="" sitemapMountedPage="NONE" + local mainWebPage="" sitemapWebPage="NONE" local restartHttpd=false sitemapAction="" Print_Output true "Mounting WebUI tabs for $SCRIPT_NAME" "$PASS" @@ -1927,17 +1925,13 @@ Mount_WebUI() Get_WebUI_Page "$SCRIPT_DIR/scmerlin_www.asp" if [ "$MyWebPage" = "NONE" ] then - Print_Output true \ - "**ERROR** Unable to mount $SCRIPT_NAME WebUI page, exiting" \ - "$CRIT" + Print_Output true "**ERROR** Unable to mount $SCRIPT_NAME WebUI page, exiting" "$CRIT" flock -u "$FD" return 1 fi - cp -fp "$SCRIPT_DIR/scmerlin_www.asp" \ - "$SCRIPT_WEBPAGE_DIR/$MyWebPage" - echo "$SCRIPT_NAME" \ - > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" + cp -fp "$SCRIPT_DIR/scmerlin_www.asp" "$SCRIPT_WEBPAGE_DIR/$MyWebPage" + echo "$SCRIPT_NAME" > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" if [ "$(uname -o)" = "ASUSWRT-Merlin" ] then @@ -1946,57 +1940,54 @@ Mount_WebUI() cp -fp /www/index_style.css /tmp/ fi - # Apply CSS/menu behavior based on saved setting - Apply_WebUI_Modifications apply + # Apply CSS/menu behavior based on saved setting # + Extra_WebUI_Modifications apply if [ ! -f "$TEMP_MENU_TREE" ] then cp -fp /www/require/modules/menuTree.js "$TEMP_MENU_TREE" fi - # Always remove any existing scMerlin main page entry first + # Remove any existing scMerlin webpage first # sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" + _CreateMenuAddOnsSection_ + sed -i \ "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/i {url: \"$MyWebPage\", tabName: \"$SCRIPT_NAME\"}," \ "$TEMP_MENU_TREE" - realpage="$MyWebPage" + mainWebPage="$MyWebPage" # - # Always clean up any previously-mounted Sitemap page and its menuTree - # entry first, so the current WUI toggle state fully controls it. + # Clean up any previously-mounted Sitemap webpage and its MenuTree + # entry, so the current state of the toggle switch fully controls it. # - sitemapMountedPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" - if [ -n "$sitemapMountedPage" ] && \ - [ "$sitemapMountedPage" != "NONE" ] + sitemapWebPage="$(_Check_WebGUI_Page_Exists_ "$SCRIPT_DIR/sitemap.asp")" + if [ -n "$sitemapWebPage" ] && \ + [ "$sitemapWebPage" != "NONE" ] then - sed -i "\\~$sitemapMountedPage~d" "$TEMP_MENU_TREE" - rm -f "$SCRIPT_WEBPAGE_DIR/$sitemapMountedPage" 2>/dev/null - rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$sitemapMountedPage" | cut -f1 -d'.').title" \ - 2>/dev/null + sed -i "\\~$sitemapWebPage~d" "$TEMP_MENU_TREE" + rm -f "$SCRIPT_WEBPAGE_DIR/$sitemapWebPage" + rm -f "$SCRIPT_WEBPAGE_DIR/$(echo "$sitemapWebPage" | cut -f1 -d'.').title" restartHttpd=true sitemapAction="removed" fi # - # Only mount/add Sitemap when WebUI modifications are ENABLED. + # Do bind mount if WebUI modifications are ENABLED # # - if [ -f "$WEBUI_MODS_FILE" ] && [ -f "$SCRIPT_DIR/sitemap.asp" ] + if [ -f "$WEBUI_MODS_FILE" ] && \ + [ -f "$SCRIPT_DIR/sitemap.asp" ] then Get_WebUI_Page "$SCRIPT_DIR/sitemap.asp" if [ "$MyWebPage" = "NONE" ] then - Print_Output true \ - "**ERROR** Unable to mount $SCRIPT_NAME Sitemap page, exiting" \ - "$CRIT" + Print_Output true "**ERROR** Unable to mount $SCRIPT_NAME Sitemap page, exiting" "$CRIT" flock -u "$FD" return 1 fi - cp -fp "$SCRIPT_DIR/sitemap.asp" \ - "$SCRIPT_WEBPAGE_DIR/$MyWebPage" - echo "Sitemap" \ - > "$SCRIPT_WEBPAGE_DIR/$(echo "$MyWebPage" | cut -f1 -d'.').title" + cp -fp "$SCRIPT_DIR/sitemap.asp" "$SCRIPT_WEBPAGE_DIR/$MyWebPage" sed -i "\\~$MyWebPage~d" "$TEMP_MENU_TREE" sed -i \ "/url: \"javascript:var helpwindow=window.open('\/ext\/shared-jy\/redirect.htm'/a {url: \"$MyWebPage\", tabName: \"Sitemap\"}," \ @@ -2010,7 +2001,7 @@ Mount_WebUI() umount /www/require/modules/menuTree.js 2>/dev/null mount -o bind "$TEMP_MENU_TREE" /www/require/modules/menuTree.js - # state.js is now fully handled here + # state.js is now fully handled here # Patch_StateJS if "$restartHttpd" @@ -2027,7 +2018,7 @@ Mount_WebUI() fi flock -u "$FD" - Print_Output true "Mounted $SCRIPT_NAME WebUI page as $realpage" "$PASS" + Print_Output true "Mounted $SCRIPT_NAME WebUI page as $mainWebPage" "$PASS" } ##-------------------------------------## @@ -2240,15 +2231,18 @@ TailTaintDNSmasq() enable) touch "$TAIL_TAINTED_FILE" "$SCRIPT_DIR/S95tailtaintdns" start >/dev/null 2>&1 - if [ -f /jffs/scripts/services-start ]; then + if [ -f /jffs/scripts/services-start ] + then STARTUPLINECOUNT=$(grep -i -c '# '"$SCRIPT_NAME - tailtaintdns" /jffs/scripts/services-start) STARTUPLINECOUNTEX=$(grep -i -cx "$SCRIPT_DIR/S95tailtaintdns start >/dev/null 2>&1 & # $SCRIPT_NAME - tailtaintdns" /jffs/scripts/services-start) - if [ "$STARTUPLINECOUNT" -gt 1 ] || { [ "$STARTUPLINECOUNTEX" -eq 0 ] && [ "$STARTUPLINECOUNT" -gt 0 ]; }; then + if [ "$STARTUPLINECOUNT" -gt 1 ] || { [ "$STARTUPLINECOUNTEX" -eq 0 ] && [ "$STARTUPLINECOUNT" -gt 0 ]; } + then sed -i -e '/# '"$SCRIPT_NAME - tailtaintdns"'/d' /jffs/scripts/services-start fi - if [ "$STARTUPLINECOUNTEX" -eq 0 ]; then + if [ "$STARTUPLINECOUNTEX" -eq 0 ] + then echo "$SCRIPT_DIR/S95tailtaintdns start >/dev/null 2>&1 & # $SCRIPT_NAME - tailtaintdns" >> /jffs/scripts/services-start fi else @@ -2261,9 +2255,9 @@ TailTaintDNSmasq() disable) rm -f "$TAIL_TAINTED_FILE" "$SCRIPT_DIR/S95tailtaintdns" stop >/dev/null 2>&1 - if [ -f /jffs/scripts/services-start ]; then + if [ -f /jffs/scripts/services-start ] + then STARTUPLINECOUNT=$(grep -i -c '# '"$SCRIPT_NAME - tailtaintdns" /jffs/scripts/services-start) - if [ "$STARTUPLINECOUNT" -gt 0 ]; then sed -i -e '/# '"$SCRIPT_NAME"' - tailtaintdns/d' /jffs/scripts/services-start fi @@ -2525,7 +2519,7 @@ _InstallWanEventHook_() _Init_WAN_Uptime_File_() { local ifaceNum timeSecs seedTag wanIFaceNum wanIFaceFile - local wansMode seeded_any=false + local wansMode seededANY=false wansMode="$(nvram get wans_mode 2>/dev/null)" @@ -2542,17 +2536,17 @@ _Init_WAN_Uptime_File_() then read -r wanIFaceNum timeSecs seedTag < "$wanIFaceFile" fi - if [ "$wanIFaceNum" != "$ifaceNum" ] || [ -z "$timeSecs" ] + if [ "$ifaceNum" != "$wanIFaceNum" ] || [ -z "$timeSecs" ] then echo "$ifaceNum $(date +%s) SEED" > "$wanIFaceFile" sleep 1 fi - seeded_any=true + seededANY=true else rm -f "/tmp/wan${ifaceNum}_uptime.tmp" fi done - "$seeded_any" && return 0 || return 1 + "$seededANY" && return 0 || return 1 fi for ifaceNum in 0 1 @@ -2560,19 +2554,18 @@ _Init_WAN_Uptime_File_() if [ "$(nvram get "wan${ifaceNum}_primary")" = "1" ] && \ [ "$(nvram get "wan${ifaceNum}_state_t")" = "2" ] then - wanIFaceNum="" + wanIFaceNum="" ; timeSecs="" wanIFaceFile="/tmp/wan${ifaceNum}_uptime.tmp" if [ -s "$wanIFaceFile" ] then read -r wanIFaceNum timeSecs seedTag < "$wanIFaceFile" fi - - if [ -n "$wanIFaceNum" ] && [ "$ifaceNum" = "$wanIFaceNum" ] - then return 0 # Already SEEDED # + if [ "$ifaceNum" != "$wanIFaceNum" ] || [ -z "$timeSecs" ] + then + echo "$ifaceNum $(date +%s) SEED" > "$wanIFaceFile" + sleep 1 fi - echo "$ifaceNum $(date +%s) SEED" > "$wanIFaceFile" - sleep 1 - return 0 + return 0 # SEEDED OK # fi done @@ -2669,9 +2662,8 @@ Get_WAN_Uptime() approx_flag="" if [ -z "$upsecs" ] || [ "$upsecs" -le 0 ] then - wanIFaceNum="" + wanIFaceNum="" ; wanup_secs="" ; seedTag="" wanIFaceFile="/tmp/wan${ifaceNum}_uptime.tmp" - wanup_secs="" ; seedTag="" if [ -s "$wanIFaceFile" ] then read -r wanIFaceNum wanup_secs seedTag < "$wanIFaceFile" @@ -2682,7 +2674,7 @@ Get_WAN_Uptime() now_secs="$(date +%s)" if [ "$wanup_secs" -lt "$now_secs" ] then - upsecs="$(( now_secs - wanup_secs ))" + upsecs="$((now_secs - wanup_secs))" [ "$seedTag" = "SEED" ] && \ approx_flag=" (initial-seed)" fi @@ -2748,7 +2740,7 @@ Get_WAN_Uptime() then continue fi - wanIFaceNum="" + wanIFaceNum="" ; wanup_secs="" ; seedTag="" wanIFaceFile="/tmp/wan${ifaceNum}_uptime.tmp" if [ -s "$wanIFaceFile" ] then @@ -2770,7 +2762,7 @@ Get_WAN_Uptime() if [ -n "$active_IFaceWAN" ] && [ "$wanup_secs" -lt "$now_secs" ] then - upsecs="$(( now_secs - wanup_secs ))" + upsecs="$((now_secs - wanup_secs))" approx_flag="$seedTag" # will be "SEED" # else active_IFaceWAN="" @@ -3635,13 +3627,13 @@ _Menu_ToggleOptions_() printf " ${GRNct}dns${CLRct}. Toggle dnsmasq tainted watchdog script\n" printf " Currently: ${TAILTAINT_DNS_STATUS}\n\n" - if [ "$(Apply_WebUI_Modifications status)" = "ENABLED" ] + if [ "$(Extra_WebUI_Modifications status)" = "ENABLED" ] then WEBUI_MODS_STATUS="${GRNct}ENABLED${CLRct}" else WEBUI_MODS_STATUS="${REDct}DISABLED${CLRct}" fi - printf " ${GRNct}wui${CLRct}. Toggle WebUI modifications\n" + printf " ${GRNct}wui${CLRct}. Toggle additional WebUI modifications\n" printf " Currently: ${WEBUI_MODS_STATUS}\n\n" printf " ${GRNct}e${CLRct}. Return to Main Menu\n" @@ -3684,11 +3676,11 @@ _Menu_ToggleOptions_() ;; wui) printf "\n" - WEBUI_MODS_STATUS="$(Apply_WebUI_Modifications status)" + WEBUI_MODS_STATUS="$(Extra_WebUI_Modifications status)" if [ "$WEBUI_MODS_STATUS" = "ENABLED" ] - then Apply_WebUI_Modifications disable + then Extra_WebUI_Modifications disable elif [ "$WEBUI_MODS_STATUS" = "DISABLED" ] - then Apply_WebUI_Modifications enable + then Extra_WebUI_Modifications enable fi break ;; @@ -3859,7 +3851,6 @@ Menu_Install() fi Create_Dirs - touch "$WEBUI_MODS_FILE" Create_Symlinks Shortcut_Script create Set_Version_Custom_Settings local "$SCRIPT_VERSION" @@ -3869,6 +3860,7 @@ Menu_Install() _InstallWanEventHook_ create 2>/dev/null _Init_WAN_Uptime_File_ + touch "$WEBUI_MODS_FILE" Update_File scmerlin_www.asp Update_File sitemap.asp Update_File shared-jy.tar.gz @@ -3893,6 +3885,7 @@ Menu_Install() ##----------------------------------------## Menu_Startup() { + Print_Output true "$SCRIPT_NAME $SCRIPT_VERSION starting up" "$PASS" Create_Dirs Create_Symlinks Set_Version_Custom_Settings local "$SCRIPT_VERSION" @@ -4064,10 +4057,10 @@ Menu_Uninstall() umount /www/index_style.css 2>/dev/null fi - if [ -f /tmp/state.js ] && \ - grep -qE 'function GenerateSiteMap|function AddDropdowns|function injectDropdowns|BEGIN:SCMERLIN_' /tmp/state.js + if [ -f "$TMP_STATE_JS" ] && \ + grep -qE 'function GenerateSiteMap|function AddDropdowns|function injectDropdowns|BEGIN:SCMERLIN_' "$TMP_STATE_JS" then - rm -f /tmp/state.js + rm -f "$TMP_STATE_JS" umount /www/state.js 2>/dev/null restartHttpd=true fi @@ -4079,12 +4072,12 @@ Menu_Uninstall() fi flock -u "$FD" - rm -rf "$SCRIPT_WEB_DIR" 2>/dev/null + rm -fr "$SCRIPT_WEB_DIR" 2>/dev/null "$SCRIPT_DIR/S99tailtop" stop >/dev/null 2>&1 sleep 5 - rm -rf "$SCRIPT_DIR" + rm -fr "$SCRIPT_DIR" SETTINGSFILE="/jffs/addons/custom_settings.txt" sed -i '/scmerlin_version_local/d' "$SETTINGSFILE" @@ -4326,7 +4319,7 @@ case "$1" in then settingstate="$(echo "$3" | sed "s/${SCRIPT_NAME_LOWER}_WebUIMods//")"; settingstate="$(echo "$settingstate" | tr 'A-Z' 'a-z')" - Apply_WebUI_Modifications "$settingstate" + Extra_WebUI_Modifications "$settingstate" elif echo "$3" | grep -qE "^${SCRIPT_NAME_LOWER}servicerestart" then rm -f "$SCRIPT_WEB_DIR/detect_service.js" @@ -4501,7 +4494,7 @@ case "$1" in then # In load-balance, trust the event's iface ($2) # # don't touch the other file # - wanIFaceNum="$2" # 0 or 1 + wanIFaceNum="$2" # 0 or 1 # else # Don't trust the WAN Events in Failover/primary mode # # Pick active by primary flags (fallback to connected state) # @@ -4515,7 +4508,7 @@ case "$1" in then wanIFaceNum="1" else - # Prefer the event's iface if it is actually up + # Prefer the event's iface if it is actually up # if [ -n "$2" ] && _InterfaceUP_ "$2" then wanIFaceNum="$2" @@ -4527,8 +4520,8 @@ case "$1" in wanIFaceNum="1" fi fi - # In non-LB, clear the other WAN's file to avoid stale reads - otherIF=$([ "$wanIFaceNum" = "0" ] && echo 1 || echo 0) + # In non-LB, clear the other WAN file to avoid stale reads # + otherIF="$([ "$wanIFaceNum" = "0" ] && echo 1 || echo 0)" rm -f "/tmp/wan${otherIF}_uptime.tmp" fi @@ -4540,12 +4533,12 @@ case "$1" in read -r wanIFaceNum timeSecs < "$wanIFaceFile" fi - # Write only when iface is truly usable in this context + # Write only when iface is truly usable in this context # if [ -n "$wanIFaceNum" ] then echo "$wanIFaceNum $timeSecs" > "$wanIFaceFile" else - # Neither WAN is usable; clear both + # Neither WAN is usable; clear both # rm -f /tmp/wan0_uptime.tmp /tmp/wan1_uptime.tmp fi elif [ "$3" = "stopped" ] || \ @@ -4554,7 +4547,7 @@ case "$1" in then # Disconnected/other events: # # Clean up only the iface that raised the event (safe in all modes) # - if [ -n "$2" ] + if [ -n "$2" ] then rm -f "/tmp/wan${2}_uptime.tmp" fi diff --git a/scmerlin_www.asp b/scmerlin_www.asp index d419917..1992dd9 100644 --- a/scmerlin_www.asp +++ b/scmerlin_www.asp @@ -27,9 +27,9 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo @@ -675,12 +676,17 @@ var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[ -Enable WebUI modifications
+ +Enable additional WebUI modifications + + Yes No diff --git a/scmerlin_www.js b/scmerlin_www.js index 727288a..eec0155 100644 --- a/scmerlin_www.js +++ b/scmerlin_www.js @@ -1,5 +1,5 @@ /**----------------------------**/ -/** Last Modified: 2025-Oct-21 **/ +/** Last Modified: 2026-Mar-15 **/ /**----------------------------**/ var arrayproclistlines = []; @@ -431,6 +431,30 @@ function Save_DNSmasqWatchdog() setTimeout(Get_DNSmasqWatchdogEnabled_File, 4000); } +const enableWebUIModsHint = 'This option handles WebUI modifications to enable or disable the Sitemap page and the pop-up menus on the left-hand-side vertical menu bar. These changes requires logging you out of the WebUI to restart the web server.'; + +/**-------------------------------------**/ +/** Added by Martinski W. [2026-Mar-15] **/ +/**-------------------------------------**/ +function ShowHintMsg (formField) +{ + let theHintMsg; + switch (formField.name) + { + case 'ENABLE_WEBUI_MODS': + theHintMsg = enableWebUIModsHint; + break; + default: + theHintMsg = ''; + break; + } + if (theHintMsg.length > 0) + { + $(formField)[0].onmouseout = nd; + return overlib(theHintMsg,0,0); + } +} + /**-------------------------------------**/ /** Added by Martinski W. [2024-Apr-28] **/ /**-------------------------------------**/ From f0597d0a9a88c134fdef8908b30fba2281a9a83b Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 15 Mar 2026 20:52:50 -0700 Subject: [PATCH 11/14] Fixed misspelling Just fixing a misspelling. --- scmerlin.sh | 2 +- scmerlin_www.asp | 2 +- scmerlin_www.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index 65e8cc0..e81b4d4 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="26031509" +readonly SCRIPT_VERSTAG="26031520" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" diff --git a/scmerlin_www.asp b/scmerlin_www.asp index 1992dd9..1a85271 100644 --- a/scmerlin_www.asp +++ b/scmerlin_www.asp @@ -545,7 +545,7 @@ function update_temperatures() } /* End firmware functions */ -var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var o=0;o",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIModsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuimodsenabled.htm",dataType:"text",cache:!1,error:function(){document.form.scMerlin_WebUIMods.value="Disable",$("#scMerlin_WebUIMods_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIMods.value="Enable",$("#scMerlin_WebUIMods_Status").text("Currently: ENABLED")}})}function Save_WebUIMods(){$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),void 0!==WaitMsgPopupBox&&WaitMsgPopupBox.CloseMsg(),window._scmPauseAjax=!0,document.form.action_script.value="start_scmerlin_WebUIMods"+document.form.scMerlin_WebUIMods.value,document.form.action_wait.value=8,showLoading(),document.form.submit()}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const enableWebUIModsHint="This option handles WebUI modifications to enable or disable the Sitemap page and the pop-up menus on the left-hand-side vertical menu bar. These changes requires logging you out of the WebUI to restart the web server.";function ShowHintMsg(e){let t;switch(e.name){case"ENABLE_WEBUI_MODS":t=enableWebUIModsHint;break;default:t="";break}if(t.length>0)return $(e)[0].onmouseout=nd,overlib(t,0,0)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,o,i=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var o=window["Chart"+e];null!=o&&o.destroy();var i=document.getElementById("canvasChart"+e).getContext("2d");o=new Chart(i,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=o} +var arrayproclistlines=[],sortnameproc="CPU%",sortdirproc="desc",arraycronjobs=[],sortnamecron="Name",sortdircron="asc",tmout=null;function SetCurrentPage(){document.form.next_page.value=window.location.pathname.substring(1),document.form.current_page.value=window.location.pathname.substring(1)}Chart.defaults.global.defaultFontColor="#CCC",Chart.Tooltip.positioners.cursor=function(e,t){return t};var srvnamelist=["dnsmasq","wan","httpd","wireless","vsftpd","samba","ddns","ntpd/chronyd"],srvdesclist=["DNS/DHCP Server","Internet Connection","Web Interface","WiFi","FTP Server","Samba","DDNS client","Timeserver"],srvnamevisiblelist=[!0,!1,!0,!1,!0,!1,!1,!0],sortedAddonPages=[];function initial(){SetCurrentPage(),LoadCustomSettings(),show_menu(),Draw_Chart_NoData("nvramUsage","Data loading..."),Draw_Chart_NoData("jffsUsage","Data loading..."),Draw_Chart_NoData("MemoryUsage","Data loading..."),Draw_Chart_NoData("SwapUsage","No swap file configured"),$("#sortTableCron").empty(),$("#sortTableCron").append(BuildSortTableHtmlNoData()),$("#sortTableProcesses").empty(),$("#sortTableProcesses").append(BuildSortTableHtmlNoData());let e="",t="";if(isWireGuard_Supported){e+=Build_WireGuardServer_Table(1),$("#table_config").after(e);for(var r=1;r<6;r++)t+=Build_WireGuardClient_Table(r);$("#table_config").after(t)}let s="";for(r=1;r<3;r++)s+=Build_OpenVPNServer_Table(r);$("#table_config").after(s);let a="";for(r=1;r<6;r++)a+=Build_OpenVPNClient_Table(r);$("#table_config").after(a);let n="";for(var o=0;o",'',"Data loading...","","","",'
Data loading...
'}function BuildSortTableHtml(e){var t='';if("sortTableProcesses"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(var r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}else if("sortTableCron"==e){t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+='',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+='';for(r=0;r',t+="",t+="",t+="",t+="",t+="",t+="",t+="",t+=""}return t+="",t+="
PIDPPIDUSERSTATVSZVSZ%CPUCPU%COMMAND
"+arrayproclistlines[r].PID+""+arrayproclistlines[r].PPID+""+arrayproclistlines[r].USER+""+arrayproclistlines[r].STAT+""+arrayproclistlines[r].VSZ+""+arrayproclistlines[r].VSZP+""+arrayproclistlines[r].CPU+""+arrayproclistlines[r].CPUP+""+arrayproclistlines[r].COMMAND+"
NameMinHourDayMMonthDayWCommand
"+arraycronjobs[r].Name+""+arraycronjobs[r].Min+""+arraycronjobs[r].Hour+""+arraycronjobs[r].DayM+""+arraycronjobs[r].Month+""+arraycronjobs[r].DayW+""+arraycronjobs[r].Command+"
"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_NTPwatchdog.value="Enable",$("#scMerlin_NTPwatchdog_Status").text("Currently: ENABLED")}})}function Save_NTPWatchdog(){document.form.action_script.value="start_scmerlin_NTPwatchdog"+document.form.scMerlin_NTPwatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_NTPWatchdogEnabled_File,4e3)}function Get_DNSmasqWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/tailtaintdnsenabled.htm",dataType:"text",error:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(e){document.form.scMerlin_DNSmasqWatchdog.value="Enable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: ENABLED")}})}function Get_WebUIModsEnabled_File(){$.ajax({url:"/ext/scmerlin/webuimodsenabled.htm",dataType:"text",cache:!1,error:function(){document.form.scMerlin_WebUIMods.value="Disable",$("#scMerlin_WebUIMods_Status").text("Currently: DISABLED")},success:function(){document.form.scMerlin_WebUIMods.value="Enable",$("#scMerlin_WebUIMods_Status").text("Currently: ENABLED")}})}function Save_WebUIMods(){$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),void 0!==WaitMsgPopupBox&&WaitMsgPopupBox.CloseMsg(),window._scmPauseAjax=!0,document.form.action_script.value="start_scmerlin_WebUIMods"+document.form.scMerlin_WebUIMods.value,document.form.action_wait.value=8,showLoading(),document.form.submit()}function Save_DNSmasqWatchdog(){document.form.action_script.value="start_scmerlin_DNSmasqWatchdog"+document.form.scMerlin_DNSmasqWatchdog.value,document.form.action_wait.value=4,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit(),setTimeout(Get_DNSmasqWatchdogEnabled_File,4e3)}const enableWebUIModsHint="This option handles WebUI modifications to enable or disable the Sitemap page and the pop-up menus on the left-hand-side vertical menu bar. These changes require logging you out of the WebUI to restart the web server.";function ShowHintMsg(e){let t;switch(e.name){case"ENABLE_WEBUI_MODS":t=enableWebUIModsHint;break;default:t="";break}if(t.length>0)return $(e)[0].onmouseout=nd,overlib(t,0,0)}const WaitMsgPopupBox={waitCounter:0,waitMaxSecs:0,waitTimerOn:!1,waitTimerID:null,waitMsgBox:null,waitMsgTemp:"",waitMsgBoxID:"myWaitMsgPopupBoxID",CloseMsg:function(){this.waitTimerOn=!1,this.waitCounter=0,this.waitMaxSecs=0,this.waitMsgTemp="",null!=this.waitTimerID&&(clearTimeout(this.waitTimerID),this.waitTimerID=null),null!=this.waitMsgBox&&this.waitMsgBox.close()},StartMsg:function(e,t,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(t/1e3),this.ShowTimedMsg(e,r))},ShowTimedMsg:function(e,t){if(this.waitCounter>this.waitMaxSecs)return void this.CloseMsg();if(!this.waitTimerOn)return;this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID));let r=this.waitCounter+1;0==this.waitCounter&&this.waitMsgBox.close(),t?t&&(this.waitMsgBox.innerText=e+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=e+"\n >":this.waitMsgTemp=this.waitMsgTemp+">",this.waitMsgBox.innerText=this.waitMsgTemp),0==this.waitCounter&&this.waitMsgBox.showModal(),this.waitCounter=r,this.waitTimerID=setTimeout((function(){WaitMsgPopupBox.ShowTimedMsg(e,t)}),1e3)},ShowMsg:function(e,t){this.waitMsgBox=document.getElementById(this.waitMsgBoxID),null==this.waitMsgBox&&(this.waitMsgBox=document.body.appendChild(document.createElement("dialog")),this.waitMsgBox.setAttribute("id",this.waitMsgBoxID)),this.waitMsgBox.close(),this.waitMsgBox.innerText=e,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),t)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(e){let t;const r=e.split("\n");t='
';for(var s=0;s"+r[s]+"

";return t+='
',t},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(e){this.alertMsgBox=document.getElementById(this.alertMsgBoxID),null==this.alertMsgBox&&(this.alertMsgBox=document.body.appendChild(document.createElement("dialog")),this.alertMsgBox.setAttribute("id",this.alertMsgBoxID)),this.alertMsgBox.close(),this.alertMsgBox.innerHTML=this.BuildAlertBox(e),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(e,t,r){t?(document.getElementById(e).disabled=!1,document.getElementById(e).title=r,null!=theButtonBackStyle&&(document.getElementById(e).style.background=theButtonBackStyle)):(0==document.getElementById(e).disabled&&(theButtonBackStyle=document.getElementById(e).style.background),document.getElementById(e).disabled=!0,document.getElementById(e).title=r,document.getElementById(e).style.background="grey")}function SetNTPReadyCheckButtonState(e,t){let r;r=e?NTPReadyCheck.buttonHintMsg:t,SetButtonGenState("btnSaveNTPcheck",e,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(e){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(e){let t=e.split("\n");t=t.filter(Boolean);let r,s,a,n,o,i=t.length,l="";for(var c=0;c (a."+sortfield+".toLowerCase() > b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() > a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => (a."+sortfield+".toLowerCase() < b."+sortfield+".toLowerCase()) ? 1 : ((b."+sortfield+".toLowerCase() < a."+sortfield+".toLowerCase()) ? -1 : 0));"),window[sortdir]="desc"):"number"==sorttype&&(-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(a."+sortfield+'.replace("m","000"))) - parseFloat(getNum(b.'+sortfield+'.replace("m","000"))));'),window[sortdir]="asc"):(eval(arrayid+" = "+arrayid+".sort((a,b) => parseFloat(getNum(b."+sortfield+'.replace("m","000"))) - parseFloat(getNum(a.'+sortfield+'.replace("m","000"))));'),window[sortdir]="desc")),$("#"+tableid).empty(),$("#"+tableid).append(BuildSortTableHtml(tableid)),$("#"+tableid).find(".sortable").each((function(e,t){t.innerHTML==window[sortname]&&("asc"==window[sortdir]?t.innerHTML=window[sortname]+" ↑":t.innerHTML=window[sortname]+" ↓")}))}function getNum(e){if(isNaN(e)){if("*"==e)return-10;if(-1!=e.indexOf("*/"))return-5;if(-1!=e.indexOf("/"))return e.split("/")[0];if("Sun"==e)return 0;if("Mon"==e)return 1;if("Tue"==e)return 2;if("Wed"==e)return 3;if("Thu"==e)return 4;if("Fri"==e)return 5;if("Sat"==e)return 6}return e}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(e,t,r){var s="";if(0==r&&(s+='
 
',s+='',s+='',s+='',s+=""),0!=r&&r%4!=0||(s+=""),s+='",r>0&&(r+1)%4==0&&(s+=""),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,n=0;n';s+=""}s+="
WebUI Addons (click to expand/collapse)
'+e+'
'+t.substring(t.lastIndexOf("/")+1)+"
"}return s}function BuildServiceTable(e,t,r,s){var a="";return 0==s&&(a+='
 
',a+='',a+='',a+='',a+=""),0!=s&&s%2!=0||(a+=""),a+=r?'":'",a+='",s>0&&(s+1)%2==0&&(a+=""),s==srvnamelist.length-1&&(a+="
Services (click to expand/collapse)
'+t+' ('+e+")'+t+"',a+='',a+='',a+='',a+='',a+="
"),a}function Build_OpenVPNClient_Table(theIndex){let vpnClientHTML="",vpnClientName="vpnclient"+theIndex,vpnClientDesc=eval("document.form.vpnc"+theIndex+"_desc").value;return 1==theIndex&&(vpnClientHTML+='
 
',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(vpnClientHTML+=""),vpnClientHTML+='",vpnClientHTML+='",5==theIndex&&(vpnClientHTML+=''),theIndex>1&&theIndex%2==0&&(vpnClientHTML+=""),5==theIndex&&(vpnClientHTML+="
OpenVPN Clients (click to expand/collapse)
OpenVPN Client '+theIndex,vpnClientHTML+='
('+vpnClientDesc+")		',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+='',vpnClientHTML+="
"),vpnClientHTML}function Build_OpenVPNServer_Table(e){let t="",r="vpnserver"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",2==e&&(t+="",t+="
OpenVPN Servers (click to expand/collapse)
OpenVPN Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardServer_Table(e){let t="",r="wgServer"+e;return 1==e&&(t+='
 
',t+='',t+='',t+='',t+="",t+=""),t+='",t+='",1==e&&(t+='',t+="
WireGuard Server (click to expand/collapse)
WireGuard Server '+e+"',t+='',t+='',t+='',t+='',t+="
"),t}function Build_WireGuardClient_Table(theIndex){let wgClientHTML="",wgClientName="wgClient"+theIndex,wgClientDesc=eval("document.form.wrgc"+theIndex+"_desc").value;return null!==wgClientDesc&&""!==wgClientDesc||(wgClientDesc="No description"),1==theIndex&&(wgClientHTML+='
 
',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+=""),1!=theIndex&&(theIndex+1)%2!=0||(wgClientHTML+=""),wgClientHTML+='",wgClientHTML+='",5==theIndex&&(wgClientHTML+=''),theIndex>1&&theIndex%2==0&&(wgClientHTML+=""),5==theIndex&&(wgClientHTML+="
WireGuard Clients (click to expand/collapse)
WireGuard Client '+theIndex,wgClientHTML+='
('+wgClientDesc+")		',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+='',wgClientHTML+="
"),wgClientHTML}function round(e,t){return Number(Math.round(e+"e"+t)+"e-"+t)}function Draw_Chart_NoData(e,t){document.getElementById("canvasChart"+e).width="265",document.getElementById("canvasChart"+e).height="250",document.getElementById("canvasChart"+e).style.width="265px",document.getElementById("canvasChart"+e).style.height="250px";var r=document.getElementById("canvasChart"+e).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(t,135,125),r.restore()}function Draw_Chart(e){var t=[],r=[],s=[],a="",n="";"MemoryUsage"==e?(t=[1*mem_stats_arr[0]-1*mem_stats_arr[1]-1*mem_stats_arr[2]-1*mem_stats_arr[3],mem_stats_arr[1],mem_stats_arr[2],mem_stats_arr[3]],r=["Used","Free","Buffers","Cache"],s=["#5eaec0","#12cf80","#ceca09","#9d12c4"],a="Memory Usage",n="MB"):"SwapUsage"==e?(t=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",n="MB"):"nvramUsage"==e?(t=[round(mem_stats_arr[6]/1024,2).toFixed(2),round(1*nvramtotal-1*mem_stats_arr[6]/1024,2).toFixed(2)],r=["Used","Free"],s=["#5eaec0","#12cf80"],a="NVRAM Usage",n="KB"):"jffsUsage"==e&&(t=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",n="MB");var o=window["Chart"+e];null!=o&&o.destroy();var i=document.getElementById("canvasChart"+e).getContext("2d");o=new Chart(i,{type:"pie",options:{segmentShowStroke:!1,segmentStrokeColor:"#000",maintainAspectRatio:!1,animation:{duration:0},hover:{animationDuration:0},responsiveAnimationDuration:0,legend:{onClick:null,display:!0,position:"left",labels:{fontColor:"#ffffff"}},title:{display:!0,text:a,position:"top"},tooltips:{callbacks:{title:function(e,t){return t.labels[e[0].index]},label:function(e,t){return round(t.datasets[e.datasetIndex].data[e.index],2).toFixed(2)+" "+n}},mode:"point",position:"cursor",intersect:!0},scales:{xAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}],yAxes:[{display:!1,gridLines:{display:!1},scaleLabel:{display:!1},ticks:{display:!1}}]}},data:{labels:r,datasets:[{data:t,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+e]=o} diff --git a/scmerlin_www.js b/scmerlin_www.js index eec0155..0c0a989 100644 --- a/scmerlin_www.js +++ b/scmerlin_www.js @@ -431,7 +431,7 @@ function Save_DNSmasqWatchdog() setTimeout(Get_DNSmasqWatchdogEnabled_File, 4000); } -const enableWebUIModsHint = 'This option handles WebUI modifications to enable or disable the Sitemap page and the pop-up menus on the left-hand-side vertical menu bar. These changes requires logging you out of the WebUI to restart the web server.'; +const enableWebUIModsHint = 'This option handles WebUI modifications to enable or disable the Sitemap page and the pop-up menus on the left-hand-side vertical menu bar. These changes require logging you out of the WebUI to restart the web server.'; /**-------------------------------------**/ /** Added by Martinski W. [2026-Mar-15] **/ From 711c04b5fe3487181ba18af60dc40dfef5273116 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 19:23:24 +0000 Subject: [PATCH 12/14] Bump softprops/action-gh-release in the all-actions group Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.5.0 to 2.6.1 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.5.0...v2.6.1) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 5fecb20..b3e36d0 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.5.0 + uses: softprops/action-gh-release@v2.6.1 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From ea0332857efa03524cc483bd91489cbd96823211 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Fri, 20 Mar 2026 09:36:07 -0400 Subject: [PATCH 13/14] Quick Cold-Boot Fix Moving: Extra_WebUI_Modifications apply to after "$TEMP_MENU_TREE" has been created and after _CreateMenuAddOnsSection_ / Sitemap injection has finalized the menu state. --- scmerlin.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index e81b4d4..c68050d 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2026-Mar-15 +# Last Modified: 2026-Mar-20 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="26031520" +readonly SCRIPT_VERSTAG="26032009" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -1940,9 +1940,6 @@ Mount_WebUI() cp -fp /www/index_style.css /tmp/ fi - # Apply CSS/menu behavior based on saved setting # - Extra_WebUI_Modifications apply - if [ ! -f "$TEMP_MENU_TREE" ] then cp -fp /www/require/modules/menuTree.js "$TEMP_MENU_TREE" @@ -1998,6 +1995,11 @@ Mount_WebUI() sitemapAction="added" fi + # Apply CSS/menu behavior based on saved setting # + # only AFTER TEMP_MENU_TREE reflects the final menu state. # + # This ensures the Addons icon CSS is added on cold boot/reboot as well. # + Extra_WebUI_Modifications apply + umount /www/require/modules/menuTree.js 2>/dev/null mount -o bind "$TEMP_MENU_TREE" /www/require/modules/menuTree.js From c9990b340143d7fca2526e7cf09a12f25b5a3461 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sat, 21 Mar 2026 02:46:43 -0700 Subject: [PATCH 14/14] Fix and Code Improvements - Removed unnecessary calls to function that handles the additional WebUI modifications. - Modified code to make sure the 'Addons' icon is always added when mounting the WebUI, regardless of whether the extra WebUI modifications are enabled or disabled. --- README.md | 2 +- scmerlin.sh | 74 ++++++++++++++++++++++++----------------------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 435bd3d..f481f8f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin ## v2.5.48 -### Updated on 2026-Mar-15 +### Updated on 2026-Mar-21 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index c68050d..02c7397 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2026-Mar-20 +# Last Modified: 2026-Mar-21 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" readonly SCM_VERSION="v2.5.48" readonly SCRIPT_VERSION="v2.5.48" -readonly SCRIPT_VERSTAG="26032009" +readonly SCRIPT_VERSTAG="26032101" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -1209,26 +1209,22 @@ Patch_StateJS() return 0 } -##---------------------------------------## -## Added by ExtremeFiretop [2026-Mar-09] ## -##---------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2026-Mar-21] ## +##----------------------------------------## Extra_WebUI_Modifications() { case "$1" in enable) touch "$WEBUI_MODS_FILE" - Extra_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 ;; disable) rm -f "$WEBUI_MODS_FILE" - Extra_WebUI_Modifications apply >/dev/null 2>&1 Mount_WebUI >/dev/null 2>&1 ;; apply) - local keepAddonsCss=false - - # Always work from a writable temp copy if one does not exist yet + # Always work from a writable temp copy if one does not exist yet # if [ ! -f /tmp/index_style.css ] then umount /www/index_style.css 2>/dev/null @@ -1236,42 +1232,33 @@ Extra_WebUI_Modifications() 2>/dev/null || return 1 fi - # Strip scMerlin dropdown CSS unconditionally first + # Strip scMerlin dropdown CSS unconditionally first # sed -i '/\.dropdown-content/d' /tmp/index_style.css sed -i '/\.dropdown:hover[[:space:]]*\.dropdown-content/d' \ /tmp/index_style.css - # Decide whether .menu_Addons CSS should remain - if [ -f "$TEMP_MENU_TREE" ] && \ - grep -qF 'index: "menu_Addons"' "$TEMP_MENU_TREE" - then - keepAddonsCss=true - fi - - # If WebUI mods are disabled, do not re-add dropdown CSS + # If WebUI mods are DISABLED, do NOT re-add dropdown CSS # if [ ! -f "$WEBUI_MODS_FILE" ] then - if "$keepAddonsCss" && \ - grep -qF '.menu_Addons { background:' /tmp/index_style.css + umount /www/index_style.css 2>/dev/null + + if grep -qF '.menu_Addons { background:' /tmp/index_style.css then - umount /www/index_style.css 2>/dev/null mount -o bind /tmp/index_style.css /www/index_style.css else rm -f /tmp/index_style.css 2>/dev/null - umount /www/index_style.css 2>/dev/null fi return 0 fi - # WebUI mods enabled: ensure Addons icon CSS exists if Addons menu exists - if "$keepAddonsCss" && \ - ! grep -qF '.menu_Addons { background:' /tmp/index_style.css + # Ensure the required menu 'Addons' icon exists at this point # + if ! grep -qF '.menu_Addons { background:' /tmp/index_style.css then echo ".menu_Addons { background: url(ext/shared-jy/addons.png); background-size: contain;}" \ >> /tmp/index_style.css fi - # Re-add dropdown CSS + # Re-add dropdown CSS # { echo ".dropdown-content {top: 0px; left: 185px; "\ "visibility: hidden; position: absolute; "\ @@ -1908,7 +1895,7 @@ ${ENDIN_MenuAddOnsTag}" "$TEMP_MENU_TREE" ### locking mechanism code credit to Martineau (@MartineauUK) ### ##----------------------------------------## -## Modified by Martinski W. [2025-May-17] ## +## Modified by Martinski W. [2026-Mar-21] ## ##----------------------------------------## Mount_WebUI() { @@ -1940,6 +1927,12 @@ Mount_WebUI() cp -fp /www/index_style.css /tmp/ fi + # The menu 'Addons' icon must exist when mounting the WebUI # + if ! grep -qF '.menu_Addons { background:' /tmp/index_style.css + then + echo ".menu_Addons { background: url(ext/shared-jy/addons.png); }" >> /tmp/index_style.css + fi + if [ ! -f "$TEMP_MENU_TREE" ] then cp -fp /www/require/modules/menuTree.js "$TEMP_MENU_TREE" @@ -1995,9 +1988,9 @@ Mount_WebUI() sitemapAction="added" fi - # Apply CSS/menu behavior based on saved setting # - # only AFTER TEMP_MENU_TREE reflects the final menu state. # - # This ensures the Addons icon CSS is added on cold boot/reboot as well. # + # Apply CSS/menu behavior based on saved setting, but ONLY # + # *AFTER* "TEMP_MENU_TREE" reflects the final menu state. # + # This ensures proper initialization on cold boots/reboots. # Extra_WebUI_Modifications apply umount /www/require/modules/menuTree.js 2>/dev/null @@ -3974,9 +3967,9 @@ _FindandRemoveMenuAddOnsSection_() return "$retCode" } -##------------------------------------------## -## Modified by ExtremeFiretop [2025-Jul-22] ## -##------------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2026-Mar-21] ## +##----------------------------------------## Menu_Uninstall() { Print_Output true "Removing $SCRIPT_NAME..." "$PASS" @@ -3994,7 +3987,7 @@ Menu_Uninstall() flock -x "$FD" local doResetWebGUI=false - local keepAddonsCss=false + local keepAddonsCSS=false local restartHttpd=false if [ -f "$SCRIPT_DIR/sitemap.asp" ] @@ -4029,7 +4022,7 @@ Menu_Uninstall() if [ -f "$TEMP_MENU_TREE" ] && \ grep -qF 'index: "menu_Addons"' "$TEMP_MENU_TREE" then - keepAddonsCss=true + keepAddonsCSS=true fi if "$doResetWebGUI" @@ -4044,17 +4037,16 @@ Menu_Uninstall() sed -i '/\.dropdown:hover[[:space:]]*\.dropdown-content/d' \ /tmp/index_style.css - if "$keepAddonsCss" && \ + umount /www/index_style.css 2>/dev/null + + if "$keepAddonsCSS" && \ grep -qF '.menu_Addons { background:' /tmp/index_style.css then - umount /www/index_style.css 2>/dev/null mount -o bind /tmp/index_style.css /www/index_style.css - restartHttpd=true else rm -f /tmp/index_style.css - umount /www/index_style.css 2>/dev/null - restartHttpd=true fi + restartHttpd=true else umount /www/index_style.css 2>/dev/null fi