mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup hacke v.2

This commit is contained in:
Thomas Tanghus 2013-05-31 00:53:57 +02:00
parent e21649ccff
commit ad5c4bf771
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base.php
View File

@ -572,6 +572,7 @@ class OC {
} }
OC::tryBasicAuthLogin(); OC::tryBasicAuthLogin();
if (!self::$CLI) { if (!self::$CLI) {
try { try {
if (!OC_Config::getValue('maintenance', false)) { if (!OC_Config::getValue('maintenance', false)) {
@ -679,9 +680,8 @@ class OC {
$error[] = 'invalidpassword'; $error[] = 'invalidpassword';
// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
} elseif (OC::tryBasicAuthLogin()) {
$error[] = 'invalidpassword';
} }
OC_Util::displayLoginPage(array_unique($error)); OC_Util::displayLoginPage(array_unique($error));
} }
@ -779,8 +779,6 @@ class OC {
if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) { 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_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
OC_User::unsetMagicInCookie(); OC_User::unsetMagicInCookie();
$_REQUEST['redirect_url'] = OC_Request::requestUri();
//OC_Util::redirectToDefaultPage();
} }
return true; return true;
} }