Always check updateCheck before using it (#38519)

Co-authored-by: Franciska Perisa <franciska.perisa@bcmsolutions.de>
joomla · Aug 18, 2022 · 147911f · 147911f
1 parent ec2009e
commit 147911f
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/build/media_source/com_joomlaupdate/js/default.es6.js
@@ -10,13 +10,14 @@ Joomla = window.Joomla || {};
 
   Joomla.submitbuttonUpload = () => {
     const form = document.getElementById('uploadForm');
+    const confirmBackup = document.getElementById('joomlaupdate-confirm-backup');
 
     // do field validation
     if (form.install_package.value === '') {
       alert(Joomla.Text._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'), true);
     } else if (form.install_package.files[0].size > form.max_upload_size.value) {
       alert(Joomla.Text._('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG'), true);
-    } else if (document.getElementById('joomlaupdate-confirm-backup').checked) {
+    } else if (confirmBackup && confirmBackup.checked) {
       form.submit();
     }
   };
@@ -53,13 +54,15 @@ Joomla = window.Joomla || {};
     const form = installButton ? installButton.closest('form') : null;
     const task = form ? form.querySelector('[name=task]', form) : null;
     if (uploadButton) {
-      uploadButton.disabled = !updateCheck.checked;
       uploadButton.addEventListener('click', Joomla.submitbuttonUpload);
-      updateCheck.addEventListener('change', () => {
-        uploadButton.disabled = !updateCheck.checked;
-      });
+      uploadButton.disabled = updateCheck && !updateCheck.checked;
+      if (updateCheck) {
+        updateCheck.addEventListener('change', () => {
+          uploadButton.disabled = !updateCheck.checked;
+        });
+      }
     }
-    if (confirmButton && !updateCheck.checked) {
+    if (confirmButton && updateCheck && !updateCheck.checked) {
       confirmButton.classList.add('disabled');
     }
     if (confirmButton && updateCheck) {
@@ -73,22 +76,24 @@ Joomla = window.Joomla || {};
     }
     if (uploadField) {
       uploadField.addEventListener('change', Joomla.installpackageChange);
-      uploadField.addEventListener('change', () => {
-        const fileSize = uploadForm.install_package.files[0].size;
-        const allowedSize = uploadForm.max_upload_size.value;
-        if (fileSize <= allowedSize && updateCheck.disabled) {
-          updateCheck.disabled = !updateCheck.disabled;
-        } else if (fileSize <= allowedSize && !updateCheck.disabled && !updateCheck.checked) {
-          updateCheck.disabled = false;
-        } else if (fileSize <= allowedSize && updateCheck.checked) {
-          updateCheck.checked = updateCheck.classList.contains('d-none');
-          uploadButton.disabled = true;
-        } else if (fileSize > allowedSize && !updateCheck.disabled) {
-          updateCheck.disabled = !updateCheck.disabled;
-          updateCheck.checked = updateCheck.classList.contains('d-none');
-          uploadButton.disabled = true;
-        }
-      });
+      if (updateCheck) {
+        uploadField.addEventListener('change', () => {
+          const fileSize = uploadForm.install_package.files[0].size;
+          const allowedSize = uploadForm.max_upload_size.value;
+          if (fileSize <= allowedSize && updateCheck.disabled) {
+            updateCheck.disabled = !updateCheck.disabled;
+          } else if (fileSize <= allowedSize && !updateCheck.disabled && !updateCheck.checked) {
+            updateCheck.disabled = false;
+          } else if (fileSize <= allowedSize && updateCheck.checked) {
+            updateCheck.checked = updateCheck.classList.contains('d-none');
+            uploadButton.disabled = true;
+          } else if (fileSize > allowedSize && !updateCheck.disabled) {
+            updateCheck.disabled = !updateCheck.disabled;
+            updateCheck.checked = updateCheck.classList.contains('d-none');
+            uploadButton.disabled = true;
+          }
+        });
+      }
     }
     // Trigger (re-) install (including checkbox confirm if we update)
     if (installButton && installButton.getAttribute('href') === '#' && task) {