[Pkg-owncloud-commits] [owncloud] 59/78: Fix singe user mode on public.php - take two

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 2c656b0e4c7b4774815ec06c37f22c2bc14d3ead
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Apr 10 11:17:33 2015 +0200

    Fix singe user mode on public.php - take two
---
 lib/base.php | 6 +++++-
 public.php   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 14e2b4f..1714bd1 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 0e04db6..ab6331a 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');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git