Commit 7052c02b authored by Benoit Mortier's avatar Benoit Mortier
Browse files

merge simple master to fusiondirectory

parent 98a6b9c3
......@@ -203,11 +203,11 @@ class simpleManagement extends management
}
$filter .= ')';
$attributes = array_values(array_unique($attributes));
$this->filter->query[0]['filter'] = '(&'.$filter.'$NAME)';
$this->filter->query[0]['attribute'] = $attributes;
$this->filter->elements['NAME']['set'] = '(|('.join('=*$*)(', $attributes).'=*$*))';
$this->filter->elements['NAME']['autocomplete']['filter'] = '(&'.$filter.'(|('.join('=*$NAME*)(', $attributes).'=*$NAME*))'.')';
$this->filter->elements['NAME']['autocomplete']['attribute'] = $attributes;
$this->filter->query[0]['filter'] = '(&'.$filter.'$NAME)';
$this->filter->query[0]['attribute'] = $attributes;
$this->filter->elements['NAME']['set'] = '(|('.join('=*$*)(', $attributes).'=*$*))';
$this->filter->elements['NAME']['autocomplete']['filter'] = '(&'.$filter.'(|('.join('=*$NAME*)(', $attributes).'=*$NAME*))'.')';
$this->filter->elements['NAME']['autocomplete']['attribute'] = $attributes;
uasort($this->filter->elements, 'strlenSort');
$this->filter->elements = array_reverse($this->filter->elements);
}
......
......@@ -24,11 +24,11 @@
<maxlength>60</maxlength>
<default></default>
<unset></unset>
<set>(|(cn=*$*)(description=*$*))</set>
<set>FILTER</set>
<alphabet>true</alphabet>
<autocomplete>
<backend>LDAP</backend>
<filter>(&amp;(|$FAKEFILTER)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
<filter>FILTER</filter>
<attribute>cn</attribute>
<attribute>description</attribute>
<frequency>0.5</frequency>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment