aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/messages.php
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2022-10-26 10:32:43 +0000
committerDavid Siegfried <david.siegfried@uni-vechta.de>2022-10-26 10:32:43 +0000
commite1af76a74550bcdd55eb48b9a32f39f468a466cd (patch)
tree9b318bcdbe749ae62f3b6fc4476d4d0aa14ea2d3 /app/controllers/messages.php
parent11eefe375e36c8e99cf28019d5d66b2eb8b4d5a9 (diff)
fix for BIESt 1283, closes #1283
Closes #1283 Merge request studip/studip!1066
Diffstat (limited to 'app/controllers/messages.php')
-rw-r--r--app/controllers/messages.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/messages.php b/app/controllers/messages.php
index d3d8985..c4fd07b 100644
--- a/app/controllers/messages.php
+++ b/app/controllers/messages.php
@@ -412,7 +412,7 @@ class MessagesController extends AuthenticatedController {
], 'MessageUser::build');
}
- if (!$this->default_message->receivers->count() && is_array($_SESSION['sms_data']['p_rec'])) {
+ if (!$this->default_message->receivers->count() && !empty($_SESSION['sms_data']['p_rec'])) {
$this->default_message->receivers = DBManager::get()->fetchAll("SELECT user_id,'rec' as snd_rec FROM auth_user_md5 WHERE username IN(?) ORDER BY Nachname,Vorname", [$_SESSION['sms_data']['p_rec']], 'MessageUser::build');
unset($_SESSION['sms_data']);
}
@@ -566,8 +566,8 @@ class MessagesController extends AuthenticatedController {
$this->default_message['subject'] = Request::get("default_subject");
}
$settings = UserConfig::get($GLOBALS['user']->id)->MESSAGING_SETTINGS;
- $this->mailforwarding = Request::get('emailrequest') ? true : $settings['request_mail_forward'];
- $this->show_adressees = Request::get('show_adressees') ? true : $settings['show_adressees'];;
+ $this->mailforwarding = Request::bool('emailrequest', $settings['request_mail_forward'] ?? false);
+ $this->show_adressees = Request::bool('show_adressees', $settings['show_adressees'] ?? false);
if (Request::get('inst_id') || Request::get('course_id') || Request::option('group_id') || !Config::get()->SHOW_ADRESSEES_LIMIT) {
$this->show_adressees = null;
}