Move get/set-Calls into ModelBase and abstract all access into a Model

Conflicts:
	model/Overview.php
	model/Room.php
	model/StreamList.php
	tests/ModelTestbase.php

5 files changed, 27 insertions, 26 deletions

diff --git a/template/assemblies/banner.phtml b/template/assemblies/banner.phtml
index 02db100..f818b30 100644
--- a/template/assemblies/banner.phtml
+++ b/template/assemblies/banner.phtml
@@ -1,4 +1,5 @@
-<? if(has('CONFERENCE.BANNER_HTML')) ?>
-<div class="banner">
-	<?=get('CONFERENCE.BANNER_HTML')?>
-</div>
+<? if($conference->hasBannerHtml()): ?>
+	<div class="banner">
+		<?=$conference->getBannerHtml()?>
+	</div>
+<? endif ?>
diff --git a/template/assemblies/footer.phtml b/template/assemblies/footer.phtml
index 2c5ab5d..619eff8 100644
--- a/template/assemblies/footer.phtml
+++ b/template/assemblies/footer.phtml
@@ -1,6 +1,6 @@
 <footer>
-	<? if(has('CONFERENCE.FOOTER_HTML')): ?>
-		<?= get('CONFERENCE.FOOTER_HTML') ?>
+	<? if($conference->hasFooterHtml()): ?>
+		<?= $conference->getFooterHtml() ?>
 	<? else: ?>
 		by <a href="https://c3voc.de">c3voc</a>
 	<? endif ?>
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index 50eb9cb..cb6b991 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -3,22 +3,22 @@
 		<div class="navbar-header">
 			<a class="navbar-brand" href="">
 				<i class="icon"></i>
-				<?=h(get('CONFERENCE.TITLE', 'C3Voc Streaming'))?>
+				<?=h($conference->getTitle())?>
 			</a>
 		</div>
 
 		<div class="nav navbar-form navbar-right button-wrapper">
-			<? if(has('FEEDBACK')): ?>
-				<a class="form-control btn btn-default" href="feedback/">
+			<? if($feedback->isEnabled()): ?>
+				<a class="form-control btn btn-default" href="<?=h($feedback->getUrl())?>">
 					<span class="fa fa-bullhorn"></span>
 				</a>
 			<? endif ?>
-			<? if(has('OVERVIEW.RELEASES')): ?>
-				<a class="form-control btn btn-default" href="<?=h(get('OVERVIEW.RELEASES'))?>">
+			<? if($conference->hasReleases()): ?>
+				<a class="form-control btn btn-default" href="<?=h($conference->getReleasesUrl())?>">
 					<span class="fa fa-video-camera"></span>
 				</a>
 			<? endif ?>
-			<a class="form-control btn btn-default" href="about/">
+			<a class="form-control btn btn-default" href="<?=h($conference->getAboutUrl())?>">
 				<span class="fa fa-info"></span>
 			</a>
 		</div>
diff --git a/template/overview.phtml b/template/overview.phtml
index f0eb2d2..8e26423 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -89,9 +89,9 @@
 		</div>
 	<? endforeach ?>
 
-	<? if($overview->hasReleases() || $overview->hasRelive()): ?>
+	<? if($conference->hasReleases() || $conference->hasRelive()): ?>
 		<?
-			$class = ($overview->hasReleases() && $overview->hasRelive()) ?
+			$class = ($conference->hasReleases() && $conference->hasRelive()) ?
 				// both enabled
 				'col-sm-6 col-xs-12' :
 
@@ -104,11 +104,11 @@
 				<h2>Recordings</h2>
 			</div>
 
-			<? if($overview->hasReleases()): ?>
+			<? if($conference->hasReleases()): ?>
 				<div class="<?=h($class)?>">
 					<div class="panel panel-primary">
 						<div class="panel-body">
-							<a href="<?=h($overview->getReleasesUrl())?>">
+							<a href="<?=h($conference->getReleasesUrl())?>">
 								<span class="fa fa-video-camera"></span> Releases
 							</a>
 						</div>
@@ -116,11 +116,11 @@
 				</div>
 			<? endif ?>
 
-			<? if($overview->hasRelive()): ?>
+			<? if($conference->hasRelive()): ?>
 				<div class="<?=h($class)?>">
 					<div class="panel panel-primary">
 						<div class="panel-body">
-							<a href="<?=h($overview->getReliveUrl())?>">
+							<a href="<?=h($conference->getReliveUrl())?>">
 								<span class="fa fa-play-circle"></span> ReLive
 							</a>
 						</div>
diff --git a/template/page.phtml b/template/page.phtml
index 9af5d7b..58f502c 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -8,20 +8,20 @@
 
 <? include("$assemblies/motd.phtml") ?>
 
-		<title><?=h($title)?> – <?=h(get('CONFERENCE.TITLE', 'C3Voc'))?> Streaming</title>
+		<title><?=h($title)?> – <?=h($conference->getTitle())?> Streaming</title>
 
 		<meta name="robots" content="index,follow" />
 
-		<? if(has('CONFERENCE.AUTHOR')): ?>
-			<meta name="author" content="<?=h(get('CONFERENCE.AUTHOR'))?>" />
+		<? if($conference->hasAuthor()): ?>
+			<meta name="author" content="<?=h($conference->getAuthor())?>" />
 		<? endif ?>
 
-		<? if(has('CONFERENCE.DESCRIPTION')): ?>
-			<meta name="description" content="<?=h(get('CONFERENCE.DESCRIPTION'))?>" />
+		<? if($conference->hasDescription()): ?>
+			<meta name="description" content="<?=h($conference->getDescription())?>" />
 		<? endif ?>
 
-		<? if(has('CONFERENCE.KEYWORDS')): ?>
-			<meta name="keywords" content="<?=h(get('CONFERENCE.KEYWORDS'))?>" />
+		<? if($conference->hasKeywords()): ?>
+			<meta name="keywords" content="<?=h($conference->getKeywords())?>" />
 		<? endif ?>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -57,7 +57,7 @@
 		<? include("$assemblies/footer.phtml") ?>
 
 		<span class="js-settings"
-			data-scheduleoffset="<?=h(get('SCHEDULE.SIMULATE_OFFSET', 0))?>"
+			data-scheduleoffset="<?=h($schedule->getSimulationOffset())?>"
 		></span>
 	</body>
 </html>