From 681d3f5933292665fd95c211cee747ab6060ac24 Mon Sep 17 00:00:00 2001 From: Dominik Müller <info@profi-webdesign.net> Date: Sat, 18 Jan 2014 23:39:12 -0500 Subject: [PATCH] Merge branch 'vmailuid' of /home/git/repositories/renky/ispconfig3 --- interface/web/mail/mail_user_edit.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 61f27cb..435489f 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -203,9 +203,11 @@ $maildir = str_replace("[localpart]", strtolower($_POST["email_local_part"]), $maildir); $this->dataRecord["maildir"] = $maildir; $this->dataRecord["homedir"] = $mail_config["homedir_path"]; - $this->dataRecord["uid"] = $mail_config["mailuser_uid"]; - $this->dataRecord["gid"] = $mail_config["mailuser_gid"]; - + + // Will be overwritten by mail_plugin + $this->dataRecord['uid'] = 999989999; + $this->dataRecord['gid'] = 999989999; + //* 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 = '".$app->db->quote($this->dataRecord["email"])."'"); if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_alias_or_forward_txt")."<br>"; -- Gitblit v1.9.1