Merge commit 'refs/merge-requests/59' of git://gitorious.org/owncloud/owncloud

1 files changed, 9 insertions, 1 deletions

diff --git a/index.php b/index.php
index 4e1f5bcc8d6..924e7394f7b 100644
--- a/index.php
+++ b/index.php
@@ -100,6 +100,14 @@ else {
 			$error = true;
 		}
 	}
-
+		// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+		elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){
+			if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
+				OC_User::unsetMagicInCookie();
+				OC_Util::redirectToDefaultPage();
+			}else{
+				$error = true;
+			}
+		}
 	OC_Template::printGuestPage('', 'login', array('error' => $error, 'redirect' => isset($_REQUEST['redirect_url'])?$_REQUEST['redirect_url']:'' ));
 }