diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php index 6c7c0987fd..79e900ebbd 100644 --- a/apps/encryption/settings/settings-admin.php +++ b/apps/encryption/settings/settings-admin.php @@ -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(); diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index e55aba6757..9804db045c 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -16,56 +16,58 @@ style('encryption', 'settings-admin'); t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?>
- t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
-
-
-
- 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.")) ?>
-
-
- "/>
- "/>
- "
- value="t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
-
+ t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
+
+
+
+ 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.")) ?>
+
+
+ "/>
+ "/>
+ "
+ value="t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
+
>
- t("Change recovery key password:")); ?>
-
-
- "/>
-
- "/>
- "/>
+
>
+ t("Change recovery key password:")); ?>
+
+
+ "/>
+
+ "/>
+ "/>
-
-