From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 01 Jul 2016 03:53:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/mail/mail_user_edit.php | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index a155cbd..aedcd22 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -237,8 +237,13 @@ $this->dataRecord["homedir"] = $mail_config["homedir_path"]; // Will be overwritten by mail_plugin - $this->dataRecord['uid'] = -1; - $this->dataRecord['gid'] = -1; + if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') { + $this->dataRecord['uid'] = -1; + $this->dataRecord['gid'] = -1; + } else { + $this->dataRecord['uid'] = intval($mail_config["mailuser_uid"]); + $this->dataRecord['gid'] = intval($mail_config["mailuser_gid"]); + } //* Check if there is no alias or forward with this address $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE active = 'y' AND source = ?", $this->dataRecord["email"]); -- Gitblit v1.9.1