From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/mail_user_edit.php | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index e1e05d3..aedcd22 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -209,7 +209,7 @@
// Set Maildir format
if ($this->id == 0) {
- $this->dataRecord['maildir_format'] = $sys_config['maildir_format'];
+ $this->dataRecord['maildir_format'] = $mail_config['maildir_format'];
}
else {
// restore Maildir format
@@ -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