Merge branch 'main' into issue-3911issue-3911

7 files changed, 46 insertions, 27 deletions

diff --git a/app/views/course/wizard/steps/basicdata/index.php b/app/views/course/wizard/steps/basicdata/index.php
index e1f10a4..f19643a 100644
--- a/app/views/course/wizard/steps/basicdata/index.php
+++ b/app/views/course/wizard/steps/basicdata/index.php
@@ -123,7 +123,7 @@
     </div>
 </section>
 
-<?php if ($dsearch) : ?>
+<?php if (isset($dsearch)) : ?>
 <section>
     <label for="deputy_id_3">
         <?= _('Vertretungen') ?>
diff --git a/app/views/course/wizard/steps/lvgroups/_node.php b/app/views/course/wizard/steps/lvgroups/_node.php
index 8b159bd..78db2f1 100644
--- a/app/views/course/wizard/steps/lvgroups/_node.php
+++ b/app/views/course/wizard/steps/lvgroups/_node.php
@@ -1,4 +1,4 @@
-<? if (!$search_result || in_array($node->id, $search_result)) : ?>
+<? if (empty($search_result) || in_array($node->id, $search_result)) : ?>
 <? $id = $node->id . '-' . $pos_id; ?>
     <? if (!count($children)) : ?>
         <li><?= _('Keine Module verfügbar') ?></li>
diff --git a/app/views/course/wizard/steps/lvgroups/index.php b/app/views/course/wizard/steps/lvgroups/index.php
index 744cc94..0d8e196 100644
--- a/app/views/course/wizard/steps/lvgroups/index.php
+++ b/app/views/course/wizard/steps/lvgroups/index.php
@@ -17,25 +17,33 @@
         </li>
     </ul>
 </div>
-<? if (!$values['locked']) : ?>
+<? if (empty($values['locked'])) : ?>
 
-	<div id="lvgroup-tree-open-nodes">
-	<? foreach ($open_lvg_nodes as $opennode) : ?>
-		<input type="hidden" name="open_lvg_nodes[]" value="<?= $opennode; ?>">
-	<? endforeach; ?>
-	</div>
+    <div id="lvgroup-tree-open-nodes">
+    <? foreach ($open_lvg_nodes as $opennode) : ?>
+        <input type="hidden" name="open_lvg_nodes[]" value="<?= $opennode; ?>">
+    <? endforeach; ?>
+    </div>
 
     <div id="studyareas" data-ajax-url="<?= $ajax_url ?>"
         data-forward-url="<?= $no_js_url ?>" data-no-search-result="<?=_('Es wurde kein Suchergebnis gefunden.') ?>">
         <h2><?= _('Lehrveranstaltungsgruppen Suche') ?></h2>
         <div>
             <input type="text" size="40" style="width: auto;" name="search" id="lvgroup-tree-search"
-                   value="<?= $values['searchterm'] ?>">
+                   value="<?= htmlReady($values['searchterm'] ?? '') ?>">
             <span id="lvgroup-tree-search-start">
-                <?= Icon::create('search', 'clickable')->asInput(["name" => 'start_search', "onclick" => "return STUDIP.MVV.CourseWizard.searchTree()", "class" => $search_result?'hidden-no-js':'']) ?>
+                <?= Icon::create('search')->asInput([
+                    'name'    => 'start_search',
+                    'onclick' => 'return STUDIP.MVV.CourseWizard.searchTree()',
+                    'class'   => !empty($search_result) ? 'hidden-no-js' : '',
+                ]) ?>
             </span>
             <span id="lvgroup-tree-search-reset" class="hidden-js">
-                <?= Icon::create('refresh', 'clickable')->asInput(["name" => 'reset_search', "onclick" => "return STUDIP.MVV.CourseWizard.resetSearch()", "class" => $search_result?'':' hidden-no-js']) ?>
+                <?= Icon::create('refresh')->asInput([
+                    'name'    => 'reset_search',
+                    'onclick' => 'return STUDIP.MVV.CourseWizard.resetSearch()',
+                    'class'   => !empty($search_result) ? '' : ' hidden-no-js',
+                ]) ?>
             </span>
         </div>
 
@@ -56,23 +64,25 @@
                 <? $pos_id = 1; ?>
                 <? foreach ((array) $tree as $node) : ?>
                     <? $children = $node->getChildren() ?>
-                    <? if (count($children)) : ?>
-                    <?= $this->render_partial('lvgroups/_node',
-                        ['node' => $node, 'pos_id' => $pos_id++,
-                            'open_nodes' => $open_lvg_nodes ?: [],
-                            'search_result' => $search_result ?: [],
-                            'children' => $node->getChildren()]) ?>
+                    <? if (count($children) > 0) : ?>
+                    <?= $this->render_partial('lvgroups/_node', [
+                        'node'          => $node,
+                        'pos_id'        => $pos_id++,
+                        'open_nodes'    => $open_lvg_nodes ?: [],
+                        'search_result' => $search_result ?? [],
+                        'children'      => $node->getChildren(),
+                    ]) ?>
                     <? endif ?>
                 <? endforeach; ?>
                 </ul>
             </li>
         </ul>
     </div>
-    <? if ($values['open_lvg_nodes']) : ?>
+    <? if (!empty($values['open_lvg_nodes'])) : ?>
     <input type="hidden" name="open_nodes" value="<?= json_encode($values['open_lvg_nodes']) ?>"/>
     <? endif; ?>
-    <? if ($values['searchterm']) : ?>
-    <input type="hidden" name="searchterm" value="<?= $values['searchterm'] ?>"/>
+    <? if (!empty($values['searchterm'])) : ?>
+    <input type="hidden" name="searchterm" value="<?= htmlReady($values['searchterm']) ?>">
     <? endif; ?>
     <script>
     //<!--
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
index 09d2405..a7e2cd0 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_entry.php
@@ -2,7 +2,7 @@
 # Lifter010: TODO
 $_id = htmlReady(implode('_', (array) $area->getId()));
 ?>
-<li id="lvgroup-tree-assigned-<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgroup-tree-assigned-<?= $_id ?>">
 <? if (!$locked) : ?>
    <?= Icon::create('trash', 'clickable')->asInput(["name" => 'lvgruppe_selection[remove]['.$_id.']', "onclick" => "return STUDIP.MVV.CourseWizard.removeLVGroup('".$_id."')", "class" => '',
        "data-id" => $_id, "data-course_id" => htmlReady($course_id)]) ?>
diff --git a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
index a6715da..7c51448 100644
--- a/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
+++ b/app/views/course/wizard/steps/lvgroups/lvgroup_searchentry.php
@@ -1,7 +1,7 @@
 <?php
 $_id = htmlReady(implode('_', (array) $area->getId()));
 ?>
-<li id="lvgruppe_search_<?= $_id ?>" class="<?= TextHelper::cycle('odd', 'even') ?>">
+<li id="lvgruppe_search_<?= $_id ?>">
 
    <?= Icon::create('arr_2left', Icon::ROLE_SORT)->asInput([
        'name'    => "assign[{$_id}]",
diff --git a/app/views/course/wizard/steps/studyareas/_assigned_node.php b/app/views/course/wizard/steps/studyareas/_assigned_node.php
index 459cddd..9525fc8 100644
--- a/app/views/course/wizard/steps/studyareas/_assigned_node.php
+++ b/app/views/course/wizard/steps/studyareas/_assigned_node.php
@@ -1,12 +1,12 @@
 <li class="sem-tree-assigned-<?= $element['id'] ?>">
     <?= htmlReady($element['name']) ?>
-    <?php if (!$values['locked'] && $element['assignable'] && in_array($element['id'], $studyareas ?: [])) : ?>
-        <?= Icon::create('trash', 'clickable')->asInput(["name" => 'unassign['.$element['id'].']', "onclick" => "return STUDIP.CourseWizard.unassignNode('".$element['id']."')"]) ?>
-    <input type="hidden" name="studyareas[]" value="<?= $element['id'] ?>"/>
+    <?php if (empty($values['locked']) && $element['assignable'] && in_array($element['id'], $studyareas ?: [])) : ?>
+        <?= Icon::create('trash')->asInput(["name" => 'unassign['.$element['id'].']', "onclick" => "return STUDIP.CourseWizard.unassignNode('".$element['id']."')"]) ?>
+    <input type="hidden" name="studyareas[]" value="<?= htmlReady($element['id']) ?>"/>
     <?php endif ?>
     <ul>
         <?php foreach ($element['children'] as $c) : ?>
         <?= $this->render_partial('studyareas/_assigned_node', ['element' => $c]) ?>
         <?php endforeach ?>
     </ul>
-</li>
\ No newline at end of file
+</li>
diff --git a/app/views/course/wizard/summary.php b/app/views/course/wizard/summary.php
index 5217bac..ec5a646 100644
--- a/app/views/course/wizard/summary.php
+++ b/app/views/course/wizard/summary.php
@@ -1,4 +1,13 @@
-<form class="default" action="<?= $controller->url_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post">
+<?php
+/**
+ * @var Course_WikiController $controller
+ * @var int $stepnumber
+ * @var string $temp_id
+ * @var bool $dialog
+ * @var Course|null $source_course
+ */
+?>
+<form class="default" action="<?= $controller->link_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post">
 <fieldset>
     <legend><?= _('Anlegen der Veranstaltung') ?></legend>