Skip to content

Fixed it so that when performing the search, it correctly fills the u… #32308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mstolf wants to merge 1 commit into from
Closed

Fixed it so that when performing the search, it correctly fills the u… #32308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions lib/private/Contacts/ContactsMenu/ContactsStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offs
}
return true;
});

$entries = array_map(function (array $contact) {
return $this->contactArrayToEntry($contact);
}, $contacts);
Expand Down Expand Up @@ -312,19 +311,17 @@ public function findOne(IUser $user, $shareType, $shareWith) {
private function contactArrayToEntry(array $contact) {
$entry = new Entry();

if (isset($contact['id'])) {
$entry->setId($contact['id']);
if (isset($contact['UID'])) {
$entry->setId($contact['UID']);
$uid = $contact['UID'];
$avatar = "/index.php/avatar/$uid/64";
$entry->setAvatar($avatar);
}

if (isset($contact['FN'])) {
$entry->setFullName($contact['FN']);
}

$avatarPrefix = "VALUE=uri:";
Copy link
Member

@CarlSchwan CarlSchwan May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the two way should be keep. e.g. first try looking if the PHOTO property exists and if not fallback to the UID?

Copy link
Contributor

@AndyXheli AndyXheli May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mstolf I left line 323 throw 327 in place and only added 314 throw 318 and its working for me

if (isset($contact['PHOTO']) && strpos($contact['PHOTO'], $avatarPrefix) === 0) {
$entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix)));
}

if (isset($contact['EMAIL'])) {
foreach ($contact['EMAIL'] as $email) {
$entry->addEMailAddress($email);
Expand Down