summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-04-02 17:36:51 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:31 +0200
commitb9e4e61759b4cc3cdf5c0cabd8e5a8d6828d5528 (patch)
treeb864eda935f94b3cc934b96571c08e29102d3ac5
parent69e95531f88f89c793ec383139bb093f0c979596 (diff)
downloadnextcloud-server-b9e4e61759b4cc3cdf5c0cabd8e5a8d6828d5528.tar.gz
nextcloud-server-b9e4e61759b4cc3cdf5c0cabd8e5a8d6828d5528.zip
userRecovery() was replaced by setRecoveryForUser()
-rw-r--r--apps/encryption/appinfo/routes.php5
-rw-r--r--apps/encryption/controller/recoverycontroller.php12
2 files changed, 0 insertions, 17 deletions
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 1a6cf18fbed..d4867f5fdaa 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -30,11 +30,6 @@ namespace OCA\Encryption\AppInfo;
'verb' => 'POST'
],
[
- 'name' => 'Recovery#userRecovery',
- 'url' => '/ajax/userRecovery',
- 'verb' => 'POST'
- ],
- [
'name' => 'Recovery#changeRecoveryPassword',
'url' => '/ajax/changeRecoveryPassword',
'verb' => 'POST'
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index 24d7f5a06ed..da55d81f63a 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -130,18 +130,6 @@ class RecoveryController extends Controller {
}
}
- public function userRecovery($userEnableRecovery) {
- if (isset($userEnableRecovery) && ($userEnableRecovery === '0' || $userEnableRecovery === '1')) {
- $userId = $this->user->getUID();
- if ($userEnableRecovery === '1') {
- // Todo xxx figure out if we need keyid's here or what.
- return $this->recovery->addRecoveryKeys();
- }
- // Todo xxx see :98
- return $this->recovery->removeRecoveryKeys();
- }
- }
-
/**
* @NoAdminRequired
*/