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

fixes #3793

Closes #3793

Merge request studip/studip!2671
parent 12cbd92f
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ class CoursePublicFolder extends StandardFolder ...@@ -59,7 +59,7 @@ class CoursePublicFolder extends StandardFolder
*/ */
public function hasWorldwideAccess() public function hasWorldwideAccess()
{ {
return (bool) $this->folderdata['data_content']['worldwide_access']; return !empty($this->folderdata['data_content']['worldwide_access']);
} }
......
...@@ -107,7 +107,7 @@ class HiddenFolder extends PermissionEnabledFolder ...@@ -107,7 +107,7 @@ class HiddenFolder extends PermissionEnabledFolder
public function __get($attribute) public function __get($attribute)
{ {
if ($attribute === 'download_allowed') { if ($attribute === 'download_allowed') {
return $this->folderdata['data_content']['download_allowed']; return !empty($this->folderdata['data_content']['download_allowed']);
} }
return $this->folderdata[$attribute]; return $this->folderdata[$attribute];
} }
......
...@@ -123,8 +123,8 @@ class TimedFolder extends PermissionEnabledFolder ...@@ -123,8 +123,8 @@ class TimedFolder extends PermissionEnabledFolder
$this->folderdata['data_content']['permission'] = $this->permission; $this->folderdata['data_content']['permission'] = $this->permission;
} }
$this->start_time = intval($this->folderdata['data_content']['start_time']); $this->start_time = intval($this->folderdata['data_content']['start_time'] ?? 0);
$this->end_time = intval($this->folderdata['data_content']['end_time']); $this->end_time = intval($this->folderdata['data_content']['end_time'] ?? 0);
$this->must_have_perm = 'tutor'; $this->must_have_perm = 'tutor';
} }
......
...@@ -10,7 +10,7 @@ $dates = CourseDate::findByRange_id($folder->range_id); ...@@ -10,7 +10,7 @@ $dates = CourseDate::findByRange_id($folder->range_id);
</option> </option>
<? endif; ?> <? endif; ?>
<? foreach ($dates as $one_date): ?> <? foreach ($dates as $one_date): ?>
<option <?= @$date->id === $one_date->id ? 'selected' : '' ?> value="<?= htmlReady($one_date->id) ?>"> <option <?= isset($date) && $date->id === $one_date->id ? 'selected' : '' ?> value="<?= htmlReady($one_date->id) ?>">
<?= htmlReady(CourseDateFolder::formatDate($one_date)) ?> <?= htmlReady(CourseDateFolder::formatDate($one_date)) ?>
</option> </option>
<? endforeach; ?> <? endforeach; ?>
......
...@@ -22,12 +22,11 @@ ...@@ -22,12 +22,11 @@
</strong> </strong>
<br> <br>
<? endif ?> <? endif ?>
<? if ($folder->data_content['permission'] == 3) : ?> <? if (isset($folder->data_content['permission']) && $folder->data_content['permission'] == 3): ?>
<div> <div>
<?= _("Dieser Ordner ist ein Hausaufgabenordner. Es können nur Dateien eingestellt werden.") ?> <?= _("Dieser Ordner ist ein Hausaufgabenordner. Es können nur Dateien eingestellt werden.") ?>
</div> </div>
<? endif ?> <? elseif (isset($folder->data_content['permission']) && $folder->data_content['permission'] == 5): ?>
<? if ($folder->data_content['permission'] == 5) : ?>
<div> <div>
<?= _('Ein Ordner für Materialien, welche nur zum Download zu Verfügung gestellt werden sollen.') ?> <?= _('Ein Ordner für Materialien, welche nur zum Download zu Verfügung gestellt werden sollen.') ?>
</div> </div>
......
<label> <label>
<?= _('Sichtbar ab') ?> <?= _('Sichtbar ab') ?>
<input type="text" name="start_time" id="start_time" data-datetime-picker <input type="text" name="start_time" id="start_time" data-datetime-picker
value="<?= $folder->data_content['start_time'] ? value="<?= !empty($folder->data_content['start_time']) ?
date('d.m.Y H:i', $folder->data_content['start_time']) : date('d.m.Y H:i', $folder->data_content['start_time']) :
_('unbegrenzt') ?>" _('unbegrenzt') ?>"
placeholder="<?= _('unbegrenzt') ?>"> placeholder="<?= _('unbegrenzt') ?>">
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
<label> <label>
<?= _('Sichtbar bis') ?> <?= _('Sichtbar bis') ?>
<input type="text" name="end_time" id="end_time" data-datetime-picker <input type="text" name="end_time" id="end_time" data-datetime-picker
value="<?= $folder->data_content['end_time'] ? date('d.m.Y H:i', $folder->data_content['end_time']) : value="<?= !empty($folder->data_content['end_time']) ? date('d.m.Y H:i', $folder->data_content['end_time']) :
_('unbegrenzt') ?>" _('unbegrenzt') ?>"
placeholder="<?= _('unbegrenzt') ?>"> placeholder="<?= _('unbegrenzt') ?>">
</label> </label>
<label> <label>
<input name="perm_read" type="checkbox" value="1" <? if ($folder->data_content['permission'] & 4) echo 'checked'; ?>> <input name="perm_read" type="checkbox" value="1" <? if (isset($folder->data_content['permission']) && $folder->data_content['permission'] & 4) echo 'checked'; ?>>
<strong>r</strong> - <?= _('Lesen (Dateien können heruntergeladen werden)') ?> <strong>r</strong> - <?= _('Lesen (Dateien können heruntergeladen werden)') ?>
</label> </label>
<label> <label>
<input name="perm_write" type="checkbox" value="1" <? if ($folder->data_content['permission'] & 2) echo 'checked'; ?>> <input name="perm_write" type="checkbox" value="1" <? if (isset($folder->data_content['permission']) && $folder->data_content['permission'] & 2) echo 'checked'; ?>>
<strong>w</strong> - <?= _('Schreiben (Dateien können hochgeladen werden)') ?> <strong>w</strong> - <?= _('Schreiben (Dateien können hochgeladen werden)') ?>
</label> </label>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment