Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-03 06:27:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Centralize some argument parsing

Browse source 
Improved parser error handling
Fix Sieve Vacation extension
This commit is contained in:
djmaze 2021-01-15 11:34:16 +01:00
parent 55178016a0
commit 68fc9f21bd
7 changed files with 131 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/Sieve/Extensions/rfc5173.js
View file

@ -11,7 +11,7 @@ class Body extends Grammar.Test
constructor()
{
super('body');
this.comparator = 'i;ascii-casemap',
this.comparator = '',
this.match_type = ':is',
this.body_transform = ''; // :raw, :content <string-list>, :text
this.key_list = new Grammar.StringList;
@ -31,14 +31,10 @@ class Body extends Grammar.Test
pushArguments(args)
{
args.forEach((arg, i) => {
if (':is' === arg || ':contains' === arg || ':matches' === arg) {
this.match_type = arg;
} else if (':raw' === arg || ':text' === arg) {
if (':raw' === arg || ':text' === arg) {
this.body_transform = arg;
} else if (arg instanceof Grammar.StringList || arg instanceof Grammar.StringType) {
if (':comparator' === args[i-1]) {
this.comparator = arg;
} else if (':content' === args[i-1]) {
if (':content' === args[i-1]) {
this.body_transform = ':content ' + arg;
} else {
this[args[i+1] ? 'content_list' : 'key_list'] = arg;