From 7e61344ea2c132945a90b8687ca82928382edb84 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 14 Feb 2008 12:56:10 +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@8907 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../kolab/personal/mail/kolab/class_mail-methods-golab.inc | 6 ++++++ .../kolab/personal/mail/kolab/class_mail-methods-kolab.inc | 6 ++++++ 2 files changed, 12 insertions(+) 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 dc75674c2..568dbcb69 100644 --- 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 c0606046b..6158dafd7 100644 --- 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']; } -- 2.30.2