1 files changed, 33 insertions, 42 deletions

diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js
index 054dd7ced2e..66848162d28 100644
--- a/apps/settings/src/admin.js
+++ b/apps/settings/src/admin.js
@@ -1,6 +1,15 @@
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { generateUrl } from '@nextcloud/router'
+import $ from 'jquery'
+import axios from '@nextcloud/axios'
+
 window.addEventListener('DOMContentLoaded', () => {
 	$('#loglevel').change(function() {
-		$.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
+		$.post(generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
 			OC.Log.reload()
 		})
 	})
@@ -40,17 +49,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailsettings'),
-			type: 'POST',
-			data: $('#mail_general_settings_form').serialize(),
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailsettings'), $('#mail_general_settings_form').serialize())
+			.then(() => {
 				OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#mail_settings_msg', error)
+			})
 	}
 
 	const toggleEmailCredentials = function() {
@@ -60,17 +64,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		}
 
 		OC.msg.startSaving('#mail_settings_msg')
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailsettings/credentials'),
-			type: 'POST',
-			data: $('#mail_credentials_settings').serialize(),
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailsettings/credentials'), $('#mail_credentials_settings').serialize())
+			.then(() => {
 				OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#mail_settings_msg', error)
+			})
 	}
 
 	$('#mail_general_settings_form').change(changeEmailSettings)
@@ -86,16 +85,12 @@ window.addEventListener('DOMContentLoaded', () => {
 		event.preventDefault()
 		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…'))
 
-		$.ajax({
-			url: OC.generateUrl('/settings/admin/mailtest'),
-			type: 'POST',
-			success: () => {
+		axios.post(generateUrl('/settings/admin/mailtest'))
+			.then(() => {
 				OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
-			},
-			error: (xhr) => {
-				OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
-			},
-		})
+			}).catch((error) => {
+				OC.msg.finishedError('#sendtestmail_msg', error)
+			})
 	})
 
 	const setupChecks = () => {
@@ -106,7 +101,6 @@ window.addEventListener('DOMContentLoaded', () => {
 			const $el = $('#postsetupchecks')
 			$('#security-warning-state-loading').addClass('hidden')
 
-			let hasMessages = false
 			const $errorsEl = $el.find('.errors')
 			const $warningsEl = $el.find('.warnings')
 			const $infoEl = $el.find('.info')
@@ -125,33 +119,30 @@ window.addEventListener('DOMContentLoaded', () => {
 				}
 			}
 
+			let hasErrors = false
+			let hasWarnings = false
+
 			if ($errorsEl.find('li').length > 0) {
 				$errorsEl.removeClass('hidden')
-				hasMessages = true
+				hasErrors = true
 			}
 			if ($warningsEl.find('li').length > 0) {
 				$warningsEl.removeClass('hidden')
-				hasMessages = true
+				hasWarnings = true
 			}
 			if ($infoEl.find('li').length > 0) {
 				$infoEl.removeClass('hidden')
-				hasMessages = true
 			}
 
-			if (hasMessages) {
+			if (hasErrors || hasWarnings) {
 				$('#postsetupchecks-hint').removeClass('hidden')
-				if ($errorsEl.find('li').length > 0) {
+				if (hasErrors) {
 					$('#security-warning-state-failure').removeClass('hidden')
 				} else {
 					$('#security-warning-state-warning').removeClass('hidden')
 				}
 			} else {
-				const securityWarning = $('#security-warning')
-				if (securityWarning.children('ul').children().length === 0) {
-					$('#security-warning-state-ok').removeClass('hidden')
-				} else {
-					$('#security-warning-state-failure').removeClass('hidden')
-				}
+				$('#security-warning-state-ok').removeClass('hidden')
 			}
 		})
 	}