archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Extract ldap auth from password auth completely

Browse Source
This commit is contained in:
linead
2012-06-25 10:48:36 +10:00
committed by epriestley
parent bedc9acf98
commit e683236793
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/applications/auth/controller/PhabricatorLoginController.php
View File

@@ -77,14 +77,14 @@ final class PhabricatorLoginController
$password_auth = PhabricatorEnv::getEnvConfig('auth.password-auth-enabled'); $password_auth = PhabricatorEnv::getEnvConfig('auth.password-auth-enabled');
$forms = array(); $username_or_email = $request->getCookie('phusr');
$forms = array();
$errors = array(); $errors = array();
if ($password_auth) { if ($password_auth) {
$require_captcha = false; $require_captcha = false;
$e_captcha = true; $e_captcha = true;
$username_or_email = $request->getCookie('phusr');
if ($request->isFormPost()) { if ($request->isFormPost()) {
if (AphrontFormRecaptchaControl::isRecaptchaEnabled()) { if (AphrontFormRecaptchaControl::isRecaptchaEnabled()) {
@@ -188,6 +188,8 @@ final class PhabricatorLoginController
// $panel->setCreateButton('Register New Account', '/login/register/'); // $panel->setCreateButton('Register New Account', '/login/register/');
$forms['Phabricator Login'] = $form; $forms['Phabricator Login'] = $form;
}
$ldap_provider = new PhabricatorLDAPProvider(); $ldap_provider = new PhabricatorLDAPProvider();
if ($ldap_provider->isProviderEnabled()) { if ($ldap_provider->isProviderEnabled()) {
$ldap_form = new AphrontFormView(); $ldap_form = new AphrontFormView();
@@ -211,7 +213,6 @@ final class PhabricatorLoginController
$forms['LDAP Login'] = $ldap_form; $forms['LDAP Login'] = $ldap_form;
} }
}
$providers = PhabricatorOAuthProvider::getAllProviders(); $providers = PhabricatorOAuthProvider::getAllProviders();
foreach ($providers as $provider) { foreach ($providers as $provider) {