Skip to content
Snippets Groups Projects
Commit e9849270 authored by Thomas Müller's avatar Thomas Müller
Browse files

Revert "fixes #4574"

This reverts commit 81a45cfc.
parent 4629d6ad
No related branches found
No related tags found
No related merge requests found
...@@ -826,16 +826,11 @@ class OC { ...@@ -826,16 +826,11 @@ class OC {
) { ) {
return false; return false;
} }
// don't redo authentication if user is already logged in OC_App::loadApps(array('authentication'));
// otherwise session would be invalidated in OC_User::login with if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
// session_regenerate_id at every page load //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
if (!OC_User::isLoggedIn()) { OC_User::unsetMagicInCookie();
OC_App::loadApps(array('authentication')); $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
OC_User::unsetMagicInCookie();
$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
}
} }
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment