mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6086 from owncloud/incognito_mode 

return false if user is in incognito mode
This commit is contained in:
Morris Jobke 2013-11-27 09:11:18 -08:00
parent 4a78f12682 6deda1b9f6
commit 39f9e16f20
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/user.php
View File

@ -314,7 +314,7 @@ class OC_User {
* Checks if the user is logged in * Checks if the user is logged in
*/ */
public static function isLoggedIn() { public static function isLoggedIn() {
if (\OC::$session->get('user_id')) { if (\OC::$session->get('user_id') && self::$incognitoMode === false) {
OC_App::loadApps(array('authentication')); OC_App::loadApps(array('authentication'));
self::setupBackends(); self::setupBackends();
return self::userExists(\OC::$session->get('user_id')); return self::userExists(\OC::$session->get('user_id'));
@ -353,7 +353,7 @@ class OC_User {
* @return bool * @return bool
*/ */
public static function isAdminUser($uid) { public static function isAdminUser($uid) {
if (OC_Group::inGroup($uid, 'admin')) { if (OC_Group::inGroup($uid, 'admin') && self::$incognitoMode === false) {
return true; return true;
} }
return false; return false;