diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-09-01 02:48:54 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-09-01 02:50:27 +0200 |
| commit | 3dacf149de2ac560328242666473533c81c4b418 (patch) | |
| tree | 4991c802bb82d5be6572eec64cc7128548a8d646 /lib/base.php | |
| parent | f67aef608f7bbeb43be2c8d8c10dc91ea0cb5d4b (diff) | |
| download | nextcloud-server-3dacf149de2ac560328242666473533c81c4b418.tar.gz nextcloud-server-3dacf149de2ac560328242666473533c81c4b418.zip | |
allow configuring user backends in config.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 8d605e52802..fb83f6ea0a4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -351,6 +351,9 @@ class OC{ } } + //setup extra user backends + OC_User::setupBackends(); + // register cache cleanup jobs OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc'); OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); @@ -423,6 +426,7 @@ class OC{ // Someone is logged in : if(OC_User::isLoggedIn()) { OC_App::loadApps(); + OC_User::setupBackends(); if(isset($_GET["logout"]) and ($_GET["logout"])) { OC_User::logout(); header("Location: ".OC::$WEBROOT.'/'); @@ -469,7 +473,7 @@ class OC{ } protected static function handleLogin() { - OC_App::loadApps(array('prelogin','authentication')); + OC_App::loadApps(array('prelogin')); $error = false; // remember was checked after last login if (OC::tryRememberLogin()) { @@ -517,7 +521,12 @@ class OC{ || ($_SESSION['sectoken']!=$_POST['sectoken']) ) { return false; } + OC_App::loadApps(); + + //setup extra user backends + OC_User::setupBackends(); + if(OC_User::login($_POST["user"], $_POST["password"])) { if(!empty($_POST["remember_login"])){ if(defined("DEBUG") && DEBUG) { |