Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v14.0.0beta1
@@ -41,6 +41,9 @@ class Folder extends File implements \OCP\Share_Backend_Collection { | |||
public function getParents($itemSource, $shareWith = null, $owner = null) { | |||
$result = array(); | |||
$parent = $this->getParentId($itemSource); | |||
$userManager = \OC::$server->getUserManager(); | |||
while ($parent) { | |||
$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner); | |||
if ($shares) { | |||
@@ -49,8 +52,11 @@ class Folder extends File implements \OCP\Share_Backend_Collection { | |||
$share['collection']['path'] = $name; | |||
$share['collection']['item_type'] = 'folder'; | |||
$share['file_path'] = $name; | |||
$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']); | |||
$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']); | |||
$ownerUser = $userManager->get($share['uid_owner']); | |||
$displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName(); | |||
$shareWithUser = $userManager->get($share['share_with']); | |||
$displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName(); | |||
$share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner']; | |||
$share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner']; | |||
@@ -1094,11 +1094,11 @@ class User_LDAPTest extends TestCase { | |||
->willReturnCallback(function($uuid) { return $uuid . '1'; }); | |||
//with displayName | |||
$result = \OCP\User::getDisplayName('gunslinger'); | |||
$result = \OC::$server->getUserManager()->get('gunslinger')->getDisplayName(); | |||
$this->assertEquals('Roland Deschain', $result); | |||
//empty displayname retrieved | |||
$result = \OCP\User::getDisplayName('newyorker'); | |||
$result = \OC::$server->getUserManager()->get('newyorker')->getDisplayName(); | |||
$this->assertEquals('newyorker', $result); | |||
} | |||
@@ -1238,7 +1238,8 @@ class Share extends Constants { | |||
$row['share_with_displayname'] = $row['share_with']; | |||
if ( isset($row['share_with']) && $row['share_with'] != '' && | |||
$row['share_type'] === self::SHARE_TYPE_USER) { | |||
$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']); | |||
$shareWithUser = \OC::$server->getUserManager()->get($row['share_with']); | |||
$row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName(); | |||
} else if(isset($row['share_with']) && $row['share_with'] != '' && | |||
$row['share_type'] === self::SHARE_TYPE_REMOTE) { | |||
$addressBookEntries = \OC::$server->getContactsManager()->search($row['share_with'], ['CLOUD']); | |||
@@ -1251,7 +1252,8 @@ class Share extends Constants { | |||
} | |||
} | |||
if ( isset($row['uid_owner']) && $row['uid_owner'] != '') { | |||
$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']); | |||
$ownerUser = \OC::$server->get($row['uid_owner']); | |||
$row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName(); | |||
} | |||
if ($row['permissions'] > 0) { |
@@ -312,6 +312,8 @@ class OC_User { | |||
* | |||
* @param string $uid | |||
* @return string|bool uid or false | |||
* @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method | |||
* get() of \OCP\IUserManager - \OC::$server->getUserManager() | |||
*/ | |||
public static function getDisplayName($uid = null) { | |||
if ($uid) { |
@@ -57,18 +57,6 @@ class User { | |||
return \OC_User::getUser(); | |||
} | |||
/** | |||
* Get the user display name of the user currently logged in. | |||
* @param string|null $user user id or null for current user | |||
* @return string display name | |||
* @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method | |||
* get() of \OCP\IUserManager - \OC::$server->getUserManager() | |||
* @since 5.0.0 | |||
*/ | |||
public static function getDisplayName( $user = null ) { | |||
return \OC_User::getDisplayName( $user ); | |||
} | |||
/** | |||
* Check if the user is logged in | |||
* @return boolean |