From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/lib/plugins/mail_user_filter_plugin.inc.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index e831789..5afd1c0 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -177,7 +177,7 @@
} elseif ($page_form->dataRecord["op"] == 'is') {
$content .= "^".$searchterm."$";
} elseif ($page_form->dataRecord["op"] == 'begins') {
- $content .= " ".$searchterm."";
+ $content .= "^".$searchterm."";
} elseif ($page_form->dataRecord["op"] == 'ends') {
$content .= ".*".$searchterm."$";
}
@@ -252,6 +252,7 @@
if($page_form->dataRecord["action"] == 'move') {
$content .= 'ID' . "$page_form->id" . 'EndFolder = "$DEFAULT/.' . $page_form->dataRecord['target'] . '/"' . "\n";
+ $content .= "xfilter \"/usr/bin/formail -A \\\"X-User-Mail-Filter-ID"."$page_form->id".": Yes\\\"\"" . "\n";
$content .= "to ". '$ID' . "$page_form->id" . 'EndFolder' . "\n";
} else {
$content .= "to /dev/null\n";
--
Gitblit v1.9.1