Skip optional :all modified in address/envelope rule

pull/100/merge
Aleksander Machniak 11 years ago
parent 2feba7bf4d
commit b2c5869fe2

@ -260,7 +260,8 @@ class rcube_sieve_script
$this->add_index($test, $tests[$i], $exts); $this->add_index($test, $tests[$i], $exts);
} }
if (!empty($test['part'])) { // :all address-part is optional, skip it
if (!empty($test['part']) && $test['part'] != 'all') {
$tests[$i] .= ' :' . $test['part']; $tests[$i] .= ' :' . $test['part'];
if ($test['part'] == 'user' || $test['part'] == 'detail') { if ($test['part'] == 'user' || $test['part'] == 'detail') {
array_push($exts, 'subaddress'); array_push($exts, 'subaddress');

@ -39,7 +39,7 @@ if true
} }
fileinto "Test"; fileinto "Test";
# rule:[address test] # rule:[address test]
if address :all :is "From" "nagios@domain.tld" if address :is "From" "nagios@domain.tld"
{ {
fileinto "domain.tld"; fileinto "domain.tld";
stop; stop;

@ -1,6 +1,6 @@
require ["enotify","envelope","variables"]; require ["enotify","envelope","variables"];
# rule:[from] # rule:[from]
if envelope :all :matches "from" "*" if envelope :matches "from" "*"
{ {
set "env_from" " [really: ${1}]"; set "env_from" " [really: ${1}]";
} }
@ -10,7 +10,7 @@ if header :matches "Subject" "*"
set "subject" "${1}"; set "subject" "${1}";
} }
# rule:[from notify] # rule:[from notify]
if address :all :matches "from" "*" if address :matches "from" "*"
{ {
set "from_addr" "${1}"; set "from_addr" "${1}";
notify :message "${from_addr}${env_from}: ${subject}" "mailto:alm@example.com"; notify :message "${from_addr}${env_from}: ${subject}" "mailto:alm@example.com";

@ -12,7 +12,7 @@ if header :index 2 :contains ["From","To"] "test@domain.tld"
stop; stop;
} }
# rule:[index-address] # rule:[index-address]
if address :index 1 :all :is "From" "nagios@domain.tld" if address :index 1 :is "From" "nagios@domain.tld"
{ {
fileinto "domain.tld"; fileinto "domain.tld";
stop; stop;

@ -1,6 +1,6 @@
require ["envelope","notify","variables"]; require ["envelope","notify","variables"];
# rule:[from] # rule:[from]
if envelope :all :matches "from" "*" if envelope :matches "from" "*"
{ {
set "env_from" " [really: ${1}]"; set "env_from" " [really: ${1}]";
} }
@ -10,7 +10,7 @@ if header :matches "Subject" "*"
set "subject" "${1}"; set "subject" "${1}";
} }
# rule:[from notify] # rule:[from notify]
if address :all :matches "from" "*" if address :matches "from" "*"
{ {
set "from_addr" "${1}"; set "from_addr" "${1}";
notify :message "${from_addr}${env_from}: ${subject}" :method "sms:1234567890"; notify :message "${from_addr}${env_from}: ${subject}" :method "sms:1234567890";

Loading…
Cancel
Save