index 0cd0e15be64829935b1086e24253cfb146265ae5..61d15c47fdf5b50c6936521383fb3dd670802dd0 100644 (file)
function mailMethodKolab($config)
{
+ /* Check if the mail account identification attribute
+ is overridden in the configuration file
+ */
+ if(isset($config->current['MAIL_ATTRIB']) && !empty($config->current['MAIL_ATTRIB'])){
+ $new_uattrib= strtolower($config->current['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'];
}
$mailObject->attrs[$dest]= $mailObject->attrs[$source];
$mailObject->$dest= $mailObject->attrs[$source];
+ /* Ensure that cleanup will recognize the ampped attributes too */
+ if(isset($mailObject->saved_attributes)){
+ $mailObject->saved_attributes[$dest] = $mailObject->attrs[$source];
+ $mailObject->saved_attributes[$source] = $mailObject->attrs[$source];
+ }
+
unset ($mailObject->$dest['count']);
unset ($mailObject->attrs[$source]);
}
}
/* Save shared folder target */
- $mailObject->attrs['gosaSharedFolderTarget']= "kolab+shared.".$mailObject->uid;
+ $mailObject->attrs['gosaSharedFolderTarget']= "kolab+shared.".$mailObject->mail;
/* Kolab shared folder names are like ' shared.uid@server.de '
So overwrite uid to match these folder names. Else we can't read quota settings etc.
}
}
+
+ function deleteMailbox($folder)
+ {
+ /* Remove shared folders and skip removing users.
+ KolabD is not able to remove shared folders yet, so we do it instead */
+ if(preg_match("/^shared/",$folder)){
+ return mailMethodCyrus::deleteMailbox($folder);
+ }
+ return (TRUE);
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: