WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactoring

This commit is contained in:
Roland Gruber 2017-05-25 11:00:58 +02:00
parent e6dd937f32
commit 129338dfa6
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lam/lib/account.inc
View File

@ -727,14 +727,34 @@ function searchLDAPByFilter($filter, $attributes, $scopes, $attrsOnly = false) {
* @return array list of found entries * @return array list of found entries
*/ */
function searchLDAP($suffix, $filter, $attributes) { function searchLDAP($suffix, $filter, $attributes) {
$return = searchLDAPPaged($_SESSION['ldap']->server(), escapeDN($suffix), $filter, $attributes, $limit = 0;
0, $_SESSION['config']->get_searchLimit()); if (!empty($_SESSION['config'])) {
if (ldap_errno($_SESSION['ldap']->server()) == 4) { $limit = $_SESSION['config']->get_searchLimit();
}
$return = searchLDAPPaged(getLDAPServerHandle(), escapeDN($suffix), $filter, $attributes,
0, $limit);
if (ldap_errno(getLDAPServerHandle()) == 4) {
logNewMessage(LOG_WARNING, 'LDAP size limit exeeded. Please increase the limit on your server.'); logNewMessage(LOG_WARNING, 'LDAP size limit exeeded. Please increase the limit on your server.');
} }
return $return; return $return;
} }
/**
* Returns the LDAP server handle.
*
* @return handle LDAP handle
*/
function getLDAPServerHandle() {
if (!empty($_SESSION['ldap'])) {
// admin pages
return $_SESSION['ldap']->server();
}
else {
// self service
return $_SESSION['ldapHandle'];
}
}
/** /**
* Runs an LDAP search and uses paging if configured. * Runs an LDAP search and uses paging if configured.
* *

4
lam/lib/html.inc
View File

@ -798,11 +798,13 @@ class htmlTableExtendedInputField extends htmlInputField {
* @param String $fieldName unique field name * @param String $fieldName unique field name
* @param String $fieldValue value of input field (optional) * @param String $fieldValue value of input field (optional)
* @param String $helpID help ID (optional) * @param String $helpID help ID (optional)
* @param boolean $required input required
*/ */
function __construct($label, $fieldName, $fieldValue = null, $helpID = null) { function __construct($label, $fieldName, $fieldValue = null, $helpID = null, $required = false) {
parent::__construct($fieldName, $fieldValue); parent::__construct($fieldName, $fieldValue);
$this->label = htmlspecialchars($label); $this->label = htmlspecialchars($label);
$this->helpID = $helpID; $this->helpID = $helpID;
$this->required = $required;
} }
/** /**