upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Revert "Clean up hack."

Browse source 
This reverts commit 138c7f615b.
This commit is contained in:
Thomas Tanghus 2013-05-31 00:53:15 +02:00
parent 138c7f615b
commit e21649ccff
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3rdparty
View file

@ -1 +0,0 @@
/home/tol/owncloud/3rdparty/

1
3rdparty Submodule

@ -0,0 +1 @@
Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2

6
lib/base.php
View file

@ -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;
}