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('recoveryEnabled', $recoveryAdminEnabled);
$tmpl->assign('initStatus', $session->getStatus()); $tmpl->assign('initStatus', $session->getStatus());
$tmpl->assign('encryptHomeStorage', $encryptHomeStorage); $tmpl->assign('encryptHomeStorage', $encryptHomeStorage);
$tmpl->assign('masterKeyEnabled', $util->isMasterKeyEnabled());
return $tmpl->fetchPage(); return $tmpl->fetchPage();

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

@ -16,56 +16,58 @@ 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> <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> </p>
<br /> <br />
<p id="encryptionSetRecoveryKey"> <?php if($_['masterKeyEnabled'] === false): ?>
<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?> <p id="encryptionSetRecoveryKey">
<span class="msg"></span> <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
<br/> <span class="msg"></span>
<em> <br/>
<?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.")) ?> <em>
</em> <?php p($l->t("The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.")) ?>
<br/> </em>
<input type="password" <br/>
name="encryptionRecoveryPassword" <input type="password"
id="encryptionRecoveryPassword" name="encryptionRecoveryPassword"
placeholder="<?php p($l->t("Recovery key password")); ?>"/> id="encryptionRecoveryPassword"
<input type="password" placeholder="<?php p($l->t("Recovery key password")); ?>"/>
name="encryptionRecoveryPassword" <input type="password"
id="repeatEncryptionRecoveryPassword" name="encryptionRecoveryPassword"
placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/> id="repeatEncryptionRecoveryPassword"
<input type="button" placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/>
name="enableRecoveryKey" <input type="button"
id="enableRecoveryKey" name="enableRecoveryKey"
status="<?php p($_["recoveryEnabled"]) ?>" id="enableRecoveryKey"
value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/> status="<?php p($_["recoveryEnabled"]) ?>"
</p> value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
<br/><br/> </p>
<br/><br/>
<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>> <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
<?php p($l->t("Change recovery key password:")); ?> <?php p($l->t("Change recovery key password:")); ?>
<span class="msg"></span> <span class="msg"></span>
<br/> <br/>
<input <input
type="password" type="password"
name="changeRecoveryPassword" name="changeRecoveryPassword"
id="oldEncryptionRecoveryPassword" id="oldEncryptionRecoveryPassword"
placeholder="<?php p($l->t("Old recovery key password")); ?>"/> placeholder="<?php p($l->t("Old recovery key password")); ?>"/>
<br /> <br />
<input <input
type="password" type="password"
name="changeRecoveryPassword" name="changeRecoveryPassword"
id="newEncryptionRecoveryPassword" id="newEncryptionRecoveryPassword"
placeholder="<?php p($l->t("New recovery key password")); ?>"/> placeholder="<?php p($l->t("New recovery key password")); ?>"/>
<input <input
type="password" type="password"
name="changeRecoveryPassword" name="changeRecoveryPassword"
id="repeatedNewEncryptionRecoveryPassword" id="repeatedNewEncryptionRecoveryPassword"
placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/> placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/>
<button <button
type="button" type="button"
name="submitChangeRecoveryKey"> name="submitChangeRecoveryKey">
<?php p($l->t("Change Password")); ?> <?php p($l->t("Change Password")); ?>
</button> </button>
</p> </p>
<?php endif; ?>
<?php endif; ?> <?php endif; ?>
</form> </form>