add global config, fix get_userlist

This commit is contained in:
Tyler Christiansen 2015-04-07 12:10:55 -07:00
parent 00f77f8bdf
commit 2e233e0d5c

View File

@ -32,7 +32,7 @@ function authenticate($username,$password)
{
$ldap_groups = get_group_list();
foreach($ldap_groups as $ldap_group) {
if (ldap_compare($ds,$ldap_group, $config['auth_ldap_groupmemberattr'],get_membername($username))===true)
if (ldap_compare($ds, $ldap_group, $config['auth_ldap_groupmemberattr'], get_membername($username))===true)
{
return 1;
}
@ -158,7 +158,7 @@ function get_userlist()
$user_id = $entry['uidnumber'][0];
$ldap_groups = get_group_list();
foreach($ldap_groups as $ldap_group) {
if (!isset($config['auth_ldap_group']) || ldap_compare($ds,$config['auth_ldap_group'],$config['auth_ldap_groupmemberattr'],get_membername($username))===true)
if (!isset($config['auth_ldap_group']) || ldap_compare($ds, $ldap_group, $config['auth_ldap_groupmemberattr'], get_membername($username))===true)
{
$userlist[] = array('username' => $username, 'realname' => $realname, 'user_id' => $user_id);
}
@ -202,6 +202,8 @@ function get_membername ($username)
}
function get_group_list() {
global $config;
$ldap_groups = [];
$ldap_groups[] = $config['auth_ldap_groupbase'];
foreach($config['auth_ldap_groups'] as $key => $value) {