diff --git a/README.md b/README.md index d9079b3..4414640 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ AD, LDAP 的认证, 从mantis 的LDAP code 扩展剪裁。在win2003+active directory 测试过。原地址: http://www.zentao.net/extension-viewext-25.html -*注:现在添加的认证只是基于ldap密码验证,需要在禅道系统里面有对应的用户名,否则登陆不成功。* +*注:现在添加的认证只是基于 LDAP 密码验证,需要在禅道系统里面有对应的用户名,否则登陆不成功。* ## 安装文档 diff --git a/module/user/ext/config/ldap.php b/module/user/ext/config/ldap.php index ad4870b..f380da0 100644 --- a/module/user/ext/config/ldap.php +++ b/module/user/ext/config/ldap.php @@ -1,4 +1,5 @@ ldap->ldap_server = 'ldap://ldap.example.com:389/'; +$config->ldap->ldap_server = 'ldap://ldap.example.com:389/'; /** * The LDAP Protocol Version, if 0, then the protocol version is not set. For Active Directory use version 3. */ -$config->ldap->ldap_protocol_version = 3; +$config->ldap->ldap_protocol_version = 3; /** * Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. * This maps to LDAP_OPT_REFERRALS ldap library option. For Active Directory, this should be set to OFF. */ -$config->ldap->ldap_follow_referrals = 0; //1 ON, 0 OFF -$config->ldap->ldap_root_dn = 'ou=www,dc=abc,dc=com'; -$config->ldap->ldap_uid_field = 'sAMAccountName'; // Use 'sAMAccountName' for Active Directory -$config->ldap->ldap_bind_dn = 'CN=admin,OU=admin,DC=abc,DC=com'; -$config->ldap->ldap_bind_passwd = 'abcdef'; +$config->ldap->ldap_follow_referrals = 0; //1 ON, 0 OFF +$config->ldap->ldap_root_dn = 'ou=www,dc=abc,dc=com'; +$config->ldap->ldap_uid_field = 'sAMAccountName'; // Use 'sAMAccountName' for Active Directory +$config->ldap->ldap_bind_dn = 'CN=admin,OU=admin,DC=abc,DC=com'; +$config->ldap->ldap_bind_passwd = 'abcdef'; /** * Search filter for acitve person only, !(userAccountControl:1.2.840.113556.1.4.803:=2) means active user in AD */ -#$config->ldap->ldap_organization = '(objectCategory=person)(!(userAccountControl:1.2.840.113556.1.4.803:=2))'; +#$config->ldap->ldap_organization = '(objectCategory=person)(!(userAccountControl:1.2.840.113556.1.4.803:=2))'; diff --git a/module/user/ext/model/ldap.php b/module/user/ext/model/ldap.php index 95105f1..d2d9abd 100644 --- a/module/user/ext/model/ldap.php +++ b/module/user/ext/model/ldap.php @@ -2,7 +2,7 @@ function identify($account, $password) { - if(!$account or !$password) return false; + if (!$account or !$password) return false; /* admin account skip LDAP Authenticate */ if ($account == "admin") {