Messaging Improvements

More improvements and fine-tuning WRT messaging.

Author: Martinski4GitHub

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,17 +1141,17 @@ 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.';
 
 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.';
+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 //

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_