Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit 9e2b9a9

Browse files
author
the-djmaze
committed
Show GnuPG version for #1560
1 parent 780e1f9 commit 9e2b9a9

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

dev/Settings/Admin/Security.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
3232
capaOpenPGP: SettingsCapa('OpenPGP')
3333
});
3434

35+
this.gnuPGversion = 'GnuPG v' + SettingsGet('gnupg');
36+
3537
const reset = () => {
3638
this.saveError(false);
3739
this.saveSuccess(false);

snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,9 @@ public static function AdminAppData(Actions $oActions, array &$aResult): void
456456
$aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true);
457457
$aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true);
458458
$aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true);
459+
460+
$gnupg = \SnappyMail\PGP\GnuPG::getInstance('');
461+
$aResult['gnupg'] = $gnupg ? $gnupg->getEngineInfo()['version'] : null;
459462
} else {
460463
$passfile = APP_PRIVATE_DATA.'admin_password.txt';
461464
$sPassword = $oConfig->Get('security', 'admin_password', '');

snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div data-bind="component: {
1818
name: 'Checkbox',
1919
params: {
20-
label: 'GnuPG',
20+
label: gnuPGversion,
2121
value: capaGnuPG
2222
}
2323
}"></div>

0 commit comments

Comments
 (0)