mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Show GnuPG version for #1560
This commit is contained in:
parent
780e1f9b92
commit
9e2b9a9fcd
|
@ -32,6 +32,8 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
|
||||||
capaOpenPGP: SettingsCapa('OpenPGP')
|
capaOpenPGP: SettingsCapa('OpenPGP')
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.gnuPGversion = 'GnuPG v' + SettingsGet('gnupg');
|
||||||
|
|
||||||
const reset = () => {
|
const reset = () => {
|
||||||
this.saveError(false);
|
this.saveError(false);
|
||||||
this.saveSuccess(false);
|
this.saveSuccess(false);
|
||||||
|
|
|
@ -456,6 +456,9 @@ class ActionsAdmin extends Actions
|
||||||
$aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true);
|
$aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true);
|
||||||
$aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true);
|
$aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true);
|
||||||
$aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true);
|
$aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true);
|
||||||
|
|
||||||
|
$gnupg = \SnappyMail\PGP\GnuPG::getInstance('');
|
||||||
|
$aResult['gnupg'] = $gnupg ? $gnupg->getEngineInfo()['version'] : null;
|
||||||
} else {
|
} else {
|
||||||
$passfile = APP_PRIVATE_DATA.'admin_password.txt';
|
$passfile = APP_PRIVATE_DATA.'admin_password.txt';
|
||||||
$sPassword = $oConfig->Get('security', 'admin_password', '');
|
$sPassword = $oConfig->Get('security', 'admin_password', '');
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<div data-bind="component: {
|
<div data-bind="component: {
|
||||||
name: 'Checkbox',
|
name: 'Checkbox',
|
||||||
params: {
|
params: {
|
||||||
label: 'GnuPG',
|
label: gnuPGversion,
|
||||||
value: capaGnuPG
|
value: capaGnuPG
|
||||||
}
|
}
|
||||||
}"></div>
|
}"></div>
|
||||||
|
|
Loading…
Reference in a new issue