summaryrefslogtreecommitdiffstats
path: root/settings/ajax
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-03-26 14:51:33 +0100
committerLukas Reschke <lukas@owncloud.com>2015-03-28 13:59:22 +0100
commit65202d2a18aca3b253ce5f3c7c9af17ee6d12e52 (patch)
tree04453d95db5dc3df386188cd85032052fded6db9 /settings/ajax
parentd3752ca1e925c3aed46c13f7ea26c8f540db05e0 (diff)
downloadnextcloud-server-65202d2a18aca3b253ce5f3c7c9af17ee6d12e52.tar.gz
nextcloud-server-65202d2a18aca3b253ce5f3c7c9af17ee6d12e52.zip
Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it. Fixes https://github.com/owncloud/core/issues/14956
Diffstat (limited to 'settings/ajax')
-rw-r--r--settings/ajax/checksetup.php40
1 files changed, 0 insertions, 40 deletions
diff --git a/settings/ajax/checksetup.php b/settings/ajax/checksetup.php
deleted file mode 100644
index 6e41c11e050..00000000000
--- a/settings/ajax/checksetup.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * 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/>
- *
- */
-
-OCP\JSON::checkAdminUser();
-OCP\JSON::callCheck();
-
-\OC::$server->getSession()->close();
-
-// no warning when has_internet_connection is false in the config
-$hasInternet = true;
-if (OC_Util::isInternetConnectionEnabled()) {
- $hasInternet = OC_Util::isInternetConnectionWorking(\OC::$server->getHTTPClientService());
-}
-
-OCP\JSON::success(
- array (
- 'serverHasInternetConnection' => $hasInternet,
- 'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
- )
-);