diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php
index 91d999a126e3e6a4c98bc65b4ebaef1fc6f5cdc5..3987ab52cae5f2ba6b7beb5ce5c6c67a2ff4fd29 100644
--- a/app/controllers/search/studiengaenge.php
+++ b/app/controllers/search/studiengaenge.php
@@ -197,7 +197,7 @@ class Search_StudiengaengeController extends MVVController
$this->sessSet('selected_semester', $sem);
}
- $this->with_courses = Request::option('with_courses', ($_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] ?: null));
+ $this->with_courses = Request::option('with_courses', $_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] ?? null);
$_SESSION['MVV_SEARCH_SEQUENCE_WITH_COURSES'] = $this->with_courses;
$studiengangTeil = StudiengangTeil::find($stgteil_id);
diff --git a/app/views/resources/room_planning/semester_plan.php b/app/views/resources/room_planning/semester_plan.php
index f950ed12eec3a10e6b1f47776c00bc7507d8b1a2..11a2f799d4c11b0b3fa7a52124e0a46a0a659fc5 100644
--- a/app/views/resources/room_planning/semester_plan.php
+++ b/app/views/resources/room_planning/semester_plan.php
@@ -85,10 +85,10 @@
_('Semesterplan'),
[
'editable' => true,
- 'selectable' => ($fullcalendar_studip_urls['add'] != null),
+ 'selectable' => isset($fullcalendar_studip_urls['add']),
'studip_urls' => $fullcalendar_studip_urls,
- 'minTime' => ($min_time),
- 'maxTime' => ($max_time),
+ 'minTime' => $min_time,
+ 'maxTime' => $max_time,
'allDaySlot' => false,
'columnHeaderFormat' => ['weekday'=> 'short'],
'header' => [
diff --git a/app/views/search/breadcrumb.php b/app/views/search/breadcrumb.php
index acbfbe5be68fa8064c5ada81d548208f4742b76d..5d74fbc727f82f18493c53afc9e3d392c84dafc0 100644
--- a/app/views/search/breadcrumb.php
+++ b/app/views/search/breadcrumb.php
@@ -3,9 +3,9 @@
<? $sum_points = count($bc_points) - 1; ?>
<? $index = 0; ?>
<? foreach($bc_points as $type => $point):?>
- <? $id2 = reset(array_values((array) $point['add'])); ?>
- <? $link = $controller->action_link('' . $point['actn'], $point['id'], $id2); ?>
- <? if (is_array($point['add'])) : ?>
+ <? $id2 = array_values((array) ($point['add'] ?? []))[0] ?? null; ?>
+ <? $link = $controller->action_link('' . $point['actn'], $point['id'] ?? null, $id2); ?>
+ <? if (isset($point['add']) && is_array($point['add'])) : ?>
<? $mvv_object = $type::find($point['id']); ?>
<? if ($mvv_object && $type == 'Fach' && $additional_object = Abschluss::find($point['add']['Abschluss'])) : ?>
<a href="<?= $link ?>"><?= htmlReady($mvv_object->getDisplayName() . ' (' . $additional_object->name . ')') ?></a>
@@ -16,7 +16,7 @@
<? else : ?>
<? if ($type == 'StudiengangTeil' && $mvv_object = $type::find($point['id'])) : ?>
<a href="<?= $link ?>"><?= htmlReady($mvv_object->getDisplayName(ModuleManagementModel::DISPLAY_FACH)) ?></a>
- <? elseif ($point['id'] && $mvv_object = $type::find($point['id'])) : ?>
+ <? elseif (!empty($point['id']) && $mvv_object = $type::find($point['id'])) : ?>
<a href="<?= $link ?>"><?= htmlReady($mvv_object->getDisplayName(0)) ?></a>
<? else : ?>
<a href="<?= $link ?>"><?= htmlReady($point['name']) ?></a>
diff --git a/app/views/shared/modul/_modul.php b/app/views/shared/modul/_modul.php
index c9536340a774abe47395d3c9b65328113e61f622..0bf1e215b579ee50d2b916fa181085c615cc6208 100644
--- a/app/views/shared/modul/_modul.php
+++ b/app/views/shared/modul/_modul.php
@@ -9,7 +9,7 @@
<th class="mvv-modul-details-head" data-mvv-field="mvv_modul.code"><?= htmlReady($modul->code) ?></th>
<th class="mvv-modul-details-head" data-mvv-field="mvv_modul.kp" style="text-align: right;"><?= sprintf("%d CP", $modul->kp) ?></th>
</tr>
- <? if ($show_synopse || $modul->fassung_nr): ?>
+ <? if (!empty($show_synopse) || $modul->fassung_nr): ?>
<tr>
<th colspan="2" style="font-weight: normal;">
<? if ($show_synopse) : ?>
@@ -44,7 +44,7 @@
</tr>
<tr>
<td><strong><?= _('Semester der erstmaligen Durchführung') ?></strong></td>
- <td data-mvv-field="mvv_modul.start"><?= htmlReady($startSemester['name']) ?></td>
+ <td data-mvv-field="mvv_modul.start"><?= htmlReady($startSemester['name'] ?? '') ?></td>
</tr>
<? if ($instituteName) : ?>
<tr>
@@ -77,7 +77,7 @@
?>
<li data-mvv-field="mvv_stgteilabschnitt_modul" data-mvv-id="<?= $affect_id; ?>" data-mvv-cooid="<?= $modul->getId(); ?>">
<?= htmlReady($path)?>
- <? if (!$download && (count($pathes) > 9 && $i == 4)) : ?>
+ <? if (empty($download) && count($pathes) > 9 && $i == 4) : ?>
<label class="cb-more-label" for="cb_more_studycourses"><?= _('mehr...') ?></label>
<? endif; ?>
</li>
diff --git a/lib/classes/StudipSemTreeViewSimple.class.php b/lib/classes/StudipSemTreeViewSimple.class.php
index 560f7ccb1cba8130699dcffe1b582505be6640fd..e2dba76020318f1e244f5f6c7b62373560d3fa63 100644
--- a/lib/classes/StudipSemTreeViewSimple.class.php
+++ b/lib/classes/StudipSemTreeViewSimple.class.php
@@ -175,11 +175,8 @@ class StudipSemTreeViewSimple
public function getInfoIcon($item_id)
{
- if ($item_id === 'root') {
- $info = $this->root_content;
- }
- $ret = $info ? tooltipicon(kill_format($info)) : '';
- return $ret;
+ $info = $item_id === 'root' ? $this->root_content : '';
+ return $info ? tooltipicon(kill_format($info)) : '';
}
public function showContent($item_id, $num_all_entries = 0)
diff --git a/lib/classes/sidebar/RoomSearchWidget.class.php b/lib/classes/sidebar/RoomSearchWidget.class.php
index 85052888754c9343b3957766aec891b14ef03b41..c1a3d6a856f92571cd868612a1a52ca761f0067c 100644
--- a/lib/classes/sidebar/RoomSearchWidget.class.php
+++ b/lib/classes/sidebar/RoomSearchWidget.class.php
@@ -339,8 +339,12 @@ class RoomSearchWidget extends SidebarWidget
$properties[$name] = $criteria['value'];
}
- if ($properties[$name][0] && $properties[$name][1] &&
- ($properties[$name][0] > $properties[$name][1]) && $name != 'room_category_id') {
+ if (
+ isset($properties[$name][0], $properties[$name][1])
+ && $properties[$name][0] && $properties[$name][1]
+ && $properties[$name][0] > $properties[$name][1]
+ && $name !== 'room_category_id'
+ ) {
//A range is selected, but the range start is bigger
//then the range end. That's an error!
diff --git a/lib/models/Abschluss.php b/lib/models/Abschluss.php
index 1c4fbe6fc2cc0113e469420346f89c704468adff..a3299c8ab02131fd37c6828e1e470f14c5b74c5f 100644
--- a/lib/models/Abschluss.php
+++ b/lib/models/Abschluss.php
@@ -13,7 +13,6 @@
* @category Stud.IP
* @since 3.5
*/
-
class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject
{
protected static function configure($config = [])
@@ -47,16 +46,21 @@ class Abschluss extends ModuleManagementModelTreeItem implements PrivacyObject
'order_by' => 'GROUP BY fach_id ORDER BY name'
];
- $config['additional_fields']['count_faecher']['get'] =
- function($abschluss) { return $abschluss->count_faecher; };
- $config['additional_fields']['kategorie_name']['get'] =
- function($abschluss) { return $abschluss->kategorie_name; };
- $config['additional_fields']['kategorie_id']['get'] =
- function($abschluss) { return $abschluss->category_assignment->kategorie_id; };
- $config['additional_fields']['count_studiengaenge']['get'] =
- function($abschluss) { return $abschluss->count_studiengaenge; };
- $config['additional_fields']['count_objects']['get'] =
- function($abschluss) { return $abschluss->count_objects; };
+ $config['additional_fields']['count_faecher']['get'] = function (Abschluss $abschluss) {
+ return $abschluss->count_faecher;
+ };
+ $config['additional_fields']['kategorie_name']['get'] = function (Abschluss $abschluss) {
+ return $abschluss->kategorie_name;
+ };
+ $config['additional_fields']['kategorie_id']['get'] = function (Abschluss $abschluss) {
+ return $abschluss->category_assignment ? $abschluss->category_assignment->kategorie_id : null;
+ };
+ $config['additional_fields']['count_studiengaenge']['get'] = function (Abschluss $abschluss) {
+ return $abschluss->count_studiengaenge;
+ };
+ $config['additional_fields']['count_objects']['get'] = function (Abschluss $abschluss) {
+ return $abschluss->count_objects;
+ };
$config['additional_fields']['count_user']['get'] = 'countUser';
$config['i18n_fields']['name'] = true;
diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php
index 6e55e4e89fa992634ac95b215b6b84642f1b6d40..6934563e97bc7fefdc7b14f720b9e4d6fd015c1b 100644
--- a/lib/models/Semester.class.php
+++ b/lib/models/Semester.class.php
@@ -268,6 +268,10 @@ class Semester extends SimpleORMap
$use_semester_id = true
)
{
+ $select_attributes = array_merge([
+ 'name' => 'sem_select',
+ ], $select_attributes ?? []);
+
$semester = Semester::findAllVisible();
unset($semester[0]);
@@ -280,10 +284,6 @@ class Semester extends SimpleORMap
}
$semester = array_reverse($semester, true);
- if (!$select_attributes['name']) {
- $select_attributes['name'] = 'sem_select';
- }
-
$template = $GLOBALS['template_factory']->open('shared/semester-selector');
$template->semesters = $semester;
$template->select_attributes = $select_attributes;