This reverts commit 81a45cfcf1.
This commit is contained in:
Thomas Müller 2013-09-06 00:28:13 +02:00
Родитель 4629d6ad67
Коммит e9849270e3
1 изменённых файлов: 5 добавлений и 10 удалений

Просмотреть файл

@ -826,16 +826,11 @@ class OC {
) {
return false;
}
// don't redo authentication if user is already logged in
// otherwise session would be invalidated in OC_User::login with
// session_regenerate_id at every page load
if (!OC_User::isLoggedIn()) {
OC_App::loadApps(array('authentication'));
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();
}
OC_App::loadApps(array('authentication'));
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;
}