From e13e16405ae6d568ba991a4d693c454b1e1f99a2 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Tue, 3 Mar 2015 23:28:14 +0100
Subject: Fix Stream-Selection in Feedback-Form

---
 template/assemblies/feedback.phtml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'template/assemblies')

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>
-- 
cgit v1.2.3