migrate L10NFactory access; migrate some other deprecations

1 files changed, 8 insertions, 5 deletions

diff --git a/controller/admincontroller.php b/controller/admincontroller.php
index d7e47909..f3bfdfbb 100644
--- a/controller/admincontroller.php
+++ b/controller/admincontroller.php
@@ -24,6 +24,7 @@ use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\ApiController;
 use OCA\Passman\Service\CredentialService;
+use OCP\IUserManager;
 
 
 class AdminController extends ApiController {
@@ -34,6 +35,7 @@ class AdminController extends ApiController {
 	private $revisionService;
 	private $deleteVaultRequestService;
 	private $config;
+	private $userManager;
 
 	public function __construct($AppName,
 								IRequest $request,
@@ -43,7 +45,8 @@ class AdminController extends ApiController {
 								FileService $fileService,
 								CredentialRevisionService $revisionService,
 								DeleteVaultRequestService $deleteVaultRequestService,
-								IConfig $config
+								IConfig $config,
+								IUserManager $userManager
 	) {
 		parent::__construct(
 			$AppName,
@@ -59,13 +62,13 @@ class AdminController extends ApiController {
 		$this->deleteVaultRequestService = $deleteVaultRequestService;
 
 		$this->config = $config;
+		$this->userManager = $userManager;
 	}
 
 
 	public function searchUser($term) {
-		$um = \OC::$server->getUserManager();
 		$results = array();
-		$searchResult = $um->search($term);
+		$searchResult = $this->userManager->search($term);
 		foreach ($searchResult as $user) {
 			array_push($results, array(
 				"value" => $user->getUID(),
@@ -114,7 +117,7 @@ class AdminController extends ApiController {
 		$results = array();
 		foreach($requests as $request){
 			$r = $request->jsonSerialize();
-			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy());
+			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager);
 			array_push($results, $r);
 		}
 		return new JSONResponse($results);
@@ -188,4 +191,4 @@ class AdminController extends ApiController {
 		}
 		return new JSONResponse(array('result' => $result));
 	}
-}
\ No newline at end of file
+}