Use AppFramework instead of custom controller

2 files changed, 66 insertions, 31 deletions

diff --git a/core/user/controller.php b/core/user/controller.php
deleted file mode 100644
index cbcbd936183..00000000000
--- a/core/user/controller.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Jörn Dreyer <jfd@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Core\User;
-
-class Controller {
-	public static function getDisplayNames($args) {
-		\OC_JSON::checkLoggedIn();
-		\OC_JSON::callCheck();
-
-		$users = $_GET['users'];
-		$result = array();
-		$userManager = \OC::$server->getUserManager();
-
-		foreach ($users as $user) {
-			$userObject = $userManager->get($user);
-			if (is_object($userObject)) {
-				$result[$user] = $userObject->getDisplayName();
-			} else {
-				$result[$user] = false;
-			}
-		}
-
-		\OC_JSON::success(array('users'=>$result));
-	}
-}
diff --git a/core/user/usercontroller.php b/core/user/usercontroller.php
new file mode 100644
index 00000000000..2570e3b5b05
--- /dev/null
+++ b/core/user/usercontroller.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright (c) 2014 Jörn Dreyer <jfd@owncloud.com>
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\User;
+
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http\JSONResponse;
+use \OCP\IRequest;
+
+class UserController extends Controller {
+	/**
+	 * @var \OCP\IUserManager
+	 */
+	protected $userManager;
+
+	/**
+	 * @var \OC_Defaults
+	 */
+	protected $defaults;
+
+	public function __construct($appName,
+								IRequest $request,
+								$userManager,
+								$defaults
+	) {
+		parent::__construct($appName, $request);
+		$this->userManager = $userManager;
+		$this->defaults = $defaults;
+	}
+
+	/**
+	 * Lookup user display names
+	 *
+	 * @NoAdminRequired
+	 *
+	 * @param array $users
+	 *
+	 * @return JSONResponse
+	 */
+	public function getDisplayNames($users) {
+		$result = array();
+
+		foreach ($users as $user) {
+			$userObject = $this->userManager->get($user);
+			if (is_object($userObject)) {
+				$result[$user] = $userObject->getDisplayName();
+			} else {
+				$result[$user] = $user;
+			}
+		}
+
+		$json = array(
+			'users' => $result,
+			'status' => 'success'
+		);
+
+		return new JSONResponse($json);
+
+	}
+}