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

Fix Sieve QuotedString handling

Browse source
This commit is contained in:
the-djmaze 2024-09-23 13:43:24 +02:00
parent 257d9201f6
commit 61c2eefec1
13 changed files with 185 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dev/Sieve/Extensions/rfc5293.js
View file

@ -16,24 +16,30 @@ export class AddHeaderCommand extends ActionCommand
{
super();
this.last = false;
this.field_name = new GrammarQuotedString;
this.value = new GrammarQuotedString;
this._field_name = new GrammarQuotedString;
this._value = new GrammarQuotedString;
}
get require() { return 'editheader'; }
get field_name() { return this._field_name.value; }
set field_name(v) { this._field_name.value = v; }
get value() { return this._value.value; }
set value(v) { this._value.value = v; }
toString()
{
return this.identifier
+ (this.last ? ' :last' : '')
+ ' ' + this.field_name
+ ' ' + this.value + ';';
+ ' ' + this._field_name
+ ' ' + this._value + ';';
}
pushArguments(args)
{
this.value = args.pop();
this.field_name = args.pop();
this._value = args.pop();
this._field_name = args.pop();
this.last = args.includes(':last');
}
}
@ -47,19 +53,22 @@ export class DeleteHeaderCommand extends ActionCommand
this.last = false;
this.comparator = '',
this.match_type = ':is',
this.field_name = new GrammarQuotedString;
this._field_name = new GrammarQuotedString;
this.value_patterns = new GrammarStringList;
}
get require() { return 'editheader'; }
get field_name() { return this._field_name.value; }
set field_name(v) { this._field_name.value = v; }
toString()
{
return this.identifier
+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
+ (this.comparator ? ' :comparator ' + this.comparator : '')
+ ' ' + this.match_type
+ ' ' + this.field_name
+ ' ' + this._field_name
+ ' ' + this.value_patterns + ';';
}
@ -76,10 +85,10 @@ export class DeleteHeaderCommand extends ActionCommand
});
if (l && args[l-1] instanceof GrammarString) {
this.field_name = args[l-1];
this._field_name = args[l-1];
this.value_patterns = args[l];
} else {
this.field_name = args[l];
this._field_name = args[l];
}
}
}