Skip to content

Commit 8537705

Browse files
author
Marius Cramer
committed
Merge branch 'change_owner' into 'master'
Change owner on domain module changes on mail domain, sites and dns too It's related to #97 merge request Instead of displaying a warning about owner must be changed on mail and domain too, change it everywhere. I have fixed some records which were not changed owner when changing mail domain's owner or web site's owner. If you agree, I'm thinking in disable client selector on mail, domain and dns when domain module is enabled.
2 parents 5d1c691 + 6877c68 commit 8537705

File tree

13 files changed

+338
-198
lines changed

13 files changed

+338
-198
lines changed

‎interface/lib/lang/en.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,5 @@ $wb['strength_4'] = 'Strong';
149149
$wb['strength_5'] = 'Very Strong';
150150
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of "{strength}".';
151151
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
152-
$wb['domain_owner_changed'] = 'You have changed the owner of domain {domain}, please change website and mail domain owner for this domain accordingly.';
153152

154153
?>

‎interface/lib/lang/es.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,4 @@ $wb['strength_5'] = 'Muy fuerte';
148148
$wb['weak_password_txt'] = 'La contraseña elegida no cumple las directrices de seguridad. Debe tener al menos {chars} caracteres y una fortaleza \"{strength}\".';
149149
$wb['weak_password_length_txt'] = 'La contraseña elegida no cumple las directrices de seguridad. Debe tener al menos {chars} caracteres.';
150150
$wb['Firewall'] = 'Cortafuegos';
151-
$wb['domain_owner_changed'] = 'Has cambiado el propietario del dominio {domain}, por favor cambia también el propietario del sitio web y dominio de correo de este dominio.';
152151
?>

‎interface/lib/plugins/dns_dns_slave_plugin.inc.php‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
/**
3+
* dns_dns_slave_plugin plugin
4+
*
5+
* @author Sergio Cambra <sergio@programatica.es> 2014
6+
*/
7+
8+
9+
class dns_dns_slave_plugin {
10+
11+
var $plugin_name = 'dns_dns_slave_plugin';
12+
var $class_name = 'dns_dns_slave_plugin';
13+
14+
/*
15+
This function is called when the plugin is loaded
16+
*/
17+
function onLoad() {
18+
global $app;
19+
//Register for the events
20+
$app->plugin->registerEvent('dns:dns_slave:on_after_insert', 'dns_dns_slave_plugin', 'dns_dns_slave_edit');
21+
$app->plugin->registerEvent('dns:dns_slave:on_after_update', 'dns_dns_slave_plugin', 'dns_dns_slave_edit');
22+
}
23+
24+
/*
25+
Function to change dns slave owner
26+
*/
27+
function dns_dns_slave_edit($event_name, $page_form) {
28+
global $app, $conf;
29+
30+
// make sure that the record belongs to the client group and not the admin group when a dmin inserts it
31+
if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($page_form->dataRecord["client_group_id"])) {
32+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
33+
$app->db->query("UPDATE dns_slave SET sys_groupid = $client_group_id WHERE id = ".$page_form->id);
34+
}
35+
if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($this->dataRecord["client_group_id"])) {
36+
$client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
37+
$app->db->query("UPDATE dns_slave SET sys_groupid = $client_group_id WHERE id = ".$page_form->id);
38+
}
39+
40+
//** When the client group has changed, change also the owner of the record if the owner is not the admin user
41+
if($page_form->oldDataRecord && $page_form->oldDataRecord["client_group_id"] != $page_form->dataRecord["client_group_id"] && $page_form->dataRecord["sys_userid"] != 1) {
42+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
43+
$tmp = $app->db->queryOneREcord("SELECT userid FROM sys_user WHERE default_group = ".$client_group_id);
44+
if($tmp["userid"] > 0) {
45+
$app->db->query("UPDATE dns_slave SET sys_userid = ".$tmp["userid"]." WHERE id = ".$page_form->id);
46+
}
47+
}
48+
}
49+
50+
}

‎interface/lib/plugins/dns_dns_soa_plugin.inc.php‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
/**
3+
* dns_dns_soa_plugin plugin
4+
*
5+
* @author Sergio Cambra <sergio@programatica.es> 2014
6+
*/
7+
8+
9+
class dns_dns_soa_plugin {
10+
11+
var $plugin_name = 'dns_dns_soa_plugin';
12+
var $class_name = 'dns_dns_soa_plugin';
13+
14+
/*
15+
This function is called when the plugin is loaded
16+
*/
17+
function onLoad() {
18+
global $app;
19+
//Register for the events
20+
$app->plugin->registerEvent('dns:dns_soa:on_after_insert', 'dns_dns_soa_plugin', 'dns_dns_soa_edit');
21+
$app->plugin->registerEvent('dns:dns_soa:on_after_update', 'dns_dns_soa_plugin', 'dns_dns_soa_edit');
22+
}
23+
24+
/*
25+
Function to change dns soa owner
26+
*/
27+
function dns_dns_soa_edit($event_name, $page_form) {
28+
global $app, $conf;
29+
30+
if ($event_name == 'dns:dns_soa:on_after_update') {
31+
$tmp = $app->db->diffrec($page_form->oldDataRecord, $app->tform->getDataRecord($page_form->id));
32+
if($tmp['diff_num'] > 0) {
33+
// Update the serial number of the SOA record
34+
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ".$page_form->id);
35+
$app->db->query("UPDATE dns_soa SET serial = '".$app->validate_dns->increase_serial($soa["serial"])."' WHERE id = ".$page_form->id);
36+
}
37+
38+
//** When the client group has changed, change also the owner of the record if the owner is not the admin user
39+
if($page_form->oldDataRecord["client_group_id"] != $page_form->dataRecord["client_group_id"] && $page_form->dataRecord["sys_userid"] != 1) {
40+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
41+
$tmp = $app->db->queryOneREcord("SELECT userid FROM sys_user WHERE default_group = ".$client_group_id);
42+
if($tmp["userid"] > 0) {
43+
$app->db->query("UPDATE dns_soa SET sys_userid = ".$tmp["userid"]." WHERE id = ".$page_form->id);
44+
$app->db->query("UPDATE dns_rr SET sys_userid = ".$tmp["userid"]." WHERE zone = ".$page_form->id);
45+
}
46+
}
47+
}
48+
49+
// make sure that the record belongs to the client group and not the admin group when a dmin inserts it
50+
if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($page_form->dataRecord["client_group_id"])) {
51+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
52+
$app->db->query("UPDATE dns_soa SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE id = ".$page_form->id);
53+
// And we want to update all rr records too, that belong to this record
54+
$app->db->query("UPDATE dns_rr SET sys_groupid = $client_group_id WHERE zone = ".$page_form->id);
55+
}
56+
if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) {
57+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
58+
$app->db->query("UPDATE dns_soa SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE id = ".$page_form->id);
59+
// And we want to update all rr records too, that belong to this record
60+
$app->db->query("UPDATE dns_rr SET sys_groupid = $client_group_id WHERE zone = ".$page_form->id);
61+
}
62+
}
63+
64+
}

‎interface/lib/plugins/mail_mail_domain_plugin.inc.php‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?php
2+
/**
3+
* mail_mail_domain_plugin plugin
4+
*
5+
* @author Sergio Cambra <sergio@programatica.es> 2014
6+
*/
7+
8+
9+
class mail_mail_domain_plugin {
10+
11+
var $plugin_name = 'mail_mail_domain_plugin';
12+
var $class_name = 'mail_mail_domain_plugin';
13+
14+
/*
15+
This function is called when the plugin is loaded
16+
*/
17+
function onLoad() {
18+
global $app;
19+
//Register for the events
20+
$app->plugin->registerEvent('mail:mail_domain:on_after_insert', 'mail_mail_domain_plugin', 'mail_mail_domain_edit');
21+
$app->plugin->registerEvent('mail:mail_domain:on_after_update', 'mail_mail_domain_plugin', 'mail_mail_domain_edit');
22+
}
23+
24+
/*
25+
Function to create the sites_web_domain rule and insert it into the custom rules
26+
*/
27+
function mail_mail_domain_edit($event_name, $page_form) {
28+
global $app, $conf;
29+
30+
// make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
31+
// also make sure that the user can not delete entry created by an admin
32+
if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($page_form->dataRecord["client_group_id"])) {
33+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
34+
$updates = "sys_groupid = $client_group_id, sys_perm_group = 'ru'";
35+
if ($event_name == 'mail:mail_domain:on_after_update') {
36+
$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $client_group_id");
37+
$client_user_id = ($tmp['userid'] > 0)?$tmp['userid']:1;
38+
$updates = "sys_userid = $client_user_id, $updates";
39+
}
40+
$app->db->query("UPDATE mail_domain SET $updates WHERE domain_id = ".$page_form->id);
41+
}
42+
if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) {
43+
$client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]);
44+
$updates = "sys_groupid = $client_group_id, sys_perm_group = 'riud'";
45+
if ($event_name == 'mail:mail_domain:on_after_update') {
46+
$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $client_group_id");
47+
$client_user_id = ($tmp['userid'] > 0)?$tmp['userid']:1;
48+
$updates = "sys_userid = $client_user_id, $updates";
49+
}
50+
$app->db->query("UPDATE mail_domain SET $updates WHERE domain_id = ".$page_form->id);
51+
}
52+
53+
//** If the domain name or owner has been changed, change the domain and owner in all mailbox records
54+
if($page_form->oldDataRecord && ($page_form->oldDataRecord['domain'] != $page_form->dataRecord['domain'] ||
55+
(isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) {
56+
$app->uses('getconf');
57+
$mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail');
58+
59+
//* Update the mailboxes
60+
$mailusers = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE email like '%@".$app->db->quote($page_form->oldDataRecord['domain'])."'");
61+
$sys_groupid = $app->functions->intval((isset($page_form->dataRecord['client_group_id']))?$page_form->dataRecord['client_group_id']:$page_form->oldDataRecord['sys_groupid']);
62+
$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $sys_groupid");
63+
$client_user_id = $app->functions->intval(($tmp['userid'] > 0)?$tmp['userid']:1);
64+
if(is_array($mailusers)) {
65+
foreach($mailusers as $rec) {
66+
// setting Maildir, Homedir, UID and GID
67+
$mail_parts = explode("@", $rec['email']);
68+
$maildir = str_replace("[domain]", $page_form->dataRecord['domain'], $mail_config["maildir_path"]);
69+
$maildir = str_replace("[localpart]", $mail_parts[0], $maildir);
70+
$maildir = $app->db->quote($maildir);
71+
$email = $app->db->quote($mail_parts[0].'@'.$page_form->dataRecord['domain']);
72+
$app->db->datalogUpdate('mail_user', "maildir = '$maildir', email = '$email', sys_userid = $client_user_id, sys_groupid = '$sys_groupid'", 'mailuser_id', $rec['mailuser_id']);
73+
}
74+
}
75+
76+
//* Update the aliases
77+
$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source like '%@".$app->db->quote($page_form->oldDataRecord['domain'])."' OR destination like '%@".$app->db->quote($page_form->oldDataRecord['domain'])."'");
78+
if(is_array($forwardings)) {
79+
foreach($forwardings as $rec) {
80+
$destination = $app->db->quote(str_replace($page_form->oldDataRecord['domain'], $page_form->dataRecord['domain'], $rec['destination']));
81+
$source = $app->db->quote(str_replace($page_form->oldDataRecord['domain'], $page_form->dataRecord['domain'], $rec['source']));
82+
$app->db->datalogUpdate('mail_forwarding', "source = '$source', destination = '$destination', sys_userid = $client_user_id, sys_groupid = '$sys_groupid'", 'forwarding_id', $rec['forwarding_id']);
83+
}
84+
}
85+
86+
//* Update the mailinglist
87+
$mailing_lists = $app->db->queryAllRecords("SELECT mailinglist_id FROM mail_mailinglist WHERE domain = '".$app->db->quote($page_form->oldDataRecord['domain'])."'");
88+
if(is_array($mailing_lists)) {
89+
foreach($mailing_lists as $rec) {
90+
$app->db->datalogUpdate('mail_mailinglist', "sys_userid = $client_user_id, sys_groupid = '$sys_groupid'", 'mailinglist_id', $rec['mailinglist_id']);
91+
}
92+
}
93+
94+
//* Update the mailget records
95+
$mail_gets = $app->db->queryAllRecords("SELECT mailget_id, destination FROM mail_get WHERE destination LIKE '%@".$app->db->quote($page_form->oldDataRecord['domain'])."'");
96+
if(is_array($mail_gets)) {
97+
foreach($mail_gets as $rec) {
98+
$destination = $app->db->quote(str_replace($page_form->oldDataRecord['domain'], $page_form->dataRecord['domain'], $rec['destination']));
99+
$app->db->datalogUpdate('mail_get', "destination = '$destination', sys_userid = $client_user_id, sys_groupid = '$sys_groupid'", 'mailget_id', $rec['mailget_id']);
100+
}
101+
}
102+
103+
if ($page_form->oldDataRecord["domain"] != $page_form->dataRecord['domain']) {
104+
//* Delete the old spamfilter record
105+
$tmp = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".$app->db->quote($page_form->oldDataRecord["domain"])."'");
106+
$app->db->datalogDelete('spamfilter_users', 'id', $tmp["id"]);
107+
unset($tmp);
108+
}
109+
$app->db->query("UPDATE spamfilter_users SET email=REPLACE(email, '".$app->db->quote($page_form->oldDataRecord['domain'])."', '".$app->db->quote($page_form->dataRecord['domain'])."'), sys_userid = $client_user_id, sys_groupid = $sys_groupid WHERE email LIKE '%@".$app->db->quote($page_form->oldDataRecord['domain'])."'");
110+
111+
} // end if domain name changed
112+
}
113+
114+
}

‎interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,30 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
113113
unset($records);
114114
unset($rec);
115115

116+
// Update the webdav user(s) too
117+
$records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = ".$page_form->id);
118+
foreach($records as $rec) {
119+
$app->db->datalogUpdate('webdav_user', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'webdav_user_id', $app->functions->intval($rec['webdav_user_id']));
120+
}
121+
unset($records);
122+
unset($rec);
123+
124+
// Update the web folder(s) too
125+
$records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = ".$page_form->id);
126+
foreach($records as $rec) {
127+
$app->db->datalogUpdate('web_folder', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'web_folder_id', $app->functions->intval($rec['web_folder_id']));
128+
}
129+
unset($records);
130+
unset($rec);
131+
132+
//* Update all web folder users
133+
$records = $app->db->queryAllRecords("SELECT web_folder_user.web_folder_user_id FROM web_folder_user, web_folder WHERE web_folder_user.web_folder_id = web_folder.web_folder_id AND web_folder.parent_domain_id = ".$page_form->id);
134+
foreach($records as $rec) {
135+
$app->db->datalogUpdate('web_folder_user', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'web_folder_user_id', $app->functions->intval($rec['web_folder_user_id']));
136+
}
137+
unset($records);
138+
unset($rec);
139+
116140
// Update the Shell user(s) too
117141
$records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = ".$page_form->id);
118142
foreach($records as $rec) {
@@ -121,6 +145,14 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
121145
unset($records);
122146
unset($rec);
123147

148+
// Update the cron(s) too
149+
$records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = ".$page_form->id);
150+
foreach($records as $rec) {
151+
$app->db->datalogUpdate('cron', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'id', $app->functions->intval($rec['id']));
152+
}
153+
unset($records);
154+
unset($rec);
155+
124156
//* Update all subdomains and alias domains
125157
$records = $app->db->queryAllRecords("SELECT domain_id, `domain`, `type`, `web_folder` FROM web_domain WHERE parent_domain_id = ".$page_form->id);
126158
foreach($records as $rec) {
@@ -143,6 +175,22 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
143175
foreach($records as $rec) {
144176
$app->db->datalogUpdate('web_database', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'database_id', $app->functions->intval($rec['database_id']));
145177
}
178+
179+
//* Update all database users
180+
$records = $app->db->queryAllRecords("SELECT web_database_user.database_user_id FROM web_database_user, web_database WHERE web_database_user.database_user_id IN (web_database.database_user_id, web_database.database_ro_user_id) AND web_database.parent_domain_id = ".$page_form->id);
181+
foreach($records as $rec) {
182+
$app->db->datalogUpdate('web_database_user', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."'", 'database_user_id', $app->functions->intval($rec['database_user_id']));
183+
}
184+
unset($records);
185+
unset($rec);
186+
187+
// Update APS instances
188+
$records = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($page_form->oldDataRecord["domain"])."'");
189+
if(is_array($records) && !empty($records)){
190+
foreach($records as $rec){
191+
$app->db->datalogUpdate('aps_instances', "sys_userid = '".$app->functions->intval($web_rec['sys_userid'])."', sys_groupid = '".$app->functions->intval($web_rec['sys_groupid'])."', customer_id = '".$app->functions->intval($client_id)."'", 'id', $rec['instance_id']);
192+
}
193+
}
146194
unset($records);
147195
unset($rec);
148196

‎interface/web/client/domain_edit.php‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,44 @@ function onAfterUpdate() {
216216
if(isset($this->dataRecord["client_group_id"])) {
217217
$client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
218218
$app->db->query("UPDATE domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$this->id);
219-
$lng_text = $app->lng("domain_owner_changed");
220-
$_SESSION['show_warning_msg'] = str_replace("{domain}", $this->dataRecord["domain"], $lng_text);
219+
220+
$data = new tform_actions();
221+
$tform = $app->tform;
222+
$app->tform = new tform();
223+
224+
$app->tform->loadFormDef("../dns/form/dns_soa.tform.php");
225+
$data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE origin LIKE '".$this->dataRecord['domain'].".'");
226+
if ($data->oldDataRecord) {
227+
$data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
228+
$data->id = $data->dataRecord['id'];
229+
$app->plugin->raiseEvent("dns:dns_soa:on_after_update", $data);
230+
}
231+
232+
$app->tform->loadFormDef("../dns/form/dns_slave.tform.php");
233+
$data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM dns_slave WHERE origin LIKE '".$this->dataRecord['domain'].".'");
234+
if ($data->oldDataRecord) {
235+
$data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
236+
$data->id = $data->dataRecord['id'];
237+
$app->plugin->raiseEvent("dns:dns_slave:on_after_update", $data);
238+
}
239+
240+
$app->tform->loadFormDef("../mail/form/mail_domain.tform.php");
241+
$data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = '".$this->dataRecord['domain']."'");
242+
if ($data->oldDataRecord) {
243+
$data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
244+
$data->id = $data->dataRecord['domain_id'];
245+
$app->plugin->raiseEvent("mail:mail_domain:on_after_update", $data);
246+
}
247+
248+
$app->tform->loadFormDef("../sites/form/web_vhost_domain.tform.php");
249+
$data->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain = '".$this->dataRecord['domain']."'");
250+
if ($data->oldDataRecord) {
251+
$data->dataRecord = array_merge($data->oldDataRecord, array('client_group_id' => $this->dataRecord["client_group_id"]));
252+
$data->id = $data->dataRecord['domain_id'];
253+
$app->plugin->raiseEvent("sites:web_vhost_domain:on_after_update", $data);
254+
}
255+
256+
$app->tform = $tform;
221257
}
222258
}
223259

‎interface/web/client/domain_list.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646

4747
$app->uses('listform_actions');
4848

49-
if(isset($_SESSION['show_warning_msg'])) {
50-
$app->tpl->setVar('warning_msg', $_SESSION['show_warning_msg']);
51-
unset($_SESSION['show_warning_msg']);
52-
}
53-
5449
$app->listform_actions->SQLOrderBy = 'ORDER BY domain.domain';
5550
$app->listform_actions->onLoad();
5651

0 commit comments

Comments
 (0)