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

Clean up hack.

This commit is contained in:
Thomas Tanghus 2013-05-31 00:28:03 +02:00
parent e66f609a64
commit 138c7f615b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty

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

1
3rdparty Symbolic link
View File

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

6
lib/base.php
View File

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