diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-05-31 00:53:57 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-05-31 00:53:57 +0200 |
| commit | ad5c4bf7717d96142d3b7a3526022e5bccecfdcc (patch) | |
| tree | d0a615c79773b21786d3f4c7b673865cc3932942 /lib/base.php | |
| parent | e21649ccfffc8f4c02b62126d8b49d45ba280656 (diff) | |
| download | nextcloud-server-ad5c4bf7717d96142d3b7a3526022e5bccecfdcc.tar.gz nextcloud-server-ad5c4bf7717d96142d3b7a3526022e5bccecfdcc.zip | |
Cleanup hacke v.2
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index 8622d0f8bf1..42d8fb3c8d9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -572,6 +572,7 @@ class OC { } OC::tryBasicAuthLogin(); + if (!self::$CLI) { try { if (!OC_Config::getValue('maintenance', false)) { @@ -679,9 +680,8 @@ 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,8 +779,6 @@ 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; } |