fixes #21
* sort and unify group lists at display and save time * autocompletion only yields groups that are not assigned yet
This commit is contained in:
parent
0993d2be3a
commit
b415533dd5
3 changed files with 9 additions and 4 deletions
|
@ -62,7 +62,8 @@ function getDirGroupsFromHtaccess($dirname) {
|
|||
$grouparr = explode(" ", $matches[1][0]);
|
||||
foreach ($grouparr as $group) {
|
||||
$group = trim($group);
|
||||
if (!in_array($group, $GLOBALS['mandatorygroups'])) {
|
||||
if (!in_array($group, $GLOBALS['mandatorygroups']) &&
|
||||
!in_array($group, $groups)) {
|
||||
array_push($groups, $group);
|
||||
}
|
||||
}
|
||||
|
@ -182,6 +183,8 @@ function setGroups($dirname, &$groups) {
|
|||
array_push($groups, $mgroup);
|
||||
}
|
||||
}
|
||||
$groups = array_unique($groups);
|
||||
asort($groups);
|
||||
$found = false;
|
||||
$lines = array();
|
||||
$found = false;
|
||||
|
@ -215,7 +218,7 @@ function setGroups($dirname, &$groups) {
|
|||
* Updates a directory to be accessible by the given list of
|
||||
* groups. The directory is created if it doesn't exist.
|
||||
*
|
||||
* @param string $dirname directory name relative to {@link $davconfig['dav.dir']}
|
||||
* @param string $dirname directory name relative to $davconfig['dav.dir']
|
||||
* @param array $groups a list of group names
|
||||
*/
|
||||
function updateDirectory($dirname, $groups) {
|
||||
|
@ -262,7 +265,7 @@ function delrecursive($fullname) {
|
|||
* Deletes the given directory if it has a valid name and is not the
|
||||
* administration interface directory.
|
||||
*
|
||||
* @param string $dirname directory name relative to {@link $davconfig['dav.dir']}
|
||||
* @param string $dirname directory name relative to $davconfig['dav.dir']
|
||||
*/
|
||||
function deleteDirectory($dirname) {
|
||||
global $davconfig;
|
||||
|
|
|
@ -52,7 +52,8 @@ function getGroups($part) {
|
|||
foreach ($groups as $line) {
|
||||
list($group, $users) = explode(":", $line);
|
||||
$group = trim($group);
|
||||
if (stripos($group, $last_string) === 0) {
|
||||
if (!in_array($group, $array) &&
|
||||
(stripos($group, $last_string) === 0)) {
|
||||
$retval[$prefix . $group] = $group;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -50,6 +50,7 @@ function _getGroupNames($username) {
|
|||
}
|
||||
}
|
||||
}
|
||||
asort($retval);
|
||||
return $retval;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue