the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-01-04 05:52:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix: whitelist fails when empty or when using : #938

Browse source
This commit is contained in:
the-djmaze 2023-02-09 16:16:50 +01:00
parent 6c14055006
commit b2079f7263
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dev/Model/Message.js
View file

@ -402,19 +402,19 @@ export class MessageModel extends AbstractModel {
regex = SettingsUserStore.viewImagesWhitelist()
.trim()
.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&')
.replace(/[\s\r\n,;:]+/g, '|')
.replace(/[\s\r\n,;]+/g, '|')
.replace(/\|+/g, '|');
if (regex) {
console.log('whitelist images = '+regex);
regex = new RegExp(regex);
if (this.from[0]?.email.match(regex)) {
regex = 0;
regex = null;
}
}
}
let hasImages = false,
isValid = src => {
if (!regex || src.match(regex)) {
if (null == regex || (regex && src.match(regex))) {
return true;
}
hasImages = true;