diff options
author | Thomas Olsen <tol@tanghus> | 2011-12-01 02:02:45 +0100 |
---|---|---|
committer | Thomas Olsen <tol@tanghus> | 2011-12-01 02:02:45 +0100 |
commit | 21d613cbc651d537c6fe145a8ddbec99a56035d1 (patch) | |
tree | 8be4d0031933a20b1c4388bd89c42d39fdb626ba /index.php | |
parent | 1d312cf070d809ab1b09b978dfa9d918ffe2c253 (diff) | |
download | nextcloud-server-21d613cbc651d537c6fe145a8ddbec99a56035d1.tar.gz nextcloud-server-21d613cbc651d537c6fe145a8ddbec99a56035d1.zip |
Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
Fixed indentation in /index.php
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/index.php b/index.php index 558733e1cda..7ead0fb48a7 100644 --- a/index.php +++ b/index.php @@ -100,14 +100,15 @@ 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; - } + // 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_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + OC_Util::redirectToDefaultPage(); + }else{ + $error = true; } + } OC_Template::printGuestPage('', 'login', array('error' => $error, 'redirect' => isset($_REQUEST['redirect_url'])?$_REQUEST['redirect_url']:'' )); } |