Commit 51119d7c authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6331-delete-ordering' into 'develop'

Delete mail_domain after mail_user records

Closes #6331

See merge request !1598
parents b0b511a5 3dbdfd4a
Pipeline #11827 passed with stage
in 7 seconds
...@@ -415,7 +415,7 @@ class remoting_client extends remoting { ...@@ -415,7 +415,7 @@ class remoting_client extends remoting {
$app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id); $app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id);
//* Delete all records (sub-clients, mail, web, etc....) of this client. //* 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); $tables_array = explode(',', $tables);
$client_group_id = $app->functions->intval($client_group['groupid']); $client_group_id = $app->functions->intval($client_group['groupid']);
if($client_group_id > 1) { if($client_group_id > 1) {
......
...@@ -62,12 +62,12 @@ class page_action extends tform_actions { ...@@ -62,12 +62,12 @@ class page_action extends tform_actions {
'ftp_user' => 'username', 'ftp_user' => 'username',
'mail_access' => 'source', 'mail_access' => 'source',
'mail_content_filter' => '', 'mail_content_filter' => '',
'mail_domain' => 'domain',
'mail_forwarding' => '', 'mail_forwarding' => '',
'mail_get' => '', 'mail_get' => '',
'mail_mailinglist' => 'listname', 'mail_mailinglist' => 'listname',
'mail_user' => 'email', 'mail_user' => 'email',
'mail_user_filter' => '', 'mail_user_filter' => '',
'mail_domain' => 'domain',
'shell_user' => 'username', 'shell_user' => 'username',
'spamfilter_users' => '', 'spamfilter_users' => '',
'spamfilter_wblist' => '', 'spamfilter_wblist' => '',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment