From 30ab1dce579d8bded90f115e8c613f1cad28ba7a Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Tue, 25 Feb 2025 00:17:41 -0800
Subject: [PATCH 1/2] UI Improvements

1) Added "Directory for F/W Updage Log File" option on the WebGUI page.

2) More tooltips to help clarify options:
   - Directory for F/W Update File
   - Directory for F/W Updage Log File
   - Beta-to-Release F/W Updates
   - Tailscale/ZeroTier VPN Access

5) More code improvements and fine-tuning.
---
 MerlinAU.asp | 315 ++++++++++++++++++++++++++++++++++++++-------------
 MerlinAU.sh  | 258 ++++++++++++++++++++++++++---------------
 2 files changed, 401 insertions(+), 172 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 53eb905e..ed99a1de 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Feb-22 **/
+/** Last Modified: 2025-Feb-23 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -66,6 +66,8 @@ var isEMailConfigEnabledInAMTM = false;
 var scriptAutoUpdateCronSchedHR = 'TBD';
 var fwAutoUpdateCheckCronSchedHR = 'TBD';
 
+const validationErrorMsg = 'Validation failed. Please correct invalid value and try again.';
+
 /**-------------------------------------**/
 /** Added by Martinski W. [2025-Feb-21] **/
 /**-------------------------------------**/
@@ -74,7 +76,7 @@ var doConsoleLogDEBUG = false;
 function ConsoleLogDEBUG (debugMsg, debugVar)
 {
    if (!doConsoleLogDEBUG) { return ; }
-   if (typeof debugVar === 'undefined' || debugVar === null)
+   if (debugVar === null || typeof debugVar === 'undefined')
    { console.log(debugMsg); }
    else
    { console.log(debugMsg, debugVar); }
@@ -683,69 +685,120 @@ function FWConvertWebUISettingsToCronSchedule (oldRawCronSchedule)
    return (newRawCronSchedule);
 }
 
-/**-------------------------------------**/
-/** Added by Martinski W. [2025-Jan-15] **/
-/**-------------------------------------**/
-// To support 'fwUpdateDirectory' element //
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Feb-23] **/
+/**----------------------------------------**/
+// To support 'Directory Path' elements //
 const fwUpdateDirPath =
 {
-   minLen: 5, maxLen: 200,
-   currLen: 0, hasValidChars: true, thePath: '',
-   extCheckID: 0x01, extCheckOK: true, extCheckMsg: '',
+   minLen: 5, maxLen: 220,
+   ZIPpathLen: 0, ZIPpathStr: '', ZIPdirHasValidChars: true,
+   LOGpathLen: 0, LOGpathStr: '', LOGdirHasValidChars: true,
+   extCheckZIPdirID: 0x01, extCheckZIPdirOK: true, extCheckZIPdirMSG: '',
+   extCheckLOGdirID: 0x02, extCheckLOGdirOK: true, extCheckLOGdirMSG: '',
    pathRegExp: '^(/[a-zA-Z0-9 ._#-]+)(/[a-zA-Z0-9 ._#-]+)+$',
 
-   ErrorMsg: function()
+   ErrorMsg: function(dirType)
    {
+      let thePathLength = 0, hasValidChars = true;
       const errStr = 'The directory path is INVALID.';
-      if (this.currLen < this.minLen)
+
+      if (dirType === 'ZIP')
+      {
+          thePathLength = this.ZIPpathLen;
+          hasValidChars = this.ZIPdirHasValidChars;
+      }
+      else if (dirType === 'LOG')
+      {
+          thePathLength = this.LOGpathLen;
+          hasValidChars = this.LOGdirHasValidChars;
+      }
+      if (thePathLength < this.minLen)
       {
          const excMinLen = (this.minLen - 1);
          return (`${errStr}\nThe path string must be greater than ${excMinLen} characters.`);
       }
-      if (this.currLen > this.maxLen)
+      if (thePathLength > this.maxLen)
       {
          const excMaxLen = (this.maxLen + 1);
          return (`${errStr}\nThe path string must be less than ${excMaxLen} characters.`);
       }
-      if (!this.hasValidChars)
+      if (!hasValidChars)
       {
          return (`${errStr}\nThe path string does not meet syntax requirements.`);
       }
-      if (!this.extCheckOK && this.extCheckMsg.length > 0)
+      if (dirType === 'ZIP' &&
+          !this.extCheckZIPdirOK &&
+          this.extCheckZIPdirMSG !== 'OK' &&
+          this.extCheckZIPdirMSG.length > 0)
+      {
+         return (`${errStr}\n\n${this.extCheckZIPdirMSG}\n`);
+      }
+      if (dirType === 'LOG' &&
+          !this.extCheckLOGdirOK &&
+          this.extCheckLOGdirMSG !== 'OK' &&
+          this.extCheckLOGdirMSG.length > 0)
       {
-         let extErrorMsg = this.extCheckMsg;
-         //Reset for Next Check//
-         this.extCheckOK = true; this.extCheckMsg = '';
-         return (`The directory path was INVALID.\n${extErrorMsg}`);
+         return (`${errStr}\n\n${this.extCheckLOGdirMSG}\n`);
       }
       return (`${errStr}`);
    },
-   ValidatePath: function(formField)
+   ValidatePath: function(formField, dirType)
    {
       const inputVal = formField.value;
       const inputLen = formField.value.length;
-      this.thePath = inputVal;
-      this.currLen = inputLen;
 
-      if (inputLen < this.minLen || inputLen > this.maxLen)
-      { return false; }
+      let dirHasValidChars = true;
       let foundMatch = inputVal.match (`${this.pathRegExp}`);
-      if (foundMatch == null)
-      { this.hasValidChars = false; return false; }
-      else
-      { this.hasValidChars = true; }
-      if (!this.extCheckOK && this.extCheckMsg.length > 0)
+      if (foundMatch === null) { dirHasValidChars = false; }
+
+      if (dirType === 'ZIP')
+      {
+          this.ZIPpathLen = inputLen;
+          this.ZIPpathStr = inputVal;
+          this.ZIPdirHasValidChars = dirHasValidChars;
+      }
+      else if (dirType === 'LOG')
+      {
+          this.LOGpathLen = inputLen;
+          this.LOGpathStr = inputVal;
+          this.LOGdirHasValidChars = dirHasValidChars;
+      }
+
+      if (inputLen < this.minLen || inputLen > this.maxLen) { return false; }
+      if (!dirHasValidChars) { return false; }
+
+      if (dirType === 'ZIP' &&
+          !this.extCheckZIPdirOK &&
+          this.extCheckZIPdirMSG !== 'OK' &&
+          this.extCheckZIPdirMSG.length > 0)
+      { return false; }
+
+      if (dirType === 'LOG' &&
+          !this.extCheckLOGdirOK &&
+          this.extCheckLOGdirMSG !== 'OK' &&
+          this.extCheckLOGdirMSG.length > 0)
       { return false; }
+
       return true;
+   },
+   ResetExtCheckVars: function()
+   {   //Reset for Next Check//
+       this.extCheckZIPdirOK = true;
+       this.extCheckLOGdirOK = true;
+       this.extCheckZIPdirMSG = 'OK';
+       this.extCheckLOGdirMSG = 'OK';
    }
 };
 
-/**-------------------------------------**/
-/** Added by Martinski W. [2025-Jan-15] **/
-/**-------------------------------------**/
-function ValidateDirectoryPath (formField)
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Feb-23] **/
+/**----------------------------------------**/
+function ValidateDirectoryPath (formField, dirType)
 {
-   if (fwUpdateDirPath.ValidatePath(formField))
+   if (formField === null) { return false; }
+
+   if (fwUpdateDirPath.ValidatePath(formField, dirType))
    {
       $(formField).removeClass('Invalid');
       $(formField).off('mouseover');
@@ -755,14 +808,14 @@ function ValidateDirectoryPath (formField)
    {
       formField.focus();
       $(formField).addClass('Invalid');
-      $(formField).on('mouseover',function(){return overlib(fwUpdateDirPath.ErrorMsg(),0,0);});
+      $(formField).on('mouseover',function(){return overlib(fwUpdateDirPath.ErrorMsg(dirType),0,0);});
       $(formField)[0].onmouseout = nd;
       return false;
    }
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-27] **/
+/** Modified by Martinski W. [2025-Feb-23] **/
 /**----------------------------------------**/
 function GetExternalCheckResults()
 {
@@ -781,26 +834,52 @@ function GetExternalCheckResults()
 
             // Skip during form submission //
             if (isFormSubmitting) { return true ; }
+            let validationFailed = false;
+            let validationStatus = '';
 
             if (externalCheckOK)
             {
-               fwUpdateDirPath.extCheckOK = true;
-               fwUpdateDirPath.extCheckMsg = '';
+               fwUpdateDirPath.ResetExtCheckVars();
                return true;
             }
-            if ((externalCheckID & fwUpdateDirPath.extCheckID) > 0)
+            let fwUpdateZIPdirectory = document.getElementById('fwUpdateZIPDirectory');
+            let fwUpdateLOGdirectory = document.getElementById('fwUpdateLOGDirectory');
+
+            if ((externalCheckID & fwUpdateDirPath.extCheckZIPdirID) > 0)
             {
-                externalCheckOK = true; //Reset for next check//
-                fwUpdateDirPath.extCheckOK = false;
-                fwUpdateDirPath.extCheckMsg = externalCheckMsg;
+                fwUpdateDirPath.extCheckZIPdirOK = false;
+                fwUpdateDirPath.extCheckZIPdirMSG = externalCheckMsg;
 
-                let fwUpdateDirectory = document.getElementById('fwUpdateDirectory');
-                if (!ValidateDirectoryPath (fwUpdateDirectory))
+                if (fwUpdateZIPdirectory !== null &&
+                    typeof fwUpdateZIPdirectory !== 'undefined' &&
+                    !ValidateDirectoryPath (fwUpdateZIPdirectory, 'ZIP'))
                 {
-                    alert('Validation failed.\n\n' + fwUpdateDirPath.ErrorMsg());
-                    return false;
+                    validationFailed = true;
+                    validationStatus = fwUpdateDirPath.ErrorMsg('ZIP');
                 }
             }
+            if ((externalCheckID & fwUpdateDirPath.extCheckLOGdirID) > 0)
+            {
+                fwUpdateDirPath.extCheckLOGdirOK = false;
+                fwUpdateDirPath.extCheckLOGdirMSG = externalCheckMsg;
+
+                if (fwUpdateLOGdirectory !== null &&
+                    typeof fwUpdateLOGdirectory !== 'undefined' &&
+                    !ValidateDirectoryPath (fwUpdateLOGdirectory, 'LOG'))
+                {
+                    validationFailed = true;
+                    validationStatus = fwUpdateDirPath.ErrorMsg('LOG');
+                }
+            }
+            if (validationFailed)
+            {
+                externalCheckOK = true; //Reset for Next Check//
+                fwUpdateDirPath.ResetExtCheckVars();
+                alert('Validation failed.\n' + validationStatus);
+                setTimeout(ValidateDirectoryPath, 5000, fwUpdateZIPdirectory, 'ZIP');
+                setTimeout(ValidateDirectoryPath, 5000, fwUpdateLOGdirectory, 'LOG');
+                return false;
+            }
         }
     });
 }
@@ -948,7 +1027,7 @@ function GetScriptVersion (versionType)
     else if (versionType == 'server')
     { versionProp = shared_custom_settings.MerlinAU_version_server; }
 
-    if (typeof versionProp == 'undefined' || versionProp == null)
+    if (versionProp === null || typeof versionProp === 'undefined')
     { return 'N/A'; }
     else
     { return versionProp; }
@@ -1055,15 +1134,23 @@ function SetUpEmailNotificationFields()
     }
 }
 
-/**-------------------------------------**/
-/** Added by Martinski W. [2025-Feb-21] **/
-/**-------------------------------------**/
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Feb-23] **/
+/**----------------------------------------**/
 const emailNotifyHint = 'The Email Notifications option requires the AMTM email configuration settings to be enabled and set up.';
 
 const autoBackupsHint = 'The Automatic Backups option requires the BACKUPMON script to be installed on the router.';
 
 const addonAutoUpdatesHint = 'The daily schedule for automatic updates of MerlinAU is always configured to be 15 minutes *before* the scheduled time for automatic F/W Update checks.';
 
+const FWUpdateDirZIPHint = 'This is the directory path where the subdirectory [MerlinAU.d] will be located to download and store the new F/W update files.';
+
+const FWUpdateDirLOGHint = 'This is the directory path where the subdirectory [MerlinAU.d] will be located to store the log files of the F/W update process.';
+
+const betaToReleaseHint = 'Enabling this option allows the F/W update process to detect an installed Beta version and proceed to update to the latest production release version.';
+
+const allowVPNAccessHint = 'Enabling this option allows Tailscale and ZeroTier VPN services (if installed) to remain active during the firmware update process. This may be needed when doing a firmware update to a router while connected remotely via a VPN.';
+
 const ROG_BuildTypeMsg = 'The ROG build type preference will apply only if a compatible ROG firmware image is available. Otherwise, the Pure Non-ROG build will be used instead.';
 
 const TUF_BuildTypeMsg = 'The TUF build type preference will apply only if a compatible TUF firmware image is available. Otherwise, the Pure Non-TUF build will be used instead.';
@@ -1081,6 +1168,12 @@ function ShowHintMsg (formField)
    let theHintMsg;
    switch (formField.name)
    {
+       case 'FW_UPDATE_ZIPDIR':
+           theHintMsg = FWUpdateDirZIPHint;
+           break;
+       case 'FW_UPDATE_LOGDIR':
+           theHintMsg = FWUpdateDirLOGHint;
+           break;
        case 'ROG_BUILDTYPE':
            theHintMsg = ROG_BuildTypeMsg;
            break;
@@ -1090,6 +1183,12 @@ function ShowHintMsg (formField)
        case 'CHANGELOG_CHECK':
            theHintMsg = changelogCheckHint;
            break;
+       case 'BETA_TO_RELEASE':
+           theHintMsg = betaToReleaseHint;
+           break;
+       case 'ALLOW_VPN_ACCESS':
+           theHintMsg = allowVPNAccessHint;
+           break;
        case 'AUTOMATIC_BACKUPS':
            theHintMsg = autoBackupsHint;
            break;
@@ -1139,7 +1238,7 @@ function BlockChangelog()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-21] **/
+/** Modified by Martinski W. [2025-Feb-23] **/
 /**----------------------------------------**/
 function InitializeFields()
 {
@@ -1154,7 +1253,8 @@ function InitializeFields()
     let tailscaleVPNEnabled = document.getElementById('tailscaleVPNEnabled');
     let script_AutoUpdate_Check = document.getElementById('Script_AutoUpdate_Check');
     let betaToReleaseUpdatesEnabled = document.getElementById('betaToReleaseUpdatesEnabled');
-    let fwUpdateDirectory = document.getElementById('fwUpdateDirectory');
+    let fwUpdateZIPdirectory = document.getElementById('fwUpdateZIPDirectory');
+    let fwUpdateLOGdirectory = document.getElementById('fwUpdateLOGDirectory');
 
     // Instead of reading from firmware_check_enable, read from the custom_settings //
     let storedFwUpdateEnabled = custom_settings.FW_Update_Check || 'DISABLED'; 
@@ -1230,8 +1330,11 @@ function InitializeFields()
         if (betaToReleaseUpdatesEnabled)
         { betaToReleaseUpdatesEnabled.checked = (custom_settings.FW_Allow_Beta_Production_Up === 'ENABLED'); }
 
-        if (fwUpdateDirectory)
-        { fwUpdateDirectory.value = custom_settings.FW_New_Update_ZIP_Directory_Path || ''; }
+        if (fwUpdateZIPdirectory !== null && typeof fwUpdateZIPdirectory !== 'undefined')
+        { fwUpdateZIPdirectory.value = custom_settings.FW_New_Update_ZIP_Directory_Path || ''; }
+
+        if (fwUpdateLOGdirectory !== null && typeof fwUpdateLOGdirectory !== 'undefined')
+        { fwUpdateLOGdirectory.value = custom_settings.FW_New_Update_LOG_Directory_Path || ''; }
 
         // Update Settings Status Table //
         SetStatusForGUI('changelogCheckStatus', custom_settings.CheckChangeLog);
@@ -1424,7 +1527,7 @@ function GetConfigSettings()
                 { continue; }  //Skip comments & empty lines//
 
                 tokenList = Tokenize (configLines[jIndx]);
-            
+
                 for (var kIndx = 0; kIndx < tokenList.length; kIndx++)
                 {
                     tokenStr = tokenList[kIndx];
@@ -1479,7 +1582,7 @@ function GetConfigSettings()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-26] **/
+/** Modified by Martinski W. [2025-Feb-23] **/
 /**----------------------------------------**/
 // Helper function to assign settings based on key //
 function AssignAjaxSetting (keyName, keyValue)
@@ -1510,6 +1613,10 @@ function AssignAjaxSetting (keyName, keyValue)
            ajax_custom_settings.FW_New_Update_ZIP_Directory_Path = keyValue;
            break;
 
+       case keyUpper === 'FW_NEW_UPDATE_LOG_DIRECTORY_PATH':
+           ajax_custom_settings.FW_New_Update_LOG_Directory_Path = keyValue;
+           break;
+
        case keyUpper === 'ALLOW_UPDATES_OVERVPN':
            ajax_custom_settings.Allow_Updates_OverVPN = convertToStatus(keyValue);
            break;
@@ -1671,7 +1778,7 @@ function initial()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-21] **/
+/** Modified by Martinski W. [2025-Feb-23] **/
 /**----------------------------------------**/
 function SaveActionsConfig()
 {
@@ -1692,30 +1799,30 @@ function SaveActionsConfig()
     }
     if (!ValidatePasswordString (document.getElementById('routerPassword')))
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + loginPassword.ErrorMsg());
+        alert(`${validationErrorMsg}\n\n` + loginPassword.ErrorMsg());
         return false;
     }
     if (!ValidatePostponedDays (document.form.fwUpdatePostponement))
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + fwPostponedDays.ErrorMsg());
+        alert(`${validationErrorMsg}\n\n` + fwPostponedDays.ErrorMsg());
         return false;
     }
     if (document.form.fwScheduleHOUR.disabled === false &&
         !ValidateFWUpdateTime (document.form.fwScheduleHOUR, 'HOUR'))
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + fwScheduleTime.ErrorMsg('HOUR'));
+        alert(`${validationErrorMsg}\n\n` + fwScheduleTime.ErrorMsg('HOUR'));
         return false;
     }
     if (document.form.fwScheduleMINS.disabled === false &&
         !ValidateFWUpdateTime (document.form.fwScheduleMINS, 'MINS'))
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + fwScheduleTime.ErrorMsg('MINS'));
+        alert(`${validationErrorMsg}\n\n` + fwScheduleTime.ErrorMsg('MINS'));
         return false;
     }
     if (document.getElementById('fwSchedBoxDAYSX').checked &&
         !ValidateFWUpdateXDays (document.form.fwScheduleXDAYS, 'DAYS'))
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + fwScheduleTime.ErrorMsg('DAYS'));
+        alert(`${validationErrorMsg}\n\n` + fwScheduleTime.ErrorMsg('DAYS'));
         return false;
     }
     let fwUpdateRawCronSchedule = custom_settings.FW_New_Update_Cron_Job_Schedule;
@@ -1743,6 +1850,7 @@ function SaveActionsConfig()
         "MerlinAU_FW_Auto_Backupmon",
         "MerlinAU_FW_Allow_Beta_Production_Up",
         "MerlinAU_FW_New_Update_ZIP_Directory_Path",
+        "MerlinAU_FW_New_Update_LOG_Directory_Path",
         "MerlinAU_FW_New_Update_EMail_Notification",
         "MerlinAU_FW_New_Update_EMail_FormatType",
         "MerlinAU_FW_New_Update_EMail_CC_Address",
@@ -1772,14 +1880,14 @@ function SaveActionsConfig()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-21] **/
+/** Modified by Martinski W. [2025-Feb-23] **/
 /**----------------------------------------**/
 function SaveAdvancedConfig()
 {
     // Clear amng_custom for any existing content before saving //
     document.getElementById('amng_custom').value = '';
 
-    // 1) F/W Update Email Notifications - only if NOT disabled //
+    // F/W Update Email Notifications - only if NOT disabled //
     let emailFormat = document.getElementById('emailFormat');
     let secondaryEmail = document.getElementById('secondaryEmail');
     let emailNotificationsEnabled = document.getElementById('emailNotificationsEnabled');
@@ -1794,37 +1902,53 @@ function SaveAdvancedConfig()
     if (secondaryEmail && !secondaryEmail.disabled)
     { advanced_settings.FW_New_Update_EMail_CC_Address = secondaryEmail.value || 'TBD'; }
 
-    // 2) F/W Update Directory (more checks are made in the shell script) //
-    let fwUpdateDirectory = document.getElementById('fwUpdateDirectory');
-    if (!ValidateDirectoryPath (fwUpdateDirectory))
+    // F/W Update ZIP Directory (more checks are made in the shell script) //
+    let fwUpdateZIPdirectory = document.getElementById('fwUpdateZIPDirectory');
+    if (fwUpdateZIPdirectory !== null && typeof fwUpdateZIPdirectory !== 'undefined')
     {
-        alert('Validation failed. Please correct invalid value and try again.\n\n' + fwUpdateDirPath.ErrorMsg());
-        return false;
+        if (ValidateDirectoryPath (fwUpdateZIPdirectory, 'ZIP'))
+        { advanced_settings.FW_New_Update_ZIP_Directory_Path = fwUpdateZIPdirectory.value; }
+        else
+        {
+            alert(`${validationErrorMsg}\n\n` + fwUpdateDirPath.ErrorMsg('ZIP'));
+            return false;
+        }
     }
-    if (fwUpdateDirectory)
-    { advanced_settings.FW_New_Update_ZIP_Directory_Path = fwUpdateDirectory.value || '/tmp/mnt/USB1'; }
 
-    // 3) Tailscale/ZeroTier VPN Access - only if not disabled //
+    // F/W Update LOG Directory (more checks are made in the shell script) //
+    let fwUpdateLOGdirectory = document.getElementById('fwUpdateLOGDirectory');
+    if (fwUpdateLOGdirectory !== null && typeof fwUpdateLOGdirectory !== 'undefined')
+    {
+        if (ValidateDirectoryPath (fwUpdateLOGdirectory, 'LOG'))
+        { advanced_settings.FW_New_Update_LOG_Directory_Path = fwUpdateLOGdirectory.value; }
+        else
+        {
+            alert(`${validationErrorMsg}\n\n` + fwUpdateDirPath.ErrorMsg('LOG'));
+            return false;
+        }
+    }
+
+    // Tailscale/ZeroTier VPN Access - only if not disabled //
     let tailscaleVPNEnabled = document.getElementById('tailscaleVPNEnabled');
     if (tailscaleVPNEnabled && !tailscaleVPNEnabled.disabled)
     { advanced_settings.Allow_Updates_OverVPN = tailscaleVPNEnabled.checked ? 'ENABLED' : 'DISABLED'; }
 
-    // 4) Automatic Updates for Script - only if not disabled //
+    // Automatic Updates for Script - only if not 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 //
+    // Beta-to-Release Updates - only if not disabled //
     let betaToReleaseUpdatesEnabled = document.getElementById('betaToReleaseUpdatesEnabled');
     if (betaToReleaseUpdatesEnabled && !betaToReleaseUpdatesEnabled.disabled)
     { advanced_settings.FW_Allow_Beta_Production_Up = betaToReleaseUpdatesEnabled.checked ? 'ENABLED' : 'DISABLED'; }
 
-    // 6) Automatic Backups - only if not disabled //
+    // Automatic Backups - only if not disabled //
     let autobackupEnabled = document.getElementById('autobackupEnabled');
     if (autobackupEnabled && !autobackupEnabled.disabled)
     { advanced_settings.FW_Auto_Backupmon = autobackupEnabled.checked ? 'ENABLED' : 'DISABLED'; }
 
-    // 7) ROG/TUF F/W Build Type - handle conditional rows if visible
+    // ROG/TUF F/W Build Type - handle conditional rows if visible //
     let rogFWBuildRow = document.getElementById('rogFWBuildRow');
     let rogFWBuildType = document.getElementById('rogFWBuildType');
     if (rogFWBuildRow && rogFWBuildRow.style.display !== 'none' && rogFWBuildType)
@@ -2447,23 +2571,52 @@ function initializeCollapsibleSections()
 </colgroup>
 <tr>
    <td style="text-align: left;">
-     <label for="fwUpdateDirectory">Set Directory for F/W Updates</label>
+      <label for="fwUpdateZIPDirectory">
+      <a class="hintstyle" name="FW_UPDATE_ZIPDIR" href="javascript:void(0);"
+         onclick="ShowHintMsg(this);">Directory for F/W Update File</a>
+      </label>
    </td>
    <td>
    <input autocomplete="off" type="text"
-     id="fwUpdateDirectory" name="fwUpdateDirectory"
+     id="fwUpdateZIPDirectory" name="fwUpdateZIPDirectory"
      style="width: 275px;" maxlength="200"
      onKeyPress="return validator.isString(this, event)"
-     onblur="ValidateDirectoryPath(this)"
-     onkeyup="ValidateDirectoryPath(this)"/>
+     onblur="ValidateDirectoryPath(this,'ZIP')"
+     onkeyup="ValidateDirectoryPath(this,'ZIP')"/>
    </td>
 </tr>
 <tr>
-   <td style="text-align: left;"><label for="betaToReleaseUpdatesEnabled">Beta-to-Release F/W Updates</label></td>
+   <td style="text-align: left;">
+      <label for="fwUpdateLOGDirectory">
+      <a class="hintstyle" name="FW_UPDATE_LOGDIR" href="javascript:void(0);"
+         onclick="ShowHintMsg(this);">Directory for F/W Update Log File</a>
+      </label>
+   </td>
+   <td>
+   <input autocomplete="off" type="text"
+     id="fwUpdateLOGDirectory" name="fwUpdateLOGDirectory"
+     style="width: 275px;" maxlength="200"
+     onKeyPress="return validator.isString(this, event)"
+     onblur="ValidateDirectoryPath(this,'LOG')"
+     onkeyup="ValidateDirectoryPath(this,'LOG')"/>
+   </td>
+</tr>
+<tr>
+   <td style="text-align: left;">
+      <label for="betaToReleaseUpdatesEnabled">
+      <a class="hintstyle" name="BETA_TO_RELEASE" href="javascript:void(0);"
+         onclick="ShowHintMsg(this);">Beta-to-Release F/W Updates</a>
+      </label>
+   </td>
    <td><input type="checkbox" id="betaToReleaseUpdatesEnabled" name="betaToReleaseUpdatesEnabled" /></td>
 </tr>
 <tr>
-   <td style="text-align: left;"><label for="tailscaleVPNEnabled">Tailscale/ZeroTier VPN Access</label></td>
+   <td style="text-align: left;">
+      <label for="tailscaleVPNEnabled">
+      <a class="hintstyle" name="ALLOW_VPN_ACCESS" href="javascript:void(0);"
+         onclick="ShowHintMsg(this);">Tailscale/ZeroTier VPN Access</a>
+      </label>
+   </td>
    <td><input type="checkbox" id="tailscaleVPNEnabled" name="tailscaleVPNEnabled" /></td>
 </tr>
 <tr>
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 4f1d08ad..b1ca9492 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -4,7 +4,7 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Feb-22
+# Last Modified: 2025-Feb-23
 ###################################################################
 set -u
 
@@ -1346,15 +1346,125 @@ _GetAllNodeSettings_()
 }
 
 ##-------------------------------------##
-## Added by Martinski W. [2025-Jan-15] ##
+## Added by Martinski W. [2025-Feb-23] ##
 ##-------------------------------------##
+extCheckRETvarID=0x00
+extCheckZIPdirID=0x01
+extCheckLOGdirID=0x02
+extCheckALLvarID=0x0F
+extCheckZIPdirOK=true
+extCheckLOGdirOK=true
+extCheckRETvarOK=true
+extCheckZIPdirMG="OK"
+extCheckLOGdirMG="OK"
+extCheckRETvarMG="OK"
+
+##----------------------------------------##
+## Modified by Martinski W. [2025-Jan-27] ##
+##----------------------------------------##
+_InitHelperJSFile_()
+{
+   ! "$inRouterSWmode" && return 0
+
+   [ ! -s "$HELPER_JSFILE" ] && \
+   {
+     echo "var externalCheckID = 0x00;"
+     echo "var externalCheckOK = true;"
+     echo "var externalCheckMsg = '';"
+   } > "$HELPER_JSFILE"
+
+   _WebUI_SetEmailConfigFileFromAMTM_
+   _WebUI_AutoScriptUpdateCronSchedule_
+   _WebUI_AutoFWUpdateCheckCronSchedule_
+}
+
+##----------------------------------------##
+## Modified by Martinski W. [2025-Feb-23] ##
+##----------------------------------------##
+_UpdateHelperJSFile_()
+{
+   if [ $# -lt 2 ] || \
+      [ -z "$1" ] || [ -z "$2" ] || \
+      ! "$inRouterSWmode"
+   then return 1; fi
+
+   local extCheckMsg=""
+   if [ $# -gt 2 ] && [ -n "$3" ]
+   then extCheckMsg="$3" ; fi
+
+   if [ "$(($1 & extCheckZIPdirID))" -gt 0 ]
+   then
+       extCheckZIPdirOK="$2"
+       extCheckZIPdirMG="$extCheckMsg"
+   fi
+   if [ "$(($1 & extCheckLOGdirID))" -gt 0 ]
+   then
+       extCheckLOGdirOK="$2"
+       extCheckLOGdirMG="$extCheckMsg"
+   fi
+
+   if [ "$1" = "$extCheckALLvarID" ] || \
+      [ "$extCheckZIPdirOK" = "$extCheckLOGdirOK" ]
+   then
+       extCheckRETvarOK="$extCheckZIPdirOK"
+       extCheckRETvarID="$((extCheckZIPdirID | extCheckLOGdirID))"
+       if "$extCheckZIPdirOK"
+       then
+           extCheckRETvarMG="$extCheckZIPdirMG"
+       else
+           extCheckRETvarMG="${extCheckZIPdirMG}\n\n${extCheckLOGdirMG}"
+       fi
+   elif ! "$extCheckZIPdirOK"
+   then
+       extCheckRETvarOK="$extCheckZIPdirOK"
+       extCheckRETvarID="$extCheckZIPdirID"
+       extCheckRETvarMG="$extCheckZIPdirMG"
+   elif ! "$extCheckLOGdirOK"
+   then
+       extCheckRETvarOK="$extCheckLOGdirOK"
+       extCheckRETvarID="$extCheckLOGdirID"
+       extCheckRETvarMG="$extCheckLOGdirMG"
+   fi
+
+   {
+     echo "var externalCheckID = ${extCheckRETvarID};"
+     echo "var externalCheckOK = ${extCheckRETvarOK};"
+     echo "var externalCheckMsg = '${extCheckRETvarMG}';"
+   } > "$HELPER_JSFILE"
+
+   _WebUI_SetEmailConfigFileFromAMTM_
+   _WebUI_AutoScriptUpdateCronSchedule_
+   _WebUI_AutoFWUpdateCheckCronSchedule_
+}
+
+##----------------------------------------##
+## Modified by Martinski W. [2025-Feb-23] ##
+##----------------------------------------##
 _Validate_FW_UpdateLOG_DirectoryPath_()
 {
-   if [ $# -eq 0 ] || [ -z "$1" ] || [ ! -d "$1" ]
-   then return 1 ; fi
+   if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi
+
+   local updateHelperJS=false
+   if [ $# -eq 2 ] && [ "$2" = "true" ]
+   then updateHelperJS=true ; fi
+
+   if [ ! -d "$1" ]
+   then
+       if "$updateHelperJS"
+       then
+           checkErrorMsg="The directory path for F/W update log files is NOT found:\n[$1]"
+           _UpdateHelperJSFile_ "$extCheckLOGdirID" "false" "$checkErrorMsg"
+       fi
+       Say "${REDct}**ERROR**${NOct}: Directory path [${REDct}${1}${NOct}] for F/W update log files is NOT found."
+       _WaitForEnterKey_
+       return 1
+   fi
 
    if [ "$1" = "$FW_LOG_DIR" ] || [ "$1" = "$FW_LOG_BASE_DIR" ]
-   then return 0 ; fi
+   then
+       _UpdateHelperJSFile_ "$extCheckLOGdirID" "true"
+       return 0
+   fi
 
    local newFullDirPath=""  newBaseDirPath="$1"
 
@@ -1365,7 +1475,12 @@ _Validate_FW_UpdateLOG_DirectoryPath_()
    mkdir -p -m 755 "$newFullDirPath" 2>/dev/null
    if [ ! -d "$newFullDirPath" ]
    then
-       printf "\n${REDct}**ERROR**${NOct}: Could NOT create directory [${REDct}${newFullDirPath}${NOct}].\n"
+       if "$updateHelperJS"
+       then
+           checkErrorMsg="The directory path for F/W update log files cannot be created:\n[$newFullDirPath]"
+           _UpdateHelperJSFile_ "$extCheckLOGdirID" "false" "$checkErrorMsg"
+       fi
+       Say "${REDct}**ERROR**${NOct}: Could NOT create directory path [${REDct}${newFullDirPath}${NOct}] for F/W update log files."
        _WaitForEnterKey_
        return 1
    fi
@@ -1376,24 +1491,26 @@ _Validate_FW_UpdateLOG_DirectoryPath_()
    # Update the log directory paths after validation #
    Update_Custom_Settings FW_New_Update_LOG_Directory_Path "$newBaseDirPath"
    Update_Custom_Settings FW_New_Update_LOG_Preferred_Path "$newBaseDirPath"
+   _UpdateHelperJSFile_ "$extCheckLOGdirID" "true"
    return 0
 }
 
-##------------------------------------------##
-## Modified by ExtremeFiretop [2025-Jan-15] ##
-##------------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Feb-23] ##
+##----------------------------------------##
 _Set_FW_UpdateLOG_DirectoryPath_()
 {
-   local newLogBaseDirPath="$FW_LOG_BASE_DIR"  newLogFileDirPath=""
+   local newLOG_BaseDirPath="$FW_LOG_BASE_DIR"
 
    while true
    do
-      printf "\nEnter the directory path where the LOG subdirectory [${GRNct}${FW_LOG_SUBDIR}${NOct}] will be stored.\n"
-      printf "[${theADExitStr}] [CURRENT: ${GRNct}${FW_LOG_BASE_DIR}${NOct}]:  "
+      printf "\nEnter the directory path where the subdirectory [${GRNct}${FW_LOG_SUBDIR}${NOct}] will be located.\n"
+      printf "[${theLGExitStr}]\n"
+      printf "[Current Base Path: ${GRNct}${FW_LOG_BASE_DIR}${NOct}]:  "
       read -r userInput
 
-      if [ -z "$userInput" ] || echo "$userInput" | grep -qE "^(e|exit|Exit)$"
-      then break ; fi
+      if [ -z "$userInput" ] ; then break ; fi
+      if echo "$userInput" | grep -qE "^(e|exit|Exit)$" ; then return 1 ; fi
 
       if echo "$userInput" | grep -q '/$'
       then userInput="${userInput%/*}" ; fi
@@ -1411,7 +1528,7 @@ _Set_FW_UpdateLOG_DirectoryPath_()
       fi
 
       if [ -d "$userInput" ]
-      then newLogBaseDirPath="$userInput" ; break ; fi
+      then newLOG_BaseDirPath="$userInput" ; break ; fi
 
       rootDir="${userInput%/*}"
       if [ ! -d "$rootDir" ]
@@ -1430,30 +1547,26 @@ _Set_FW_UpdateLOG_DirectoryPath_()
       else
           mkdir -m 755 "$userInput" 2>/dev/null
           if [ -d "$userInput" ]
-          then newLogBaseDirPath="$userInput" ; break
+          then newLOG_BaseDirPath="$userInput" ; break
           else printf "\n${REDct}**ERROR**${NOct}: Could NOT create directory [${REDct}${userInput}${NOct}].\n\n"
           fi
       fi
    done
 
-   # Double-check current directory indeed exists after menu selection #
-   if [ "$newLogBaseDirPath" = "$FW_LOG_BASE_DIR" ] && [ ! -d "$FW_LOG_DIR" ]
-   then mkdir -p -m 755 "$FW_LOG_DIR" ; fi
-
-   if [ -d "$newLogBaseDirPath" ]
+   if [ -d "$newLOG_BaseDirPath" ]
    then
-       if ! _Validate_FW_UpdateLOG_DirectoryPath_ "$newLogBaseDirPath"
+       if ! _Validate_FW_UpdateLOG_DirectoryPath_ "$newLOG_BaseDirPath"
        then return 1
        fi
        echo "The directory path for the log files was updated successfully."
-       _WaitForEnterKey_ "$advnMenuReturnPromptStr"
+       _WaitForEnterKey_ "$logsMenuReturnPromptStr"
    fi
    return 0
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2025-Jan-15] ##
-##-------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Feb-23] ##
+##----------------------------------------##
 _Validate_FW_UpdateZIP_DirectoryPath_()
 {
    if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi
@@ -1466,17 +1579,17 @@ _Validate_FW_UpdateZIP_DirectoryPath_()
    then
        if "$updateHelperJS"
        then
-           checkErrorMsg="The directory path [$1] was NOT found."
-           _UpdateHelperJSFile_ 0x01 "false" "$checkErrorMsg"
+           checkErrorMsg="The directory path for F/W update files is NOT found:\n[$1]"
+           _UpdateHelperJSFile_ "$extCheckZIPdirID" "false" "$checkErrorMsg"
        fi
-       Say "${REDct}**ERROR**${NOct}: Directory path [${REDct}${1}${NOct}] is NOT found."
+       Say "${REDct}**ERROR**${NOct}: Directory path [${REDct}${1}${NOct}] for F/W update files is NOT found."
        _WaitForEnterKey_
        return 1
    fi
 
    if [ "$1" = "$FW_ZIP_DIR" ] || [ "$1" = "$FW_ZIP_BASE_DIR" ]
    then
-       _UpdateHelperJSFile_ 0x01 "true"
+       _UpdateHelperJSFile_ "$extCheckZIPdirID" "true"
        return 0
    fi
 
@@ -1491,10 +1604,10 @@ _Validate_FW_UpdateZIP_DirectoryPath_()
    then
        if "$updateHelperJS"
        then
-           checkErrorMsg="The directory path [$newFullDirPath] could NOT be created."
-           _UpdateHelperJSFile_ 0x01 "false" "$checkErrorMsg"
+           checkErrorMsg="The directory path for F/W update files cannot be created:\n[$newFullDirPath]"
+           _UpdateHelperJSFile_ "$extCheckZIPdirID" "false" "$checkErrorMsg"
        fi
-       Say "${REDct}**ERROR**${NOct}: Could NOT create directory [${REDct}${newFullDirPath}${NOct}]"
+       Say "${REDct}**ERROR**${NOct}: Could NOT create directory path [${REDct}${newFullDirPath}${NOct}] for F/W update files."
        _WaitForEnterKey_
        return 1
    fi
@@ -1502,33 +1615,28 @@ _Validate_FW_UpdateZIP_DirectoryPath_()
    rm -fr "${FW_ZIP_DIR:?}"
    rm -f "${newFullDirPath}"/*.zip  "${newFullDirPath}"/*.sha256
    Update_Custom_Settings FW_New_Update_ZIP_Directory_Path "$newBaseDirPath"
-   _UpdateHelperJSFile_ 0x01 "true"
+   _UpdateHelperJSFile_ "$extCheckZIPdirID" "true"
    return 0
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-15] ##
+## Modified by Martinski W. [2025-Feb-23] ##
 ##----------------------------------------##
 _Set_FW_UpdateZIP_DirectoryPath_()
 {
-   local newZIP_BaseDirPath="$FW_ZIP_BASE_DIR"  newZIP_FileDirPath=""
+   local newZIP_BaseDirPath="$FW_ZIP_BASE_DIR"
 
    while true
    do
-      if "$isGNUtonFW"
-      then
-          printf "\nEnter the directory path where the update subdirectory [${GRNct}${FW_ZIP_SUBDIR}${NOct}] will be stored.\n" 
-      else
-          printf "\nEnter the directory path where the ZIP subdirectory [${GRNct}${FW_ZIP_SUBDIR}${NOct}] will be stored.\n"
-      fi
+      printf "\nEnter the directory path where the update subdirectory [${GRNct}${FW_ZIP_SUBDIR}${NOct}] will be located.\n" 
       if [ -n "$USBMountPoint" ] && _ValidateUSBMountPoint_ "$FW_ZIP_BASE_DIR"
       then
           printf "Default directory for USB-attached drive: [${GRNct}${FW_ZIP_BASE_DIR}${NOct}]\n"
       else
           printf "Default directory for 'Local' storage is: [${GRNct}/home/root${NOct}]\n"
       fi
-      printf "\n[${theADExitStr}] [CURRENT: ${GRNct}${FW_ZIP_BASE_DIR}${NOct}]:  "
-
+      printf "\n[${theADExitStr}]\n"
+      printf "[Current Base Path: ${GRNct}${FW_ZIP_BASE_DIR}${NOct}]:  "
       read -r userInput
 
       if [ -z "$userInput" ] ; then break ; fi
@@ -2173,50 +2281,6 @@ _WebUI_SetEmailConfigFileFromAMTM_()
    _WriteVarDefToHelperJSFile_ "isEMailConfigEnabledInAMTM" "$isEMailConfigEnabledInAMTM" true
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-27] ##
-##----------------------------------------##
-_InitHelperJSFile_()
-{
-   ! "$inRouterSWmode" && return 0
-
-   [ ! -s "$HELPER_JSFILE" ] && \
-   {
-     echo "var externalCheckID = 0x00;"
-     echo "var externalCheckOK = true;"
-     echo "var externalCheckMsg = '';"
-   } > "$HELPER_JSFILE"
-
-   _WebUI_SetEmailConfigFileFromAMTM_
-   _WebUI_AutoScriptUpdateCronSchedule_
-   _WebUI_AutoFWUpdateCheckCronSchedule_
-}
-
-##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-27] ##
-##----------------------------------------##
-_UpdateHelperJSFile_()
-{
-   if [ $# -lt 2 ] || \
-      [ -z "$1" ] || [ -z "$2" ] || \
-      ! "$inRouterSWmode"
-   then return 1; fi
-
-   local extCheckMsg=""
-   if [ $# -eq 3 ] && [ -n "$3" ]
-   then extCheckMsg="$3" ; fi
-
-   {
-     echo "var externalCheckID = ${1};"
-     echo "var externalCheckOK = ${2};"
-     echo "var externalCheckMsg = '${extCheckMsg}';"
-   } > "$HELPER_JSFILE"
-
-   _WebUI_SetEmailConfigFileFromAMTM_
-   _WebUI_AutoScriptUpdateCronSchedule_
-   _WebUI_AutoFWUpdateCheckCronSchedule_
-}
-
 ##-------------------------------------##
 ## Added by Martinski W. [2025-Jan-15] ##
 ##-------------------------------------##
@@ -2308,7 +2372,18 @@ _UpdateConfigFromWebUISettings_()
                    Say "**ERROR**: Could NOT update directory path [$keySettingValue]"
                fi
                continue
+           elif [ "$keySettingName" = "FW_New_Update_LOG_Directory_Path" ]
+           then
+               if _Validate_FW_UpdateLOG_DirectoryPath_ "$keySettingValue" true
+               then
+                   Say "Directory path [$keySettingValue] was updated successfully."
+               else
+                   settingsMergeOK=false
+                   Say "**ERROR**: Could NOT update directory path [$keySettingValue]"
+               fi
+               continue
            fi
+
            if [ "$keySettingName" = "FW_New_Update_Cron_Job_Schedule" ]
            then  # Replace delimiter char placed by the WebGUI #
                keySettingValue="$(echo "$keySettingValue" | sed 's/|/ /g')"
@@ -2333,7 +2408,7 @@ _UpdateConfigFromWebUISettings_()
 
        if ! "$settingsMergeOK"
        then  ## Reset for Next Check ##
-           { sleep 15 ; _UpdateHelperJSFile_ 0x01 "true" ; } &
+           { sleep 15 ; _UpdateHelperJSFile_ "$extCheckALLvarID" "true" ; } &
        fi
    else
        Say "No updated settings from WebUI found. No merge into $CONFIG_FILE necessary."
@@ -9397,16 +9472,17 @@ _GetFileSelectionIndex_()
    if [ $# -lt 2 ] || [ "$2" != "-MULTIOK" ]
    then
        multiIndexListOK=false
-       promptStr="Enter selection [${selectStr}] [${theLGExitStr}]?"
+       promptStr="Enter selection [${selectStr}]?"
    else
        multiIndexListOK=true
-       promptStr="Enter selection [${selectStr} | ${theAllStr}] [${theLGExitStr}]?"
+       promptStr="Enter selection [${selectStr} | ${theAllStr}]?"
    fi
    fileIndex=0  multiIndex=false
    numRegEx="([1-9]|[1-9][0-9])"
 
    while true
    do
+       printf "[${theLGExitStr}]\n"
        printf "${promptStr}  " ; read -r userInput
 
        if [ -z "$userInput" ] || \

From cfb216af7023489c15bbb46d7a0345f17eff3002 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 26 Feb 2025 00:09:09 -0800
Subject: [PATCH 2/2] Messaging Improvements

More improvements and fine-tuning WRT messaging.
---
 MerlinAU.asp | 43 ++++++++++++++++++++++---------------------
 MerlinAU.sh  | 20 +++++++++++++++++---
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index ed99a1de..80c5e75d 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Feb-23 **/
+/** Last Modified: 2025-Feb-25 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -41,6 +41,10 @@ var ajax_custom_settings = {};
 let isFormSubmitting = false;
 let FW_NewUpdateVersAvailable = '';
 
+// Order of NVRAM keys to search for 'Model ID' and 'Product ID' //
+const modelKeys = ["nvram_odmpid", "nvram_wps_modelnum", "nvram_model", "nvram_build_name"];
+const productKeys = ["nvram_productid", "nvram_build_name", "nvram_odmpid"];
+
 // Define color formatting //
 const CYANct = "<span style='color:cyan;'>";
 const REDct = "<span style='color:red;'>";
@@ -57,11 +61,12 @@ const InvCYNct = '<span style="margin-left:4px; background-color:cyan; color:bla
 const InvCLEAR = '&nbsp;</span>'
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-27] **/
+/** Modified by Martinski W. [2025-Feb-25] **/
 /**----------------------------------------**/
 var externalCheckID = 0x00;
 var externalCheckOK = true;
 var externalCheckMsg = '';
+var defaultFWUpdateZIPdirPath = '/home/root';
 var isEMailConfigEnabledInAMTM = false;
 var scriptAutoUpdateCronSchedHR = 'TBD';
 var fwAutoUpdateCheckCronSchedHR = 'TBD';
@@ -815,7 +820,7 @@ function ValidateDirectoryPath (formField, dirType)
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-23] **/
+/** Modified by Martinski W. [2025-Feb-25] **/
 /**----------------------------------------**/
 function GetExternalCheckResults()
 {
@@ -831,6 +836,7 @@ function GetExternalCheckResults()
             document.getElementById('Script_AutoUpdate_SchedText').textContent = 'Schedule: '+scriptAutoUpdateCronSchedHR;
             document.getElementById('FW_AutoUpdate_CheckSchedText').textContent = 'Schedule: '+fwAutoUpdateCheckCronSchedHR;
             SetUpEmailNotificationFields();
+            FWUpdateDirZIPHint = FWUpdateDirZIPHint.replace(/DefaultPATH/, defaultFWUpdateZIPdirPath);
 
             // Skip during form submission //
             if (isFormSubmitting) { return true ; }
@@ -876,8 +882,8 @@ function GetExternalCheckResults()
                 externalCheckOK = true; //Reset for Next Check//
                 fwUpdateDirPath.ResetExtCheckVars();
                 alert('Validation failed.\n' + validationStatus);
-                setTimeout(ValidateDirectoryPath, 5000, fwUpdateZIPdirectory, 'ZIP');
-                setTimeout(ValidateDirectoryPath, 5000, fwUpdateLOGdirectory, 'LOG');
+                setTimeout(ValidateDirectoryPath, 3000, fwUpdateZIPdirectory, 'ZIP');
+                setTimeout(ValidateDirectoryPath, 3000, fwUpdateLOGdirectory, 'LOG');
                 return false;
             }
         }
@@ -1135,7 +1141,7 @@ function SetUpEmailNotificationFields()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-23] **/
+/** Modified by Martinski W. [2025-Feb-25] **/
 /**----------------------------------------**/
 const emailNotifyHint = 'The Email Notifications option requires the AMTM email configuration settings to be enabled and set up.';
 
@@ -1143,9 +1149,9 @@ const autoBackupsHint = 'The Automatic Backups option requires the BACKUPMON scr
 
 const addonAutoUpdatesHint = 'The daily schedule for automatic updates of MerlinAU is always configured to be 15 minutes *before* the scheduled time for automatic F/W Update checks.';
 
-const FWUpdateDirZIPHint = 'This is the directory path where the subdirectory [MerlinAU.d] will be located to download and store the new F/W update files.';
+let FWUpdateDirZIPHint = "This is the base directory path where the subdirectory <br><b>MerlinAU.d/[RouterID]_firmware</b></br> will be located to download and store the new firmware update files.<br>Default base path:</br><b>DefaultPATH</b>";
 
-const FWUpdateDirLOGHint = 'This is the directory path where the subdirectory [MerlinAU.d] will be located to store the log files of the F/W update process.';
+const FWUpdateDirLOGHint = 'This is the base directory path where the subdirectory <br><b>MerlinAU.d/logs</b></br> will be located to store the log files of the firmware update process.';
 
 const betaToReleaseHint = 'Enabling this option allows the F/W update process to detect an installed Beta version and proceed to update to the latest production release version.';
 
@@ -2042,19 +2048,19 @@ function CheckFirmwareUpdate()
    document.form.submit();
 }
 
-// Function to get the first non-empty value from a list of element IDs
-function getFirstNonEmptyValue(ids)
+// Get first non-empty value from a list of element IDs //
+function GetFirstNonEmptyValue(elemIDs)
 {
-    for (var i = 0; i < ids.length; i++)
+    for (var indx = 0; indx < elemIDs.length; indx++)
     {
-        var elem = document.getElementById(ids[i]);
+        var elem = document.getElementById(elemIDs[indx]);
         if (elem)
         {
             var value = elem.value.trim();
             if (value.length > 0) { return value; }
         }
     }
-    return "";
+    return '';
 }
 
 /**----------------------------------------**/
@@ -2063,15 +2069,10 @@ function getFirstNonEmptyValue(ids)
 // Function to format and display the Router IDs //
 function FormatRouterIDs()
 {
-    // Define the order of NVRAM keys to search for Model ID and Product ID
-    var modelKeys = ["nvram_odmpid", "nvram_wps_modelnum", "nvram_model", "nvram_build_name"];
-    var productKeys = ["nvram_productid", "nvram_build_name", "nvram_odmpid"];
-
-    // Retrieve the first non-empty values //
-    var MODEL_ID = getFirstNonEmptyValue(modelKeys);
-    var PRODUCT_ID = getFirstNonEmptyValue(productKeys);
+    let MODEL_ID = GetFirstNonEmptyValue(modelKeys);
+    let PRODUCT_ID = GetFirstNonEmptyValue(productKeys);
 
-    // Convert MODEL_ID to uppercase for comparison //
+    // Convert to uppercase for comparison //
     var MODEL_ID_UPPER = MODEL_ID.toUpperCase();
 
     // Determine FW_RouterModelID based on comparison //
diff --git a/MerlinAU.sh b/MerlinAU.sh
index b1ca9492..2449eefb 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -4,7 +4,7 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Feb-23
+# Last Modified: 2025-Feb-25
 ###################################################################
 set -u
 
@@ -1359,8 +1359,20 @@ extCheckZIPdirMG="OK"
 extCheckLOGdirMG="OK"
 extCheckRETvarMG="OK"
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Feb-25] ##
+##-------------------------------------##
+_WebUI_FW_UpdateZIPDirPathDefault_()
+{
+   local defltDirPath="/home/root"
+   if [ -n "$USBMountPoint" ] && \
+      _ValidateUSBMountPoint_ "$FW_ZIP_BASE_DIR"
+   then defltDirPath="$FW_ZIP_BASE_DIR" ; fi
+   _WriteVarDefToHelperJSFile_ "defaultFWUpdateZIPdirPath" "$defltDirPath"
+}
+
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-27] ##
+## Modified by Martinski W. [2025-Feb-25] ##
 ##----------------------------------------##
 _InitHelperJSFile_()
 {
@@ -1373,13 +1385,14 @@ _InitHelperJSFile_()
      echo "var externalCheckMsg = '';"
    } > "$HELPER_JSFILE"
 
+   _WebUI_FW_UpdateZIPDirPathDefault_
    _WebUI_SetEmailConfigFileFromAMTM_
    _WebUI_AutoScriptUpdateCronSchedule_
    _WebUI_AutoFWUpdateCheckCronSchedule_
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Feb-23] ##
+## Modified by Martinski W. [2025-Feb-25] ##
 ##----------------------------------------##
 _UpdateHelperJSFile_()
 {
@@ -1432,6 +1445,7 @@ _UpdateHelperJSFile_()
      echo "var externalCheckMsg = '${extCheckRETvarMG}';"
    } > "$HELPER_JSFILE"
 
+   _WebUI_FW_UpdateZIPDirPathDefault_
    _WebUI_SetEmailConfigFileFromAMTM_
    _WebUI_AutoScriptUpdateCronSchedule_
    _WebUI_AutoFWUpdateCheckCronSchedule_