diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-11-12 16:54:38 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2018-11-12 16:54:38 +0100 |
commit | 761ba1801b6a932820beacb36f343ec3b07c471c (patch) | |
tree | e90b84baec4be81f1c6bad24d16f0ad7d60fb0be | |
parent | 859dd1e742c4c71b3fbd7035a866c230b80142c2 (diff) | |
download | nextcloud-server-761ba1801b6a932820beacb36f343ec3b07c471c.tar.gz nextcloud-server-761ba1801b6a932820beacb36f343ec3b07c471c.zip |
Remove outdated integrity warning on each page
* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r-- | core/js/integritycheck-failed-notification.js | 39 | ||||
-rw-r--r-- | lib/private/TemplateLayout.php | 6 |
2 files changed, 0 insertions, 45 deletions
diff --git a/core/js/integritycheck-failed-notification.js b/core/js/integritycheck-failed-notification.js deleted file mode 100644 index 796166cd113..00000000000 --- a/core/js/integritycheck-failed-notification.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @author Lukas Reschke - * - * @copyright Copyright (c) 2015, ownCloud, Inc. - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - */ - -/** - * This gets only loaded if the integrity check has failed and then shows a notification - */ -$(document).ready(function(){ - var text = t( - 'core', - '<a href="{docUrl}">There were problems with the code integrity check. More information…</a>', - { - docUrl: OC.generateUrl('/settings/admin/overview#security-warning') - } - ); - - OC.Notification.showHtml( - text, - { - type: 'error', - isHTML: true - } - ); -}); - diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 316e122e2c9..cbadf1df53f 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -75,12 +75,6 @@ class TemplateLayout extends \OC_Template { $this->assign('bodyid', 'body-user'); } - // Code integrity notification - $integrityChecker = \OC::$server->getIntegrityCodeChecker(); - if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) { - \OCP\Util::addScript('core', 'integritycheck-failed-notification'); - } - // Add navigation entry $this->assign( 'application', ''); $this->assign( 'appid', $appId ); |