From 0bc728b24271d1bbdce2f28e098b206452ab6391 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 19 Sep 2024 13:00:05 +0000
Subject: [PATCH] prevent php-warnings in vcard-action, fixes #4609
Closes #4609
Merge request studip/studip!3422
---
app/controllers/contact.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/controllers/contact.php b/app/controllers/contact.php
index 7820ce6cc50..98c3daf75bb 100644
--- a/app/controllers/contact.php
+++ b/app/controllers/contact.php
@@ -185,8 +185,9 @@ class ContactController extends AuthenticatedController
$charset = 'utf-8';
$filename = _('Kontakte');
$this->set_layout(null);
+ $users = [];
if (Request::submitted('user')) {
- $user = User::findManyByUsername(Request::getArray('user'));
+ $users = User::findManyByUsername(Request::getArray('user'));
}
if ($group) {
$group_object = Statusgruppen::find($group);
@@ -195,23 +196,23 @@ class ContactController extends AuthenticatedController
$this->render_nothing();
return;
}
- $user = User::findMany($group_object->members->pluck('user_id'));
+ $users = User::findMany($group_object->members->pluck('user_id'));
}
- if (!$user) {
+ if (empty($users)) {
$user_object = User::findCurrent();
if (!$user_object) {
$this->set_status(404);
$this->render_nothing();
return;
}
- $user = User::findCurrent()->contacts;
+ $users = User::findCurrent()->contacts;
}
header("Content-type: text/x-vCard;charset=" . $charset);
header("Content-disposition: attachment; " . encode_header_parameter('filename', $filename . '.vcf'));
header("Pragma: private");
- $this->vCard = vCard::export($user);
+ $this->vCard = vCard::export($users);
}
private function initSidebar($active_id = null)
--
GitLab