Merge pull request #6003 from owncloud/incognito_mode

Incognito mode

lib/private/user.php

@@ -54,6 +54,9 @@ class OC_User {
 
 	private static $_setupedBackends = array();
 
+	// bool, stores if a user want to access a resource anonymously, e.g if he opens a public link
+	private static $incognitoMode = false;
+
 	/**
 	 * @brief registers backend
 	 * @param string $backend name of the backend
@@ -319,6 +322,15 @@ class OC_User {
 		return false;
 	}
 
+	/**
+	 * @brief set incognito mode, e.g. if a user wants to open a public link
+	 * @param bool $status
+	 */
+	public static function setIncognitoMode($status) {
+		self::$incognitoMode = $status;
+
+	}
+
 	/**
 	 * Supplies an attribute to the logout hyperlink. The default behaviour
 	 * is to return an href with '?logout=true' appended. However, it can
@@ -354,7 +366,7 @@ class OC_User {
 	 */
 	public static function getUser() {
 		$uid = OC::$session ? OC::$session->get('user_id') : null;
-		if (!is_null($uid)) {
+		if (!is_null($uid) && self::$incognitoMode === false) {
 			return $uid;
 		} else {
 			return false;

public.php

@@ -20,6 +20,7 @@ try {
 
 	OC_Util::checkAppEnabled($app);
 	OC_App::loadApp($app);
+	OC_User::setIncognitoMode(true);
 
 	require_once OC_App::getAppPath($app) .'/'. $parts[1];