Added support for user-specified password for adminRecovery account in admin settings page

Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema

1 files changed, 3 insertions, 1 deletions

diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index f7ebc425120..c6d9d80f0b9 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -25,11 +25,13 @@ $user = \OCP\USER::getUser();
 $view = new \OC_FilesystemView( '/' );

 $util = new \OCA\Encryption\Util( $view, $user );

 

+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );

 $recoveryEnabledForUser = $util->recoveryEnabledForUser();

 

 \OCP\Util::addscript( 'files_encryption', 'settings-personal' );

 

-$tmpl->assign( 'recoveryEnabled', $recoveryEnabledForUser );

+$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );

+$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );

 $tmpl->assign( 'blacklist', $blackList );

 

 return $tmpl->fetchPage();