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

sorting

This commit is contained in:
Roland Gruber 2019-09-26 19:24:36 +02:00
parent a1da6a897d
commit 728e3cacc3
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/lib/baseModule.inc
View File

@ -1573,6 +1573,7 @@ abstract class baseModule {
/** /**
* Adds an area with two multi-select fields with buttons to move items from right to left and vice-versa. * Adds an area with two multi-select fields with buttons to move items from right to left and vice-versa.
* The options of the selects must be presorted.
* <br>Names: * <br>Names:
* <ul> * <ul>
* <li>First select: $namePrefix_1 * <li>First select: $namePrefix_1
@ -1601,6 +1602,7 @@ abstract class baseModule {
$firstSelect->setHasDescriptiveElements(true); $firstSelect->setHasDescriptiveElements(true);
$firstSelect->setMultiSelect(true); $firstSelect->setMultiSelect(true);
$firstSelect->setRightToLeftTextDirection($rightToLeftText); $firstSelect->setRightToLeftTextDirection($rightToLeftText);
$firstSelect->setSortElements(false);
$firstRow->add($firstSelect, 12); $firstRow->add($firstSelect, 12);
if ($showFilter) { if ($showFilter) {
$firstFilterGroup = new htmlGroup(); $firstFilterGroup = new htmlGroup();
@ -1627,6 +1629,7 @@ abstract class baseModule {
$secondSelect->setHasDescriptiveElements(true); $secondSelect->setHasDescriptiveElements(true);
$secondSelect->setMultiSelect(true); $secondSelect->setMultiSelect(true);
$secondSelect->setRightToLeftTextDirection($rightToLeftText); $secondSelect->setRightToLeftTextDirection($rightToLeftText);
$secondSelect->setSortElements(false);
$secondRow->add($secondSelect, 12); $secondRow->add($secondSelect, 12);
if ($showFilter) { if ($showFilter) {
$secondFilterGroup = new htmlGroup(); $secondFilterGroup = new htmlGroup();

2
lam/lib/modules/asteriskExtension.inc
View File

@ -440,11 +440,13 @@ class asteriskExtension extends baseModule {
$users_dn[getAbstractDN($dn)] = $dn; $users_dn[getAbstractDN($dn)] = $dn;
} }
} }
uasort($users_dn, 'compareDN');
if (isset($this->extensionOwners)) { if (isset($this->extensionOwners)) {
$memberList = $this->extensionOwners; $memberList = $this->extensionOwners;
} else { } else {
$memberList = array(); $memberList = array();
} }
usort($memberList, 'compareDN');
$members = array(); $members = array();
for ($i = 0; $i < sizeof($memberList); $i++) { for ($i = 0; $i < sizeof($memberList); $i++) {
$members[getAbstractDN($memberList[$i])] = $memberList[$i]; $members[getAbstractDN($memberList[$i])] = $memberList[$i];

1
lam/lib/modules/posixGroup.inc
View File

@ -307,6 +307,7 @@ class posixGroup extends baseModule implements passwordService {
if (isset($this->attributes['memberUid'])) { if (isset($this->attributes['memberUid'])) {
$remUsers = $this->attributes['memberUid']; $remUsers = $this->attributes['memberUid'];
} }
usort($remUsers, 'compareDN');
$remUsersDescriptive = array(); $remUsersDescriptive = array();
foreach ($remUsers as $user) { foreach ($remUsers as $user) {
if (isset($userAndGIDs[$user])) { if (isset($userAndGIDs[$user])) {