Merge pull request #5854 from nextcloud/improve-personal-page-code

Cleanup code of personal page to use public interfaces

2 files changed, 3 insertions, 54 deletions

diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/lib/private/Settings/Personal/PersonalInfo.php
index fb1f388c599..e92541c0010 100644
--- a/lib/private/Settings/Personal/PersonalInfo.php
+++ b/lib/private/Settings/Personal/PersonalInfo.php
@@ -118,10 +118,10 @@ class PersonalInfo implements ISettings {
 			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
 			'usage_relative' => $storageInfo['relative'],
 			'quota' => $storageInfo['quota'],
-			'avatarChangeSupported' => \OC_User::canUserChangeAvatar($uid),
+			'avatarChangeSupported' => $user->canChangeAvatar(),
 			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
 			'avatarScope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
-			'displayNameChangeSupported' => \OC_User::canUserChangeDisplayName($uid),
+			'displayNameChangeSupported' => $user->canChangeDisplayName(),
 			'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
 			'displayNameScope' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
 			'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
@@ -138,7 +138,7 @@ class PersonalInfo implements ISettings {
 			'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
 			'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
 			'groups' => $this->getGroups($user),
-			'passwordChangeSupported' => \OC_User::canUserChangePassword($uid),
+			'passwordChangeSupported' => $user->canChangePassword(),
 		] + $messageParameters + $languageParameters;
 
 
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php
index 7e7cbab3bce..161942c995c 100644
--- a/lib/private/legacy/user.php
+++ b/lib/private/legacy/user.php
@@ -412,57 +412,6 @@ class OC_User {
 	}
 
 	/**
-	 * Check whether user can change his avatar
-	 *
-	 * @param string $uid The username
-	 * @return bool
-	 *
-	 * Check whether a specified user can change his avatar
-	 */
-	public static function canUserChangeAvatar($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->canChangeAvatar();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Check whether user can change his password
-	 *
-	 * @param string $uid The username
-	 * @return bool
-	 *
-	 * Check whether a specified user can change his password
-	 */
-	public static function canUserChangePassword($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->canChangePassword();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Check whether user can change his display name
-	 *
-	 * @param string $uid The username
-	 * @return bool
-	 *
-	 * Check whether a specified user can change his display name
-	 */
-	public static function canUserChangeDisplayName($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->canChangeDisplayName();
-		} else {
-			return false;
-		}
-	}
-
-	/**
 	 * Check if the password is correct
 	 *
 	 * @param string $uid The username