Skip to content
Snippets Groups Projects
Commit fddbe499 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

prevent php-warnings, closes #4310

Closes #4310

Merge request studip/studip!3114
parent a815a566
No related branches found
No related tags found
No related merge requests found
...@@ -444,7 +444,11 @@ class Course_TimesroomsController extends AuthenticatedController ...@@ -444,7 +444,11 @@ class Course_TimesroomsController extends AuthenticatedController
} }
// Set Room // Set Room
$old_room_id = $termin->room_booking->resource_id; if ($termin->room_booking) {
$old_room_id = $termin->room_booking->resource_id;
} else {
$old_room_id = null;
}
$singledate = new SingleDate($termin); $singledate = new SingleDate($termin);
if ($singledate->setTime($date, $end_time)) { if ($singledate->setTime($date, $end_time)) {
$singledate->store(); $singledate->store();
......
...@@ -41,36 +41,32 @@ class NewPasswordController extends StudipController ...@@ -41,36 +41,32 @@ class NewPasswordController extends StudipController
$users = User::findByEmail(Request::get('mail')); $users = User::findByEmail(Request::get('mail'));
if (sizeof($users) == 1) { $user = $users[0];
$user = $users[0]; setTempLanguage($user->id);
} else if (sizeof($users) > 1) {
setTempLanguage($users[0]->id); // there are mutliple accounts with this mail addresses!
$subject = sprintf(
// there are mutliple accounts with this mail addresses! _("[Stud.IP - %s] Passwortänderung angefordert"),
$subject = sprintf( Config::get()->UNI_NAME_CLEAN
_("[Stud.IP - %s] Passwortänderung angefordert"), );
Config::get()->UNI_NAME_CLEAN
); $mailbody = sprintf(
_("Dies ist eine Informationsmail des Stud.IP-Systems\n"
$mailbody = sprintf( ."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n"
_("Dies ist eine Informationsmail des Stud.IP-Systems\n" . "Für die Mail-Adresse %s wurde ein Link angefordert\n"
."(Studienbegleitender Internetsupport von Präsenzlehre)\n- %s -\n\n" . "um das Passwort zurückzusetzen.\n"
. "Für die Mail-Adresse %s wurde ein Link angefordert\n" . "Dieser Mail-Adresse sind jedoch mehrere Zugänge zugeordnet,\n"
. "um das Passwort zurückzusetzen.\n" . "deshalb ist es nicht möglich, das Passwort hierüber zurückzusetzen.\n"
. "Dieser Mail-Adresse sind jedoch mehrere Zugänge zugeordnet,\n" . "Wenden sie sich bitte stattdessen an\n%s"
. "deshalb ist es nicht möglich, das Passwort hierüber zurückzusetzen.\n" ),
. "Wenden sie sich bitte stattdessen an\n%s" Config::get()->UNI_NAME_CLEAN,
), $users[0]->email,
Config::get()->UNI_NAME_CLEAN, $GLOBALS['UNI_CONTACT']
$users[0]->email, );
$GLOBALS['UNI_CONTACT']
); StudipMail::sendMessage($user->email, $subject, $mailbody);
StudipMail::sendMessage($users[0]->email, $subject, $mailbody); restoreLanguage();
restoreLanguage();
}
if ($user) { if ($user) {
// spam/abuse-protection // spam/abuse-protection
// if there are more than 5 tokens present, do NOT send another mail // if there are more than 5 tokens present, do NOT send another mail
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<?= _('Benachrichtigung über ausfallende Termine an alle Teilnehmenden verschicken') ?> <?= _('Benachrichtigung über ausfallende Termine an alle Teilnehmenden verschicken') ?>
</label> </label>
</fieldset> </fieldset>
<? if ($issue_id) : ?> <? if (!empty($issue_id)) : ?>
<input type="hidden" name="issue_id" value="<?= $issue_id ?>"> <input type="hidden" name="issue_id" value="<?= $issue_id ?>">
<? else : ?> <? else : ?>
<input type="hidden" name="termin_id" value="<?= $dates[0]->getTerminId() ?>"> <input type="hidden" name="termin_id" value="<?= $dates[0]->getTerminId() ?>">
......
...@@ -12,7 +12,7 @@ if ($best_nine_tags && count($best_nine_tags) > 0) { ...@@ -12,7 +12,7 @@ if ($best_nine_tags && count($best_nine_tags) > 0) {
<form class="oer_search" <form class="oer_search"
action="<?= $controller->link_for("oer/market/search") ?>" action="<?= $controller->link_for("oer/market/search") ?>"
method="GET" method="GET"
data-searchresults="<?= htmlReady(json_encode($material_data)) ?>" data-searchresults="<?= htmlReady(json_encode($material_data ?? [])) ?>"
data-filteredtag="<?= htmlReady(Request::get("tag")) ?>" data-filteredtag="<?= htmlReady(Request::get("tag")) ?>"
data-filteredcategory="<?= htmlReady(Request::get("category")) ?>" data-filteredcategory="<?= htmlReady(Request::get("category")) ?>"
data-tags="<?= htmlReady(json_encode($tags)) ?>" data-tags="<?= htmlReady(json_encode($tags)) ?>"
......
...@@ -119,7 +119,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType ...@@ -119,7 +119,7 @@ class CourseDateFolder extends PermissionEnabledFolder implements FolderType
} else { } else {
$this->folderdata['data_content']['permission'] = 5; $this->folderdata['data_content']['permission'] = 5;
} }
$this->folderdata['description'] = $request['description'] ?: ''; $this->folderdata['description'] = $request['description'] ?? '';
return $this; return $this;
} }
......
...@@ -20,7 +20,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType ...@@ -20,7 +20,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
{ {
public static function getIcon(bool $active = false) : Icon public static function getIcon(bool $active = false) : Icon
{ {
return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info'); return Icon::create(static::getIconShape(), $active ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO);
} }
/** /**
...@@ -64,7 +64,11 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType ...@@ -64,7 +64,11 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType
$answer = $this->getMyAnswer(); $answer = $this->getMyAnswer();
$answers = Request::getArray('answers'); $answers = Request::getArray('answers');
$userAnswer = (array) $answers[$this->getId()]['answerdata']['answers']; if (!empty($answers[$this->getId()])) {
$userAnswer = (array)$answers[$this->getId()]['answerdata']['answers'];
} else {
$userAnswer = [];
}
$answer->setData(['answerdata' => ['answers' => $userAnswer ] ]); $answer->setData(['answerdata' => ['answers' => $userAnswer ] ]);
return $answer; return $answer;
} }
......
...@@ -75,7 +75,7 @@ class SingleDate ...@@ -75,7 +75,7 @@ class SingleDate
if ($data instanceOf CourseDate || $data instanceof CourseExDate) { if ($data instanceOf CourseDate || $data instanceof CourseExDate) {
$single_date_data = $data->toArray(); $single_date_data = $data->toArray();
$single_date_data['ex_termin'] = $data instanceOf CourseDate ? 0 : 1; $single_date_data['ex_termin'] = $data instanceOf CourseDate ? 0 : 1;
$single_date_data['resource_id'] = $data->room_booking->resource_id ?: ''; $single_date_data['resource_id'] = $data->room_booking->resource_id ?? '';
if ($data instanceOf CourseDate) { if ($data instanceOf CourseDate) {
$single_date_data['related_persons'] = $data->dozenten->pluck('user_id'); $single_date_data['related_persons'] = $data->dozenten->pluck('user_id');
$single_date_data['related_groups'] = $data->statusgruppen->pluck('statusgruppe_id'); $single_date_data['related_groups'] = $data->statusgruppen->pluck('statusgruppe_id');
...@@ -147,9 +147,9 @@ class SingleDate ...@@ -147,9 +147,9 @@ class SingleDate
$after = $this->toString(); $after = $this->toString();
// logging // logging
if ($before) { if ($before) {
StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->id, $before . ' -> ' . $after); StudipLog::log('SINGLEDATE_CHANGE_TIME', $this->range_id, $this->termin_id, $before . ' -> ' . $after);
} else { } else {
StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->id, $after); StudipLog::log('SEM_ADD_SINGLEDATE', $this->range_id, $this->termin_id, $after);
} }
return true; return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment