From 89c6a2bc1fa34498e82f7b9b6e8e7160c46dc3fd Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 25 Jul 2020 21:53:39 +0200 Subject: Add setup checks for php default charset and output buffering. Signed-off-by: Daniel Kesselberg --- core/js/setupchecks.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'core') diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 2e94c82486c..62c9797d208 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -488,6 +488,9 @@ }) } + OC.SetupChecks.addGenericSetupCheck(data, 'OCA\\Settings\\SetupChecks\\PhpDefaultCharset', messages) + OC.SetupChecks.addGenericSetupCheck(data, 'OCA\\Settings\\SetupChecks\\PhpOutputBuffering', messages) + } else { messages.push({ msg: t('core', 'Error occurred while checking server setup'), @@ -505,6 +508,24 @@ return deferred.promise(); }, + addGenericSetupCheck: function(data, check, messages) { + const setupCheck = data[check] || { pass: true, description: '', severity: 'info'} + + let type = OC.SetupChecks.MESSAGE_TYPE_INFO + if (setupCheck.severity === 'warning') { + type = OC.SetupChecks.MESSAGE_TYPE_WARNING + } else if (setupCheck.severity === 'error') { + type = OC.SetupChecks.MESSAGE_TYPE_ERROR + } + + if (!setupCheck.pass) { + messages.push({ + msg: setupCheck.description, + type: type, + }) + } + }, + /** * Runs generic checks on the server side, the difference to dedicated * methods is that we use the same XHR object for all checks to save -- cgit v1.2.3 From c1831f19025ba7b2919844c8fe5e5bef1c6c7ca6 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Fri, 7 Aug 2020 17:34:03 +0200 Subject: Change const/let to var for PhantomJS Signed-off-by: Daniel Kesselberg --- core/js/setupchecks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 62c9797d208..a1f0d1aca57 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -509,9 +509,9 @@ }, addGenericSetupCheck: function(data, check, messages) { - const setupCheck = data[check] || { pass: true, description: '', severity: 'info'} + var setupCheck = data[check] || { pass: true, description: '', severity: 'info'} - let type = OC.SetupChecks.MESSAGE_TYPE_INFO + var type = OC.SetupChecks.MESSAGE_TYPE_INFO if (setupCheck.severity === 'warning') { type = OC.SetupChecks.MESSAGE_TYPE_WARNING } else if (setupCheck.severity === 'error') { -- cgit v1.2.3