diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index 2f38e4043..d65eecec0 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -52,7 +52,7 @@ class IndexController extends Zend_Controller_Action //station feed episodes $stationPodcastId = Application_Model_Preference::getStationPodcastId(); $podcastEpisodesService = new Application_Service_PodcastEpisodeService(); - $episodes = $podcastEpisodesService->getPodcastEpisodes($stationPodcastId); + $episodes = $podcastEpisodesService->getPodcastEpisodes($stationPodcastId, 0, 0); foreach ($episodes as $e => $v) { $episodes[$e]["CcFiles"]["track_title"] = htmlspecialchars($v["CcFiles"]["track_title"], ENT_QUOTES); $episodes[$e]["CcFiles"]["artist_name"] = htmlspecialchars($v["CcFiles"]["artist_name"], ENT_QUOTES); @@ -64,12 +64,15 @@ class IndexController extends Zend_Controller_Action $episodes[$e]["CcFiles"]["length"] = $length[0]; } - $this->view->episodes = json_encode($episodes); + $episodePages = array_chunk($episodes, 10); + + $this->view->episodes = json_encode($episodePages, JSON_FORCE_OBJECT); $this->view->displayRssTab = (!Application_Model_Preference::getStationPodcastPrivacy()); $stationPodcast = PodcastQuery::create()->findOneByDbId($stationPodcastId); $url = $stationPodcast->getDbUrl(); $this->view->stationPodcastRssUrl = $url; + } public function mainAction() diff --git a/airtime_mvc/application/services/PodcastEpisodeService.php b/airtime_mvc/application/services/PodcastEpisodeService.php index 2113fabd4..d54850193 100644 --- a/airtime_mvc/application/services/PodcastEpisodeService.php +++ b/airtime_mvc/application/services/PodcastEpisodeService.php @@ -253,7 +253,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir $episodes = PodcastEpisodesQuery::create() ->filterByDbPodcastId($podcastId); - if ($isStationPodcast) { + if ($isStationPodcast && $limit != 0) { $episodes = $episodes->setLimit($limit); } // XXX: We should maybe try to alias this so we don't pass CcFiles as an array key to the frontend. diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml index e29539a75..e3f71fdcd 100644 --- a/airtime_mvc/application/views/scripts/index/index.phtml +++ b/airtime_mvc/application/views/scripts/index/index.phtml @@ -58,28 +58,29 @@