Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2713 → Rev 2714

/web/acc/admin/ldap.php
128,7 → 128,7
$l_checkingConf = "Checking this configuration...";
}
 
function ldap_checkServerConfig($f_ldap_server, $f_ldap_identity, $f_ldap_password, $f_ldap_basedn, $f_ldap_uid, $f_ldap_ssl, $f_ldap_cert, $f_ldap_cert_required) {
function ldap_checkServerConfig($f_ldap_server, $f_ldap_identity, $f_ldap_password, $f_ldap_basedn, $f_ldap_base_filter, $f_ldap_uid, $f_ldap_ssl, $f_ldap_cert, $f_ldap_cert_required) {
// Socket to the LDAP port of the server
if (!$sock = @fsockopen($f_ldap_server, (($f_ldap_ssl) ? 636 : 389), $num, $error, 2)) {
// no network connection
171,7 → 171,8
}
 
// if ok, try to query the directory of users
$query = $f_ldap_uid.'=*';
$filter = ((!empty($f_ldap_base_filter)) ? $f_ldap_base_filter : '&');
$query = "(&($f_ldap_uid=*)($filter))";
$ldap_result = @ldap_search($ldapconn, $f_ldap_basedn, $query);
if ($ldap_result) {
$ldap_users_count = ldap_count_entries($ldapconn, $ldap_result);
300,7 → 301,7
if (!empty($varErrors)) {
$response['errors'] = $varErrors;
} else {
$result = ldap_checkServerConfig($ldap_server, $ldap_user, $ldap_password, $ldap_base_dn, $ldap_uid, $ldap_ssl, $ldap_cert_tmpFilename, $ldap_cert_required);
$result = ldap_checkServerConfig($ldap_server, $ldap_user, $ldap_password, $ldap_base_dn, $ldap_base_filter, $ldap_uid, $ldap_ssl, $ldap_cert_tmpFilename, $ldap_cert_required);
 
if (($result === 0) && ($ldap_ssl && $ldap_cert_required && ((isset($ldap_cert) && ($ldap_cert['error'] === UPLOAD_ERR_OK)) || (file_exists($LDAPS_CERT_LOC))))) {
if (filter_var($ldap_server, FILTER_VALIDATE_IP) !== false) {
315,7 → 316,7
$response['warnings'][] = str_replace("§cert_domainName§", $cert_domainName, $l_ldap_cert_cn_diff_dn);
}
}
$res = ldap_checkServerConfig($cert_domainName, $ldap_user, $ldap_password, $ldap_base_dn, $ldap_uid, $ldap_ssl, $ldap_cert_tmpFilename, $ldap_cert_required);
$res = ldap_checkServerConfig($cert_domainName, $ldap_user, $ldap_password, $ldap_base_dn, $ldap_base_filter, $ldap_uid, $ldap_ssl, $ldap_cert_tmpFilename, $ldap_cert_required);
if ($res > 1) {
$result = $res;
}