Updated mailForward selection list

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

diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/class_mailAddressSelect.inc b/gosa-plugins/mail/personal/mail/mailAddressSelect/class_mailAddressSelect.inc
index 31e92c53d59242b0a1c39dc554f4dac101827cc9..ebd2bac1e0846edaf4375770f6726d09eba43162 100644 (file)
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/class_mailAddressSelect.inc
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/class_mailAddressSelect.inc
@@ -31,7 +31,7 @@ class mailAddressSelect extends management
     $this->config = $config;
     $this->ui = $ui;
 
-    $this->storagePoints = array(get_ou("userRDN"));
+    $this->storagePoints = array(get_ou("userRDN"), get_ou('groupRDN'));
 
 #   // Build filter
 #   if (session::global_is_set(get_class($this)."_filter")){

diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
index ba7af5cdef3357da37d194fd90ccfb3a1e676e82..c9387b77c75d328058477ac2fb8f138c9e714e8b 100644 (file)
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
@@ -8,6 +8,11 @@
 
 <div style="border-top:1px solid #AAAAAA"></div>
 
+  {$USER}&nbsp;<LABEL for='SAMBA'>{t}Show users{/t}</LABEL><br>
+  {$GROUP}&nbsp;<LABEL for='POSIX'>{t}Show groups{/t}</LABEL><br>
+
+ <div style="border-top:1px solid #AAAAAA"></div>
+
  {$SCOPE}
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">

diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
index 4ae62a454e30edb7e628ba70caba1de2cc7f87de..86c17bce5bb5ee528179c63dbb1681ffc70db87d 100644 (file)
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
@@ -10,7 +10,7 @@
   <search>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(mail=*)$NAME)</filter>
+      <filter>(&amp;(objectClass=gosaMailAccount)(|$USER$GROUP)(mail=*)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -24,6 +24,22 @@
     <scope>auto</scope>
   </search>
 
+  <element>
+    <type>checkbox</type>
+    <tag>USER</tag>
+    <default>true</default>
+    <set>(&amp;(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate)))</set>
+    <unset></unset>
+  </element>
+
+  <element>
+    <type>checkbox</type>
+    <tag>GROUP</tag>
+    <default>true</default>
+    <unset></unset>
+    <set>(objectClass=posixGroup)</set>
+  </element>
+
   <element>
     <type>textfield</type>
     <tag>NAME</tag>
@@ -35,7 +51,7 @@
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(description=*$NAME*)(mail=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaMailAccount)(|(cn=*$NAME*)(description=*$NAME*)(mail=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>

diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.xml b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.xml
index 205ccff12a8ad27bcea037df3d814c03839b8474..f8cca6285496df34644cf0902f92440a71c742ba 100644 (file)
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.xml
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.xml
@@ -15,14 +15,21 @@
       <objectClass>gosaAccount</objectClass>
       <category>users</category>
       <class>user</class>
-      <image>plugins/mail/images/envelope.png</image>
+      <image>plugins/users/images/select_user.png</image>
     </objectType>
 
+    <objectType>
+      <label>Group</label>
+      <objectClass>posixGroup</objectClass>
+      <category>groups</category>
+      <class>group</class>
+      <image>plugins/groups/images/groups.png</image>
+    </objectType>
 
   </definition>
 
   <table>
-    <layout>|20px;c||||</layout>
+    <layout>|20px;c|||</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -30,7 +37,7 @@
 
     <department>
       <value>%{filter:departmentLink(row,dn,description)}</value>
-      <span>2</span>
+      <span>1</span>
     </department>
 
     <column>
@@ -38,23 +45,15 @@
     </column>
 
     <column>
-      <label>givename</label>
-      <sortAttribute>givenName</sortAttribute>
-      <sortType>string</sortType>
-      <value>%{givenName}</value>
-      <export>true</export>
-    </column>
-
-    <column>
-      <label>surename</label>
-      <sortAttribute>sn</sortAttribute>
+      <label>Name</label>
+      <sortAttribute>cn</sortAttribute>
       <sortType>string</sortType>
-      <value>%{sn}</value>
+      <value>%{cn}</value>
       <export>true</export>
     </column>
 
     <column>
-      <label>mail</label>
+      <label>Mail address</label>
       <sortAttribute>mail</sortAttribute>
       <sortType>string</sortType>
       <value>%{mail}</value>