From be4854f6b258f19ef422350ee3f41f8227d12089 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Mon, 20 Jan 2025 21:32:26 -0800
Subject: [PATCH 1/4] More Code Improvements & Fixes

Modifications to avoid creating WebGUI-related directories & files on AiMesh nodes.
---
 MerlinAU.sh | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index 8e5e7a7c..d19f4029 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -2047,7 +2047,7 @@ _SetVersionSharedSettings_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-05] ##
+## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
 _CreateDirPaths_()
 {
@@ -2056,6 +2056,8 @@ _CreateDirPaths_()
       mkdir -p "$SETTINGS_DIR"
       chmod 755 "$SETTINGS_DIR"
    fi
+   ! "$inRouterSWmode" && return 0
+
    if [ ! -d "$SCRIPT_WEB_DIR" ]
    then
       mkdir -p "$SCRIPT_WEB_DIR"
@@ -2064,21 +2066,28 @@ _CreateDirPaths_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-15] ##
+## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
 _CreateSymLinks_()
 {
-   rm -rf "${SCRIPT_WEB_DIR:?}/"* 2>/dev/null
+   if [ -d "$SCRIPT_WEB_DIR" ]
+   then
+       rm -rf "${SCRIPT_WEB_DIR:?}/"* 2>/dev/null
+   fi
+   ! "$inRouterSWmode" && return 0
+
    ln -s "$CONFIG_FILE" "${SCRIPT_WEB_DIR}/config.htm" 2>/dev/null
    ln -s "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/CheckHelper.js" 2>/dev/null
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2025-Jan-15] ##
-##-------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Jan-20] ##
+##----------------------------------------##
 _InitHelperJSFile_()
 {
-   [ -s "$HELPER_JSFILE" ] && return 0 
+   ! "$inRouterSWmode" && return 0
+
+   [ ! -s "$HELPER_JSFILE" ] && \
    {
      echo "var externalCheckID = 0x00;"
      echo "var externalCheckOK = true;"
@@ -2086,12 +2095,14 @@ _InitHelperJSFile_()
    } > "$HELPER_JSFILE"
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2025-Jan-15] ##
-##-------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Jan-20] ##
+##----------------------------------------##
 _UpdateHelperJSFile_()
 {
-   if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
+   if [ $# -lt 2 ] || \
+      [ -z "$1" ] || [ -z "$2" ] || \
+      ! "$inRouterSWmode"
    then return 1; fi
 
    local extCheckMsg=""
@@ -2282,7 +2293,7 @@ _CurlFileDownload_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-11] ##
+## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
 _DownloadScriptFiles_()
 {
@@ -2301,10 +2312,11 @@ _DownloadScriptFiles_()
        retCode=1
        Say "${REDct}**ERROR**${NOct}: Unable to download latest version file for $SCRIPT_NAME."
    fi
-   if _CurlFileDownload_ "$SCRIPT_WEB_ASP_FILE" "$SCRIPT_WEB_ASP_PATH"
+   if "$inRouterSWmode" && \
+      _CurlFileDownload_ "$SCRIPT_WEB_ASP_FILE" "$SCRIPT_WEB_ASP_PATH"
    then
        chmod 664 "$SCRIPT_WEB_ASP_PATH"
-       if "$inRouterSWmode" && "$updatedWebUIPage"
+       if "$updatedWebUIPage"
        then
            theWebPage="$(_GetWebUIPage_ "$SCRIPT_WEB_ASP_PATH")"
            if [ -n "$theWebPage" ] && [ "$theWebPage" != "NONE" ]
@@ -2316,7 +2328,8 @@ _DownloadScriptFiles_()
            "$isUpdateAction" && _Mount_WebUI_
        fi
        retCode=0
-   else
+   elif "$inRouterSWmode"
+   then
        retCode=1
        Say "${REDct}**ERROR**${NOct}: Unable to download latest WebUI ASP file for $SCRIPT_NAME."
    fi
@@ -9536,7 +9549,7 @@ _InvalidMenuSelection_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-11] ##
+## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
 _ShowMainMenuOptions_()
 {
@@ -9622,10 +9635,10 @@ _ShowMainMenuOptions_()
    [ -z "$FW_UpdateCheckState" ] && FW_UpdateCheckState=0
    if [ "$FW_UpdateCheckState" -eq 0 ]
    then
-       printf "\n  ${GRNct}3${NOct}.  Toggle F/W Update Check"
+       printf "\n  ${GRNct}3${NOct}.  Toggle Automatic F/W Update Checks"
        printf "\n${padStr}[Currently ${InvREDct} DISABLED ${NOct}]"
    else
-       printf "\n  ${GRNct}3${NOct}.  Toggle F/W Update Check"
+       printf "\n  ${GRNct}3${NOct}.  Toggle Automatic F/W Update Checks"
        printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}]"
    fi
    printf "\n${padStr}[Last Notification Date: $notificationStr]\n"

From 2208979d57d2b9673c4a719cf42b7185d2fab278 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Tue, 21 Jan 2025 00:54:00 -0800
Subject: [PATCH 2/4] More Code Improvements

Added/modified code to show current cron schedules on the WebGUI for automatic F/W updates and add-on updates.
---
 MerlinAU.asp | 101 +++++++++++++++++++++++++++++----------------------
 MerlinAU.sh  |  52 +++++++++++++++++++++++++-
 2 files changed, 109 insertions(+), 44 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 44bdb493..0cb95ece 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Jan-19 **/
+/** Last Modified: 2025-Jan-20 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -201,8 +201,14 @@ var externalCheckID = 0x00;
 var externalCheckOK = true;
 var externalCheckMsg = '';
 
+/**-------------------------------------**/
+/** Added by Martinski W. [2025-Jan-20] **/
+/**-------------------------------------**/
+var scriptAutoUpdateCronSchedHR = 'TBD';
+var fwAutoUpdateCheckCronSchedHR = 'TBD';
+
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-17] **/
+/** Modified by Martinski W. [2025-Jan-20] **/
 /**----------------------------------------**/
 function GetExternalCheckResults()
 {
@@ -215,6 +221,9 @@ function GetExternalCheckResults()
         },
         success: function()
         {
+            document.getElementById('Script_AutoUpdate_SchedText').textContent = 'Schedule: '+scriptAutoUpdateCronSchedHR;
+            document.getElementById('FW_AutoUpdate_CheckSchedText').textContent = 'Schedule: '+fwAutoUpdateCheckCronSchedHR;
+
             // Skip during form submission //
             if (isFormSubmitting) { return true ; }
 
@@ -388,14 +397,13 @@ function GetScriptVersion (versionType)
     { return versionProp; }
 }
 
-function prefixCustomSettings(settings, prefix)
+function PrefixCustomSettings (settings, prefix)
 {
     let prefixedSettings = {};
     for (let key in settings)
     {
-        if (settings.hasOwnProperty(key)) {
-            prefixedSettings[prefix + key] = settings[key];
-        }
+        if (settings.hasOwnProperty(key))
+        { prefixedSettings[prefix + key] = settings[key]; }
     }
     return prefixedSettings;
 }
@@ -453,21 +461,21 @@ function InitializeFields()
     let rogFWBuildType = document.getElementById('rogFWBuildType');
     let tuffFWBuildType = document.getElementById('tuffFWBuildType');
     let tailscaleVPNEnabled = document.getElementById('tailscaleVPNEnabled');
-    let autoUpdatesScriptEnabled = document.getElementById('autoUpdatesScriptEnabled');
+    let script_AutoUpdate_Check = document.getElementById('Script_AutoUpdate_Check');
     let betaToReleaseUpdatesEnabled = document.getElementById('betaToReleaseUpdatesEnabled');
     let fwUpdateDirectory = document.getElementById('fwUpdateDirectory');
 
-    // Instead of reading from firmware_check_enable, read from the custom_settings
+    // Instead of reading from firmware_check_enable, read from the custom_settings //
     let storedFwUpdateEnabled = custom_settings.FW_Update_Check || 'DISABLED'; 
-    // fallback to 'DISABLED' if custom_settings.FW_Update_Check is missing
+    // fallback to 'DISABLED' if custom_settings.FW_Update_Check is missing //
 
     // Get the checkbox and status elements
-    let FW_Update_Check = document.getElementById('FW_Update_Check');
+    let FW_AutoUpdate_Check = document.getElementById('FW_AutoUpdate_Check');
     let fwUpdateCheckStatus = document.getElementById('fwUpdateCheckStatus');
 
     // Set the checkbox state based on "ENABLED" vs. "DISABLED" vs. "TBD"
-    if (FW_Update_Check)
-    { FW_Update_Check.checked = (storedFwUpdateEnabled === 'ENABLED'); }
+    if (FW_AutoUpdate_Check)
+    { FW_AutoUpdate_Check.checked = (storedFwUpdateEnabled === 'ENABLED'); }
 
     // Update the Firmware Status display //
     if (fwUpdateCheckStatus)
@@ -549,8 +557,8 @@ function InitializeFields()
         if (tailscaleVPNEnabled)
         { tailscaleVPNEnabled.checked = (custom_settings.Allow_Updates_OverVPN === 'ENABLED'); }
 
-        if (autoUpdatesScriptEnabled)
-        { autoUpdatesScriptEnabled.checked = (custom_settings.Allow_Script_Auto_Update === 'ENABLED'); }
+        if (script_AutoUpdate_Check)
+        { script_AutoUpdate_Check.checked = (custom_settings.Allow_Script_Auto_Update === 'ENABLED'); }
 
         if (betaToReleaseUpdatesEnabled)
         { betaToReleaseUpdatesEnabled.checked = (custom_settings.FW_Allow_Beta_Production_Up === 'ENABLED'); }
@@ -844,7 +852,6 @@ function assignAjaxSetting(key, value)
                 ajax_custom_settings.FW_New_Update_ROGFWBuildType = (value === 'ENABLED') ? 'ROG' : 'Pure';
                 break;
 
-
             case keyUpper === 'TUFBUILD':
                 ajax_custom_settings.FW_New_Update_TUFWBuildType = (value === 'ENABLED') ? 'TUF' : 'Pure';
                 break;
@@ -918,7 +925,7 @@ function UpdateScriptVersion()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-18] **/
+/** Modified by Martinski W. [2025-Jan-20] **/
 /**----------------------------------------**/
 function initial()
 {
@@ -928,6 +935,8 @@ function initial()
     GetConfigSettings();
     show_menu();
     UpdateScriptVersion();
+    showhide('Script_AutoUpdate_SchedText',true);
+    showhide('FW_AutoUpdate_CheckSchedText',true);
 
     // Debugging iframe behavior //
     var hiddenFrame = document.getElementById('hidden_frame');
@@ -976,16 +985,16 @@ function SaveActionsConfig()
     var credentials = username + ':' + passwordStr;
     var encodedCredentials = btoa(credentials);
 
-    // Collect only Action form-specific settings
+    // Collect only Action form-specific settings //
     var action_settings =
     {
         credentials_base64: encodedCredentials,
         FW_New_Update_Postponement_Days: document.getElementById('fwUpdatePostponement')?.value || '0',
         CheckChangeLog: document.getElementById('changelogCheckEnabled').checked ? 'ENABLED' : 'DISABLED',
-        FW_Update_Check: document.getElementById('FW_Update_Check').checked ? 'ENABLED' : 'DISABLED'
+        FW_Update_Check: document.getElementById('FW_AutoUpdate_Check').checked ? 'ENABLED' : 'DISABLED'
     };
     // Prefix only Action settings
-    var prefixedActionSettings = prefixCustomSettings(action_settings, 'MerlinAU_');
+    var prefixedActionSettings = PrefixCustomSettings(action_settings, 'MerlinAU_');
 
     // ***** FIX BUG WHERE MerlinAU_FW_Auto_Backupmon is saved from the wrong button *****
     // ***** Only when the Advanced Options section is saved first, and then Actions Section is saved second *****
@@ -1060,9 +1069,9 @@ function SaveAdvancedConfig()
     { advanced_settings.Allow_Updates_OverVPN = tailscaleVPNEnabled.checked ? 'ENABLED' : 'DISABLED'; }
 
     // 4) Auto-Updates for Script - only if not disabled
-    let autoUpdatesScriptEnabled = document.getElementById('autoUpdatesScriptEnabled');
-    if (autoUpdatesScriptEnabled && !autoUpdatesScriptEnabled.disabled)
-    { advanced_settings.Allow_Script_Auto_Update = autoUpdatesScriptEnabled.checked ? 'ENABLED' : 'DISABLED'; }
+    let script_AutoUpdate_Check = document.getElementById('Script_AutoUpdate_Check');
+    if (script_AutoUpdate_Check && !script_AutoUpdate_Check.disabled)
+    { advanced_settings.Allow_Script_Auto_Update = script_AutoUpdate_Check.checked ? 'ENABLED' : 'DISABLED'; }
 
     // 5) Beta-to-Release Updates - only if not disabled
     let betaToReleaseUpdatesEnabled = document.getElementById('betaToReleaseUpdatesEnabled');
@@ -1086,7 +1095,7 @@ function SaveAdvancedConfig()
     { advanced_settings.FW_New_Update_TUFWBuildType = tuffFWBuildType.value || 'TUF'; }
 
     // Prefix only Advanced settings
-    var prefixedAdvancedSettings = prefixCustomSettings(advanced_settings, 'MerlinAU_');
+    var prefixedAdvancedSettings = PrefixCustomSettings(advanced_settings, 'MerlinAU_');
 
     // Remove any action keys from shared_custom_settings to avoid overwriting //
     var ACTION_KEYS = [
@@ -1366,7 +1375,7 @@ function initializeCollapsibleSections()
    <td style="padding: 4px; font-weight: bolder;" id="fwUpdateEstimatedRunDate">TBD</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 165px;"><strong>Last Notificiation Date:</strong></td>
+   <td style="padding: 4px; width: 165px;"><strong>Last Notification Date:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="fwNotificationsDate">TBD</td>
 </tr>
 <tr>
@@ -1391,31 +1400,31 @@ function initializeCollapsibleSections()
 <td style="vertical-align: top; width: 50%;">
 <table style="margin: 0; text-align: left; width: 100%; border: none;">
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Changelog Approval:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Changelog Approval:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="changelogApproval">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Changelog Check:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Changelog Check:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="changelogCheckStatus">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Beta-to-Release Updates:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Beta-to-Release Updates:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="betaToReleaseUpdatesStatus">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Tailscale VPN Access:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Tailscale VPN Access:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="tailscaleVPNAccessStatus">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Auto-Backup Enabled:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Auto-Backup Enabled:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="autobackupEnabledStatus">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Auto-Updates for Script:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Auto-Updates for MerlinAU:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="autoUpdatesScriptEnabledStatus">Disabled</td>
 </tr>
 <tr>
-   <td style="padding: 4px; width: 175px;"><strong>Email-Notifications:</strong></td>
+   <td style="padding: 4px; width: 180px;"><strong>Email Notifications:</strong></td>
    <td style="padding: 4px; font-weight: bolder;" id="emailNotificationsStatus">Disabled</td>
 </tr>
 </table></td></tr></tbody></table></td></tr></table>
@@ -1449,10 +1458,10 @@ function initializeCollapsibleSections()
 </table>
 </div>
 <form id="actionsForm">
-<table width="100%" border="0" cellpadding="5" cellspacing="5" style="table-layout: fixed;" class="FormTable SettingsTable">
+<table class="FormTable SettingsTable" width="100%" border="0" cellpadding="5" cellspacing="5" style="table-layout: fixed;">
 <colgroup>
-   <col style="width: 50%;" />
-   <col style="width: 50%;" />
+   <col style="width: 40%;" />
+   <col style="width: 60%;" />
 </colgroup>
 <tr>
    <td style="text-align: left;">
@@ -1488,8 +1497,11 @@ function initializeCollapsibleSections()
    </td>
 </tr>
 <tr>
-   <td style="text-align: left;"><label for="FW_Update_Check">Enable F/W Update Check</label></td>
-   <td><input type="checkbox" id="FW_Update_Check" name="FW_Update_Check" /></td>
+   <td style="text-align: left;"><label for="FW_AutoUpdate_Check">Enable Automatic F/W Update Checks</label></td>
+   <td>
+      <input type="checkbox" id="FW_AutoUpdate_Check" name="FW_AutoUpdate_Check"/>
+      <span id="FW_AutoUpdate_CheckSchedText" style="margin-left:10px; display:none; font-size: 12px; font-weight: bolder;"></span>
+   </td>
 </tr>
 <tr>
    <td style="text-align: left;">
@@ -1530,10 +1542,10 @@ function initializeCollapsibleSections()
 <tr>
 <td colspan="2">
 <form id="advancedOptionsForm">
-<table width="100%" border="0" cellpadding="5" cellspacing="5" style="table-layout: fixed;" class="FormTable SettingsTable">
+<table class="FormTable SettingsTable" width="100%" border="0" cellpadding="5" cellspacing="5" style="table-layout: fixed;">
 <colgroup>
-   <col style="width: 50%;" />
-   <col style="width: 50%;" />
+   <col style="width: 40%;" />
+   <col style="width: 60%;" />
 </colgroup>
 <tr>
    <td style="text-align: left;">
@@ -1561,8 +1573,11 @@ function initializeCollapsibleSections()
    <td><input type="checkbox" id="autobackupEnabled" name="autobackupEnabled" /></td>
 </tr>
 <tr>
-   <td style="text-align: left;"><label for="autoUpdatesScriptEnabled">Auto-Updates for Script</label></td>
-   <td><input type="checkbox" id="autoUpdatesScriptEnabled" name="autoUpdatesScriptEnabled" /></td>
+   <td style="text-align: left;"><label for="Script_AutoUpdate_Check">Enable Auto-Updates for MerlinAU</label></td>
+   <td>
+      <input type="checkbox" id="Script_AutoUpdate_Check" name="Script_AutoUpdate_Check"/>
+      <span id="Script_AutoUpdate_SchedText" style="margin-left:10px; display:none; font-size: 12px; font-weight: bolder;"></span>
+   </td>
 </tr>
 <tr id="rogFWBuildRow">
    <td style="text-align: left;"><label for="rogFWBuildType">ROG F/W Build Type</label></td>
@@ -1587,9 +1602,9 @@ function initializeCollapsibleSections()
    <td><input type="checkbox" id="emailNotificationsEnabled" name="emailNotificationsEnabled" /></td>
 </tr>
 <tr>
-   <td style="text-align: left;"><label for="emailFormat">Email Format</label></td>
+   <td style="text-align: left;"><label for="emailFormat">Email Notification Format</label></td>
    <td>
-      <select id="emailFormat" name="emailFormat" style="width: 28%;">
+      <select id="emailFormat" name="emailFormat" style="width: 21%;">
          <option value="HTML">HTML</option>
          <option value="PlainText">Plain Text</option>
       </select>
diff --git a/MerlinAU.sh b/MerlinAU.sh
index d19f4029..01a779f8 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -1157,7 +1157,7 @@ Get_Custom_Setting()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-15] ##
+## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
 Update_Custom_Settings()
 {
@@ -1248,10 +1248,13 @@ Update_Custom_Settings()
             elif [ "$setting_type" = "FW_New_Update_Cron_Job_Schedule" ]
             then
                 FW_UpdateCronJobSchedule="$setting_value"
+                _WebUI_AutoScriptUpdateCronSchedule_
+                _WebUI_AutoFWUpdateCheckCronSchedule_
             #
             elif [ "$setting_type" = "Script_Update_Cron_Job_SchedDays" ]
             then
                 ScriptUpdateCronSchedDays="$setting_value"
+                _WebUI_AutoScriptUpdateCronSchedule_
             #
             elif [ "$setting_type" = "FW_New_Update_ZIP_Directory_Path" ]
             then
@@ -2080,6 +2083,47 @@ _CreateSymLinks_()
    ln -s "$HELPER_JSFILE" "${SCRIPT_WEB_DIR}/CheckHelper.js" 2>/dev/null
 }
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Jan-20] ##
+##-------------------------------------##
+_WriteStringVarToHelperJSFile_()
+{
+   if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
+   then return 1; fi
+
+   if [ ! -s "$HELPER_JSFILE" ]
+   then
+       echo "var $1 = '${2}';" > "$HELPER_JSFILE"
+   elif ! grep -q "^var $1 =.*" "$HELPER_JSFILE"
+   then
+       echo "var $1 = '${2}';" >> "$HELPER_JSFILE"
+   else
+       sed -i "s/^var $1 =.*/var $1 = '${2}';/" "$HELPER_JSFILE"
+   fi
+}
+
+##-------------------------------------##
+## Added by Martinski W. [2025-Jan-20] ##
+##-------------------------------------##
+_WebUI_AutoFWUpdateCheckCronSchedule_()
+{
+   local fwUpdtCronScheduleRaw  fwUpdtCronScheduleStr
+   fwUpdtCronScheduleRaw="$(Get_Custom_Setting FW_New_Update_Cron_Job_Schedule)"
+   fwUpdtCronScheduleStr="$(_TranslateCronSchedHR_ "$fwUpdtCronScheduleRaw")"
+   _WriteStringVarToHelperJSFile_ "fwAutoUpdateCheckCronSchedHR" "$fwUpdtCronScheduleStr"
+}
+
+##-------------------------------------##
+## Added by Martinski W. [2025-Jan-20] ##
+##-------------------------------------##
+_WebUI_AutoScriptUpdateCronSchedule_()
+{
+   local scriptUpdtCronSchedRaw  scriptUpdtCronSchedStr
+   scriptUpdtCronSchedRaw="$(_GetScriptAutoUpdateCronSchedule_)"
+   scriptUpdtCronSchedStr="$(_TranslateCronSchedHR_ "$scriptUpdtCronSchedRaw")"
+   _WriteStringVarToHelperJSFile_ "scriptAutoUpdateCronSchedHR" "$scriptUpdtCronSchedStr"
+}
+
 ##----------------------------------------##
 ## Modified by Martinski W. [2025-Jan-20] ##
 ##----------------------------------------##
@@ -2093,6 +2137,9 @@ _InitHelperJSFile_()
      echo "var externalCheckOK = true;"
      echo "var externalCheckMsg = '';"
    } > "$HELPER_JSFILE"
+
+   _WebUI_AutoScriptUpdateCronSchedule_
+   _WebUI_AutoFWUpdateCheckCronSchedule_
 }
 
 ##----------------------------------------##
@@ -2114,6 +2161,9 @@ _UpdateHelperJSFile_()
      echo "var externalCheckOK = ${2};"
      echo "var externalCheckMsg = '${extCheckMsg}';"
    } > "$HELPER_JSFILE"
+
+   _WebUI_AutoScriptUpdateCronSchedule_
+   _WebUI_AutoFWUpdateCheckCronSchedule_
 }
 
 ##-------------------------------------##

From d37ea7e1bda5c3a69ddeeac163d22579ce2889ef Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Tue, 21 Jan 2025 01:16:36 -0800
Subject: [PATCH 3/4] Update MerlinAU.sh

Fine-tuning code.
---
 MerlinAU.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index 01a779f8..98a4705b 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -2107,6 +2107,7 @@ _WriteStringVarToHelperJSFile_()
 ##-------------------------------------##
 _WebUI_AutoFWUpdateCheckCronSchedule_()
 {
+   ! "$inRouterSWmode" && return 0
    local fwUpdtCronScheduleRaw  fwUpdtCronScheduleStr
    fwUpdtCronScheduleRaw="$(Get_Custom_Setting FW_New_Update_Cron_Job_Schedule)"
    fwUpdtCronScheduleStr="$(_TranslateCronSchedHR_ "$fwUpdtCronScheduleRaw")"
@@ -2118,6 +2119,7 @@ _WebUI_AutoFWUpdateCheckCronSchedule_()
 ##-------------------------------------##
 _WebUI_AutoScriptUpdateCronSchedule_()
 {
+   ! "$inRouterSWmode" && return 0
    local scriptUpdtCronSchedRaw  scriptUpdtCronSchedStr
    scriptUpdtCronSchedRaw="$(_GetScriptAutoUpdateCronSchedule_)"
    scriptUpdtCronSchedStr="$(_TranslateCronSchedHR_ "$scriptUpdtCronSchedRaw")"

From 545b8f33a4d5694dbe5e11b9e902be61303de96a Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Tue, 21 Jan 2025 19:07:07 -0800
Subject: [PATCH 4/4] More Improvements

Changes to improve the external check of "F/W Update Directory Path"
---
 MerlinAU.asp | 8 +++++---
 MerlinAU.sh  | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 0cb95ece..73414824 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Jan-20 **/
+/** Last Modified: 2025-Jan-21 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -148,8 +148,10 @@ const fwUpdateDirPath =
       }
       if (!this.extCheckOK && this.extCheckMsg.length > 0)
       {
-         this.extCheckOK = true;  //Reset for Next Check//
-         return (`The directory path was INVALID.\n${this.extCheckMsg}`);
+         let extErrorMsg = this.extCheckMsg;
+         //Reset for Next Check//
+         this.extCheckOK = true; this.extCheckMsg = '';
+         return (`The directory path was INVALID.\n${extErrorMsg}`);
       }
       return (`${errStr}`);
    },
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 98a4705b..40630384 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -2226,7 +2226,7 @@ _ActionsAfterNewConfigSettings_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-16] ##
+## Modified by Martinski W. [2025-Jan-21] ##
 ##----------------------------------------##
 _UpdateConfigFromWebUISettings_()
 {
@@ -2280,7 +2280,7 @@ _UpdateConfigFromWebUISettings_()
 
        if ! "$settingsMergeOK"
        then  ## Reset for Next Check ##
-           { sleep 10 ; _UpdateHelperJSFile_ 0x01 "true" ; } &
+           { sleep 15 ; _UpdateHelperJSFile_ 0x01 "true" ; } &
        fi
    else
        Say "No updated settings from WebUI found. No merge into $CONFIG_FILE necessary."