diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index f2f332f208a8f62b2b430e1c73a0631c951f194e..4918868bec066c7ef7ed8eb2e8952063e03a5ba2 100644 (file)
$this->initially_was_account= $this->is_account;
/* Set mailMethod to the one defined in gosa.conf */
- if (isset($this->config->current['MAILMETHOD'])){
- $method= $this->config->current['MAILMETHOD'];
+ if ($this->config->get_cfg_value("mailmethod") != ""){
+ $method= $this->config->get_cfg_value("mailmethod");
$cls = get_correct_class_name("mailMethod$method");
if ($cls && class_exists($cls)){
/* Create the account prefix user. user/
Preset folder prefix. Will change it later to respect
altnamespace. */
- if (isset($this->config->current['CYRUSUNIXSTYLE']) && $this->config->current['CYRUSUNIXSTYLE'] == "true"){
- $this->folder_prefix= "user/";
- }elseif (isset($this->config->data['MAIN']['CYRUSUNIXSTYLE']) && $this->config->data['MAIN']['CYRUSUNIXSTYLE'] == "true"){
+ if ($this->config->get_cfg_value("cyrusunixstyle") == "true"){
$this->folder_prefix= "user/";
} else {
$this->folder_prefix= "user.";
/* Fill vacation array */
$this->vacation= array();
- if (isset($this->config->current['VACATIONDIR'])){
- $dir= $this->config->current['VACATIONDIR'];
+ if ($this->config->get_cfg_value("vacationdir") != ""){
+ $dir= $this->config->get_cfg_value("vacationdir");
if (is_dir($dir) && is_readable($dir)){
/* Look for files and build the vacation array */
/* Get available mailserver */
$mailserver= array();
+ $ui = get_userinfo();
foreach ($this->config->data['SERVERS']['IMAP'] as $key => $val){
- $mailserver[]= $key;
+ if( $this->gosaMailServer == $key ||
+ preg_match("/r/",$ui->get_permissions($val['server_dn'],"server/goImapServer",""))){
+ $mailserver[]= $key;
+ }
}
/*
function allow_remove()
{
- if (isset($this->config->current['MAILMETHOD'])){
- $method= $this->config->current['MAILMETHOD'];
+ if ($this->config->get_cfg_value("mailmethod") != ""){
+ $method= $this->config->get_cfg_value("mailmethod");
if(preg_match("/olab/i",$method)){
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);