Updated user filter

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16178 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 a878872f603c8c4a8f5eb41800408e98081e208a..347dc4f1887fc2c8de25ced1ebe835823aaaa7f1 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.tpl
+++ b/gosa-core/plugins/admin/users/user-filter.tpl
@@ -4,7 +4,6 @@
 
 
   {$TEMPLATES}&nbsp;<LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br>
-  {$FUNCTIONAL}&nbsp;<LABEL for='FUNCTIONAL'>{t}Show functional users{/t}</LABEL><br>
   {$POSIX}&nbsp;<LABEL for='POSIX'>{t}Show POSIX users{/t}</LABEL><br>
   {$MAIL}&nbsp;<LABEL for='MAIL'>{t}Show Mail users{/t}</LABEL><br>
   {$SAMBA}&nbsp;<LABEL for='SAMBA'>{t}Show Samba users{/t}</LABEL><br>

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 2098e2442c8c882efbebfa1e3e07f1f3a5788e59..5b42c1853a71fc42021092176036f0a2ec08e3a4 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)$TEMPLATES$NAME$FUNCTIONAL$SAMBA$POSIX$MAIL)</filter>
+      <filter>(&amp;(objectClass=gosaAccount)$TEMPLATES$NAME$SAMBA$POSIX$MAIL)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>givenName</attribute>
@@ -43,40 +43,32 @@
     <type>checkbox</type>
     <tag>TEMPLATES</tag>
     <default></default>
-    <unset></unset>
-    <set>(objectClass=gosaUserTemplate)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>FUNCTIONAL</tag>
-    <default></default>
-    <unset></unset>
-    <set>(!(|(objectClass=posixAccount)(objectClass=sambaSamAccount)(objectClass=gosaMailAccount)))</set>
+    <unset>(!(objectClass=gosaUserTemplate))</unset>
+    <set></set>
   </element>
 
   <element>
     <type>checkbox</type>
     <tag>POSIX</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=posixAccount)</set>
+    <default>true</default>
+    <unset>(!(objectClass=posixAccount))</unset>
+    <set></set>
   </element>
 
   <element>
     <type>checkbox</type>
     <tag>MAIL</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=gosaMailAccount)</set>
+    <default>true</default>
+    <unset>(!(objectClass=gosaMailAccount))</unset>
+    <set></set>
   </element>
 
   <element>
     <type>checkbox</type>
     <tag>SAMBA</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=sambaSamAccount)</set>
+    <default>true</default>
+    <unset>(!(objectClass=sambaSamAccount))</unset>
+    <set></set>
   </element>
 
 </filterdef>