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

Resolve #938

Browse source
This commit is contained in:
the-djmaze 2023-02-10 09:55:52 +01:00
parent f05ff65b30
commit 31dd1b74b8
42 changed files with 29 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dev/Model/Message.js
View file

@ -300,9 +300,7 @@ export class MessageModel extends AbstractModel {
body.classList.toggle('plain', 0); body.classList.toggle('plain', 0);
if (!this.isSpam() && FolderUserStore.spamFolder() != this.folder) { if (!this.isSpam() && FolderUserStore.spamFolder() != this.folder) {
if (('dkim' === SettingsUserStore.viewImages() && 'pass' === this.dkim[0]?.[0]) if ('always' === SettingsUserStore.viewImages()) {
|| 'always' === SettingsUserStore.viewImages()
) {
this.showExternalImages(); this.showExternalImages();
} }
if ('match' === SettingsUserStore.viewImages()) { if ('match' === SettingsUserStore.viewImages()) {
@ -399,11 +397,19 @@ export class MessageModel extends AbstractModel {
const body = this.body; const body = this.body;
if (body && this.hasImages()) { if (body && this.hasImages()) {
if (regex) { if (regex) {
regex = SettingsUserStore.viewImagesWhitelist() regex = [];
.trim() SettingsUserStore.viewImagesWhitelist().trim().split(/[\s\r\n,;]+/g).forEach(rule => {
.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&') rule = rule.split('+');
.replace(/[\s\r\n,;]+/g, '|') rule[0] = rule[0].trim();
.replace(/\|+/g, '|'); if (rule[0]
&& (!rule.includes('spf') || 'pass' === this.spf[0]?.[0])
&& (!rule.includes('dkim') || 'pass' === this.dkim[0]?.[0])
&& (!rule.includes('dmarc') || 'pass' === this.dmarc[0]?.[0])
) {
regex.push(rule[0].replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&'));
}
});
regex = regex.join('|').replace(/\|+/g, '|');
if (regex) { if (regex) {
console.log('whitelist images = '+regex); console.log('whitelist images = '+regex);
regex = new RegExp(regex); regex = new RegExp(regex);

29
dev/View/User/MailBox/MessageView.js
View file

@ -112,8 +112,7 @@ export class MailMessageView extends AbstractViewRight {
// viewer // viewer
viewFromShort: '', viewFromShort: '',
viewFromDkimData: ['none', ''], dkimData: ['none', '', '']
viewToShort: ''
}); });
this.moveAction = moveAction; this.moveAction = moveAction;
@ -171,10 +170,10 @@ export class MailMessageView extends AbstractViewRight {
canBeRepliedOrForwarded: () => !MessagelistUserStore.isDraftFolder() && this.messageVisibility(), canBeRepliedOrForwarded: () => !MessagelistUserStore.isDraftFolder() && this.messageVisibility(),
viewFromDkimVisibility: () => 'none' !== this.viewFromDkimData()[0], viewDkimIcon: () => 'none' !== this.dkimData()[0],
viewFromDkimStatusIconClass:() => { dkimIconClass:() => {
switch (this.viewFromDkimData()[0]) { switch (this.dkimData()[0]) {
case 'none': case 'none':
return ''; return '';
case 'pass': case 'pass':
@ -184,13 +183,9 @@ export class MailMessageView extends AbstractViewRight {
} }
}, },
viewFromDkimStatusTitle:() => { dkimTitle:() => {
const status = this.viewFromDkimData(); const dkim = this.dkimData();
if (arrayLength(status) && status[0]) { return dkim[0] ? dkim[2] || 'DKIM: ' + dkim[0] : '';
return status[1] || 'DKIM: ' + status[0];
}
return '';
}, },
showWhitelistOptions: () => 'match' === SettingsUserStore.viewImages(), showWhitelistOptions: () => 'match' === SettingsUserStore.viewImages(),
@ -212,10 +207,7 @@ export class MailMessageView extends AbstractViewRight {
this.viewHash = message.hash; this.viewHash = message.hash;
// TODO: make first param a user setting #683 // TODO: make first param a user setting #683
this.viewFromShort(message.from.toString(false, true)); this.viewFromShort(message.from.toString(false, true));
let dkim = 1 === arrayLength(message.from) && message.dkim this.dkimData(message.dkim[0] || ['none', '', '']);
&& message.dkim.find(dkim => message.from[0].email.includes(dkim[1]));
this.viewFromDkimData(dkim ? [dkim[0], dkim[2]] : ['none', '']);
this.viewToShort(message.to.toString(true, true));
} else { } else {
MessagelistUserStore.selectedMessage(null); MessagelistUserStore.selectedMessage(null);
@ -503,6 +495,11 @@ export class MailMessageView extends AbstractViewRight {
whitelistText(txt) { whitelistText(txt) {
let value = (SettingsUserStore.viewImagesWhitelist().trim() + '\n' + txt).trim(); let value = (SettingsUserStore.viewImagesWhitelist().trim() + '\n' + txt).trim();
/*
if ('pass' === currentMessage().spf[0]?.[0]) value += '+spf';
if ('pass' === currentMessage().dkim[0]?.[0]) value += '+dkim';
if ('pass' === currentMessage().dmarc[0]?.[0]) value += '+dmarc';
*/
SettingsUserStore.viewImagesWhitelist(value); SettingsUserStore.viewImagesWhitelist(value);
Remote.saveSetting('ViewImagesWhitelist', value); Remote.saveSetting('ViewImagesWhitelist', value);
currentMessage().showExternalImages(1); currentMessage().showExternalImages(1);

1
snappymail/v/0.0.0/app/localization/ar-SA/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/bg-BG/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/cs-CZ/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/da-DK/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/de-DE/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/el-GR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/en-GB/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/en/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/es-ES/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/et-EE/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/eu/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/fa-IR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/fi-FI/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/fr-FR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "Images externes", "EXTERNAL_IMAGES": "Images externes",
"IMAGES_OPTION_ASK": "Toujours demander", "IMAGES_OPTION_ASK": "Toujours demander",
"IMAGES_OPTION_WHITELIST": "Ajouter à la liste blanche ou demander", "IMAGES_OPTION_WHITELIST": "Ajouter à la liste blanche ou demander",
"IMAGES_OPTION_DKIM": "Toujours afficher quand DKIM est valide",
"IMAGES_OPTION_ALWAYS": "Toujours afficher", "IMAGES_OPTION_ALWAYS": "Toujours afficher",
"IMAGES_WHITELIST": "Liste blanche Images" "IMAGES_WHITELIST": "Liste blanche Images"
}, },

1
snappymail/v/0.0.0/app/localization/hu-HU/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/id-ID/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/is-IS/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/it-IT/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/ja-JP/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/ko-KR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/lt-LT/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/lv-LV/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/nb-NO/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/pl-PL/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/pt-BR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/pt-PT/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "Imagens externas", "EXTERNAL_IMAGES": "Imagens externas",
"IMAGES_OPTION_ASK": "Perguntar sempre", "IMAGES_OPTION_ASK": "Perguntar sempre",
"IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar", "IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar",
"IMAGES_OPTION_DKIM": "Mostrar sempre que DKIM for válido",
"IMAGES_OPTION_ALWAYS": "Mostrar sempre", "IMAGES_OPTION_ALWAYS": "Mostrar sempre",
"IMAGES_WHITELIST": "Lista Branca de imagens" "IMAGES_WHITELIST": "Lista Branca de imagens"
}, },

1
snappymail/v/0.0.0/app/localization/pt/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "Imagens externas", "EXTERNAL_IMAGES": "Imagens externas",
"IMAGES_OPTION_ASK": "Perguntar sempre", "IMAGES_OPTION_ASK": "Perguntar sempre",
"IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar", "IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar",
"IMAGES_OPTION_DKIM": "Mostrar sempre que DKIM for válido",
"IMAGES_OPTION_ALWAYS": "Mostrar sempre", "IMAGES_OPTION_ALWAYS": "Mostrar sempre",
"IMAGES_WHITELIST": "Lista Branca de imagens" "IMAGES_WHITELIST": "Lista Branca de imagens"
}, },

1
snappymail/v/0.0.0/app/localization/ro-RO/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/ru-RU/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/sk-SK/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/sl-SI/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/sv-SE/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/tr-TR/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/uk-UA/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/vi-VN/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/zh-CN/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

1
snappymail/v/0.0.0/app/localization/zh-TW/user.json
View file

@ -421,7 +421,6 @@
"EXTERNAL_IMAGES": "External images", "EXTERNAL_IMAGES": "External images",
"IMAGES_OPTION_ASK": "Always ask", "IMAGES_OPTION_ASK": "Always ask",
"IMAGES_OPTION_WHITELIST": "Whitelist or ask", "IMAGES_OPTION_WHITELIST": "Whitelist or ask",
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
"IMAGES_OPTION_ALWAYS": "Show always", "IMAGES_OPTION_ALWAYS": "Show always",
"IMAGES_WHITELIST": "Images whitelist" "IMAGES_WHITELIST": "Images whitelist"
}, },

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -130,14 +130,14 @@
</div> </div>
<div class="informationShort" data-bind="hidden: showFullInfo"> <div class="informationShort" data-bind="hidden: showFullInfo">
<span class="from" data-bind="html: viewFromShort, title: message().from"></span> <span class="from" data-bind="html: viewFromShort, title: message().from"></span>
<i data-bind="visible: viewFromDkimVisibility, css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle"></i> <i data-bind="visible: viewDkimIcon, css: dkimIconClass, title: dkimTitle"></i>
</div> </div>
<div class="informationFull" data-bind="visible: showFullInfo, with: message"> <div class="informationFull" data-bind="visible: showFullInfo, with: message">
<table> <table>
<tr data-bind="visible: from.length"> <tr data-bind="visible: from.length">
<td data-i18n="GLOBAL/FROM"></td> <td data-i18n="GLOBAL/FROM"></td>
<td><span data-bind="text: from"></span> <td><span data-bind="text: from"></span>
<i data-bind="visible: $parent.viewFromDkimVisibility, css: $parent.viewFromDkimStatusIconClass, title: $parent.viewFromDkimStatusTitle"></i> <i data-bind="visible: $parent.viewDkimIcon, css: $parent.dkimIconClass, title: $parent.dkimTitle"></i>
</td> </td>
</tr> </tr>
<tr data-bind="visible: to.length"> <tr data-bind="visible: to.length">

1
snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
View file

@ -231,7 +231,6 @@
<select data-bind="value: viewImages"> <select data-bind="value: viewImages">
<option value="ask" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ASK"></option> <option value="ask" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ASK"></option>
<option value="match" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_WHITELIST"></option> <option value="match" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_WHITELIST"></option>
<option value="dkim" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_DKIM"></option>
<option value="always" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ALWAYS"></option> <option value="always" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ALWAYS"></option>
</select> </select>
</div> </div>