diff options
author | Sam Tuke <samtuke@owncloud.com> | 2013-05-01 19:18:31 +0200 |
---|---|---|
committer | Sam Tuke <samtuke@owncloud.com> | 2013-05-01 19:21:01 +0200 |
commit | ba29147e34a22142c4bfd2afa3f5b9f1e6efcd63 (patch) | |
tree | 643e10cc813c815253c78d4ab6650c42a8986c91 /apps/files_encryption/ajax/userrecovery.php | |
parent | d3db4ee103903e97ec2cfb8430b14699f1f6e8ae (diff) | |
download | nextcloud-server-ba29147e34a22142c4bfd2afa3f5b9f1e6efcd63.tar.gz nextcloud-server-ba29147e34a22142c4bfd2afa3f5b9f1e6efcd63.zip |
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
Diffstat (limited to 'apps/files_encryption/ajax/userrecovery.php')
-rw-r--r-- | apps/files_encryption/ajax/userrecovery.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php index 56c18f7ad5b..f72be3181ef 100644 --- a/apps/files_encryption/ajax/userrecovery.php +++ b/apps/files_encryption/ajax/userrecovery.php @@ -13,21 +13,18 @@ use OCA\Encryption; \OCP\JSON::checkLoggedIn(); \OCP\JSON::checkAppEnabled( 'files_encryption' ); -\OCP\JSON::callCheck(); if ( isset( $_POST['userEnableRecovery'] ) + && ( 0 == $_POST['userEnableRecovery'] || 1 == $_POST['userEnableRecovery'] ) ) { - // Ensure preference is an integer - $recoveryEnabled = intval( $_POST['userEnableRecovery'] ); - $userId = \OCP\USER::getUser(); $view = new \OC_FilesystemView( '/' ); - $util = new Util( $view, $userId ); + $util = new \OCA\Encryption\Util( $view, $userId ); // Save recovery preference to DB - $result = $util->setRecovery( $recoveryEnabled ); + $result = $util->setRecoveryForUser( $_POST['userEnableRecovery'] ); if ( $result ) { |