From 8eefc5c4e1bc01d73e59561f0e61456cf3245a47 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 18 Aug 2015 14:42:57 +0200 Subject: [PATCH] Move remaining setupchecks to new fomat --- core/js/setupchecks.js | 14 ++++++++------ core/js/tests/specs/setupchecksSpec.js | 10 ++++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 6e23b58f00..2e21c6ad72 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -87,14 +87,16 @@ }); } if(data.phpSupported && data.phpSupported.eol) { - messages.push( - t('core', 'Your PHP version ({version}) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'}) - ); + messages.push({ + msg: t('core', 'Your PHP version ({version}) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'}), + type: OC.SetupChecks.MESSAGE_TYPE_INFO + }); } if(!data.forwardedForHeadersWorking) { - messages.push( - t('core', 'The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our documentation.', {docLink: data.reverseProxyDocs}) - ); + messages.push({ + msg: t('core', 'The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our documentation.', {docLink: data.reverseProxyDocs}), + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }); } } else { messages.push({ diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 45ccebe849..c70ea0ff9f 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -205,7 +205,10 @@ describe('OC.SetupChecks tests', function() { ); async.done(function( data, s, x ){ - expect(data).toEqual(['The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our documentation.']); + expect(data).toEqual([{ + msg: 'The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our documentation.', + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }]); done(); }); }); @@ -250,7 +253,10 @@ describe('OC.SetupChecks tests', function() { ); async.done(function( data, s, x ){ - expect(data).toEqual(['Your PHP version (5.4.0) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.']); + expect(data).toEqual([{ + msg: 'Your PHP version (5.4.0) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', + type: OC.SetupChecks.MESSAGE_TYPE_INFO + }]); done(); }); });