From c9e9cd746ed86cc2ce2de841e7663ec30b165c24 Mon Sep 17 00:00:00 2001
From: the1matrix1 <the1matrix1@ispconfig3>
Date: Fri, 14 May 2010 04:15:09 -0400
Subject: [PATCH]
---
interface/web/mail/mail_domain_edit.php | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 7f81c27..bfd38ca 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -62,7 +62,7 @@
$app->error('Reseller: '.$app->tform->wordbook["limit_maildomain_txt"]);
}
}
-
+
parent::onShowNew();
}
@@ -116,7 +116,24 @@
}
-
+ /*
+ * Now we have to check, if we should use the domain-module to select the domain
+ * or not
+ */
+ $app->uses('ini_parser,getconf');
+ $settings = $app->getconf->get_global_config('domains');
+ if ($settings['use_domain_module'] == 'y'){
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ $sql = "SELECT domain FROM domain WHERE sys_groupid =" . $client_group_id;
+ $domains = $app->db->queryAllRecords($sql);
+ $domain_select = '';
+ if(is_array($domains)) {
+ foreach( $domains as $domain) {
+ $domain_select .= "<option value=" . $domain['domain'] . ">" . $domain['domain'] . "</option>\r\n";
+ }
+ }
+ $app->tpl->setVar("domain_option",$domain_select);
+ }
// Get the spamfilter policys for the user
@@ -280,14 +297,14 @@
$app->db->datalogDelete('spamfilter_users', 'id', $tmp_user["id"]);
}
} // endif spamfilter policy
-
- //** If the domain name has been changed, change the domain in all mailbox records
- if($this->oldDataRecord['domain'] != $this->dataRecord['domain']) {
+ //** If the domain name or owner has been changed, change the domain and owner in all mailbox records
+ if($this->oldDataRecord['domain'] != $this->dataRecord['domain'] || (isset($this->dataRecord['client_group_id']) && $this->oldDataRecord['sys_groupid'] != $this->dataRecord['client_group_id'])) {
$app->uses('getconf');
$mail_config = $app->getconf->get_server_config($this->dataRecord["server_id"],'mail');
//* Update the mailboxes
$mailusers = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE email like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."'");
+ $sys_groupid = (isset($this->dataRecord['client_group_id']))?$this->dataRecord['client_group_id']:$this->oldDataRecord['sys_groupid'];
if(is_array($mailusers)) {
foreach($mailusers as $rec) {
// setting Maildir, Homedir, UID and GID
@@ -296,7 +313,7 @@
$maildir = str_replace("[localpart]",$mail_parts[0],$maildir);
$maildir = mysql_real_escape_string($maildir);
$email = mysql_real_escape_string($mail_parts[0].'@'.$this->dataRecord['domain']);
- $app->db->datalogUpdate('mail_user', "maildir = '$maildir', email = '$email'", 'mailuser_id', $rec['mailuser_id']);
+ $app->db->datalogUpdate('mail_user', "maildir = '$maildir', email = '$email', sys_groupid = '$sys_groupid'", 'mailuser_id', $rec['mailuser_id']);
}
}
@@ -306,7 +323,7 @@
foreach($forwardings as $rec) {
$destination = mysql_real_escape_string(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['destination']));
$source = mysql_real_escape_string(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['source']));
- $app->db->datalogUpdate('mail_forwarding', "source = '$source', destination = '$destination'", 'forwarding_id', $rec['forwarding_id']);
+ $app->db->datalogUpdate('mail_forwarding', "source = '$source', destination = '$destination', sys_groupid = '$sys_groupid'", 'forwarding_id', $rec['forwarding_id']);
}
}
--
Gitblit v1.9.1