From b97669b98ebbd54efde9582defacdd49f4040dfb Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 14 Feb 2008 12:56:19 +0000
Subject: [PATCH] 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
---
 .../mail/personal/mail/class_mail-methods-cyrus.inc         | 6 ++++++
 .../personal/mail/class_mail-methods-sendmail-cyrus.inc     | 6 ++++++
 gosa-plugins/mail/personal/mail/class_mail-methods.inc      | 6 ++++++
 3 files changed, 18 insertions(+)

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 388a5a715..3b7e8b083 100644
--- 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 8bb8d73be..b70dfc14b 100644
--- 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 1874648a9..ebc9dc13f 100644
--- 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)
-- 
2.30.2