From 43b345cabb3e8743a91c39e8d6367c1aa594ebd2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 17 Jan 2013 10:33:59 -0500
Subject: [PATCH] Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be merged to trunk.
---
interface/web/mail/mail_user_del.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/interface/web/mail/mail_user_del.php b/interface/web/mail/mail_user_del.php
index 9b26933..a6d5346 100644
--- a/interface/web/mail/mail_user_del.php
+++ b/interface/web/mail/mail_user_del.php
@@ -54,9 +54,16 @@
function onBeforeDelete() {
global $app; $conf;
- $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".mysql_real_escape_string($this->dataRecord["email"])."'");
+ $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
$app->db->datalogDelete('spamfilter_users', 'id', $tmp_user["id"]);
+ $tmp_filters = $app->db->queryAllRecords("SELECT filter_id FROM mail_user_filter WHERE mailuser_id = '".$this->id."'");
+ if(is_array($tmp_filters)) {
+ foreach($tmp_filters as $tmp) {
+ $app->db->datalogDelete('mail_user_filter', 'filter_id', $tmp["filter_id"]);
+ }
+ }
+
}
}
--
Gitblit v1.9.1