diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-05-31 00:53:15 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-05-31 00:53:15 +0200 |
| commit | e21649ccfffc8f4c02b62126d8b49d45ba280656 (patch) | |
| tree | 49b13a0d1598947afc6f60cef5247d4f2484e2b9 /lib/base.php | |
| parent | 138c7f615bef9994629d4aa283ae7f037dc0f14d (diff) | |
| download | nextcloud-server-e21649ccfffc8f4c02b62126d8b49d45ba280656.tar.gz nextcloud-server-e21649ccfffc8f4c02b62126d8b49d45ba280656.zip | |
Revert "Clean up hack."
This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d.
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 42d8fb3c8d9..8622d0f8bf1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -572,7 +572,6 @@ class OC { } OC::tryBasicAuthLogin(); - if (!self::$CLI) { try { if (!OC_Config::getValue('maintenance', false)) { @@ -680,8 +679,9 @@ class OC { $error[] = 'invalidpassword'; // 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)); } @@ -779,6 +779,8 @@ class OC { 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(); + $_REQUEST['redirect_url'] = OC_Request::requestUri(); + //OC_Util::redirectToDefaultPage(); } return true; } |