X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fuser-filter.xml;h=546d47652c4d04a8753bcc2495766e3ca0add99c;hb=22309e0d434aaa14851dbb616938d5f68635bbc0;hp=7649c6d4444185cb62b421f3896577435e8bf70b;hpb=e72f12f3c2ca05f1d11f3922acc341cba9285b81;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 7649c6d44..546d47652 100644
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -1,116 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<filter>
+<filterdef>
   <definition>
     <category>users</category>
-    <template>user-filter.tpl</template>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>givenName</attribute>
+    <attribute>sn</attribute>
+    <attribute>uid</attribute>
+    <attribute>userPassword</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(!(objectClass=gosaUserTemplate))(|$GENERIC$POSIX$MAIL$SAMBA)(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>givenName</attribute>
-      <attribute>sn</attribute>
-      <attribute>uid</attribute>
-      <attribute>modifyTimestamp</attribute>
-      <attribute>userPassword</attribute>
+      <filter>(&amp;(objectClass=gosaAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
     </query>
+    <autocomplete>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </search>
+
+  <search>
+    <tag>template</tag>
+    <label>Show templates</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;$TEMPLATE(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>givenName</attribute>
-      <attribute>sn</attribute>
-      <attribute>uid</attribute>
-      <attribute>modifyTimestamp</attribute>
-      <attribute>userPassword</attribute>
+      <filter>(&amp;(objectClass=gosaUserTemplate)(|(cn=$)(sn=$)(uid=$)))</filter>
     </query>
-    <base>true</base>
-    <scope>auto</scope>
+    <autocomplete>
+      <attribute>mail</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
   </search>
 
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <!--<regex>^...</regex>-->
-    <alphabet>true</alphabet>
-    <default>*</default>
-    <unset>this is a not valid and failing filter</unset>
-    <set>$</set>
-    <autocomplete>
+  <search>
+    <tag>posix</tag>
+    <label>Show POSIX users</label>
+    <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(objectClass=posixAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
+    </query>
+    <autocomplete>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TEMPLATE</tag>
-    <default></default>
-    <unset>(&amp;(!(objectClass=gosaUserTemplate)(!(objectClass=gosaAccount))))</unset>
-    <set>(objectClass=gosaUserTemplate)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>GENERIC</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=gosaAccount)(!(|(objectClass=posixAccount)(objectClass=gosaMailAccount)(objectClass=sambaSamAccount)(objectClass=gosaProxyAccount))))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>POSIX</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=posixAccount)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>MAIL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gosaMailAccount)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SAMBA</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=sambaSamAccount)</set>
-  </element>
+  </search>
 
-  <element>
-    <type>combobox</type>
-    <tag>ROLLE</tag>
-    <unset></unset>
-    <set></set>
-    <default>*</default>
-    <value>
-      <key>*</key>
-      <label>All</label>
-    </value>
-    <autocomplete>
+  <search>
+    <tag>samba</tag>
+    <label>Show SAMBA users</label>
+    <query>
       <backend>LDAP</backend>
-      <base>dc=gonicus,dc=de</base>
-      <scope>sub</scope>
-      <category>roles</category>
-      <objectbase>ou=roles</objectbase>
-      <filter>(objectClass=organizationalRole)</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(objectClass=sambaSamAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
+    </query>
+    <autocomplete>
       <attribute>cn</attribute>
-      <key>cn</key>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
     </autocomplete>
-   </element>
+  </search>
+
+  <search>
+    <tag>mail</tag>
+    <label>Show mail users</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaAccount)(objectClass=gosaMailAccount)(|(cn=$)(sn=$)(uid=$)(mail=$)))</filter>
+    </query>
+    <autocomplete>
+      <attribute>mail</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </search>
 
-</filter>
+</filterdef>