Skip to content

Commit

Permalink
Added external images option 'Always when DKIM is valid' for #201
Browse files Browse the repository at this point in the history
  • Loading branch information
the-djmaze committed Feb 6, 2023
1 parent 2a619df commit e8f2001
Show file tree
Hide file tree
Showing 40 changed files with 42 additions and 1 deletion.
4 changes: 3 additions & 1 deletion dev/Model/Message.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/ar-SA/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/bg-BG/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/cs-CZ/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/da-DK/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/de-DE/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/el-GR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/en-GB/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/en/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/es-ES/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/et-EE/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/eu/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/fa-IR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/fi-FI/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/fr-FR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/hu-HU/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/id-ID/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/is-IS/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/it-IT/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/ja-JP/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/ko-KR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/lt-LT/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/lv-LV/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/nb-NO/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/pl-PL/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/pt-BR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/pt-PT/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/pt/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/ro-RO/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/ru-RU/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/sk-SK/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/sl-SI/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/sv-SE/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/tr-TR/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/uk-UA/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/vi-VN/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/zh-CN/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/localization/zh-TW/user.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit e8f2001

Please sign in to comment.