diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-02-24 08:52:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 08:52:26 +0100 |
| commit | b26568133f00771ed92f22fd5d6d45c6e595e8bb (patch) | |
| tree | 6b3a259ba3bbd6751446a54f5bc58e2db9cff904 /lib | |
| parent | 97b6c1496e76042e3582941aa7411e455fe9d3b8 (diff) | |
| parent | 9533f4e5edfded577b67d08f7778a8a1704132f2 (diff) | |
| download | nextcloud-server-b26568133f00771ed92f22fd5d6d45c6e595e8bb.tar.gz nextcloud-server-b26568133f00771ed92f22fd5d6d45c6e595e8bb.zip | |
Merge pull request #3605 from nextcloud/single-user
Clean up single user mode
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 27 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 |
3 files changed, 0 insertions, 29 deletions
diff --git a/lib/base.php b/lib/base.php index 9f480c0b0dc..c63efb359cc 100644 --- a/lib/base.php +++ b/lib/base.php @@ -286,32 +286,6 @@ class OC { } } - public static function checkSingleUserMode($lockIfNoUserLoggedIn = false) { - if (!\OC::$server->getSystemConfig()->getValue('singleuser', false)) { - return; - } - $user = OC_User::getUserSession()->getUser(); - if ($user) { - $group = \OC::$server->getGroupManager()->get('admin'); - if ($group->inGroup($user)) { - return; - } - } else { - if(!$lockIfNoUserLoggedIn) { - return; - } - } - // send http status 503 - header('HTTP/1.1 503 Service Temporarily Unavailable'); - header('Status: 503 Service Temporarily Unavailable'); - header('Retry-After: 120'); - - // render error page - $template = new OC_Template('', 'singleuser.user', 'guest'); - $template->printPage(); - die(); - } - /** * Checks if the version requires an update and shows * @param bool $showTemplate Whether an update screen should get shown @@ -990,7 +964,6 @@ class OC { OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(); } - self::checkSingleUserMode(); OC_Util::setupFS(); OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo()); return; diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 19eb4ca7df6..9a1ede021a7 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -411,7 +411,6 @@ return array( 'OC\\Core\\Command\\Maintenance\\Mimetype\\UpdateJS' => $baseDir . '/core/Command/Maintenance/Mimetype/UpdateJS.php', 'OC\\Core\\Command\\Maintenance\\Mode' => $baseDir . '/core/Command/Maintenance/Mode.php', 'OC\\Core\\Command\\Maintenance\\Repair' => $baseDir . '/core/Command/Maintenance/Repair.php', - 'OC\\Core\\Command\\Maintenance\\SingleUser' => $baseDir . '/core/Command/Maintenance/SingleUser.php', 'OC\\Core\\Command\\Maintenance\\UpdateHtaccess' => $baseDir . '/core/Command/Maintenance/UpdateHtaccess.php', 'OC\\Core\\Command\\Security\\ImportCertificate' => $baseDir . '/core/Command/Security/ImportCertificate.php', 'OC\\Core\\Command\\Security\\ListCertificates' => $baseDir . '/core/Command/Security/ListCertificates.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index e1b5e025d0b..329773cd6eb 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -441,7 +441,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Command\\Maintenance\\Mimetype\\UpdateJS' => __DIR__ . '/../../..' . '/core/Command/Maintenance/Mimetype/UpdateJS.php', 'OC\\Core\\Command\\Maintenance\\Mode' => __DIR__ . '/../../..' . '/core/Command/Maintenance/Mode.php', 'OC\\Core\\Command\\Maintenance\\Repair' => __DIR__ . '/../../..' . '/core/Command/Maintenance/Repair.php', - 'OC\\Core\\Command\\Maintenance\\SingleUser' => __DIR__ . '/../../..' . '/core/Command/Maintenance/SingleUser.php', 'OC\\Core\\Command\\Maintenance\\UpdateHtaccess' => __DIR__ . '/../../..' . '/core/Command/Maintenance/UpdateHtaccess.php', 'OC\\Core\\Command\\Security\\ImportCertificate' => __DIR__ . '/../../..' . '/core/Command/Security/ImportCertificate.php', 'OC\\Core\\Command\\Security\\ListCertificates' => __DIR__ . '/../../..' . '/core/Command/Security/ListCertificates.php', |