Updated mailMethods.

-Use mail identification attribute from gosa configurtation, if is set.

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

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
index dc75674c264866d1c3b5a99affe85396a60a47b6..568dbcb693297f12fae0840c448c0ec40e226f08 100644 (file)
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-golab.inc
@@ -31,6 +31,12 @@ class mailMethodGolab extends mailMethodCyrus
 
   function mailMethodGolab(&$config)
   {
+    /* Check if the mail account identification attribute
+       is overridden in the configuration file
+     */
+    if(isset($config->current['MAIL_ATTRIB'])){
+      $this->uattrib = $config->current['MAIL_ATTRIB'];
+    }
     $this->config= $config->data['SERVERS']['IMAP'];
   }
 

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
index c0606046b0c9094667c53e70d3b0bd4cc58b6d13..6158dafd77b9db30a0540849ef2ed7656c78d34e 100644 (file)
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
@@ -31,6 +31,12 @@ class mailMethodKolab extends mailMethodCyrus
 
   function mailMethodKolab(&$config)
   {
+    /* Check if the mail account identification attribute
+       is overridden in the configuration file
+     */
+    if(isset($config->current['MAIL_ATTRIB'])){
+      $this->uattrib = $config->current['MAIL_ATTRIB'];
+    }
     $this->config= $config->data['SERVERS']['IMAP'];
   }