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

1 files changed, 2 insertions, 29 deletions

diff --git a/model/Overview.php b/model/Overview.php
index 10507cc..f02f9f2 100644
--- a/model/Overview.php
+++ b/model/Overview.php
@@ -1,13 +1,11 @@
 <?php
 
-require_once('model/Room.php');
-
-class Overview
+class Overview extends ModelBase
 {
 	public function getGroups() {
 		$groups = array();
 
-		foreach(get('OVERVIEW.GROUPS') as $group => $rooms)
+		foreach($this->get('OVERVIEW.GROUPS') as $group => $rooms)
 		{
 			foreach($rooms as $room)
 			{
@@ -24,29 +22,4 @@ class Overview
 
 		return $groups;
 	}
-
-	public function getReleasesUrl() {
-		return get('OVERVIEW.RELEASES');
-	}
-
-	public function getReliveUrl() {
-		if(has('OVERVIEW.RELIVE'))
-			return get('OVERVIEW.RELIVE');
-
-		elseif(has('OVERVIEW.RELIVE_JSON'))
-			return 'relive/';
-
-		else
-			return null;
-	}
-
-
-
-	public function hasRelive() {
-		return has('OVERVIEW.RELIVE') || has('OVERVIEW.RELIVE_JSON');
-	}
-
-	public function hasReleases() {
-		return has('OVERVIEW.RELEASES');
-	}
 }