diff options
Diffstat (limited to 'lib/private/legacy')
-rw-r--r-- | lib/private/legacy/app.php | 4 | ||||
-rw-r--r-- | lib/private/legacy/json.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/util.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index a475b895d9f..d5af15bdc20 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -488,7 +488,7 @@ class OC_App { } // if the user is logged-in - if (OC_User::isLoggedIn()) { + if (\OC::$server->getUserSession()->isLoggedIn()) { // personal menu $settings[] = array( "id" => "personal", @@ -1227,7 +1227,7 @@ class OC_App { */ public static function getStorage($appId) { if (OC_App::isEnabled($appId)) { //sanity check - if (OC_User::isLoggedIn()) { + if (\OC::$server->getUserSession()->isLoggedIn()) { $view = new \OC\Files\View('/' . OC_User::getUser()); if (!$view->file_exists($appId)) { $view->mkdir($appId); diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php index f386d03ab1b..0e598a68ee1 100644 --- a/lib/private/legacy/json.php +++ b/lib/private/legacy/json.php @@ -67,7 +67,7 @@ class OC_JSON{ */ public static function checkLoggedIn() { $twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager(); - if( !OC_User::isLoggedIn() + if( !\OC::$server->getUserSession()->isLoggedIn() || $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { $l = \OC::$server->getL10N('lib'); http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED); diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 5ef1130d361..82fb07eb95a 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -137,7 +137,7 @@ class OC_Util { // If we are not forced to load a specific user we load the one that is logged in if ($user === null) { $user = ''; - } else if ($user == "" && OC_User::isLoggedIn()) { + } else if ($user == "" && \OC::$server->getUserSession()->isLoggedIn()) { $user = OC_User::getUser(); } @@ -971,7 +971,7 @@ class OC_Util { */ public static function checkLoggedIn() { // Check if we are a user - if (!OC_User::isLoggedIn()) { + if (!\OC::$server->getUserSession()->isLoggedIn()) { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( 'core.login.showLoginForm', [ |