diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-10 11:17:33 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-05-06 12:14:34 +0200 |
| commit | 2c656b0e4c7b4774815ec06c37f22c2bc14d3ead (patch) | |
| tree | b9f48df2237b756e35fdae66ca4b6e8ea7287b52 | |
| parent | 9c44e7bfb813dfbfe77c99d64b49fc0bb45f6b0f (diff) | |
| download | nextcloud-server-2c656b0e4c7b4774815ec06c37f22c2bc14d3ead.tar.gz nextcloud-server-2c656b0e4c7b4774815ec06c37f22c2bc14d3ead.zip | |
Fix singe user mode on public.php - take two
| -rw-r--r-- | lib/base.php | 6 | ||||
| -rw-r--r-- | public.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 14e2b4fe1ff..1714bd1e5ef 100644 --- a/lib/base.php +++ b/lib/base.php @@ -260,7 +260,7 @@ class OC { } } - public static function checkSingleUserMode() { + public static function checkSingleUserMode($lockIfNoUserLoggedIn = false) { if (!\OCP\Config::getSystemValue('singleuser', false)) { return; } @@ -270,6 +270,10 @@ class OC { if ($group->inGroup($user)) { return; } + } else { + if(!$lockIfNoUserLoggedIn) { + return; + } } // send http status 503 header('HTTP/1.1 503 Service Temporarily Unavailable'); diff --git a/public.php b/public.php index 0e04db66da7..ab6331a377a 100644 --- a/public.php +++ b/public.php @@ -12,7 +12,7 @@ try { } OC::checkMaintenanceMode(); - OC::checkSingleUserMode(); + OC::checkSingleUserMode(true); $pathInfo = OC_Request::getPathInfo(); if (!$pathInfo && !isset($_GET['service'])) { header('HTTP/1.0 404 Not Found'); |