|
|
|
@ -245,6 +245,10 @@ class OC_API { |
|
|
|
$return = OC_User::login($authUser, $authPw); |
|
|
|
$return = OC_User::login($authUser, $authPw); |
|
|
|
if ($return === true) { |
|
|
|
if ($return === true) { |
|
|
|
self::$logoutRequired = true; |
|
|
|
self::$logoutRequired = true; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// initialize the user's filesystem |
|
|
|
|
|
|
|
\OC_Util::setUpFS(\OC_User::getUser()); |
|
|
|
|
|
|
|
|
|
|
|
return $authUser; |
|
|
|
return $authUser; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -252,6 +256,10 @@ class OC_API { |
|
|
|
$loggedIn = OC_User::isLoggedIn(); |
|
|
|
$loggedIn = OC_User::isLoggedIn(); |
|
|
|
$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false; |
|
|
|
$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false; |
|
|
|
if ($loggedIn === true && $ocsApiRequest) { |
|
|
|
if ($loggedIn === true && $ocsApiRequest) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// initialize the user's filesystem |
|
|
|
|
|
|
|
\OC_Util::setUpFS(\OC_User::getUser()); |
|
|
|
|
|
|
|
|
|
|
|
return OC_User::getUser(); |
|
|
|
return OC_User::getUser(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|