From b9e4e61759b4cc3cdf5c0cabd8e5a8d6828d5528 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 2 Apr 2015 17:36:51 +0200
Subject: [PATCH] userRecovery() was replaced by setRecoveryForUser()
---
apps/encryption/appinfo/routes.php | 5 -----
apps/encryption/controller/recoverycontroller.php | 12 ------------
2 files changed, 17 deletions(-)
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 1a6cf18fbe..d4867f5fda 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -29,11 +29,6 @@ namespace OCA\Encryption\AppInfo;
'url' => '/ajax/adminRecovery',
'verb' => 'POST'
],
- [
- 'name' => 'Recovery#userRecovery',
- 'url' => '/ajax/userRecovery',
- 'verb' => 'POST'
- ],
[
'name' => 'Recovery#changeRecoveryPassword',
'url' => '/ajax/changeRecoveryPassword',
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index 24d7f5a06e..da55d81f63 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
*/
--
GitLab