Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 05:29:20 +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

45
dev/Sieve/Extensions/rfc5703.js
View file

@ -20,7 +20,7 @@ export class ForEveryPartCommand extends ControlCommand
constructor()
{
super();
this._name = new GrammarString;
this.name = new GrammarString;
this.commands = new GrammarCommands;
}
@ -29,8 +29,8 @@ export class ForEveryPartCommand extends ControlCommand
toString()
{
let result = 'foreverypart';
if (this._name.length) {
result += ' :name ' + this._name;
if (this.name.length) {
result += ' :name ' + this.name;
}
return result + ' ' + this.commands;
}
@ -39,7 +39,7 @@ export class ForEveryPartCommand extends ControlCommand
{
args.forEach((arg, i) => {
if (':name' === arg) {
this._name.value = args[i+1].value;
this.name.value = args[i+1].value;
}
});
}
@ -53,8 +53,8 @@ export class BreakCommand extends ForEveryPartCommand
toString()
{
let result = 'break';
if (this._name.length) {
result += ' :name ' + this._name;
if (this.name.length) {
result += ' :name ' + this.name;
}
return result + ';';
}
@ -68,14 +68,23 @@ export class ReplaceCommand extends ActionCommand
constructor()
{
super();
this.mime = false;
this._subject = new GrammarQuotedString;
this._from = new GrammarQuotedString;
this.replacement = new GrammarQuotedString;
this.mime = false;
this._subject = new GrammarQuotedString;
this._from = new GrammarQuotedString;
this._replacement = new GrammarQuotedString;
}
get require() { return 'replace'; }
get subject() { return this._subject.value; }
set subject(str) { this._subject.value = str; }
get from() { return this._from.value; }
set from(str) { this._from.value = str; }
get replacement() { return this._replacement.value; }
set replacement(str) { this._replacement.value = str; }
toString()
{
let result = 'replace';
@ -88,12 +97,12 @@ export class ReplaceCommand extends ActionCommand
if (this._from.length) {
result += ' :from ' + this._from;
}
return result + this.replacement + ';';
return result + this._replacement + ';';
}
pushArguments(args)
{
this.replacement = args.pop();
this._replacement = args.pop();
args.forEach((arg, i) => {
if (':mime' === arg) {
this.mime = true;
@ -119,6 +128,9 @@ export class EncloseCommand extends ActionCommand
get require() { return 'enclose'; }
get subject() { return this._subject.value; }
set subject(v) { this._subject.value = v; }
toString()
{
let result = 'enclose';
@ -153,9 +165,12 @@ export class ExtractTextCommand extends ActionCommand
super();
this.modifiers = [];
this._first = new GrammarNumber;
this.varname = new GrammarQuotedString;
this._varname = new GrammarQuotedString;
}
get varname() { return this._varname.value; }
set varname(v) { this._varname.value = v; }
get require() { return 'extracttext'; }
toString()
@ -165,12 +180,12 @@ export class ExtractTextCommand extends ActionCommand
if (0 < this._first.value) {
result += ' :first ' + this._first;
}
return result + ' ' + this.varname + ';';
return result + ' ' + this._varname + ';';
}
pushArguments(args)
{
this.varname = args.pop();
this._varname = args.pop();
[':lower', ':upper', ':lowerfirst', ':upperfirst', ':quotewildcard', ':length'].forEach(modifier => {
args.includes(modifier) && this.modifiers.push(modifier);
});