diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-05-04 18:14:38 +0400 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-05-04 18:14:38 +0400 |
| commit | c8946ea6086c642a5c367f2e5f63d58bc185c331 (patch) | |
| tree | aacba56be830d53517a958a222470414b1297d79 /apps/files_encryption/settings-admin.php | |
| parent | 9605d14a17522dd47c760a1c37a0374cfb0551b9 (diff) | |
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
Diffstat (limited to 'apps/files_encryption/settings-admin.php')
| -rw-r--r-- | apps/files_encryption/settings-admin.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php index b09515f0c33..ae9a85643ef 100644 --- a/apps/files_encryption/settings-admin.php +++ b/apps/files_encryption/settings-admin.php @@ -21,6 +21,7 @@ $recoveryAdminUid = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminUi $tmpl->assign( 'blacklist', $blackList ); $tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) ); $tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled ); +$tmpl->assign( 'recoveryAdminUid', $recoveryAdminUid ); \OCP\Util::addscript( 'files_encryption', 'settings-admin' ); \OCP\Util::addscript( 'core', 'multiselect' ); |