From 3f982290a9210425e7f28fd131c716d0cfb50486 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Wed, 18 Aug 2021 12:01:42 -0700
Subject: [PATCH] Fixes for RPE.

---
 index.html | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index 61f4556..6ceb595 100644
--- a/index.html
+++ b/index.html
@@ -1726,9 +1726,9 @@
             </div>
             <!-- ###END###{Alarms} -->
             <div id="dialog26" style="margin:auto;margin:3px">
-                <label><input type="radio" name="d26" id='idx_d26all' value=32769>All boot options are enabled<br></label>
-                <label><input type="radio" name="d26" id='idx_d26ocr' value=32768>Remote Platform Erase is disabled<br></label>
-                <label><input type="radio" name="d26" id='idx_d26off' value=32770>Remote Platform Erase and One Click Recovery are disabled<br></label>
+                <label><input type="radio" name="d26" id='idx_d26all' value=32771>All boot options are enabled<br></label>
+                <label><input type="radio" name="d26" id='idx_d26ocr' value=32769>Remote Platform Erase is disabled<br></label>
+                <label><input type="radio" name="d26" id='idx_d26off' value=32768>Remote Platform Erase and One Click Recovery are disabled<br></label>
             </div>
         </div>
         <div style="padding:10px;margin-bottom:4px">
@@ -1746,7 +1746,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.0';
+        var version = '0.9.1';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -5540,7 +5540,7 @@
 
             // Power Options
             if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
-                var enabledBootStateStr = { 0: "Unknown", 1: "Other", 2: "Enabled", 3: "Disabled", 4: "Shutting Down", 5: "Not Applicable", 6: "Enabled but Offline", 7: "In Test", 8: "Deferred", 9: "Quiesce", 10: "Starting", 32768: "RPE Disabled", 32769: "All Enabled", 32770: "RPE & OCR Disabled" };
+                var enabledBootStateStr = { 0: "Unknown", 1: "Other", 2: "Enabled", 3: "Disabled", 4: "Shutting Down", 5: "Not Applicable", 6: "Enabled but Offline", 7: "In Test", 8: "Deferred", 9: "Quiesce", 10: "Starting", 32768: "RPE & OCR Disabled", 32769: "RPE Disabled", 32771: "All Enabled" };
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Unknown";
                 x += TableEntry("Boot Features", addLinkConditional(t, 'showEnableBootServiceDlg()', xxAccountAdminName));
             }
@@ -10052,9 +10052,9 @@
         function showEnableBootServiceDlg() {
             if (xxdialogMode) return;
             if (amtsysstate['CIM_BootService'].response['EnabledState'] != null) {
-                idx_d26all.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32769);
-                idx_d26ocr.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32768);
-                idx_d26off.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32770);
+                idx_d26all.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32771);
+                idx_d26ocr.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32769);
+                idx_d26off.checked = (amtsysstate['CIM_BootService'].response['EnabledState'] == 32768);
             }
             setDialogMode(26, "Boot Features", 3, showEnableBootServiceDlgOk)
         }
@@ -10321,7 +10321,7 @@
                     if (powerState & 2) { addOption('d5actionSelect', "Power up to Secure Erase", 104); }
                     if (powerState & 1) { addOption('d5actionSelect', "Reset to Secure Erase", 105); }
                 }
-                if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32769) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0)) {
+                if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32771) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0)) {
                     if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
                     if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
                 }
@@ -10548,7 +10548,7 @@
             QV('d24dLockResetButton', amtPowerBootCapabilities['ResetButtonLock'] == true);
             QV('d24dSerialOverLan', amtPowerBootCapabilities['SOL'] == true);
             QV('d24dSecureErase', amtPowerBootCapabilities['SecureErase'] == true);
-            QV('d24dPlatformErase', (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32769) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0));
+            QV('d24dPlatformErase', (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32771) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0));
             QV('d24dLockSleepButton', amtPowerBootCapabilities['SleepButtonLock'] == true);
             QV('d24dUserPasswordBypass', amtPowerBootCapabilities['UserPasswordBypass'] == true);
             QV('idx_d24Verbocity1', amtPowerBootCapabilities['VerbosityQuiet'] == true);
@@ -10812,7 +10812,7 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32769) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] == 32771) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
                     r['PlatformErase'] = true;
                     r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
                     r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
@@ -11072,7 +11072,7 @@
                 try { var reader = new FileReader(); uploadSupport = ((reader != null) && (reader.readAsBinaryString != null)); } catch (ex) { console.log(ex); }
                 x += '<br><td class=r1>' + TableEnd(AddRefreshButton('PullStorage()') + (uploadSupport ? AddButton("Upload...", 'UploadToStorage()') : '')
                 // ###BEGIN###{Mode-NodeWebkit}
-                    + AddButton("Upload Application...", 'UploadAppToStorage()')
+                    //+ AddButton("Upload Application...", 'UploadAppToStorage()')
                 // ###END###{Mode-NodeWebkit}
                 );
                 // ###BEGIN###{Mode-Firmware}
@@ -11171,6 +11171,7 @@
         }
 
         // ###BEGIN###{Mode-NodeWebkit}
+        /*
         var UploadAppToStorageFileList;
         function UploadAppToStorage() {
             if (xxdialogMode) return;
@@ -11193,6 +11194,7 @@
                 if (err == null) { PushToStorage('index.htm', '<metadata><headers><h>Content-Encoding: ' + (file.endsWith('.br')?'br':'gzip') + '</h><h>Content-Type: text/html</h></headers></metadata>' + data); }
             });
         }
+        */
         // ###END###{Mode-NodeWebkit}
 
         function UploadToStorageEx(button, tag) {