From 3dbdfd4a3cb448031e812713772e6d46218eb113 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 9 Apr 2022 22:44:56 +0200 Subject: [PATCH] Delete mail_domain after mail_user records --- interface/lib/classes/remote.d/client.inc.php | 2 +- interface/web/client/client_del.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/remote.d/client.inc.php b/interface/lib/classes/remote.d/client.inc.php index 5af1592db9..29dc257797 100644 --- a/interface/lib/classes/remote.d/client.inc.php +++ b/interface/lib/classes/remote.d/client.inc.php @@ -413,7 +413,7 @@ class remoting_client extends remoting { $app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id); //* Delete all records (sub-clients, mail, web, etc....) of this client. - $tables = 'cron,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic,domain,mail_mailinglist,client,spamfilter_wblist'; + $tables = 'cron,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,mail_domain,support_message,web_database,web_database_user,web_domain,web_traffic,domain,mail_mailinglist,client,spamfilter_wblist'; $tables_array = explode(',', $tables); $client_group_id = $app->functions->intval($client_group['groupid']); if($client_group_id > 1) { diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php index dadcae0bdf..49835f8dde 100644 --- a/interface/web/client/client_del.php +++ b/interface/web/client/client_del.php @@ -62,12 +62,12 @@ class page_action extends tform_actions { 'ftp_user' => 'username', 'mail_access' => 'source', 'mail_content_filter' => '', - 'mail_domain' => 'domain', 'mail_forwarding' => '', 'mail_get' => '', 'mail_mailinglist' => 'listname', 'mail_user' => 'email', 'mail_user_filter' => '', + 'mail_domain' => 'domain', 'shell_user' => 'username', 'spamfilter_users' => '', 'spamfilter_wblist' => '', -- GitLab