Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordartcafe <github@dartcafe.de>2022-03-23 22:50:44 +0300
committerdartcafe <github@dartcafe.de>2022-03-23 22:50:44 +0300
commit41d56ed05f19690fc66dd1d7ac076b1769f412cd (patch)
tree8442ea374a2c17b4748015ee57eca23b2fb8386c /lib
parentf4ad84af70478faa48734e0aed72cc9cc9f97b3f (diff)
add email addresses to poll export for owner
Signed-off-by: dartcafe <github@dartcafe.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/Service/MailService.php2
-rw-r--r--lib/Service/PollService.php7
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php
index 779ee15e..6d20ecfb 100644
--- a/lib/Service/MailService.php
+++ b/lib/Service/MailService.php
@@ -125,7 +125,7 @@ class MailService {
} catch (\Exception $e) {
// catch silently
}
- return $userId;
+ return '';
}
public function resendInvitation(string $token): Share {
diff --git a/lib/Service/PollService.php b/lib/Service/PollService.php
index 7229a1e2..81b61148 100644
--- a/lib/Service/PollService.php
+++ b/lib/Service/PollService.php
@@ -359,9 +359,12 @@ class PollService {
$votes = $this->voteMapper->findParticipantsByPoll($this->poll->getId());
$list = [];
foreach ($votes as $vote) {
- $list[] = $vote->getDisplayName() . ' <' . $this->mailService->resolveEmailAddress($this->poll->getId(), $vote->getUserId()) . '>';
+ $list[] = [
+ 'displayName' => $vote->getDisplayName(),
+ 'emailAddress' => $this->mailService->resolveEmailAddress($this->poll->getId(), $vote->getUserId()),
+ 'combined' => $vote->getDisplayName() . ' <' . $this->mailService->resolveEmailAddress($this->poll->getId(), $vote->getUserId()) . '>'];
}
- return array_unique($list);
+ return $list;
}
/**