diff options
author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-08-18 17:10:58 +0200 |
---|---|---|
committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-08-18 17:10:58 +0200 |
commit | 69e72eeb37b6d0084c137e1cffffe8717c2f1de0 (patch) | |
tree | aacd63bcdd20eaa2ed11b9b46d0897dfd56513c6 /core | |
parent | 66d8476e9e20d6a05551b4af4f0f169258bc8291 (diff) | |
parent | 8eefc5c4e1bc01d73e59561f0e61456cf3245a47 (diff) | |
download | nextcloud-server-69e72eeb37b6d0084c137e1cffffe8717c2f1de0.tar.gz nextcloud-server-69e72eeb37b6d0084c137e1cffffe8717c2f1de0.zip |
Merge pull request #18390 from rullzer/fix_setupchecks
Move remaining setupchecks to new fomat
Diffstat (limited to 'core')
-rw-r--r-- | core/js/setupchecks.js | 14 | ||||
-rw-r--r-- | 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 6e23b58f001..2e21c6ad725 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 <a href="{phpLink}">supported by PHP</a>. 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 <a href="{phpLink}">supported by PHP</a>. 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 <a href="{docLink}">documentation</a>.', {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 <a href="{docLink}">documentation</a>.', {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 45ccebe849c..c70ea0ff9fa 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 <a href="https://docs.owncloud.org/foo/bar.html">documentation</a>.']); + 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 <a href="https://docs.owncloud.org/foo/bar.html">documentation</a>.', + 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 <a href="https://secure.php.net/supported-versions.php">supported by PHP</a>. 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 <a href="https://secure.php.net/supported-versions.php">supported by PHP</a>. 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(); }); }); |