From dd9dfc4461ba9e484f25c81e232f00ce1873e2f0 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 25 Jun 2015 12:14:03 +0200 Subject: show nice display name for remote shares if possible --- lib/private/share/share.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/private/share') diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 027c518f9f1..87000ca29a5 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1703,11 +1703,20 @@ class Share extends Constants { $row['permissions'] &= ~\OCP\Constants::PERMISSION_SHARE; } // Add display names to result + $row['share_with_displayname'] = $row['share_with']; if ( isset($row['share_with']) && $row['share_with'] != '' && isset($row['share_with']) && $row['share_type'] === self::SHARE_TYPE_USER) { $row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']); - } else { - $row['share_with_displayname'] = $row['share_with']; + } 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']); + foreach ($addressBookEntries as $entry) { + foreach ($entry['CLOUD'] as $cloudID) { + if ($cloudID === $row['share_with']) { + $row['share_with_displayname'] = $entry['FN']; + } + } + } } if ( isset($row['uid_owner']) && $row['uid_owner'] != '') { $row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']); -- cgit v1.2.3 From a288d0eea36331703bf1d6e48b4bbe3e0b98e4b2 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 25 Jun 2015 12:14:46 +0200 Subject: ne need to check twice if $row['share_with'] is set --- lib/private/share/share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/share') diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 87000ca29a5..e4932288358 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1705,7 +1705,7 @@ class Share extends Constants { // Add display names to result $row['share_with_displayname'] = $row['share_with']; if ( isset($row['share_with']) && $row['share_with'] != '' && - isset($row['share_with']) && $row['share_type'] === self::SHARE_TYPE_USER) { + $row['share_type'] === self::SHARE_TYPE_USER) { $row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']); } else if(isset($row['share_with']) && $row['share_with'] != '' && $row['share_type'] === self::SHARE_TYPE_REMOTE) { -- cgit v1.2.3