summaryrefslogtreecommitdiffstats
path: root/settings/personal.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-04-29 15:00:57 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-05-13 12:35:25 +0200
commita9ac11718e62017c70682f99eb35b43b1ef9c498 (patch)
treed4874aca27972f45acdb756ba2200f886617141b /settings/personal.php
parent254fa5eb22efa5ba572702064377a6ad9eec9a53 (diff)
downloadnextcloud-server-a9ac11718e62017c70682f99eb35b43b1ef9c498.tar.gz
nextcloud-server-a9ac11718e62017c70682f99eb35b43b1ef9c498.zip
backup the encryption key after the encryption was disabled so that the user
can restore them if needed
Diffstat (limited to 'settings/personal.php')
-rw-r--r--settings/personal.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/settings/personal.php b/settings/personal.php
index 0da14a8c8c4..47b2dc1a46a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -33,7 +33,9 @@ $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N:
$languageCodes=OC_L10N::findAvailableLanguages();
//check if encryption was enabled in the past
-$enableDecryptAll = OC_Util::encryptedFiles();
+$filesStillEncrypted = OC_Util::encryptedFiles();
+$backupKeysExists = OC_Util::backupKeysExists();
+$enableDecryptAll = $filesStillEncrypted || $backupKeysExists;
// array of common languages
$commonlangcodes = array(
@@ -92,6 +94,8 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
+$tmpl->assign('backupKeysExists' , $backupKeysExists);
+$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));