From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 14 Feb 2008 12:33:15 +0000 (+0000)
Subject: Updated mail methods.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90ed285b4ff765ffa03f835da81c24bd09bd8902;p=gosa.git

Updated mail methods.
-If MAIL_ATTRIB is set in the gosa config, then use this value as mail account indetification attribute.
  (var $uattrib in all mail classes)



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

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 327e947b6..2812f63b3 100644
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -27,6 +27,13 @@ var $uattrib= "uid";
 
   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/include/class_mail-methods-golab.inc b/include/class_mail-methods-golab.inc
index 0991b8ef7..64cd7dd69 100644
--- a/include/class_mail-methods-golab.inc
+++ b/include/class_mail-methods-golab.inc
@@ -32,6 +32,13 @@ 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/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index b43c10ad1..a4944df64 100644
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -32,6 +32,13 @@ 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'];
   }
 
diff --git a/include/class_mail-methods-sendmail-cyrus.inc b/include/class_mail-methods-sendmail-cyrus.inc
index f8cb7c3de..255c85529 100644
--- a/include/class_mail-methods-sendmail-cyrus.inc
+++ b/include/class_mail-methods-sendmail-cyrus.inc
@@ -24,6 +24,13 @@ 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/include/class_mail-methods.inc b/include/class_mail-methods.inc
index 2e67f7eaa..9c7c428fe 100644
--- a/include/class_mail-methods.inc
+++ b/include/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)