From c2a1a02fe452fe93057f36e6d37a8634df2e0bd6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 20 Jan 2016 10:22:44 +0100
Subject: move user controller to core/controller

---
 core/application.php               |  2 +-
 core/controller/usercontroller.php | 79 ++++++++++++++++++++++++++++++++++++++
 core/user/usercontroller.php       | 79 --------------------------------------
 3 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 core/controller/usercontroller.php
 delete mode 100644 core/user/usercontroller.php

(limited to 'core')

diff --git a/core/application.php b/core/application.php
index 996a612105d..6536f63c1d8 100644
--- a/core/application.php
+++ b/core/application.php
@@ -30,7 +30,7 @@ use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
 use \OCP\AppFramework\App;
 use OC\Core\LostPassword\Controller\LostController;
-use OC\Core\User\UserController;
+use OC\Core\Controller\UserController;
 use OC\Core\Controller\AvatarController;
 use \OCP\Util;
 
diff --git a/core/controller/usercontroller.php b/core/controller/usercontroller.php
new file mode 100644
index 00000000000..72193761022
--- /dev/null
+++ b/core/controller/usercontroller.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Controller;
+
+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);
+
+	}
+}
diff --git a/core/user/usercontroller.php b/core/user/usercontroller.php
deleted file mode 100644
index 38ecd86b459..00000000000
--- a/core/user/usercontroller.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-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);
-
-	}
-}
-- 
cgit v1.2.3