Changed logic to "AND"

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

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 16e6111b8307b252d2c09a1d0480c6bab4e561c4..2098e2442c8c882efbebfa1e3e07f1f3a5788e59 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$FUNCTIONAL$SAMBA$POSIX$MAIL)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>givenName</attribute>
@@ -43,14 +43,14 @@
     <type>checkbox</type>
     <tag>TEMPLATES</tag>
     <default></default>
-    <unset>(!(objectClass=gosaUserTemplate))</unset>
-    <set></set>
+    <unset></unset>
+    <set>(objectClass=gosaUserTemplate)</set>
   </element>
 
   <element>
     <type>checkbox</type>
     <tag>FUNCTIONAL</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(!(|(objectClass=posixAccount)(objectClass=sambaSamAccount)(objectClass=gosaMailAccount)))</set>
   </element>
@@ -58,7 +58,7 @@
   <element>
     <type>checkbox</type>
     <tag>POSIX</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=posixAccount)</set>
   </element>
@@ -66,7 +66,7 @@
   <element>
     <type>checkbox</type>
     <tag>MAIL</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=gosaMailAccount)</set>
   </element>
@@ -74,7 +74,7 @@
   <element>
     <type>checkbox</type>
     <tag>SAMBA</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=sambaSamAccount)</set>
   </element>