Updated filter description

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14659 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/admin/users/user-filter.tpl b/gosa-core/plugins/admin/users/user-filter.tpl
index 948b8e6f0bc70dd333cf935ee175e0f208c52264..227243dcfcf2f95419949f78b59c0e52119e8cb7 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.tpl
+++ b/gosa-core/plugins/admin/users/user-filter.tpl
@@ -5,6 +5,7 @@
 </div>
 
 <div class="contentboxb">
+
 <div style="border-top:1px solid #AAAAAA"></div>
 
 {$TEMPLATES}&nbsp;<LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br>

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 5b009f6729ce1ec7f2f4924589854be1dd68bdbb..f1ca5334ce93624a54405818d469a12be8ee92ca 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -10,7 +10,7 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaAccount)$NAME)</filter>
+      <filter>(&amp;(objectClass=gosaAccount)$TEMPLATES$NAME(|$FUNCTIONAL$SAMBA$POSIX$MAIL))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>givenName</attribute>
@@ -29,6 +29,7 @@
     <default></default>
     <unset></unset>
     <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+    <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
@@ -51,7 +52,7 @@
     <tag>FUNCTIONAL</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=gosaAccount)</set>
+    <set>(!(|(objectClass=posixAccount)(objectClass=sambaSamAccount)(objectClass=gosaMailAccount)(objectClass=gofaxAccount)(objectClass=gofonAccount)))</set>
   </element>
 
   <element>