Merge pull request #21264 from owncloud/deprecated_oc_user_methods

Cleanup OC_User deprecated methods

3 files changed, 21 insertions, 103 deletions

diff --git a/lib/base.php b/lib/base.php
index 038c259ecf6..8f1432d6fb9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -875,7 +875,7 @@ class OC {
 
 		// Handle redirect URL for logged in users
 		if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
-			$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
+			$location = \OC::$server->getURLGenerator()->getAbsoluteURL(urldecode($_REQUEST['redirect_url']));
 
 			// Deny the redirect if the URL contains a @
 			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
diff --git a/lib/private/user.php b/lib/private/user.php
index 74441d9175a..f806aa07251 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -66,14 +66,6 @@ class OC_User {
 		return OC::$server->getUserSession();
 	}
 
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated Use \OC::$server->getUserManager()
-	 */
-	public static function getManager() {
-		return OC::$server->getUserManager();
-	}
-
 	private static $_backends = array();
 
 	private static $_usedBackends = array();
@@ -84,44 +76,6 @@ class OC_User {
 	private static $incognitoMode = false;
 
 	/**
-	 * registers backend
-	 *
-	 * @param string $backend name of the backend
-	 * @deprecated Add classes by calling OC_User::useBackend() with a class instance instead
-	 * @return bool
-	 *
-	 * Makes a list of backends that can be used by other modules
-	 */
-	public static function registerBackend($backend) {
-		self::$_backends[] = $backend;
-		return true;
-	}
-
-	/**
-	 * gets available backends
-	 *
-	 * @deprecated
-	 * @return array an array of backends
-	 *
-	 * Returns the names of all backends.
-	 */
-	public static function getBackends() {
-		return self::$_backends;
-	}
-
-	/**
-	 * gets used backends
-	 *
-	 * @deprecated
-	 * @return array an array of backends
-	 *
-	 * Returns the names of all used backends.
-	 */
-	public static function getUsedBackends() {
-		return array_keys(self::$_usedBackends);
-	}
-
-	/**
 	 * Adds the backend to the list of used backends
 	 *
 	 * @param string|OC_User_Interface $backend default: database The backend to use for user management
@@ -132,7 +86,7 @@ class OC_User {
 	public static function useBackend($backend = 'database') {
 		if ($backend instanceof OC_User_Interface) {
 			self::$_usedBackends[get_class($backend)] = $backend;
-			self::getManager()->registerBackend($backend);
+			\OC::$server->getUserManager()->registerBackend($backend);
 		} else {
 			// You'll never know what happens
 			if (null === $backend OR !is_string($backend)) {
@@ -146,17 +100,17 @@ class OC_User {
 				case 'sqlite':
 					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', \OCP\Util::DEBUG);
 					self::$_usedBackends[$backend] = new OC_User_Database();
-					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
+					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				case 'dummy':
 					self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
-					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
+					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				default:
 					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', \OCP\Util::DEBUG);
 					$className = 'OC_USER_' . strToUpper($backend);
 					self::$_usedBackends[$backend] = new $className();
-					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
+					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 			}
 		}
@@ -168,7 +122,7 @@ class OC_User {
 	 */
 	public static function clearBackends() {
 		self::$_usedBackends = array();
-		self::getManager()->clearBackends();
+		\OC::$server->getUserManager()->clearBackends();
 	}
 
 	/**
@@ -199,42 +153,6 @@ class OC_User {
 	}
 
 	/**
-	 * Create a new user
-	 *
-	 * @param string $uid The username of the user to create
-	 * @param string $password The password of the new user
-	 * @throws Exception
-	 * @return bool true/false
-	 *
-	 * Creates a new user. Basic checking of username is done in OC_User
-	 * itself, not in its subclasses.
-	 *
-	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
-	 * @deprecated Use \OC::$server->getUserManager()->createUser($uid, $password)
-	 */
-	public static function createUser($uid, $password) {
-		return self::getManager()->createUser($uid, $password);
-	}
-
-	/**
-	 * delete a user
-	 *
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 * @deprecated Use \OC::$server->getUserManager()->get() and then run delete() on the return
-	 */
-	public static function deleteUser($uid) {
-		$user = self::getManager()->get($uid);
-		if ($user) {
-			return $user->delete();
-		} else {
-			return false;
-		}
-	}
-
-	/**
 	 * Try to login a user
 	 *
 	 * @param string $loginname The login name of the user to log in
@@ -343,7 +261,7 @@ class OC_User {
 		if (is_null($displayName)) {
 			$displayName = $uid;
 		}
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->setDisplayName($displayName);
 		} else {
@@ -452,7 +370,7 @@ class OC_User {
 	 */
 	public static function getDisplayName($uid = null) {
 		if ($uid) {
-			$user = self::getManager()->get($uid);
+			$user = \OC::$server->getUserManager()->get($uid);
 			if ($user) {
 				return $user->getDisplayName();
 			} else {
@@ -490,7 +408,7 @@ class OC_User {
 	 * Change the password of a user
 	 */
 	public static function setPassword($uid, $password, $recoveryPassword = null) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->setPassword($password, $recoveryPassword);
 		} else {
@@ -507,7 +425,7 @@ class OC_User {
 	 * Check whether a specified user can change his avatar
 	 */
 	public static function canUserChangeAvatar($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->canChangeAvatar();
 		} else {
@@ -524,7 +442,7 @@ class OC_User {
 	 * Check whether a specified user can change his password
 	 */
 	public static function canUserChangePassword($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->canChangePassword();
 		} else {
@@ -541,7 +459,7 @@ class OC_User {
 	 * Check whether a specified user can change his display name
 	 */
 	public static function canUserChangeDisplayName($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->canChangeDisplayName();
 		} else {
@@ -560,7 +478,7 @@ class OC_User {
 	 * returns the user id or false
 	 */
 	public static function checkPassword($uid, $password) {
-		$manager = self::getManager();
+		$manager = \OC::$server->getUserManager();
 		$username = $manager->checkPassword($uid, $password);
 		if ($username !== false) {
 			return $username->getUID();
@@ -576,7 +494,7 @@ class OC_User {
 	 * @deprecated Use \OC::$server->getUserManager->getHome()
 	 */
 	public static function getHome($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->getHome();
 		} else {
@@ -595,7 +513,7 @@ class OC_User {
 	 * @param integer $offset
 	 */
 	public static function getUsers($search = '', $limit = null, $offset = null) {
-		$users = self::getManager()->search($search, $limit, $offset);
+		$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
 		$uids = array();
 		foreach ($users as $user) {
 			$uids[] = $user->getUID();
@@ -616,7 +534,7 @@ class OC_User {
 	 */
 	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = array();
-		$users = self::getManager()->searchDisplayName($search, $limit, $offset);
+		$users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
 		foreach ($users as $user) {
 			$displayNames[$user->getUID()] = $user->getDisplayName();
 		}
@@ -630,7 +548,7 @@ class OC_User {
 	 * @return boolean
 	 */
 	public static function userExists($uid) {
-		return self::getManager()->userExists($uid);
+		return \OC::$server->getUserManager()->userExists($uid);
 	}
 
 	/**
@@ -639,7 +557,7 @@ class OC_User {
 	 * @param string $uid the user to disable
 	 */
 	public static function disableUser($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			$user->setEnabled(false);
 		}
@@ -651,7 +569,7 @@ class OC_User {
 	 * @param string $uid
 	 */
 	public static function enableUser($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			$user->setEnabled(true);
 		}
@@ -664,7 +582,7 @@ class OC_User {
 	 * @return bool
 	 */
 	public static function isEnabled($uid) {
-		$user = self::getManager()->get($uid);
+		$user = \OC::$server->getUserManager()->get($uid);
 		if ($user) {
 			return $user->isEnabled();
 		} else {
diff --git a/lib/private/util.php b/lib/private/util.php
index 578001988d4..c63befb3f32 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1250,7 +1250,7 @@ class OC_Util {
 		fclose($fp);
 
 		// accessing the file via http
-		$url = OC_Helper::makeURLAbsolute(OC::$WEBROOT . '/data' . $fileName);
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
 		try {
 			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
 		} catch (\Exception $e) {