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 327e947b6ce1051ae6ef529c22151a8420e2729e..2812f63b35ef54cb6894f5726c09b51e813fac72 100644 (file)
--- 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 0991b8ef790ddffe4f3ce6923b573e65492c4320..64cd7dd69f2b7c711e39f05a089cc1985358442b 100644 (file)
--- 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 b43c10ad12cb8984c7db9c5779d241cacd38d6d6..a4944df64636f187af39ad4da16f0a65d963c9ad 100644 (file)
--- 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 f8cb7c3de3b8fe6abedcf29285d6e7cb68f2037f..255c855294a1df0094fe87f2fc64de4c988b47ee 100644 (file)
--- 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 2e67f7eaa6eb45c2348a2b44ebcafbb2611c6602..9c7c428fe5d79df7bb1b5564e551fd5dd31c3bb3 100644 (file)
--- 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)