Skip to content

Commit c44c12f

Browse files
committed
Handle new filter source type "Detail"
1 parent 5f532fc commit c44c12f

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

interface/lib/plugins/mail_user_filter_plugin.inc.php

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,20 @@ private function mail_user_filter_get_rule($page_form) {
148148
}
149149
$content .= 'if size :over '.intval($page_form->dataRecord["searchterm"]).$unit.' {'."\n";
150150
} else {
151-
152-
if($page_form->dataRecord["source"] == 'Header') {
153-
$parts = explode(':',trim($page_form->dataRecord["searchterm"]));
154-
$page_form->dataRecord["source"] = trim($parts[0]);
155-
unset($parts[0]);
156-
$page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
157-
unset($parts);
151+
if($page_form->dataRecord["source"] == 'Detail') {
152+
$content .= 'if envelope :detail :regex "to" ["';
153+
} else {
154+
if($page_form->dataRecord["source"] == 'Header') {
155+
$parts = explode(':',trim($page_form->dataRecord["searchterm"]));
156+
$page_form->dataRecord["source"] = trim($parts[0]);
157+
unset($parts[0]);
158+
$page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
159+
unset($parts);
160+
}
161+
162+
$content .= 'if header :regex ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
158163
}
159164

160-
$content .= 'if header :regex ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
161-
162165
$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
163166
$searchterm = str_replace(
164167
array(

0 commit comments

Comments
 (0)