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 b70dfc14bcb1b1f9933422c8971f5ca51cf3895b..b80758ea432e668fdcb3aac79cecc24fd491f955 100644 (file)
/* 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'];
+ if($config->get_cfg_value("mail_attrib") != ""){
+ $new_uattrib= strtolower($config->get_cfg_value("mail_attrib"));
+ if(in_array($new_uattrib,array("mail","uid"))){
+ $this->uattrib = $new_uattrib;
+ }else{
+ trigger_error(sprintf("Unsupported MAIL_ATTRIB in gosa configuration specified, use 'mail' or 'uid', instead of '%s'.", $new_uattrib));
+ }
}
+
$this->config= $config->data['SERVERS']['IMAP'];
}