fixes #4279, fixes #4281

Closes #4279 and #4281

Merge request studip/studip!3100

app/controllers/course/room_requests.php

@@ -583,9 +583,11 @@ class Course_RoomRequestsController extends AuthenticatedController
             $this->request->store();
 
             //Store the properties:
-            foreach ($_SESSION[$request_id]['selected_properties'] as $name => $state) {
-                if (!empty($state)) {
-                    $this->request->setProperty($name, $state);
+            if (isset($_SESSION[$request_id]['selected_properties'])) {
+                foreach ($_SESSION[$request_id]['selected_properties'] as $name => $state) {
+                    if (!empty($state)) {
+                        $this->request->setProperty($name, $state);
+                    }
                 }
             }
 

app/views/materialien/files/add_dokument.php

-<form class="default" action="<?= $controller->action_link('add_dokument', $origin,  $range_type, $range_id, $mvvfile_id) ?>" method="post" data-dialog="size=auto">
-    <input type="hidden" name="mvvfile_id" id="mvvfile_id" value="<?= htmlReady($mvvfile_id) ?>">
-    <input type="hidden" name="range_id" id="range_id" value="<?= htmlReady($range_id) ?>">
-    <input type="hidden" name="range_type" id="range_type" value="<?= htmlReady($range_type) ?>">
-
-
+<form class="default" action="<?= $controller->action_link('add_dokument', $origin ?? null,  $range_type ?? null, $range_id ?? null, $mvvfile_id ?? null) ?>" method="post" data-dialog="size=auto">
+    <input type="hidden" name="mvvfile_id" id="mvvfile_id" value="<?= htmlReady($mvvfile_id ?? '') ?>">
+    <input type="hidden" name="range_id" id="range_id" value="<?= htmlReady($range_id ?? null) ?>">
+    <input type="hidden" name="range_type" id="range_type" value="<?= htmlReady($range_type ?? null) ?>">
 
     <label>
         <?= _('Jahr') ?>
-        <input name="doc_year" type="text" value="<?= htmlReady($doc_year) ?>"<?= $perm->disable('year') ?>>
+        <input name="doc_year" type="text" value="<?= htmlReady($doc_year ?? '') ?>"<?= $perm->disable('year') ?>>
     </label>
 
-    <input type="hidden" name="doc_type" value="<?= $doc_type ?>">
+    <input type="hidden" name="doc_type" value="<?= htmlReady($doc_type ?? '') ?>">
     <label>
         <?= _('Art der Datei') ?>
         <select name="doc_type"<?= $perm->haveFieldPerm('type') ? '' : ' disable' ?>>
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $doc_type ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= isset($doc_type) && $key == $doc_type ? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
@@ -93,7 +93,9 @@
         <?= _('Kategoriezuordnung') ?>
         <select name="doc_cat">
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['CATEGORY']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == $doc_cat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= isset($doc_cat) && $key == $doc_cat ? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
@@ -103,13 +105,15 @@
         <select id="mvv-files-tags" multiple name="doc_tags[]">
             <option value=""></option>
         <? foreach ($GLOBALS['MVV_DOCUMENTS']['TAG']['values'] as $key => $entry) : ?>
-            <option value="<?= $key ?>"<?= $key == in_array($key, explode(';', $doc_tags))? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>
+            <option value="<?= htmlReady($key) ?>"<?= $key == in_array($key, explode(';', $doc_tags ?? ''))? ' selected' : '' ?>>
+                <?= htmlReady($entry['name']) ?>
+            </option>
         <? endforeach; ?>
         </select>
     </label>
 
     <label>
-        <input name="doc_extvisible" type="checkbox" value="1" <?= $doc_extvisible?'checked':''; ?>>
+        <input name="doc_extvisible" type="checkbox" value="1" <?= !empty($doc_extvisible) ? 'checked' : '' ?>>
         <?= _('Sichtbarkeit nach außen') ?>
     </label>
 

lib/models/AuxLockRule.php

@@ -164,7 +164,7 @@ class AuxLockRule extends SimpleORMap
             foreach ($this->datafields as $field => $useless_value_pls_refactor) {
 
                 // if standard get it from the mapping else get it from the datafield
-                if ($mapping[$field]) {
+                if (!empty($mapping[$field])) {
                     $result['head'][$field] = $head_mapping[$field];
                     $new[$field] = htmlReady($mapping[$field]);
                 } else {