From ea4b6c7699a7fbb7be3d9e5ce86c84a36b63f569 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 15 Mar 2015 19:13:25 +0100 Subject: 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 --- model/Overview.php | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) (limited to 'model/Overview.php') 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 @@ $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'); - } } -- cgit v1.2.3