mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Added external images option 'Always when DKIM is valid' for #201
This commit is contained in:
parent
2a619dfa93
commit
e8f200186d
40 changed files with 42 additions and 1 deletions
|
|
@ -277,7 +277,9 @@ export class MessageModel extends AbstractModel {
|
|||
body.classList.toggle('plain', 0);
|
||||
|
||||
if (!this.isSpam() && FolderUserStore.spamFolder() != this.folder) {
|
||||
if ('always' === SettingsUserStore.viewImages()) {
|
||||
if (('dkim' === SettingsUserStore.viewImages() && 'pass' === this.dkim[0]?.[0])
|
||||
|| 'always' === SettingsUserStore.viewImages()
|
||||
) {
|
||||
this.showExternalImages();
|
||||
}
|
||||
if ('match' === SettingsUserStore.viewImages()) {
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "Images externes",
|
||||
"IMAGES_OPTION_ASK": "Toujours demandez",
|
||||
"IMAGES_OPTION_WHITELIST": "Ajouter à la liste blanche ou demander",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Toujours afficher",
|
||||
"IMAGES_WHITELIST": "Liste blanche Images"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "Imagens externas",
|
||||
"IMAGES_OPTION_ASK": "Perguntar sempre",
|
||||
"IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Mostrar sempre",
|
||||
"IMAGES_WHITELIST": "Lista Branca de imagens"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "Imagens externas",
|
||||
"IMAGES_OPTION_ASK": "Perguntar sempre",
|
||||
"IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Mostrar sempre",
|
||||
"IMAGES_WHITELIST": "Lista Branca de imagens"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -421,6 +421,7 @@
|
|||
"EXTERNAL_IMAGES": "External images",
|
||||
"IMAGES_OPTION_ASK": "Always ask",
|
||||
"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
|
||||
"IMAGES_OPTION_DKIM": "Show always when DKIM is valid",
|
||||
"IMAGES_OPTION_ALWAYS": "Show always",
|
||||
"IMAGES_WHITELIST": "Images whitelist"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -231,6 +231,7 @@
|
|||
<select data-bind="value: viewImages">
|
||||
<option value="ask" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ASK"></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>
|
||||
</select>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue