From 4006dd38f8c45e16a618945fe1e6b680d6e6524f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 4 Mar 2024 13:33:40 +0100
Subject: [PATCH] Make "verify signatures automatically" optional, as it
requires more IMAP fetching
---
dev/Settings/Admin/Security.js | 2 +-
.../v/0.0.0/app/libraries/RainLoop/Actions.php | 1 +
.../app/libraries/RainLoop/Actions/Messages.php | 6 ++++--
.../0.0.0/app/libraries/RainLoop/ActionsAdmin.php | 1 +
.../app/libraries/RainLoop/Config/Application.php | 1 +
.../v/0.0.0/app/localization/cs-CZ/admin.json | 3 ++-
.../v/0.0.0/app/localization/da-DK/admin.json | 3 ++-
.../v/0.0.0/app/localization/de-DE/admin.json | 3 ++-
snappymail/v/0.0.0/app/localization/en/admin.json | 3 ++-
.../v/0.0.0/app/localization/es-ES/admin.json | 3 ++-
snappymail/v/0.0.0/app/localization/eu/admin.json | 3 ++-
.../v/0.0.0/app/localization/fa-IR/admin.json | 3 ++-
.../v/0.0.0/app/localization/fi-FI/admin.json | 3 ++-
.../v/0.0.0/app/localization/fr-FR/admin.json | 3 ++-
.../v/0.0.0/app/localization/hu-HU/admin.json | 3 ++-
.../v/0.0.0/app/localization/id-ID/admin.json | 3 ++-
.../v/0.0.0/app/localization/it-IT/admin.json | 3 ++-
.../v/0.0.0/app/localization/ja-JP/admin.json | 3 ++-
.../v/0.0.0/app/localization/lt-LT/admin.json | 3 ++-
.../v/0.0.0/app/localization/nb-NO/admin.json | 3 ++-
.../v/0.0.0/app/localization/nl-NL/admin.json | 3 ++-
.../v/0.0.0/app/localization/pl-PL/admin.json | 3 ++-
.../v/0.0.0/app/localization/pt-BR/admin.json | 3 ++-
.../v/0.0.0/app/localization/pt-PT/admin.json | 3 ++-
snappymail/v/0.0.0/app/localization/pt/admin.json | 3 ++-
.../v/0.0.0/app/localization/ru-RU/admin.json | 3 ++-
.../v/0.0.0/app/localization/sk-SK/admin.json | 3 ++-
.../v/0.0.0/app/localization/sl-SI/admin.json | 3 ++-
.../v/0.0.0/app/localization/sv-SE/admin.json | 3 ++-
.../v/0.0.0/app/localization/vi-VN/admin.json | 3 ++-
.../v/0.0.0/app/localization/zh-CN/admin.json | 3 ++-
.../Views/Admin/AdminSettingsSecurity.html | 15 +++++++++++----
32 files changed, 71 insertions(+), 33 deletions(-)
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index e3797b1a5..30186f994 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -10,7 +10,7 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
constructor() {
super();
- this.addSettings(['useLocalProxyForExternalImages']);
+ this.addSettings(['useLocalProxyForExternalImages', 'autoVerifySignatures']);
this.weakPassword = rl.app.weakPassword;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 7d7ee26bc..de9ca8887 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -845,6 +845,7 @@ class Actions
if ($aResult['Auth']) {
$aResult['useLocalProxyForExternalImages'] = (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false);
+ $aResult['autoVerifySignatures'] = (bool)$oConfig->Get('security', 'auto_verify_signatures', false);
$aResult['allowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);
$aResult['Capa'] = $this->Capa($bAdmin, $oAccount);
$value = \ini_get('upload_max_filesize');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index bf682ed55..f168a9fa5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -457,8 +457,10 @@ trait Messages
{
$oMessage = $this->MailClient()->Message($sFolder, $iUid, true, $this->Cacher($oAccount));
+ $bAutoVerify = $this->Config()->Get('security', 'auto_verify_signatures', false);
+
// S/MIME signed. Verify it, so we have the raw mime body to show
- if ($oMessage->smimeSigned) try {
+ if ($oMessage->smimeSigned && ($bAutoVerify || !$oMessage->smimeSigned['detached'])) try {
$bOpaque = !$oMessage->smimeSigned['detached'];
$sBody = $this->ImapClient()->FetchMessagePart(
$oMessage->Uid,
@@ -475,7 +477,7 @@ trait Messages
$this->logException($e);
}
- if ($oMessage->pgpSigned) try {
+ if ($bAutoVerify && $oMessage->pgpSigned) try {
$GPG = $this->GnuPG();
if ($GPG) {
if ($oMessage->pgpSigned['sigPartId']) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 2180a37e7..bfeae54da 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -65,6 +65,7 @@ class ActionsAdmin extends Actions
});
$this->setConfigFromParams($oConfig, 'useLocalProxyForExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool');
+ $this->setConfigFromParams($oConfig, 'autoVerifySignatures', 'security', 'auto_verify_signatures', 'bool');
$this->setConfigFromParams($oConfig, 'allowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
$this->setConfigFromParams($oConfig, 'allowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index f097bd6dd..ddf8b46a7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -203,6 +203,7 @@ Warning: only enable when server does not do this, else double compression error
'x_xss_protection_header' => array('1; mode=block'),
'openpgp' => array(true),
+ 'auto_verify_signatures' => array(false),
'allow_admin_panel' => array(true, 'Access settings'),
'admin_login' => array('admin', 'Login and password for web admin panel'),
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index aa5a6a211..37a7311e6 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Zabezpečení",
"LABEL_USE_IMAGE_PROXY": "Použít lokální proxy pro externí obrázky",
- "LABEL_ALLOW_OPENPGP": "Povolit OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Povolit OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Zobrazit PHP informace (php_info)",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Přístupové údaje administrace",
"LABEL_CURRENT_PASSWORD": "Současné heslo",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index b6d5db762..a8646743a 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sikkerhed",
"LABEL_USE_IMAGE_PROXY": "Brug lokal proxy til eksterne billeder",
- "LABEL_ALLOW_OPENPGP": "Tillad OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Tillad OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Vis PHP informationer",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Adgangsoplysninger",
"LABEL_CURRENT_PASSWORD": "Nuværende adgangskode",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index d930e0dec..1a32dadae 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sicherheit",
"LABEL_USE_IMAGE_PROXY": "Lokalen Proxy für externe Bilder verwenden",
- "LABEL_ALLOW_OPENPGP": "OpenPGP erlauben",
+ "LABEL_ALLOW_OPENPGP": "OpenPGP.js erlauben",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "PHP-Informationen anzeigen",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Adminpanel-Zugangsdaten",
"LABEL_CURRENT_PASSWORD": "Aktuelles Passwort",
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index abe729cf4..c045ab969 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Security",
"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
- "LABEL_ALLOW_OPENPGP": "Allow OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Allow OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Show PHP information",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
"LABEL_CURRENT_PASSWORD": "Current password",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index 17183a4d7..e6a90a3da 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Seguridad",
"LABEL_USE_IMAGE_PROXY": "Utilizar un proxy local para mostrar imágenes externas",
- "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Mostrar información de PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciales de Acceso al panel de control",
"LABEL_CURRENT_PASSWORD": "Contraseña actual",
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index a4609ce76..794c49e38 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Segurtasuna",
"LABEL_USE_IMAGE_PROXY": "Erabili proxy lokala kanpoko irudientzat",
- "LABEL_ALLOW_OPENPGP": "Baimendu OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Baimendu OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Erakutsi PHP informazioa",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panelerako Sarbide Kredentzialak",
"LABEL_CURRENT_PASSWORD": "Uneko pasahitza",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index 1b9c23c68..2ebe94282 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "امنیت",
"LABEL_USE_IMAGE_PROXY": "از پروکسی محلی برای عکسهای خارج از سرور استفاده شود",
- "LABEL_ALLOW_OPENPGP": "فعالسازی OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "فعالسازی OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "نمایش اطلاعات PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "اعتبار مجوز دسترسی به صفحه مدیریت",
"LABEL_CURRENT_PASSWORD": "گذرواژه فعلی",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index 94354fad1..c7a27b547 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Tietoturva",
"LABEL_USE_IMAGE_PROXY": "Käytä paikallista proxya ulkoisille kuville.",
- "LABEL_ALLOW_OPENPGP": "Salli OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Salli OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Näytä PHP tiedot",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hallintapaneeli kirjautumistiedot",
"LABEL_CURRENT_PASSWORD": "Nykyinen salasana",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index 512bf41c4..8a3f43924 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sécurité",
"LABEL_USE_IMAGE_PROXY": "Utiliser un proxy local pour les images externes",
- "LABEL_ALLOW_OPENPGP": "Autoriser OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Autoriser OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Voir les informations PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Codes d'accès au panneau d'administration",
"LABEL_CURRENT_PASSWORD": "Mot de passe actuel",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index 41daa0787..23725f8aa 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Biztonság",
"LABEL_USE_IMAGE_PROXY": "Helyi proxy használata a külső képekhez",
- "LABEL_ALLOW_OPENPGP": "OpenPGP engedélyezése",
+ "LABEL_ALLOW_OPENPGP": "OpenPGP.js engedélyezése",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "PHP információ megjelenítése",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin panel hozzáférés hitelesítés",
"LABEL_CURRENT_PASSWORD": "Jelenlegi jelszó",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index e0f269a1c..059ce635f 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Keamanan",
"LABEL_USE_IMAGE_PROXY": "Gunakan proxy lokal untuk gambar dari luar",
- "LABEL_ALLOW_OPENPGP": "Izinkan OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Izinkan OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Tampilkan informasi PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hak Akses Panel Admin",
"LABEL_CURRENT_PASSWORD": "Password saat ini",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index b03df0e94..6330c43a8 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sicurezza",
"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
- "LABEL_ALLOW_OPENPGP": "Permetti OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Permetti OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Mostra informazioni PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenziali di Accesso Pannello Admin",
"LABEL_CURRENT_PASSWORD": "Password Corrente",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
index ea3bd7e30..62c35b776 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "セキュリティ",
"LABEL_USE_IMAGE_PROXY": "外部イメージにローカルProxyを使う",
- "LABEL_ALLOW_OPENPGP": "OpenPGPを使う",
+ "LABEL_ALLOW_OPENPGP": "OpenPGP.jsを使う",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "PHP情報を表示",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理画面アクセス情報",
"LABEL_CURRENT_PASSWORD": "現在のパスワード",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index 57a080c7e..f27e4c822 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sauga",
"LABEL_USE_IMAGE_PROXY": "naudoti vietinį šliuzą (proxy) išoriniams paveikslėliams",
- "LABEL_ALLOW_OPENPGP": "Leisti OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Leisti OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Rodyti PHP informaciją",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Valdymo skydo prieigos rekvizitai",
"LABEL_CURRENT_PASSWORD": "Dabartinis slaptažodis",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 138a1c805..9b60f437d 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Sikkerhet",
"LABEL_USE_IMAGE_PROXY": "Bruk lokal mellomtjener for eksterne bilder",
- "LABEL_ALLOW_OPENPGP": "Tillat OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Tillat OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Vis PHP-informasjon",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Akkreditiver for admin-panel",
"LABEL_CURRENT_PASSWORD": "Gjeldende passord",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index 33cd56350..6912cf006 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Beveiliging",
"LABEL_USE_IMAGE_PROXY": "Gebruik de server als proxy voor externe afbeeldingen",
- "LABEL_ALLOW_OPENPGP": "OpenPGP toestaan",
+ "LABEL_ALLOW_OPENPGP": "OpenPGP.js toestaan",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "PHP informatie tonen",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Toegangsgegevens beheer paneel",
"LABEL_CURRENT_PASSWORD": "Huidig wachtwoord",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index 9b07359a1..f6a25ccf5 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Bezpieczeństwo",
"LABEL_USE_IMAGE_PROXY": "Użyj lokalnego serwera proxy dla zewnętrznych obrazów",
- "LABEL_ALLOW_OPENPGP": "Zezwól na używanie OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Zezwól na używanie OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Pokaż informacje o wersji PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Poświadczenia dostępu do panelu administracyjnego",
"LABEL_CURRENT_PASSWORD": "Bieżące hasło",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 0c7e98d3d..19137bb20 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Segurança",
"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
- "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Mostar informações PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel Administrativo",
"LABEL_CURRENT_PASSWORD": "Senha atual",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index c7849e0bd..b33b4873e 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Segurança",
"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
- "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Mostrar informação do PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel de Admin",
"LABEL_CURRENT_PASSWORD": "Palavra-passe atual",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index c7849e0bd..b33b4873e 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Segurança",
"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
- "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Mostrar informação do PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel de Admin",
"LABEL_CURRENT_PASSWORD": "Palavra-passe atual",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index 46103cbd1..a2782e863 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Безопасность",
"LABEL_USE_IMAGE_PROXY": "Использовать локальный прокси для внешних изображений",
- "LABEL_ALLOW_OPENPGP": "Разрешить OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Разрешить OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Показать PHP информацию",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Учетные данные для доступа к панели администратора",
"LABEL_CURRENT_PASSWORD": "Текущий пароль",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index 42ed92a32..41fbcb407 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Bezpečnosť",
"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
- "LABEL_ALLOW_OPENPGP": "Povoliť OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Povoliť OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Zobraziť informácie o PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
"LABEL_CURRENT_PASSWORD": "Súčasné heslo",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index a8d9843b5..4f0f7e658 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Varnost",
"LABEL_USE_IMAGE_PROXY": "Uporabni lokalni posredniški strežnik za zunanje slike",
- "LABEL_ALLOW_OPENPGP": "Dovoli OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Dovoli OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Prikaz PHP informacij",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Prijavni podatki za administracijsko ploščo",
"LABEL_CURRENT_PASSWORD": "Trenutno geslo",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index 3cdfed6e9..19fcf18f1 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "Säkerhet",
"LABEL_USE_IMAGE_PROXY": "Använd lokal proxy för externa bilder",
- "LABEL_ALLOW_OPENPGP": "Tillåt OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Tillåt OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Visa PHP-information",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Administrativsuppgifter",
"LABEL_CURRENT_PASSWORD": "Nuvarande lösenord",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index 5f0dd530b..3b1e3bbf2 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "An ninh",
"LABEL_USE_IMAGE_PROXY": "Sử dụng proxy tại máy chủ cho những hình ảnh tải ngoài về",
- "LABEL_ALLOW_OPENPGP": "Cho phép OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "Cho phép OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "Hiển thị thông tin PHP",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Thông tin truy cập bảng quản trị",
"LABEL_CURRENT_PASSWORD": "Mật khẩu hiện tại",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index b9a4f0d03..6233f2774 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -85,7 +85,8 @@
"TAB_SECURITY": {
"LEGEND_SECURITY": "安全",
"LABEL_USE_IMAGE_PROXY": "对外部图片使用本地代理",
- "LABEL_ALLOW_OPENPGP": "允许使用 OpenPGP",
+ "LABEL_ALLOW_OPENPGP": "允许使用 OpenPGP.js",
+ "LABEL_AUTO_VERIFY": "Verify signatures automatically",
"LABEL_SHOW_PHP_INFO": "显示 PHP 信息",
"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理员面板访问凭据",
"LABEL_CURRENT_PASSWORD": "当前密码",
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index a4721ccdf..5ae1f3eff 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -5,15 +5,22 @@
+