Also replace ApacheBackend with Authentication\IApacheBackend in user.
This commit is contained in:
parent
621ab1c7ee
commit
aa34438d06
|
@ -219,10 +219,10 @@ class OC_User {
|
||||||
*
|
*
|
||||||
* Log in a user and regenerate a new session.
|
* Log in a user and regenerate a new session.
|
||||||
*
|
*
|
||||||
* @param \OCP\ApacheBackend $backend
|
* @param \OCP\Authentication\IApacheBackend $backend
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public static function loginWithApache(\OCP\ApacheBackend $backend) {
|
public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) {
|
||||||
|
|
||||||
$uid = $backend->getCurrentUserId();
|
$uid = $backend->getCurrentUserId();
|
||||||
$run = true;
|
$run = true;
|
||||||
|
@ -248,7 +248,7 @@ class OC_User {
|
||||||
*/
|
*/
|
||||||
public static function handleApacheAuth() {
|
public static function handleApacheAuth() {
|
||||||
foreach (self::$_usedBackends as $backend) {
|
foreach (self::$_usedBackends as $backend) {
|
||||||
if ($backend instanceof OCP\ApacheBackend) {
|
if ($backend instanceof OCP\Authentication\IApacheBackend) {
|
||||||
if ($backend->isSessionActive()) {
|
if ($backend->isSessionActive()) {
|
||||||
OC_App::loadApps();
|
OC_App::loadApps();
|
||||||
|
|
||||||
|
@ -320,7 +320,7 @@ class OC_User {
|
||||||
*/
|
*/
|
||||||
public static function getLogoutAttribute() {
|
public static function getLogoutAttribute() {
|
||||||
foreach (self::$_usedBackends as $backend) {
|
foreach (self::$_usedBackends as $backend) {
|
||||||
if ($backend instanceof OCP\ApacheBackend) {
|
if ($backend instanceof OCP\Authentication\IApacheBackend) {
|
||||||
if ($backend->isSessionActive()) {
|
if ($backend->isSessionActive()) {
|
||||||
return $backend->getLogoutAttribute();
|
return $backend->getLogoutAttribute();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue