mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disable the recovery key if the master key is enabled

This commit is contained in:
Bjoern Schiessle 2016-03-02 19:38:21 +01:00
parent 4f25f34178
commit b6050b44c2
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/encryption/settings/settings-admin.php
View File

@ -49,5 +49,6 @@ $encryptHomeStorage = $util->shouldEncryptHomeStorage();
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
$tmpl->assign('initStatus', $session->getStatus());
$tmpl->assign('encryptHomeStorage', $encryptHomeStorage);
$tmpl->assign('masterKeyEnabled', $util->isMasterKeyEnabled());
return $tmpl->fetchPage();

2
apps/encryption/templates/settings-admin.php
View File

@ -16,6 +16,7 @@ style('encryption', 'settings-admin');
<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
</p>
<br />
<?php if($_['masterKeyEnabled'] === false): ?>
<p id="encryptionSetRecoveryKey">
<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
<span class="msg"></span>
@ -68,4 +69,5 @@ style('encryption', 'settings-admin');
</button>
</p>
<?php endif; ?>
<?php endif; ?>
</form>