diff options
| author | MaZderMind | 2015-03-03 23:28:14 +0100 |
|---|---|---|
| committer | MaZderMind | 2015-03-03 23:28:14 +0100 |
| commit | e13e16405ae6d568ba991a4d693c454b1e1f99a2 (patch) | |
| tree | 9634599c03b0d832dec4d859f7b7e8a3f872b666 | |
| parent | 1cf6e0161c5e89909c6d51d15f8533d798d2dc4e (diff) | |
Fix Stream-Selection in Feedback-Form
| -rw-r--r-- | lib/helper.php | 13 | ||||
| -rw-r--r-- | template/assemblies/feedback.phtml | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/helper.php b/lib/helper.php index 50d381d..d23eb35 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -153,6 +153,19 @@ function room_has_slides($room) return count(array_intersect(array('slides'), $formats)) > 0; } +function room_get_possible_selections($room) +{ + $selections = array(); + + if(room_has_hd($room)) $selections[] = 'hd'; + if(room_has_sd($room)) $selections[] = 'sd'; + if(room_has_audio($room)) $selections[] = 'audio'; + if(room_has_music($room)) $selections[] = 'music'; + if(room_has_slides($room)) $selections[] = 'slides'; + + return $selections; +} + function room_has_rtmp($room) { $formats = get("ROOMS.$room.FORMATS"); diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml index 6979bfc..80df984 100644 --- a/template/assemblies/feedback.phtml +++ b/template/assemblies/feedback.phtml @@ -52,17 +52,14 @@ <label for="stream">Stream</label> <select class="form-control" name="stream" id="stream"> <option></option> - <? foreach(array('saal1', 'saal2', 'saalg', 'saal6', 'sendezentrum') as $roomIter): ?> - <? foreach($GLOBALS['CONFIG']['FORMATS'] as $formatIter => $formatDislay): ?> + <? foreach(get('ROOMS') as $roomSlug => $roomInfo): ?> + <? if(!has("ROOMS.$roomSlug.FEEDBACK")) continue ?> + <? foreach(room_get_possible_selections($roomSlug) as $selectionIter): ?> <option - <? if($roomIter == $room && $formatIter == $format): ?>selected<? endif ?> - value="<?=h("$roomIter-$formatIter")?>"><?=h($GLOBALS['CONFIG']['ROOMS'][$roomIter])?> – <?=h($formatDislay)?></option> + <? if($roomSlug == $room && $selectionIter == @$selection): ?>selected<? endif ?> + value="<?=h("$roomSlug-$selectionIter")?>"><?=h(get("ROOMS.$roomSlug.DISPLAY", $roomSlug))?> – <?=h($selectionIter)?></option> <? endforeach ?> <? endforeach ?> - - <? foreach(array('lounge', 'ambient') as $roomIter): ?> - <option value="<?=h("$roomIter")?>"><?=h($GLOBALS['CONFIG']['ROOMS'][$roomIter])?></option> - <? endforeach ?> </select> </div> </div> |