From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/mail/mail_domain_del.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
index 1e62ac6..806996a 100644
--- a/interface/web/mail/mail_domain_del.php
+++ b/interface/web/mail/mail_domain_del.php
@@ -59,8 +59,8 @@
// Before we delete the email domain,
// we will delete all depending records.
- // Delete all forwardings where the osurce or destination belongs to this domain
- $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR destination like '%@".$app->db->quote($domain)."'");
+ // Delete all forwardings where the source or destination belongs to this domain
+ $records = $app->db->queryAllRecords("SELECT forwarding_id as id FROM mail_forwarding WHERE source like '%@".$app->db->quote($domain)."' OR (destination like '%@".$app->db->quote($domain)."' AND type != 'forward')");
foreach($records as $rec) {
$app->db->datalogDelete('mail_forwarding','forwarding_id',$rec['id']);
}
@@ -78,11 +78,17 @@
}
// Delete all spamfilters that belong to this domain
- $records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email = '@".$app->db->quote($domain)."'");
+ $records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email = '%@".$app->db->quote($domain)."'");
foreach($records as $rec) {
$app->db->datalogDelete('spamfilter_users','id',$rec['id']);
}
+ // Delete all mailinglists that belong to this domain
+ $records = $app->db->queryAllRecords("SELECT mailinglist_id FROM mail_mailinglist WHERE domain = '".$app->db->quote($domain)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('mail_mailinglist','mailinglist_id',$rec['id']);
+ }
+
}
}
--
Gitblit v1.9.1