Updated mailMethods.

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

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

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
index 388a5a715eed93704a3f50d72b4f68a7ec1cd376..3b7e8b08329014f3d22f7fdd1e827a089a76c994 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -27,6 +27,12 @@ class mailMethodCyrus extends mailMethod
 
   function mailMethodCyrus(&$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/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
index 8bb8d73be5ba14f57060d9f12b34dacfd8f0ca3c..b70dfc14bcb1b1f9933422c8971f5ca51cf3895b 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-sendmail-cyrus.inc
@@ -23,6 +23,12 @@ class mailMethodSendmailCyrus extends mailMethodCyrus
 
   function mailMethodSendmailCyrus(&$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/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
index 1874648a9c9e86d0117ede05f2249333f1df16f8..ebc9dc13fe11e9f1f2a072180dd89ebe64c0ca7e 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
@@ -25,6 +25,12 @@ class mailMethod
   
   function mailMethod(&$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'];
+    }
   }
 
   function connect($gosaMailServer)