diff --git a/README.md b/README.md
index 6f89d83..426c433 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # scMerlin
 
-## v2.5.7
-### Updated on 2024-Sep-22 by @decoderman with updates from @Martinski4GitHub
+## v2.5.8
+### Updated on 2024-Sep-29 by @decoderman with updates from @Martinski4GitHub
 
 ## 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 9d7f12e..8b5f8a4 100644
--- a/scmerlin.sh
+++ b/scmerlin.sh
@@ -11,7 +11,7 @@
 ##       https://github.com/jackyaz/scMerlin        ##
 ##                                                  ##
 ######################################################
-# Last Modified: 2024-Sep-22
+# Last Modified: 2024-Sep-29
 #-----------------------------------------------------
 
 ##########       Shellcheck directives     ###########
@@ -27,8 +27,8 @@
 ### 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.7"
-readonly SCRIPT_VERSION="v2.5.7"
+readonly SCM_VERSION="v2.5.8"
+readonly SCRIPT_VERSION="v2.5.8"
 SCRIPT_BRANCH="master"
 SCRIPT_REPO="https://raw.githubusercontent.com/decoderman/$SCRIPT_NAME/$SCRIPT_BRANCH"
 readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
diff --git a/scmerlin_www.asp b/scmerlin_www.asp
index 3978b8a..8276150 100644
--- a/scmerlin_www.asp
+++ b/scmerlin_www.asp
@@ -30,7 +30,7 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo
 <script>
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2024-Sep-07] **/
+/** Modified by Martinski W. [2024-Sep-29] **/
 /**----------------------------------------**/
 
 var custom_settings;
@@ -318,7 +318,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(t,e){return e};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());for(var t="",e=1;e<3;e++)t+=BuildVPNServerTable(e);$("#table_config").after(t);var r="";for(e=1;e<6;e++)r+=BuildVPNClientTable(e);$("#table_config").after(r);var s="";for(e=0;e<srvnamelist.length;e++)s+=BuildServiceTable(srvnamelist[e],srvdesclist[e],srvnamevisiblelist[e],e);$("#table_config").after(s),document.formScriptActions.action_script.value="start_scmerlingetaddonpages;start_scmerlingetcronjobs",document.formScriptActions.submit(),setTimeout(load_addonpages,5e3),setTimeout(get_cronlist_file,5e3),get_proclist_file(),Get_NTPWatchdogEnabled_File(),Get_NTPReadyCheck_Option(),Get_DNSmasqWatchdogEnabled_File(),update_temperatures(),update_sysinfo(),ScriptUpdateLayout(),AddEventHandlers()}function ScriptUpdateLayout(){var t=GetVersionNumber("local"),e=GetVersionNumber("server");$("#scmerlin_version_local").text(t),t!=e&&"N/A"!=e&&($("#scmerlin_version_server").text("Updated version available: "+e),showhide("btnChkUpdate",!1),showhide("scmerlin_version_server",!0),showhide("btnDoUpdate",!0))}function reload(){location.reload(!0)}function update_status(){$.ajax({url:"/ext/scmerlin/detect_update.js",dataType:"script",error:function(t){setTimeout(update_status,1e3)},success:function(){"InProgress"==updatestatus?setTimeout(update_status,1e3):(document.getElementById("imgChkUpdate").style.display="none",showhide("scmerlin_version_server",!0),"None"!=updatestatus?($("#scmerlin_version_server").text("Updated version available: "+updatestatus),showhide("btnChkUpdate",!1),showhide("btnDoUpdate",!0)):($("#scmerlin_version_server").text("No update available"),showhide("btnChkUpdate",!0),showhide("btnDoUpdate",!1)))}})}function CheckUpdate(){showhide("btnChkUpdate",!1),document.formScriptActions.action_script.value="start_scmerlincheckupdate",document.formScriptActions.submit(),document.getElementById("imgChkUpdate").style.display="",setTimeout(update_status,2e3)}function DoUpdate(){document.form.action_script.value="start_scmerlindoupdate",document.form.action_wait.value=15,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit()}function RestartService(t){showhide("btnRestartSrv_"+t,!1),showhide("txtRestartSrv_"+t,!1),document.formScriptActions.action_script.value="start_scmerlinservicerestart"+t,document.formScriptActions.submit(),document.getElementById("imgRestartSrv_"+t).style.display="",setTimeout(service_status,1e3,t)}function service_status(t){$.ajax({url:"/ext/scmerlin/detect_service.js",dataType:"script",error:function(e){setTimeout(service_status,1e3,t)},success:function(){"InProgress"==servicestatus?setTimeout(service_status,1e3,t):(document.getElementById("imgRestartSrv_"+t).style.display="none","Done"==servicestatus?(showhide("txtRestartSrv_"+t,!0),setTimeout(showhide,3e3,"txtRestartSrv_"+t,!1),setTimeout(showhide,3250,"btnRestartSrv_"+t,!0)):showhide("txtRestartSrvError_"+t,!0))}})}function GetVersionNumber(t){var e;return"local"==t?e=custom_settings.scmerlin_version_local:"server"==t&&(e=custom_settings.scmerlin_version_server),void 0===e||null==e?"N/A":e}function BuildSortTableHtmlNoData(){return"<tr>",'<td colspan="3" class="nodata">',"Data loading...","</td>","</tr>","</table>",'<table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" bordercolor="#6b8fa3" class="sortTable"><tr><td colspan="3" class="nodata">Data loading...</td></tr></table>'}function BuildSortTableHtml(t){var e='<table border="0" cellpadding="0" cellspacing="0" width="100%" class="sortTable">';if("sortTableProcesses"==t){e+='<col style="width:50px;">',e+='<col style="width:50px;">',e+='<col style="width:75px;">',e+='<col style="width:50px;">',e+='<col style="width:50px;">',e+='<col style="width:55px;">',e+='<col style="width:50px;">',e+='<col style="width:55px;">',e+='<col style="width:740px;">',e+='<thead class="sortTableHeader">',e+="<tr>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">PID</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">PPID</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">USER</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">STAT</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">VSZ</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">VSZ%</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">CPU</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">CPU%</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">COMMAND</th>",e+="</tr>",e+="</thead>",e+='<tbody class="sortTableContent">';for(var r=0;r<arrayproclistlines.length;r++)e+='<tr class="sortRow">',e+="<td>"+arrayproclistlines[r].PID+"</td>",e+="<td>"+arrayproclistlines[r].PPID+"</td>",e+="<td>"+arrayproclistlines[r].USER+"</td>",e+="<td>"+arrayproclistlines[r].STAT+"</td>",e+="<td>"+arrayproclistlines[r].VSZ+"</td>",e+="<td>"+arrayproclistlines[r].VSZP+"</td>",e+="<td>"+arrayproclistlines[r].CPU+"</td>",e+="<td>"+arrayproclistlines[r].CPUP+"</td>",e+="<td>"+arrayproclistlines[r].COMMAND+"</td>",e+="</tr>"}else if("sortTableCron"==t){e+='<col style="width:175px;">',e+='<col style="width:45px;">',e+='<col style="width:45px;">',e+='<col style="width:45px;">',e+='<col style="width:45px;">',e+='<col style="width:45px;">',e+='<col style="width:740px;">',e+='<thead class="sortTableHeader">',e+="<tr>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Name</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Min</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Hour</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">DayM</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Month</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">DayW</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Command</th>",e+="</tr>",e+="</thead>",e+='<tbody class="sortTableContent">';for(r=0;r<arraycronjobs.length;r++)e+='<tr class="sortRow">',e+="<td>"+arraycronjobs[r].Name+"</td>",e+="<td>"+arraycronjobs[r].Min+"</td>",e+="<td>"+arraycronjobs[r].Hour+"</td>",e+="<td>"+arraycronjobs[r].DayM+"</td>",e+="<td>"+arraycronjobs[r].Month+"</td>",e+="<td>"+arraycronjobs[r].DayW+"</td>",e+="<td>"+arraycronjobs[r].Command+"</td>",e+="</tr>"}return e+="</tbody>",e+="</table>"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(t){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(t){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(t){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(t){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(t,e,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(e/1e3),this.ShowTimedMsg(t,r))},ShowTimedMsg:function(t,e){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(),e?e&&(this.waitMsgBox.innerText=t+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=t+"\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(t,e)}),1e3)},ShowMsg:function(t,e){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=t,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),e)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(t){let e;const r=t.split("\n");e='<div name="alertMsgBox" id="myAlertMsgBox"><div class = "message">';for(var s=0;s<r.length;s++)e+="<p>"+r[s]+"</p>";return e+='</div><div style="text-align:center"><button class="button_gen" id="myAlertBoxOKButton" style="margin-top:15px;" onclick="AlertMsgBox.CloseAlert();">OK</button></div></div>',e},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(t){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(t),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(t,e,r){e?(document.getElementById(t).disabled=!1,document.getElementById(t).title=r,null!=theButtonBackStyle&&(document.getElementById(t).style.background=theButtonBackStyle)):(0==document.getElementById(t).disabled&&(theButtonBackStyle=document.getElementById(t).style.background),document.getElementById(t).disabled=!0,document.getElementById(t).title=r,document.getElementById(t).style.background="grey")}function SetNTPReadyCheckButtonState(t,e){let r;r=t?NTPReadyCheck.buttonHintMsg:e,SetButtonGenState("btnSaveNTPcheck",t,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(t){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(t){let e=t.split("\n");e=e.filter(Boolean);let r,s,a,o,n,i=e.length,l="";for(var c=0;c<i;c++)r=e[c].match(/^NTP_Ready_Check=/),s=e[c].indexOf("#"),-1==s&&null!=r&&(a=e[c].split("="),o=a[0],n=a[1],document.form.scMerlin_NTPcheck.value="ENABLED"==n?"Enable":"Disable");"ENABLED"==n?NTPReadyCheck.showCompletedMsg&&(l=NTPReadyCheck.enabledDoneMsg):"DISABLED"==n&&("ENABLED"==NTPReadyCheck.prevSetting&&NTPReadyCheck.showWarningAlert?l=NTPReadyCheck.disabledAlertMsg:"DISABLED"==NTPReadyCheck.prevSetting&&NTPReadyCheck.showCompletedMsg&&(l=NTPReadyCheck.disabledDoneMsg)),$("#scMerlin_NTPcheck_Status").text("Currently: "+n),WaitMsgPopupBox.CloseMsg(),""!=l&&AlertMsgBox.ShowAlert(l),SetNTPReadyCheckButtonState(!0,null),NTPReadyCheck.prevSetting=n,NTPReadyCheck.showCompletedMsg=!1,NTPReadyCheck.showWarningAlert=!1}})}function Save_NTPReadyCheck_Option(){let t=0,e="",r=document.form.scMerlin_NTPcheck.value,s="start_scmerlin_NTPcheck"+r;"Enable"==r?(NTPReadyCheck.nextSetting="ENABLED",e=NTPReadyCheck.waitToEnableMsg):(NTPReadyCheck.nextSetting="DISABLED",e=NTPReadyCheck.waitToDisableMsg),NTPReadyCheck.showCompletedMsg=!0,NTPReadyCheck.prevSetting==NTPReadyCheck.nextSetting?(t=2e3,NTPReadyCheck.showWarningAlert=!1):(t=4e3,NTPReadyCheck.showWarningAlert=!0),SetNTPReadyCheckButtonState(!1,e),WaitMsgPopupBox.StartMsg(e,8e3,!1),document.formScriptActions.action_script.value=s,document.formScriptActions.submit(),setTimeout(Get_NTPReadyCheck_Option,t)}function load_addonpages(){$.ajax({url:"/ext/scmerlin/addonwebpages.htm",dataType:"text",error:function(t){setTimeout(load_addonpages,1e3)},success:function(t){var e=t.split("\n");e=e.filter(Boolean);for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.NAME=s[0].trim(),a.URL=s[1].trim(),sortedAddonPages.push(a)}catch{}sortedAddonPages=sortedAddonPages.sort((function(t,e){return t.NAME.toLowerCase().localeCompare(e.NAME.toLowerCase())}));var o="";for(r=0;r<sortedAddonPages.length;r++)o+=BuildAddonPageTable(sortedAddonPages[r].NAME,sortedAddonPages[r].URL,r);$("#table_config").after(o),AddEventHandlers()}})}function get_cronlist_file(){$.ajax({url:"/ext/scmerlin/scmcronjobs.htm",dataType:"text",error:function(t){tmout=setTimeout(get_cronlist_file,1e3)},success:function(t){ParseCronJobs(t)}})}function ParseCronJobs(t){var e=t.split("\n");e=e.filter(Boolean),arraycronjobs=[];for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.Name=s[0].trim().replace(/^\"/,"").replace(/\"$/,""),a.Min=s[1].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/,","),a.Hour=s[2].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/,","),a.DayM=s[3].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/,","),a.Month=s[4].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/,","),a.DayW=s[5].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/,","),a.Command=s[6].trim().replace(/^\"/,"").replace(/\"$/,""),arraycronjobs.push(a)}catch{}SortTable("sortTableCron","arraycronjobs",sortnamecron+" "+sortdircron.replace("desc","↑").replace("asc","↓").trim(),"sortnamecron","sortdircron")}function get_proclist_file(){$.ajax({url:"/ext/scmerlin/top.htm",dataType:"text",error:function(t){tmout=setTimeout(get_proclist_file,1e3)},success:function(t){ParseProcList(t),document.getElementById("auto_refresh").checked&&(tmout=setTimeout(get_proclist_file,5e3))}})}function ParseProcList(t){var e=t.split("\n");e=e.filter(Boolean),arrayproclistlines=[];for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.PID=s[0].trim(),a.PPID=s[1].trim(),a.USER=s[2].trim(),a.STAT=s[3].trim(),a.VSZ=s[4].trim(),a.VSZP=s[5].trim(),a.CPU=s[6].trim(),a.CPUP=s[7].trim(),a.COMMAND=s[8].trim(),arrayproclistlines.push(a)}catch{}SortTable("sortTableProcesses","arrayproclistlines",sortnameproc+" "+sortdirproc.replace("desc","↑").replace("asc","↓").trim(),"sortnameproc","sortdirproc")}function GetCookie(t,e){return null!=cookie.get("scm_"+t)?cookie.get("scm_"+t):"string"==e?"":"number"==e?0:void 0}function SetCookie(t,e){cookie.set("scm_"+t,e,3650)}function AddEventHandlers(){$(".collapsible-jquery").off("click").on("click",(function(){$(this).siblings().toggle("fast",(function(){"none"==$(this).css("display")?SetCookie($(this).siblings()[0].id,"collapsed"):(SetCookie($(this).siblings()[0].id,"expanded"),"routermemory"==$(this).siblings()[0].id?(Draw_Chart("MemoryUsage"),0!=parseInt(mem_stats_arr[5])?Draw_Chart("SwapUsage"):Draw_Chart_NoData("SwapUsage","No swap file configured")):"routerstorage"==$(this).siblings()[0].id&&(Draw_Chart("nvramUsage"),Draw_Chart("jffsUsage")))}))})),$(".collapsible-jquery").each((function(t,e){"collapsed"==GetCookie($(this)[0].id,"string")?$(this).siblings().toggle(!1):$(this).siblings().toggle(!0)})),$("#auto_refresh").off("click").on("click",(function(){ToggleRefresh()}))}function SortTable(tableid,arrayid,sorttext,sortname,sortdir){window[sortname]=sorttext.replace("↑","").replace("↓","").trim();var sorttype="number",sortfield=window[sortname];switch(window[sortname]){case"VSZ%":sortfield="VSZP";break;case"CPU%":sortfield="CPUP";break;case"USER":case"STAT":case"COMMAND":case"Name":case"Command":sorttype="string";break}"string"==sorttype?-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => (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(t,e){e.innerHTML==window[sortname]&&("asc"==window[sortdir]?e.innerHTML=window[sortname]+" ↑":e.innerHTML=window[sortname]+" ↓")}))}function getNum(t){if(isNaN(t)){if("*"==t)return-10;if(-1!=t.indexOf("*/"))return-5;if(-1!=t.indexOf("/"))return t.split("/")[0];if("Sun"==t)return 0;if("Mon"==t)return 1;if("Tue"==t)return 2;if("Wed"==t)return 3;if("Thu"==t)return 4;if("Fri"==t)return 5;if("Sat"==t)return 6}return t}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(t,e,r){var s="";if(0==r&&(s+='<div style="line-height:10px;">&nbsp;</div>',s+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_services">',s+='<thead class="collapsible-jquery" id="addonpages">',s+='<tr><td colspan="4">WebUI Addons (click to expand/collapse)</td></tr>',s+="</thead>"),0!=r&&r%4!=0||(s+="<tr>"),s+='<td class="addonpageurl"><a href="'+e.substring(e.lastIndexOf("/")+1)+'">'+t+'</a><br /><span class="addonpageurl">'+e.substring(e.lastIndexOf("/")+1)+"</span></td>",r>0&&(r+1)%4==0&&(s+="</tr>"),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,o=0;o<a;o++)s+='<td class="addonpageurl"></td>';s+="</tr>"}s+="</table>"}return s}function BuildServiceTable(t,e,r,s){var a="";return 0==s&&(a+='<div style="line-height:10px;">&nbsp;</div>',a+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_services">',a+='<thead class="collapsible-jquery" id="servicescontrol">',a+='<tr><td colspan="4">Services (click to expand/collapse)</td></tr>',a+="</thead>"),0!=s&&s%2!=0||(a+="<tr>"),a+=r?'<td class="servicename">'+e+' <span class="settingname">('+t+")</span></td>":'<td class="servicename">'+e+"</td>",a+='<td class="servicevalue">',a+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+(t=t.replace("/",""))+'\');" value="Restart" id="btnRestartSrv_'+t+'">',a+='<span id="txtRestartSrv_'+t+'" style="display:none;" class="servicespan">Done</span>',a+='<span id="txtRestartSrvError_'+t+'" style="display:none;" class="servicespan">Invalid - service disabled</span>',a+='<img id="imgRestartSrv_'+t+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',a+="</td>",s>0&&(s+1)%2==0&&(a+="</tr>"),s==srvnamelist.length-1&&(a+="</table>"),a}function BuildVPNClientTable(loopindex){var vpnclientshtml="",vpnclientname="vpnclient"+loopindex,vpnclientdesc=eval("document.form.vpnc"+loopindex+"_desc").value;return 1==loopindex&&(vpnclientshtml+='<div style="line-height:10px;">&nbsp;</div>',vpnclientshtml+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_vpnclients">',vpnclientshtml+='<thead class="collapsible-jquery" id="vpnclientscontrol">',vpnclientshtml+='<tr><td colspan="4">VPN Clients (click to expand/collapse)</td></tr>',vpnclientshtml+="</thead>"),1!=loopindex&&(loopindex+1)%2!=0||(vpnclientshtml+="<tr>"),vpnclientshtml+='<td class="servicename">VPN Client '+loopindex,vpnclientshtml+='<br /><span class="settingname">('+vpnclientdesc+")</span></td>",vpnclientshtml+='<td class="servicevalue">',vpnclientshtml+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+vpnclientname+'\');" value="Restart" id="btnRestartSrv_'+vpnclientname+'">',vpnclientshtml+='<span id="txtRestartSrv_'+vpnclientname+'" style="display:none;" class="servicespan">Done</span>',vpnclientshtml+='<span id="txtRestartSrvError_'+vpnclientname+'" style="display:none;" class="servicespan">Invalid - VPN Client disabled</span>',vpnclientshtml+='<img id="imgRestartSrv_'+vpnclientname+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',vpnclientshtml+="</td>",5==loopindex&&(vpnclientshtml+='<td class="servicename"></td><td class="servicevalue"></td>'),loopindex>1&&loopindex%2==0&&(vpnclientshtml+="</tr>"),5==loopindex&&(vpnclientshtml+="</table>"),vpnclientshtml}function BuildVPNServerTable(t){var e="",r="vpnserver"+t;return 1==t&&(e+='<div style="line-height:10px;">&nbsp;</div>',e+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_vpnservers">',e+='<thead class="collapsible-jquery" id="vpnserverscontrol">',e+='<tr><td colspan="4">VPN Servers (click to expand/collapse)</td></tr>',e+="</thead>",e+="<tr>"),e+='<td class="servicename">VPN Server '+t+"</td>",e+='<td class="servicevalue">',e+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+r+'\');" value="Restart" id="btnRestartSrv_'+r+'">',e+='<span id="txtRestartSrv_'+r+'" style="display:none;" class="servicespan">Done</span>',e+='<span id="txtRestartSrvError_'+r+'" style="display:none;" class="servicespan">Invalid - VPN Server disabled</span>',e+='<img id="imgRestartSrv_'+r+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',e+="</td>",2==t&&(e+="</tr>",e+="</table>"),e}function round(t,e){return Number(Math.round(t+"e"+e)+"e-"+e)}function Draw_Chart_NoData(t,e){document.getElementById("canvasChart"+t).width="265",document.getElementById("canvasChart"+t).height="250",document.getElementById("canvasChart"+t).style.width="265px",document.getElementById("canvasChart"+t).style.height="250px";var r=document.getElementById("canvasChart"+t).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(e,135,125),r.restore()}function Draw_Chart(t){var e=[],r=[],s=[],a="",o="";"MemoryUsage"==t?(e=[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",o="MB"):"SwapUsage"==t?(e=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",o="MB"):"nvramUsage"==t?(e=[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",o="KB"):"jffsUsage"==t&&(e=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",o="MB");var n=window["Chart"+t];null!=n&&n.destroy();var i=document.getElementById("canvasChart"+t).getContext("2d");n=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(t,e){return e.labels[t[0].index]},label:function(t,e){return round(e.datasets[t.datasetIndex].data[t.index],2).toFixed(2)+" "+o}},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:e,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+t]=n}
+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(t,e){return e};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());for(var t="",e=1;e<3;e++)t+=BuildVPNServerTable(e);$("#table_config").after(t);var r="";for(e=1;e<6;e++)r+=BuildVPNClientTable(e);$("#table_config").after(r);var s="";for(e=0;e<srvnamelist.length;e++)s+=BuildServiceTable(srvnamelist[e],srvdesclist[e],srvnamevisiblelist[e],e);$("#table_config").after(s),document.formScriptActions.action_script.value="start_scmerlingetaddonpages;start_scmerlingetcronjobs",document.formScriptActions.submit(),setTimeout(load_addonpages,5e3),setTimeout(get_cronlist_file,5e3),get_proclist_file(),Get_NTPWatchdogEnabled_File(),Get_NTPReadyCheck_Option(),Get_DNSmasqWatchdogEnabled_File(),update_temperatures(),update_sysinfo(),ScriptUpdateLayout(),AddEventHandlers()}function ScriptUpdateLayout(){var t=GetVersionNumber("local"),e=GetVersionNumber("server");$("#scmerlin_version_local").text(t),t!=e&&"N/A"!=e&&($("#scmerlin_version_server").text("Updated version available: "+e),showhide("btnChkUpdate",!1),showhide("scmerlin_version_server",!0),showhide("btnDoUpdate",!0))}function reload(){location.reload(!0)}function update_status(){$.ajax({url:"/ext/scmerlin/detect_update.js",dataType:"script",error:function(t){setTimeout(update_status,1e3)},success:function(){"InProgress"==updatestatus?setTimeout(update_status,1e3):(document.getElementById("imgChkUpdate").style.display="none",showhide("scmerlin_version_server",!0),"None"!=updatestatus?($("#scmerlin_version_server").text("Updated version available: "+updatestatus),showhide("btnChkUpdate",!1),showhide("btnDoUpdate",!0)):($("#scmerlin_version_server").text("No update available"),showhide("btnChkUpdate",!0),showhide("btnDoUpdate",!1)))}})}function CheckUpdate(){showhide("btnChkUpdate",!1),document.formScriptActions.action_script.value="start_scmerlincheckupdate",document.formScriptActions.submit(),document.getElementById("imgChkUpdate").style.display="",setTimeout(update_status,2e3)}function DoUpdate(){document.form.action_script.value="start_scmerlindoupdate",document.form.action_wait.value=15,$("#auto_refresh").prop("checked",!1),null!=tmout&&clearTimeout(tmout),showLoading(),document.form.submit()}function RestartService(t){showhide("btnRestartSrv_"+t,!1),showhide("txtRestartSrv_"+t,!1),document.formScriptActions.action_script.value="start_scmerlinservicerestart"+t,document.formScriptActions.submit(),document.getElementById("imgRestartSrv_"+t).style.display="",setTimeout(service_status,1e3,t)}function service_status(t){$.ajax({url:"/ext/scmerlin/detect_service.js",dataType:"script",error:function(e){setTimeout(service_status,1e3,t)},success:function(){"InProgress"==servicestatus?setTimeout(service_status,1e3,t):(document.getElementById("imgRestartSrv_"+t).style.display="none","Done"==servicestatus?(showhide("txtRestartSrv_"+t,!0),setTimeout(showhide,3e3,"txtRestartSrv_"+t,!1),setTimeout(showhide,3250,"btnRestartSrv_"+t,!0)):showhide("txtRestartSrvError_"+t,!0))}})}function GetVersionNumber(t){var e;return"local"==t?e=custom_settings.scmerlin_version_local:"server"==t&&(e=custom_settings.scmerlin_version_server),void 0===e||null==e?"N/A":e}function BuildSortTableHtmlNoData(){return"<tr>",'<td colspan="3" class="nodata">',"Data loading...","</td>","</tr>","</table>",'<table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" bordercolor="#6b8fa3" class="sortTable"><tr><td colspan="3" class="nodata">Data loading...</td></tr></table>'}function BuildSortTableHtml(t){var e='<table border="0" cellpadding="0" cellspacing="0" width="100%" class="sortTable">';if("sortTableProcesses"==t){e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:75px;">',e+='<col style="width:50px;">',e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:50px;">',e+='<col style="width:55px;">',e+='<col style="width:740px;">',e+='<thead class="sortTableHeader">',e+="<tr>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">PID</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">PPID</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">USER</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">STAT</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">VSZ</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">VSZ%</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">CPU</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">CPU%</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableProcesses','arrayproclistlines',this.innerHTML,'sortnameproc','sortdirproc')\">COMMAND</th>",e+="</tr>",e+="</thead>",e+='<tbody class="sortTableContent">';for(var r=0;r<arrayproclistlines.length;r++)e+='<tr class="sortRow">',e+="<td>"+arrayproclistlines[r].PID+"</td>",e+="<td>"+arrayproclistlines[r].PPID+"</td>",e+="<td>"+arrayproclistlines[r].USER+"</td>",e+="<td>"+arrayproclistlines[r].STAT+"</td>",e+="<td>"+arrayproclistlines[r].VSZ+"</td>",e+="<td>"+arrayproclistlines[r].VSZP+"</td>",e+="<td>"+arrayproclistlines[r].CPU+"</td>",e+="<td>"+arrayproclistlines[r].CPUP+"</td>",e+="<td>"+arrayproclistlines[r].COMMAND+"</td>",e+="</tr>"}else if("sortTableCron"==t){e+='<col style="width:175px;">',e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:55px;">',e+='<col style="width:740px;">',e+='<thead class="sortTableHeader">',e+="<tr>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Name</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Min</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Hour</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">DayM</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Month</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">DayW</th>",e+="<th class=\"sortable\" onclick=\"SortTable('sortTableCron','arraycronjobs',this.innerHTML,'sortnamecron','sortdircron')\">Command</th>",e+="</tr>",e+="</thead>",e+='<tbody class="sortTableContent">';for(r=0;r<arraycronjobs.length;r++)e+='<tr class="sortRow">',e+="<td>"+arraycronjobs[r].Name+"</td>",e+="<td>"+arraycronjobs[r].Min+"</td>",e+="<td>"+arraycronjobs[r].Hour+"</td>",e+="<td>"+arraycronjobs[r].DayM+"</td>",e+="<td>"+arraycronjobs[r].Month+"</td>",e+="<td>"+arraycronjobs[r].DayW+"</td>",e+="<td>"+arraycronjobs[r].Command+"</td>",e+="</tr>"}return e+="</tbody>",e+="</table>"}function Get_NTPWatchdogEnabled_File(){$.ajax({url:"/ext/scmerlin/watchdogenabled.htm",dataType:"text",error:function(t){document.form.scMerlin_NTPwatchdog.value="Disable",$("#scMerlin_NTPwatchdog_Status").text("Currently: DISABLED")},success:function(t){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(t){document.form.scMerlin_DNSmasqWatchdog.value="Disable",$("#scMerlin_DNSmasqWatchdog_Status").text("Currently: DISABLED")},success:function(t){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(t,e,r){this.waitTimerOn||(this.waitTimerOn=!0,this.waitCounter=0,this.waitMsgTemp="",this.waitMaxSecs=Math.round(e/1e3),this.ShowTimedMsg(t,r))},ShowTimedMsg:function(t,e){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(),e?e&&(this.waitMsgBox.innerText=t+` [${r}]`):(0==this.waitCounter?this.waitMsgTemp=t+"\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(t,e)}),1e3)},ShowMsg:function(t,e){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=t,this.waitMsgBox.showModal(),setTimeout((function(){WaitMsgPopupBox.waitMsgBox.close()}),e)}},AlertMsgBox={alertMsgBox:null,alertMsgBoxID:"myAlertMsgPopupBoxID",BuildAlertBox:function(t){let e;const r=t.split("\n");e='<div name="alertMsgBox" id="myAlertMsgBox"><div class = "message">';for(var s=0;s<r.length;s++)e+="<p>"+r[s]+"</p>";return e+='</div><div style="text-align:center"><button class="button_gen" id="myAlertBoxOKButton" style="margin-top:15px;" onclick="AlertMsgBox.CloseAlert();">OK</button></div></div>',e},CloseAlert:function(){null!=this.alertMsgBox&&this.alertMsgBox.close()},ShowAlert:function(t){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(t),this.alertMsgBox.showModal()}};var theButtonBackStyle=null;function SetButtonGenState(t,e,r){e?(document.getElementById(t).disabled=!1,document.getElementById(t).title=r,null!=theButtonBackStyle&&(document.getElementById(t).style.background=theButtonBackStyle)):(0==document.getElementById(t).disabled&&(theButtonBackStyle=document.getElementById(t).style.background),document.getElementById(t).disabled=!0,document.getElementById(t).title=r,document.getElementById(t).style.background="grey")}function SetNTPReadyCheckButtonState(t,e){let r;r=t?NTPReadyCheck.buttonHintMsg:e,SetButtonGenState("btnSaveNTPcheck",t,r)}function Get_NTPReadyCheck_Option(){$.ajax({url:"/ext/scmerlin/NTP_Ready_Config.htm",dataType:"text",error:function(t){document.form.scMerlin_NTPcheck.value="Disable",NTPReadyCheck.prevOptionValue="DISABLED",WaitMsgPopupBox.CloseMsg(),SetNTPReadyCheckButtonState(!0,null),$("#scMerlin_NTPcheck_Status").text("Currently: DISABLED")},success:function(t){let e=t.split("\n");e=e.filter(Boolean);let r,s,a,o,n,i=e.length,l="";for(var c=0;c<i;c++)r=e[c].match(/^NTP_Ready_Check=/),s=e[c].indexOf("#"),-1==s&&null!=r&&(a=e[c].split("="),o=a[0],n=a[1],document.form.scMerlin_NTPcheck.value="ENABLED"==n?"Enable":"Disable");"ENABLED"==n?NTPReadyCheck.showCompletedMsg&&(l=NTPReadyCheck.enabledDoneMsg):"DISABLED"==n&&("ENABLED"==NTPReadyCheck.prevSetting&&NTPReadyCheck.showWarningAlert?l=NTPReadyCheck.disabledAlertMsg:"DISABLED"==NTPReadyCheck.prevSetting&&NTPReadyCheck.showCompletedMsg&&(l=NTPReadyCheck.disabledDoneMsg)),$("#scMerlin_NTPcheck_Status").text("Currently: "+n),WaitMsgPopupBox.CloseMsg(),""!=l&&AlertMsgBox.ShowAlert(l),SetNTPReadyCheckButtonState(!0,null),NTPReadyCheck.prevSetting=n,NTPReadyCheck.showCompletedMsg=!1,NTPReadyCheck.showWarningAlert=!1}})}function Save_NTPReadyCheck_Option(){let t=0,e="",r=document.form.scMerlin_NTPcheck.value,s="start_scmerlin_NTPcheck"+r;"Enable"==r?(NTPReadyCheck.nextSetting="ENABLED",e=NTPReadyCheck.waitToEnableMsg):(NTPReadyCheck.nextSetting="DISABLED",e=NTPReadyCheck.waitToDisableMsg),NTPReadyCheck.showCompletedMsg=!0,NTPReadyCheck.prevSetting==NTPReadyCheck.nextSetting?(t=2e3,NTPReadyCheck.showWarningAlert=!1):(t=4e3,NTPReadyCheck.showWarningAlert=!0),SetNTPReadyCheckButtonState(!1,e),WaitMsgPopupBox.StartMsg(e,8e3,!1),document.formScriptActions.action_script.value=s,document.formScriptActions.submit(),setTimeout(Get_NTPReadyCheck_Option,t)}function load_addonpages(){$.ajax({url:"/ext/scmerlin/addonwebpages.htm",dataType:"text",error:function(t){setTimeout(load_addonpages,1e3)},success:function(t){var e=t.split("\n");e=e.filter(Boolean);for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.NAME=s[0].trim(),a.URL=s[1].trim(),sortedAddonPages.push(a)}catch{}sortedAddonPages=sortedAddonPages.sort((function(t,e){return t.NAME.toLowerCase().localeCompare(e.NAME.toLowerCase())}));var o="";for(r=0;r<sortedAddonPages.length;r++)o+=BuildAddonPageTable(sortedAddonPages[r].NAME,sortedAddonPages[r].URL,r);$("#table_config").after(o),AddEventHandlers()}})}function get_cronlist_file(){$.ajax({url:"/ext/scmerlin/scmcronjobs.htm",dataType:"text",error:function(t){tmout=setTimeout(get_cronlist_file,1e3)},success:function(t){ParseCronJobs(t)}})}function ParseCronJobs(t){var e=t.split("\n");e=e.filter(Boolean),arraycronjobs=[];for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.Name=s[0].trim().replace(/^\"/,"").replace(/\"$/,""),a.Min=s[1].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/g,","),a.Hour=s[2].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/g,","),a.DayM=s[3].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/g,","),a.Month=s[4].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/g,","),a.DayW=s[5].trim().replace(/^\"/,"").replace(/\"$/,"").replace(/\|/g,","),a.Command=s[6].trim().replace(/^\"/,"").replace(/\"$/,""),arraycronjobs.push(a)}catch{}SortTable("sortTableCron","arraycronjobs",sortnamecron+" "+sortdircron.replace("desc","↑").replace("asc","↓").trim(),"sortnamecron","sortdircron")}function get_proclist_file(){$.ajax({url:"/ext/scmerlin/top.htm",dataType:"text",error:function(t){tmout=setTimeout(get_proclist_file,1e3)},success:function(t){ParseProcList(t),document.getElementById("auto_refresh").checked&&(tmout=setTimeout(get_proclist_file,5e3))}})}function ParseProcList(t){var e=t.split("\n");e=e.filter(Boolean),arrayproclistlines=[];for(var r=0;r<e.length;r++)try{var s=e[r].split(","),a=new Object;a.PID=s[0].trim(),a.PPID=s[1].trim(),a.USER=s[2].trim(),a.STAT=s[3].trim(),a.VSZ=s[4].trim(),a.VSZP=s[5].trim(),a.CPU=s[6].trim(),a.CPUP=s[7].trim(),a.COMMAND=s[8].trim(),arrayproclistlines.push(a)}catch{}SortTable("sortTableProcesses","arrayproclistlines",sortnameproc+" "+sortdirproc.replace("desc","↑").replace("asc","↓").trim(),"sortnameproc","sortdirproc")}function GetCookie(t,e){return null!=cookie.get("scm_"+t)?cookie.get("scm_"+t):"string"==e?"":"number"==e?0:void 0}function SetCookie(t,e){cookie.set("scm_"+t,e,3650)}function AddEventHandlers(){$(".collapsible-jquery").off("click").on("click",(function(){$(this).siblings().toggle("fast",(function(){"none"==$(this).css("display")?SetCookie($(this).siblings()[0].id,"collapsed"):(SetCookie($(this).siblings()[0].id,"expanded"),"routermemory"==$(this).siblings()[0].id?(Draw_Chart("MemoryUsage"),0!=parseInt(mem_stats_arr[5])?Draw_Chart("SwapUsage"):Draw_Chart_NoData("SwapUsage","No swap file configured")):"routerstorage"==$(this).siblings()[0].id&&(Draw_Chart("nvramUsage"),Draw_Chart("jffsUsage")))}))})),$(".collapsible-jquery").each((function(t,e){"collapsed"==GetCookie($(this)[0].id,"string")?$(this).siblings().toggle(!1):$(this).siblings().toggle(!0)})),$("#auto_refresh").off("click").on("click",(function(){ToggleRefresh()}))}function SortTable(tableid,arrayid,sorttext,sortname,sortdir){window[sortname]=sorttext.replace("↑","").replace("↓","").trim();var sorttype="number",sortfield=window[sortname];switch(window[sortname]){case"VSZ%":sortfield="VSZP";break;case"CPU%":sortfield="CPUP";break;case"USER":case"STAT":case"COMMAND":case"Name":case"Command":sorttype="string";break}"string"==sorttype?-1==sorttext.indexOf("↓")&&-1==sorttext.indexOf("↑")||-1!=sorttext.indexOf("↓")?(eval(arrayid+" = "+arrayid+".sort((a,b) => (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(t,e){e.innerHTML==window[sortname]&&("asc"==window[sortdir]?e.innerHTML=window[sortname]+" ↑":e.innerHTML=window[sortname]+" ↓")}))}function getNum(t){if(isNaN(t)){if("*"==t)return-10;if(-1!=t.indexOf("*/"))return-5;if(-1!=t.indexOf("/"))return t.split("/")[0];if("Sun"==t)return 0;if("Mon"==t)return 1;if("Tue"==t)return 2;if("Wed"==t)return 3;if("Thu"==t)return 4;if("Fri"==t)return 5;if("Sat"==t)return 6}return t}function ToggleRefresh(){1==$("#auto_refresh").prop("checked")?get_proclist_file():null!=tmout&&clearTimeout(tmout)}function BuildAddonPageTable(t,e,r){var s="";if(0==r&&(s+='<div style="line-height:10px;">&nbsp;</div>',s+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_services">',s+='<thead class="collapsible-jquery" id="addonpages">',s+='<tr><td colspan="4">WebUI Addons (click to expand/collapse)</td></tr>',s+="</thead>"),0!=r&&r%4!=0||(s+="<tr>"),s+='<td class="addonpageurl"><a href="'+e.substring(e.lastIndexOf("/")+1)+'">'+t+'</a><br /><span class="addonpageurl">'+e.substring(e.lastIndexOf("/")+1)+"</span></td>",r>0&&(r+1)%4==0&&(s+="</tr>"),r==sortedAddonPages.length-1){if(sortedAddonPages.length%4!=0){for(var a=4-sortedAddonPages.length%4,o=0;o<a;o++)s+='<td class="addonpageurl"></td>';s+="</tr>"}s+="</table>"}return s}function BuildServiceTable(t,e,r,s){var a="";return 0==s&&(a+='<div style="line-height:10px;">&nbsp;</div>',a+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_services">',a+='<thead class="collapsible-jquery" id="servicescontrol">',a+='<tr><td colspan="4">Services (click to expand/collapse)</td></tr>',a+="</thead>"),0!=s&&s%2!=0||(a+="<tr>"),a+=r?'<td class="servicename">'+e+' <span class="settingname">('+t+")</span></td>":'<td class="servicename">'+e+"</td>",a+='<td class="servicevalue">',a+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+(t=t.replace("/",""))+'\');" value="Restart" id="btnRestartSrv_'+t+'">',a+='<span id="txtRestartSrv_'+t+'" style="display:none;" class="servicespan">Done</span>',a+='<span id="txtRestartSrvError_'+t+'" style="display:none;" class="servicespan">Invalid - service disabled</span>',a+='<img id="imgRestartSrv_'+t+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',a+="</td>",s>0&&(s+1)%2==0&&(a+="</tr>"),s==srvnamelist.length-1&&(a+="</table>"),a}function BuildVPNClientTable(loopindex){var vpnclientshtml="",vpnclientname="vpnclient"+loopindex,vpnclientdesc=eval("document.form.vpnc"+loopindex+"_desc").value;return 1==loopindex&&(vpnclientshtml+='<div style="line-height:10px;">&nbsp;</div>',vpnclientshtml+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_vpnclients">',vpnclientshtml+='<thead class="collapsible-jquery" id="vpnclientscontrol">',vpnclientshtml+='<tr><td colspan="4">VPN Clients (click to expand/collapse)</td></tr>',vpnclientshtml+="</thead>"),1!=loopindex&&(loopindex+1)%2!=0||(vpnclientshtml+="<tr>"),vpnclientshtml+='<td class="servicename">VPN Client '+loopindex,vpnclientshtml+='<br /><span class="settingname">('+vpnclientdesc+")</span></td>",vpnclientshtml+='<td class="servicevalue">',vpnclientshtml+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+vpnclientname+'\');" value="Restart" id="btnRestartSrv_'+vpnclientname+'">',vpnclientshtml+='<span id="txtRestartSrv_'+vpnclientname+'" style="display:none;" class="servicespan">Done</span>',vpnclientshtml+='<span id="txtRestartSrvError_'+vpnclientname+'" style="display:none;" class="servicespan">Invalid - VPN Client disabled</span>',vpnclientshtml+='<img id="imgRestartSrv_'+vpnclientname+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',vpnclientshtml+="</td>",5==loopindex&&(vpnclientshtml+='<td class="servicename"></td><td class="servicevalue"></td>'),loopindex>1&&loopindex%2==0&&(vpnclientshtml+="</tr>"),5==loopindex&&(vpnclientshtml+="</table>"),vpnclientshtml}function BuildVPNServerTable(t){var e="",r="vpnserver"+t;return 1==t&&(e+='<div style="line-height:10px;">&nbsp;</div>',e+='<table width="100%" border="1" align="center" cellpadding="2" cellspacing="0" bordercolor="#6b8fa3" class="FormTable SettingsTable" style="border:0px;" id="table_vpnservers">',e+='<thead class="collapsible-jquery" id="vpnserverscontrol">',e+='<tr><td colspan="4">VPN Servers (click to expand/collapse)</td></tr>',e+="</thead>",e+="<tr>"),e+='<td class="servicename">VPN Server '+t+"</td>",e+='<td class="servicevalue">',e+='<input type="button" class="button_gen restartbutton" onclick="RestartService(\''+r+'\');" value="Restart" id="btnRestartSrv_'+r+'">',e+='<span id="txtRestartSrv_'+r+'" style="display:none;" class="servicespan">Done</span>',e+='<span id="txtRestartSrvError_'+r+'" style="display:none;" class="servicespan">Invalid - VPN Server disabled</span>',e+='<img id="imgRestartSrv_'+r+'" style="display:none;vertical-align:middle;" src="images/InternetScan.gif"/>',e+="</td>",2==t&&(e+="</tr>",e+="</table>"),e}function round(t,e){return Number(Math.round(t+"e"+e)+"e-"+e)}function Draw_Chart_NoData(t,e){document.getElementById("canvasChart"+t).width="265",document.getElementById("canvasChart"+t).height="250",document.getElementById("canvasChart"+t).style.width="265px",document.getElementById("canvasChart"+t).style.height="250px";var r=document.getElementById("canvasChart"+t).getContext("2d");r.save(),r.textAlign="center",r.textBaseline="middle",r.font="normal normal bolder 22px Arial",r.fillStyle="white",r.fillText(e,135,125),r.restore()}function Draw_Chart(t){var e=[],r=[],s=[],a="",o="";"MemoryUsage"==t?(e=[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",o="MB"):"SwapUsage"==t?(e=[mem_stats_arr[4],1*mem_stats_arr[5]-1*mem_stats_arr[4]],r=["Used","Free"],s=["#135fee","#1aa658"],a="Swap Usage",o="MB"):"nvramUsage"==t?(e=[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",o="KB"):"jffsUsage"==t&&(e=[jffs_Used,jffs_Free],r=["Used","Free"],s=["#135fee","#1aa658"],a="JFFS Usage",o="MB");var n=window["Chart"+t];null!=n&&n.destroy();var i=document.getElementById("canvasChart"+t).getContext("2d");n=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(t,e){return e.labels[t[0].index]},label:function(t,e){return round(e.datasets[t.datasetIndex].data[t.index],2).toFixed(2)+" "+o}},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:e,borderWidth:1,backgroundColor:s,borderColor:"#000000"}]}}),window["Chart"+t]=n}
 
 </script>
 </head>
diff --git a/scmerlin_www.js b/scmerlin_www.js
index b7eb226..ba431a2 100644
--- a/scmerlin_www.js
+++ b/scmerlin_www.js
@@ -200,18 +200,23 @@ function BuildSortTableHtmlNoData(){
 	return tablehtml;
 }
 
-function BuildSortTableHtml(type) {
+/**----------------------------------------**/
+/** Modified by Martinski W. [2024-Sep-29] **/
+/**----------------------------------------**/
+function BuildSortTableHtml(type)
+{
 	var tablehtml = '<table border="0" cellpadding="0" cellspacing="0" width="100%" class="sortTable">';
-	if(type == 'sortTableProcesses'){
-		tablehtml += '<col style="width:50px;">';
-		tablehtml += '<col style="width:50px;">';
-		tablehtml += '<col style="width:75px;">';
-		tablehtml += '<col style="width:50px;">';
-		tablehtml += '<col style="width:50px;">';
-		tablehtml += '<col style="width:55px;">';
-		tablehtml += '<col style="width:50px;">';
-		tablehtml += '<col style="width:55px;">';
-		tablehtml += '<col style="width:740px;">';
+	if (type == 'sortTableProcesses')
+	{
+		tablehtml += '<col style="width:55px;">';   /**PID**/
+		tablehtml += '<col style="width:55px;">';   /**PPID**/
+		tablehtml += '<col style="width:75px;">';   /**USER**/
+		tablehtml += '<col style="width:50px;">';   /**STAT**/
+		tablehtml += '<col style="width:55px;">';   /**VSZ**/
+		tablehtml += '<col style="width:55px;">';   /**VSZ%**/
+		tablehtml += '<col style="width:50px;">';   /**CPU**/
+		tablehtml += '<col style="width:55px;">';   /**CPU%**/
+		tablehtml += '<col style="width:740px;">';  /**COMMAND**/
 		tablehtml += '<thead class="sortTableHeader">';
 		tablehtml += '<tr>';
 		tablehtml += '<th class="sortable" onclick="SortTable(\'sortTableProcesses\',\'arrayproclistlines\',this.innerHTML,\'sortnameproc\',\'sortdirproc\')">PID</th>';
@@ -227,7 +232,8 @@ function BuildSortTableHtml(type) {
 		tablehtml += '</thead>';
 		tablehtml += '<tbody class="sortTableContent">';
 		
-		for(var i = 0; i < arrayproclistlines.length; i++){
+		for (var i = 0; i < arrayproclistlines.length; i++)
+		{
 			tablehtml += '<tr class="sortRow">';
 			tablehtml += '<td>'+arrayproclistlines[i].PID+'</td>';
 			tablehtml += '<td>'+arrayproclistlines[i].PPID+'</td>';
@@ -241,14 +247,15 @@ function BuildSortTableHtml(type) {
 			tablehtml += '</tr>';
 		}
 	}
-	else if(type == 'sortTableCron'){
-		tablehtml += '<col style="width:175px;">';
-		tablehtml += '<col style="width:45px;">';
-		tablehtml += '<col style="width:45px;">';
-		tablehtml += '<col style="width:45px;">';
-		tablehtml += '<col style="width:45px;">';
-		tablehtml += '<col style="width:45px;">';
-		tablehtml += '<col style="width:740px;">';
+	else if (type == 'sortTableCron')
+	{
+		tablehtml += '<col style="width:175px;">';  /**Name**/
+		tablehtml += '<col style="width:55px;">';   /**Min**/
+		tablehtml += '<col style="width:55px;">';   /**Hour**/
+		tablehtml += '<col style="width:55px;">';   /**DayM**/
+		tablehtml += '<col style="width:55px;">';   /**Month**/
+		tablehtml += '<col style="width:55px;">';   /**DayW**/
+		tablehtml += '<col style="width:740px;">';  /**Command**/
 		tablehtml += '<thead class="sortTableHeader">';
 		tablehtml += '<tr>';
 		tablehtml += '<th class="sortable" onclick="SortTable(\'sortTableCron\',\'arraycronjobs\',this.innerHTML,\'sortnamecron\',\'sortdircron\')">Name</th>';
@@ -262,7 +269,8 @@ function BuildSortTableHtml(type) {
 		tablehtml += '</thead>';
 		tablehtml += '<tbody class="sortTableContent">';
 		
-		for(var i = 0; i < arraycronjobs.length; i++){
+		for (var i = 0; i < arraycronjobs.length; i++)
+		{
 			tablehtml += '<tr class="sortRow">';
 			tablehtml += '<td>'+arraycronjobs[i].Name+'</td>';
 			tablehtml += '<td>'+arraycronjobs[i].Min+'</td>';
@@ -668,21 +676,26 @@ function get_cronlist_file(){
 	});
 }
 
-function ParseCronJobs(data){
+/**----------------------------------------**/
+/** Modified by Martinski W. [2024-Sep-29] **/
+/**----------------------------------------**/
+function ParseCronJobs(data)
+{
 	var cronjobs = data.split('\n');
 	cronjobs = cronjobs.filter(Boolean);
 	arraycronjobs = [];
-	
-	for(var i = 0; i < cronjobs.length; i++){
+
+	for (var i = 0; i < cronjobs.length; i++)
+	{
 		try{
 			var cronfields = cronjobs[i].split(',');
 			var parsedcronline = new Object();
 			parsedcronline.Name = cronfields[0].trim().replace(/^\"/,'').replace(/\"$/,'');
-			parsedcronline.Min = cronfields[1].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/,',');
-			parsedcronline.Hour = cronfields[2].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/,',');
-			parsedcronline.DayM = cronfields[3].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/,',');
-			parsedcronline.Month = cronfields[4].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/,',');
-			parsedcronline.DayW = cronfields[5].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/,',');
+			parsedcronline.Min = cronfields[1].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/g,',');
+			parsedcronline.Hour = cronfields[2].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/g,',');
+			parsedcronline.DayM = cronfields[3].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/g,',');
+			parsedcronline.Month = cronfields[4].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/g,',');
+			parsedcronline.DayW = cronfields[5].trim().replace(/^\"/,'').replace(/\"$/,'').replace(/\|/g,',');
 			parsedcronline.Command = cronfields[6].trim().replace(/^\"/,'').replace(/\"$/,'');
 			arraycronjobs.push(parsedcronline);
 		}
@@ -690,7 +703,7 @@ function ParseCronJobs(data){
 			//do nothing,continue
 		}
 	}
-	
+
 	SortTable('sortTableCron','arraycronjobs',sortnamecron+' '+sortdircron.replace('desc','↑').replace('asc','↓').trim(),'sortnamecron','sortdircron');
 }