From d0c182e25b1f315754d33f8ffeeace9948e72761 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:01:05 -0800
Subject: [PATCH 1/2] New Checkmarks on WebGUI

Modified WebGUI page with checkmarks to give users the option to "Keep configuration file"
when uninstalling, and to "Bypass postponed days" when doing a F/W update check.
---
 MerlinAU.asp |  76 +++++++++++++++++++++++++++----------
 MerlinAU.sh  | 103 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/MerlinAU.asp b/MerlinAU.asp
index 73414824..edf1d495 100644
--- a/MerlinAU.asp
+++ b/MerlinAU.asp
@@ -29,7 +29,7 @@
 <script language="JavaScript" type="text/javascript">
 
 /**----------------------------**/
-/** Last Modified: 2025-Jan-21 **/
+/** Last Modified: 2025-Jan-22 **/
 /** Intended for 1.4.0 Release **/
 /**----------------------------**/
 
@@ -447,7 +447,7 @@ function handleROGFWBuildTypeVisibility()
 }
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Jan-13] **/
+/** Modified by Martinski W. [2025-Jan-22] **/
 /**----------------------------------------**/
 function InitializeFields()
 {
@@ -471,7 +471,9 @@ function InitializeFields()
     let storedFwUpdateEnabled = custom_settings.FW_Update_Check || 'DISABLED'; 
     // fallback to 'DISABLED' if custom_settings.FW_Update_Check is missing //
 
-    // Get the checkbox and status elements
+    $('#KeepConfigFile').prop('checked',false);
+    $('#BypassPostponedDays').prop('checked',false);
+
     let FW_AutoUpdate_Check = document.getElementById('FW_AutoUpdate_Check');
     let fwUpdateCheckStatus = document.getElementById('fwUpdateCheckStatus');
 
@@ -1127,6 +1129,9 @@ function SaveAdvancedConfig()
     console.log("Advanced Config Form submitted with settings:", updatedSettings);
 }
 
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Jan-22] **/
+/**----------------------------------------**/
 function Uninstall()
 {
    console.log("Uninstalling MerlinAU...");
@@ -1134,9 +1139,15 @@ function Uninstall()
    if (!confirm("Are you sure you want to completely uninstall MerlinAU?"))
    { return; }
 
-   document.form.action_script.value = 'start_MerlinAUuninstall';
-   document.form.action_wait.value = 10;
+   let actionScriptVal;
+   let keepConfigFile = document.getElementById('KeepConfigFile');
+   if (!keepConfigFile.checked)
+   { actionScriptVal = 'start_MerlinAUuninstall'; }
+   else
+   { actionScriptVal = 'start_MerlinAUuninstall_keepConfig'; }
 
+   document.form.action_script.value = actionScriptVal;
+   document.form.action_wait.value = 10;
    showLoading();
    document.form.submit();
 }
@@ -1150,23 +1161,36 @@ function changelogApproval()
 
    document.form.action_script.value = 'start_MerlinAUapprovechangelog';
    document.form.action_wait.value = 10;
-
    showLoading();
    document.form.submit();
 }
 
-function checkFirmwareUpdate()
+/**----------------------------------------**/
+/** Modified by Martinski W. [2025-Jan-22] **/
+/**----------------------------------------**/
+function CheckFirmwareUpdate()
 {
-    console.log("Initiating F/W Update Check...");
-
-    if (!confirm("NOTE:\nIf you have no postponement days set or remaining, the firmware could flash NOW!\nThis means logging you out of the WebUI and rebooting the router.\nContinue to check for firmware updates now?"))
-    { return; }
+   console.log("Initiating F/W Update Check...");
 
-    document.form.action_script.value = 'start_MerlinAUcheckupdate';
-    document.form.action_wait.value = 60;
+   let actionScriptVal;
+   let bypassPostponedDays = document.getElementById('BypassPostponedDays');
+   if (!bypassPostponedDays.checked)
+   {
+       actionScriptVal = 'start_MerlinAUcheckupdate';
+       if (!confirm("NOTE:\nIf you have no postponement days set or remaining, the firmware may flash NOW!\nThis means logging you out of the WebUI and rebooting the router.\nContinue to check for firmware updates now?"))
+       { return; }
+   }
+   else
+   {
+       actionScriptVal = 'start_MerlinAUcheckupdate_bypassDays';
+       if (!confirm("NOTE:\nThe firmware may flash NOW!\nThis means logging you out of the WebUI and rebooting the router.\nContinue to check for firmware updates now?"))
+       { return; }
+   }
 
-    showLoading();
-    document.form.submit();
+   document.form.action_script.value = actionScriptVal;
+   document.form.action_wait.value = 60;
+   showLoading();
+   document.form.submit();
 }
 
 // Function to get the first non-empty value from a list of element IDs
@@ -1439,7 +1463,7 @@ function initializeCollapsibleSections()
    <tr><td colspan="2">Actions (click to expand/collapse)</td></tr>
 </thead>
 <tbody><tr><td colspan="2">
-<div style="text-align: center; margin-top: 10px;">
+<div style="text-align: center; margin-top: 3px;">
 <table width="100%" border="0" cellpadding="10" cellspacing="0" style="table-layout: fixed; border-collapse: collapse; background-color: transparent;">
 <colgroup>
    <col style="width: 33%;" />
@@ -1448,13 +1472,27 @@ function initializeCollapsibleSections()
 </colgroup>
 <tr>
 <td style="text-align: right; border: none;">
-   <input type="submit" onclick="checkFirmwareUpdate(); return false;" value="F/W Update Check" class="button_gen savebutton" name="button">
+   <input type="submit" id="FWUpdateCheckButton" onclick="CheckFirmwareUpdate();
+    return false;" value="F/W Update Check" class="button_gen savebutton" name="button">
+   <br>
+   <label style="color:#FFCC00; margin-top: 5px; margin-bottom:8x">
+   <input type="checkbox" checked="" id="BypassPostponedDays" name="BypassPostponedDays"
+    style="padding:0; vertical-align:middle; position:relative; margin-left:-5px; margin-top:5px; margin-bottom:8px"/>Bypass postponed days</label>
+   </br>
 </td>
 <td style="text-align: center; border: none;" id="approveChangelogCell">
-   <input type="submit" id="approveChangelogButton" onclick="changelogApproval(); return false;" value="Approve Changelog" class="button_gen savebutton" name="button">
+   <input type="submit" id="approveChangelogButton" onclick="changelogApproval();
+    return false;" value="Approve Changelog" class="button_gen savebutton" name="button">
+   <br><label style="margin-top: 5px; margin-bottom:8x"></br>
 </td>
 <td style="text-align: left; border: none;">
-   <input type="submit" onclick="Uninstall(); return false;" value="Uninstall" class="button_gen savebutton" name="button">
+   <input type="submit" id="UninstallButton" onclick="Uninstall(); return false;"
+    value="Uninstall" class="button_gen savebutton" name="button">
+   <br>
+   <label style="color:#FFCC00; margin-top: 5px; margin-bottom:8x">
+   <input type="checkbox" checked="" id="KeepConfigFile" name="KeepConfigFile"
+    style="padding:0; vertical-align:middle; position:relative; margin-left:-3px; margin-top:5px; margin-bottom:8px"/>Keep configuration file</label>
+   </br>
 </td>
 </tr>
 </table>
diff --git a/MerlinAU.sh b/MerlinAU.sh
index 40630384..e697ef74 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-Jan-20
+# Last Modified: 2025-Jan-22
 ###################################################################
 set -u
 
@@ -159,13 +159,15 @@ else cronListCmd="crontab -l"
 fi
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-Nov-27] ##
+## Modified by Martinski W. [2025-Jan-22] ##
 ##----------------------------------------##
 inMenuMode=true
 isInteractive=false
 FlashStarted=false
 MerlinChangeLogURL=""
 GnutonChangeLogURL=""
+keepConfigFile=false
+bypassPostponedDays=false
 
 # Main LAN Network Info #
 readonly myLAN_HostName="$(nvram get lan_hostname)"
@@ -7130,7 +7132,7 @@ _CheckNodeFWUpdateNotification_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-May-18] ##
+## Modified by Martinski W. [2025-Jan-22] ##
 ##----------------------------------------##
 _CheckTimeToUpdateFirmware_()
 {
@@ -7169,13 +7171,13 @@ _CheckTimeToUpdateFirmware_()
        upfwDateTimeStrn="$(date -d @$upfwDateTimeSecs +"%A, %Y-%b-%d %I:%M %p")"
        Say "The firmware update is expected to occur on or after ${GRNct}${upfwDateTimeStrn}${NOct}, depending on when your cron job is scheduled to check again."
        return 1
+   else
+       Say "The firmware update is expected to occur on ${GRNct}${nextCronTimeSecs}${NOct}."
    fi
 
-   Say "The firmware update is expected to occur on ${GRNct}${nextCronTimeSecs}${NOct}."
-   echo ""
-
-   # Check if running in a menu environment #
-   if "$isInteractive" && _WaitForYESorNO_ "Would you like to proceed with the update now?"
+   "$isInteractive" && \
+   printf "\n${BOLDct}Would you like to proceed with the update now${NOct}"
+   if _WaitForYESorNO_ "$("$bypassPostponedDays" && echo YES || echo NO)"
    then return 0
    else return 1
    fi
@@ -8818,22 +8820,22 @@ _DoInstallation_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jan-20] ##
+## Modified by Martinski W. [2025-Jan-22] ##
 ##----------------------------------------##
 _DoUnInstallation_()
 {
+   "$isInteractive" && \
    printf "\n${BOLDct}Are you sure you want to uninstall $ScriptFileName script now${NOct}"
    ! _WaitForYESorNO_ && return 0
 
    if ! _AcquireLock_ cliFileLock ; then return 1 ; fi
 
-   local doSaveConfig=false
    local savedCFGPath="${SCRIPTS_PATH}/${SCRIPT_NAME}_CFG.SAVED.TXT"
 
    printf "\n${BOLDct}Do you want to keep/save the $SCRIPT_NAME configuration file${NOct}"
-   if _WaitForYESorNO_ NO
+   if _WaitForYESorNO_ "$("$keepConfigFile" && echo YES || echo NO)"
    then
-       doSaveConfig=true
+       keepConfigFile=true
        mv -f "$CONFIG_FILE" "$savedCFGPath"
    fi
 
@@ -8864,7 +8866,7 @@ _DoUnInstallation_()
        Say "${CRITct}**ERROR**: Uninstallation failed.${NOct}"
    fi
 
-   if "$doSaveConfig"
+   if "$keepConfigFile"
    then
        if mkdir -p "$SETTINGS_DIR"
        then
@@ -10291,7 +10293,7 @@ then
 fi
 
 ##----------------------------------------##
-## Modified by Martinski W. [2024-Jan-15] ##
+## Modified by Martinski W. [2024-Jan-22] ##
 ##----------------------------------------##
 if [ $# -gt 0 ]
 then
@@ -10349,35 +10351,52 @@ then
        uninstall) _DoUnInstallation_
            ;;
        service_event)
-           if [ "$2" = "start" ] && [ "$3" = "${SCRIPT_NAME}uninstall" ]
-           then
-               _DoUnInstallation_
-               sleep 1
-           elif [ "$2" = "start" ] && [ "$3" = "${SCRIPT_NAME}approvechangelog" ] 
-           then
-               local currApprovalStatus="$(Get_Custom_Setting "FW_New_Update_Changelog_Approval")"
-               if [ "$currApprovalStatus" = "BLOCKED" ]
-               then
-                   Update_Custom_Settings "FW_New_Update_Changelog_Approval" "APPROVED"
-               elif [ "$currApprovalStatus" = "APPROVED" ]
-               then
-                   Update_Custom_Settings "FW_New_Update_Changelog_Approval" "BLOCKED"
-               fi
-           elif [ "$2" = "start" ] && [ "$3" = "${SCRIPT_NAME}checkupdate" ]
-           then
-               if _AcquireLock_ cliFileLock
-               then
-                   _RunFirmwareUpdateNow_
-                   _ReleaseLock_ cliFileLock
-               fi
-           elif [ "$2" = "start" ] && [ "$3" = "${SCRIPT_NAME}config" ]
+           if [ "$2" = "start" ]
            then
-               if _AcquireLock_ cliFileLock
-               then
-                   _UpdateConfigFromWebUISettings_
-                   _ConfirmCronJobForFWAutoUpdates_
-                   _ReleaseLock_ cliFileLock
-               fi
+               case "$3" in
+                   "${SCRIPT_NAME}uninstall" | \
+                   "${SCRIPT_NAME}uninstall_keepConfig")
+                       if [ "$3" = "${SCRIPT_NAME}uninstall_keepConfig" ]
+                       then keepConfigFile=true
+                       else keepConfigFile=false
+                       fi
+                       _DoUnInstallation_
+                       sleep 1
+                       ;;
+                   "${SCRIPT_NAME}approvechangelog")
+                       local currApprovalStatus="$(Get_Custom_Setting "FW_New_Update_Changelog_Approval")"
+                       if [ "$currApprovalStatus" = "BLOCKED" ]
+                       then
+                           Update_Custom_Settings "FW_New_Update_Changelog_Approval" "APPROVED"
+                       elif [ "$currApprovalStatus" = "APPROVED" ]
+                       then
+                           Update_Custom_Settings "FW_New_Update_Changelog_Approval" "BLOCKED"
+                       fi
+                       ;;
+                   "${SCRIPT_NAME}checkupdate" | \
+                   "${SCRIPT_NAME}checkupdate_bypassDays")
+                       if _AcquireLock_ cliFileLock
+                       then
+                           if [ "$3" = "${SCRIPT_NAME}checkupdate_bypassDays" ]
+                           then bypassPostponedDays=true
+                           else bypassPostponedDays=false
+                           fi
+                           _RunFirmwareUpdateNow_
+                           _ReleaseLock_ cliFileLock
+                       fi
+                       ;;
+                   "${SCRIPT_NAME}config")
+                       if _AcquireLock_ cliFileLock
+                       then
+                           _UpdateConfigFromWebUISettings_
+                           _ConfirmCronJobForFWAutoUpdates_
+                           _ReleaseLock_ cliFileLock
+                       fi
+                       ;;
+                   *)
+                       printf "${REDct}INVALID Parameters [$*].${NOct}\n"
+                       ;;
+               esac
            fi
            ;;
        *) printf "${REDct}INVALID Parameter [$*].${NOct}\n"

From 7b0eee90712769d335270f5939af8bc3ea8276a5 Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:54:54 -0800
Subject: [PATCH 2/2] Update MerlinAU.sh

Fine-tuning.
---
 MerlinAU.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index e697ef74..1c4e9ecd 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -5646,9 +5646,9 @@ _Set_FW_UpdatePostponementDays_()
    return 0
 }
 
-##-------------------------------------##
-## Added by Martinski W. [2024-Nov-24] ##
-##-------------------------------------##
+##----------------------------------------##
+## Modified by Martinski W. [2025-Jan-22] ##
+##----------------------------------------##
 _TranslateCronSchedHR_()
 {
    if [ $# -eq 0 ] || [ -z "$1" ]
@@ -5695,30 +5695,30 @@ _TranslateCronSchedHR_()
 
    if [ "$theCronDAYW" = "*" ] && [ "$theCronDAYM" = "*" ]
    then
-       infoStrDAYS="every day, in every month"
+       infoStrDAYS="every day, every month"
    elif [ "$theCronDAYW" != "*" ]
    then
        if echo "$theCronDAYW" | grep -qE "^[*]/.*"
        then
            freqNumDAYW="$(echo "$theCronDAYW" | cut -f2 -d'/')"
-           infoStrDAYS="every $freqNumDAYW days of the week, in every month"
+           infoStrDAYS="every $freqNumDAYW days of the week, every month"
        elif echo "$theCronDAYW" | grep -qE "[,-]"
        then
-           infoStrDAYS="days ${theCronDAYW}, in every month"
+           infoStrDAYS="on ${theCronDAYW}, every month"
        else
-           infoStrDAYS="day ${theCronDAYW}, in every month"
+           infoStrDAYS="on ${theCronDAYW}, every month"
        fi
    elif [ "$theCronDAYM" != "*" ]
    then
        if echo "$theCronDAYM" | grep -qE "^[*]/.*"
        then
            freqNumDAYM="$(echo "$theCronDAYM" | cut -f2 -d'/')"
-           infoStrDAYS="every $freqNumDAYM days of the month, in every month"
+           infoStrDAYS="every $freqNumDAYM days of the month, every month"
        elif echo "$theCronDAYM" | grep -qE "[,-]"
        then
-           infoStrDAYS="days ${theCronDAYM} of the month, in every month"
+           infoStrDAYS="days ${theCronDAYM} of the month, every month"
        else
-           infoStrDAYS="day ${theCronDAYM} of the month, in every month"
+           infoStrDAYS="day ${theCronDAYM} of the month, every month"
        fi
    fi
 
@@ -6342,7 +6342,7 @@ _Set_FW_UpdateCronScheduleGuided_()
    cronSchedDAYM="$(echo "$currCronSched" | awk -F ' ' '{print $3}')"
    cronSchedDAYW="$(echo "$currCronSched" | awk -F ' ' '{print $5}')"
 
-   ## MONTH is FIXED to "every month" for F/W Update Purposes ##
+   ## MONTH is FIXED to "Every Month" for F/W Update Purposes ##
    cronSchedMNTH="*" ; nextSchedMNTH="*"
 
    _ClearCronSchedValues_()