From d0b105d80e6679ffcb664e3d382948d5d2093227 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 12 Feb 2025 21:02:11 -0800
Subject: [PATCH] Minor Changes

Fixed a couple of typos and grammar syntax.
Minor format changes to remove some Linter tool "coding standards" warnings.
---
 MerlinAU.asp | 88 ++++++++++++++++++++++++++--------------------------
 MerlinAU.sh  | 61 +++++++++++++++++++-----------------
 2 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 2ca78293..923d2529 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Jan-27 **/
+/** Last Modified: 2025-Feb-12 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -1702,17 +1702,15 @@ function SaveAdvancedConfig()
     // 7) 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) {
-        advanced_settings.ROGBuild = (rogFWBuildType.value === 'ROG') ? 'ENABLED' : 'DISABLED';
-    }
+    if (rogFWBuildRow && rogFWBuildRow.style.display !== 'none' && rogFWBuildType)
+    { advanced_settings.ROGBuild = (rogFWBuildType.value === 'ROG') ? 'ENABLED' : 'DISABLED'; }
 
     let tufFWBuildRow = document.getElementById('tuffFWBuildRow');
     let tuffFWBuildType = document.getElementById('tuffFWBuildType');
-    if (tufFWBuildRow && tufFWBuildRow.style.display !== 'none' && tuffFWBuildType) {
-        advanced_settings.TUFBuild = (tuffFWBuildType.value === 'TUF') ? 'ENABLED' : 'DISABLED';
-    }
+    if (tufFWBuildRow && tufFWBuildRow.style.display !== 'none' && tuffFWBuildType)
+    { advanced_settings.TUFBuild = (tuffFWBuildType.value === 'TUF') ? 'ENABLED' : 'DISABLED'; }
 
-    // Prefix only Advanced settings
+    // Prefix only Advanced settings //
     var prefixedAdvancedSettings = PrefixCustomSettings(advanced_settings, 'MerlinAU_');
 
     // Remove any action keys from shared_custom_settings to avoid overwriting //
@@ -1903,52 +1901,54 @@ document.addEventListener("DOMContentLoaded", function()
     FormatFirmwareVersion();
 });
 
-function updateTUFROGAvailText() {
-    // For ROG
+function updateTUFROGAvailText()
+{
+    // ROG build //
     let rogSelect = document.getElementById('rogFWBuildType');
     let rogMsgSpan = document.getElementById('rogFWBuildTypeAvailMsg');
-    if (rogSelect && rogMsgSpan) {
-        if (rogSelect.value === 'ROG') {
-            rogMsgSpan.style.display = 'inline-block';
-        } else {
-            rogMsgSpan.style.display = 'none';
-        }
+    if (rogSelect && rogMsgSpan)
+    {
+        if (rogSelect.value === 'ROG')
+        { rogMsgSpan.style.display = 'inline-block'; }
+        else
+        { rogMsgSpan.style.display = 'none'; }
     }
-    
-    // For TUF
+
+    // TUF build //
     let tufSelect = document.getElementById('tuffFWBuildType');
     let tufMsgSpan = document.getElementById('tuffFWBuildTypeAvailMsg');
-    if (tufSelect && tufMsgSpan) {
-        if (tufSelect.value === 'TUF') {
-            tufMsgSpan.style.display = 'inline-block';
-        } else {
-            tufMsgSpan.style.display = 'none';
-        }
+    if (tufSelect && tufMsgSpan)
+    {
+        if (tufSelect.value === 'TUF')
+        { tufMsgSpan.style.display = 'inline-block'; }
+        else
+        { tufMsgSpan.style.display = 'none'; }
     }
 }
 
-function handleTUFROGChange(selectElem) {
-    // If user picks TUF or ROG, show the popup alert
-    if (selectElem.value === 'TUF' || selectElem.value === 'ROG') {
-        alert("The TUF/ROG Build will only apply if a compatible TUF firmware image is available. Otherwise, the Pure Build will be used.");
+function handleTUFROGChange(selectElem)
+{
+    // If user picks TUF or ROG, pop up alert //
+    if (selectElem.value === 'TUF' || selectElem.value === 'ROG')
+    {
+        alert("The TUF/ROG build will apply only if a corresponding TUF or ROG firmware image is available. Otherwise, the Pure build will be used.");
     }
-    
-    // Show or hide the "if available" text next to the relevant dropdown
-    if (selectElem.id === 'rogFWBuildType') {
+
+    if (selectElem.id === 'rogFWBuildType')
+    {
         let rogMsgSpan = document.getElementById('rogFWBuildTypeAvailMsg');
-        if (selectElem.value === 'ROG') {
-            rogMsgSpan.style.display = 'inline-block';
-        } else {
-            rogMsgSpan.style.display = 'none';
-        }
+        if (selectElem.value === 'ROG')
+        { rogMsgSpan.style.display = 'inline-block'; }
+        else
+        { rogMsgSpan.style.display = 'none'; }
     }
-    else if (selectElem.id === 'tuffFWBuildType') {
+    else if (selectElem.id === 'tuffFWBuildType')
+    {
         let tufMsgSpan = document.getElementById('tuffFWBuildTypeAvailMsg');
-        if (selectElem.value === 'TUF') {
-            tufMsgSpan.style.display = 'inline-block';
-        } else {
-            tufMsgSpan.style.display = 'none';
-        }
+        if (selectElem.value === 'TUF')
+        { tufMsgSpan.style.display = 'inline-block'; }
+        else
+        { tufMsgSpan.style.display = 'none'; }
     }
 }
 
@@ -2361,7 +2361,7 @@ function initializeCollapsibleSections()
           style="margin-left:10px; display:none; font-size:12px; font-weight:bolder;">
       Note: Only if available
     </span>
-  </td>
+   </td>
 </tr>
 <tr id="tuffFWBuildRow">
    <td style="text-align: left;"><label for="tuffFWBuildType">TUF F/W Build Type</label></td>
@@ -2374,7 +2374,7 @@ function initializeCollapsibleSections()
           style="margin-left:10px; display:none; font-size:12px; font-weight:bolder;">
       Note: Only if available
     </span>
-  </td>
+   </td>
 </tr>
 <tr>
    <td style="text-align: left;"><label for="emailNotificationsEnabled">Enable F/W Update Email Notifications</label></td>
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 59a25fb0..c47088bf 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -1843,7 +1843,6 @@ _Mount_WebUI_()
    if [ ! -f "$TEMP_MENU_TREE" ]
    then cp -fp "$ORIG_MENU_TREE" "$TEMP_MENU_TREE"
    fi
-
    sed -i "/url: \"$webPageFile\", tabName: \"$SCRIPT_NAME\"/d" "$TEMP_MENU_TREE"
 
    # Insert new page tab in the 'Administration' menu #
@@ -4772,7 +4771,7 @@ _ChangeBuildType_TUF_()
    # Use Get_Custom_Setting to retrieve the previous choice
    previous_choice="$(Get_Custom_Setting "TUFBuild")"
 
-   # If the previous choice is not set, default to 'DSIABLED'
+   # If the previous choice is not set, default to 'DISABLED'
    if [ "$previous_choice" = "TBD" ]; then
        previous_choice="DISABLED"
    fi
@@ -4792,7 +4791,7 @@ _ChangeBuildType_TUF_()
        printf "\n${SEPstr}"
        printf "\nChoose your preferred option for the build type to flash:\n"
        printf "\n  ${GRNct}1${NOct}. Original ${REDct}TUF${NOct} themed user interface"
-       printf "\n     ${REDct}(Applies only if TUF F/W is available; otherwise defaults to Pure Build)${NOct}\n"
+       printf "\n     ${REDct}(Applies only if TUF F/W is available; otherwise, defaults to Pure build)${NOct}\n"
        printf "\n  ${GRNct}2${NOct}. Pure ${GRNct}non-TUF${NOct} themed user interface"
        printf "\n     ${GRNct}(Recommended)${NOct}\n"
        printf "\n  ${GRNct}e${NOct}. Exit to Advanced Menu\n"
@@ -4807,7 +4806,7 @@ _ChangeBuildType_TUF_()
 
        case $choice in
            1) buildtypechoice="ENABLED"
-              printf "${CYANct}\nNote: The TUF Build will only apply if a compatible TUF firmware image is available. Otherwise, the Pure Build will be used.${NOct}\n"
+              printf "${CYANct}\nNote: The TUF build will apply only if a compatible TUF firmware image is available. Otherwise, the Pure build will be used.${NOct}\n"
               break
               ;;
            2) buildtypechoice="DISABLED" ; break
@@ -4856,7 +4855,7 @@ _ChangeBuildType_ROG_()
        printf "\n${SEPstr}"
        printf "\nChoose your preferred option for the build type to flash:\n"
        printf "\n  ${GRNct}1${NOct}. Original ${REDct}ROG${NOct} themed user interface"
-       printf "\n     ${REDct}(Applies only if ROG F/W is available; otherwise defaults to Pure Build)${NOct}\n"
+       printf "\n     ${REDct}(Applies only if ROG F/W is available; otherwise, defaults to Pure build)${NOct}\n"
        printf "\n  ${GRNct}2${NOct}. Pure ${GRNct}non-ROG${NOct} themed user interface"
        printf "\n     ${GRNct}(Recommended)${NOct}\n"
        printf "\n  ${GRNct}e${NOct}. Exit to Advanced Menu\n"
@@ -4871,10 +4870,10 @@ _ChangeBuildType_ROG_()
 
        case $choice in
            1) buildtypechoice="ENABLED"
-              printf "${CYANct}\nNote: The ROG Build will only apply if a compatible ROG firmware image is available. Otherwise, the Pure Build will be used.${NOct}\n"
+              printf "${CYANct}\nNote: The ROG build will apply only if a compatible ROG firmware image is available. Otherwise, the Pure build will be used.${NOct}\n"
               break
               ;;
-           2) buildtypechoice="DISASLED" ; break
+           2) buildtypechoice="DISABLED" ; break
               ;;
            *) echo ; _InvalidMenuSelection_
               ;;
@@ -8263,7 +8262,8 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
             printf "${REDct}Would you like to use the ROG build?${NOct}\n"
             printf "Enter your choice (y/n): "
             read -r choice
-            if [ "$choice" = "y" ] || [ "$choice" = "Y" ]; then
+            if [ "$choice" = "y" ] || [ "$choice" = "Y" ]
+            then
                 Say "ROG build selected for flashing"
                 firmware_file="$rog_file"
                 Update_Custom_Settings "ROGBuild" "ENABLED"
@@ -9140,18 +9140,20 @@ fi
 ##---------------------------------------##
 ## Added by ExtremeFiretop [2025-Feb-08] ##
 ##---------------------------------------##
-_CheckAndSetBackupOption_() {
+_CheckAndSetBackupOption_()
+{
     local currentBackupOption
     currentBackupOption="$(Get_Custom_Setting "FW_Auto_Backupmon")"
-    if [ -f "/jffs/scripts/backupmon.sh" ]; then
+    if [ -f "/jffs/scripts/backupmon.sh" ]
+    then
         # If setting is empty, add it to the configuration file #
-        if [ "$currentBackupOption" = "TBD" ]; then
-            Update_Custom_Settings FW_Auto_Backupmon "ENABLED"
+        if [ "$currentBackupOption" = "TBD" ]
+        then Update_Custom_Settings FW_Auto_Backupmon "ENABLED"
         fi
     else
         # If the configuration setting exists, delete it #
-        if [ "$currentBackupOption" != "TBD" ]; then
-            Delete_Custom_Settings "FW_Auto_Backupmon"
+        if [ "$currentBackupOption" != "TBD" ]
+        then Delete_Custom_Settings "FW_Auto_Backupmon"
         fi
     fi
 }
@@ -9159,7 +9161,8 @@ _CheckAndSetBackupOption_() {
 ##---------------------------------------##
 ## Added by ExtremeFiretop [2025-Feb-08] ##
 ##---------------------------------------##
-_SetDefaultBuildType_() {
+_SetDefaultBuildType_()
+{
   if echo "$PRODUCT_ID" | grep -q "^TUF-"
   then
       if [ "$(Get_Custom_Setting "TUFBuild")" = "TBD" ]
@@ -9830,7 +9833,6 @@ _ShowAdvancedOptionsMenu_()
     then
         if echo "$PRODUCT_ID" | grep -q "^TUF-"
         then
-            # Retrieve the current build type setting
             local current_build_type="$(Get_Custom_Setting "TUFBuild")"
 
             # Convert the setting to a descriptive text
@@ -9845,34 +9847,36 @@ _ShowAdvancedOptionsMenu_()
             fi
             printf "\n ${GRNct}bt${NOct}.  Toggle F/W Build Type"
             if [ "$current_build_type_menu" = "NOT SET" ]
-                then printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menu}${NOct}]\n"
-                else printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menu}${NOct}]\n"
+            then
+                printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menu}${NOct}]\n"
+            else
+                printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menu}${NOct}]\n"
             fi
         elif echo "$PRODUCT_ID" | grep -q "^GT-"
         then
-            # Retrieve the current build type setting #
             local current_build_typerog="$(Get_Custom_Setting "ROGBuild")"
 
             # Convert the setting to a descriptive text
             if [ "$current_build_typerog" = "ENABLED" ]
             then
-              current_build_type_menurog="ROG Build"
+                current_build_type_menurog="ROG Build"
             elif [ "$current_build_typerog" = "DISABLED" ]
             then
-              current_build_type_menurog="Pure Build"
+                current_build_type_menurog="Pure Build"
             else
-              current_build_type_menurog="NOT SET"
+                current_build_type_menurog="NOT SET"
             fi
             printf "\n ${GRNct}bt${NOct}.  Toggle F/W Build Type"
             if [ "$current_build_type_menurog" = "NOT SET" ]
-                then printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menurog}${NOct}]\n"
-                else printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menurog}${NOct}]\n"
+            then
+                printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menurog}${NOct}]\n"
+            else
+                printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menurog}${NOct}]\n"
             fi
         fi
     else
         if echo "$PRODUCT_ID" | grep -q "^GT-"
         then
-            # Retrieve the current build type setting
             local current_build_type="$(Get_Custom_Setting "ROGBuild")"
 
             # Convert the setting to a descriptive text
@@ -9887,8 +9891,10 @@ _ShowAdvancedOptionsMenu_()
             fi
             printf "\n ${GRNct}bt${NOct}.  Toggle F/W Build Type"
             if [ "$current_build_type_menu" = "NOT SET" ]
-                then printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menu}${NOct}]\n"
-                else printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menu}${NOct}]\n"
+            then
+                printf "\n${padStr}[Current Build Type: ${REDct}${current_build_type_menu}${NOct}]\n"
+            else
+                printf "\n${padStr}[Current Build Type: ${GRNct}${current_build_type_menu}${NOct}]\n"
             fi
         fi
     fi
@@ -10250,7 +10256,6 @@ _DoInitializationStartup_()
 
    _CheckAndSetBackupOption_
    _SetDefaultBuildType_
-
 }
 
 FW_InstalledVersion="$(_GetCurrentFWInstalledLongVersion_)"