From 8ba08e0e37faa9017e1717ca3854bb25c999a277 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Oct 2009 10:03:11 -0400
Subject: [PATCH] Merged revisions 1357 - 1402 from trunk.
---
interface/web/mail/mail_user_filter_edit.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php
index 72f13c9..346e8a4 100644
--- a/interface/web/mail/mail_user_filter_edit.php
+++ b/interface/web/mail/mail_user_filter_edit.php
@@ -68,6 +68,7 @@
function onAfterInsert() {
global $app, $conf;
+ /*
$mailuser = $app->db->queryOneRecord("SELECT sys_groupid, custom_mailfilter FROM mail_user WHERE mailuser_id = ".$this->dataRecord["mailuser_id"]);
$rule_content = $mailuser['custom_mailfilter']."\n".$app->db->quote($this->getRule());
$rule_content = $app->db->quote($rule_content);
@@ -75,7 +76,10 @@
// set permissions
$app->db->query("UPDATE mail_user_filter SET sys_groupid = ".$mailuser['sys_groupid']." WHERE filter_id = ".$this->id);
-
+ */
+ $this->onAfterUpdate();
+
+ $app->db->query("UPDATE mail_user_filter SET sys_groupid = ".$mailuser['sys_groupid']." WHERE filter_id = ".$this->id);
}
function onAfterUpdate() {
@@ -148,7 +152,7 @@
} elseif ($this->dataRecord["op"] == 'is') {
$content .= $searchterm."$/:h)\n";
} elseif ($this->dataRecord["op"] == 'begins') {
- $content .= $searchterm."/:h)\n";
+ $content .= " ".$searchterm."/:h)\n";
} elseif ($this->dataRecord["op"] == 'ends') {
$content .= ".*".$searchterm."$/:h)\n";
}
--
Gitblit v1.9.1