diff options
Diffstat (limited to '')
| -rw-r--r-- | model/Relive.php | 29 | ||||
| -rw-r--r-- | model/Schedule.php | 2 | ||||
| -rw-r--r-- | template/relive.phtml | 6 |
3 files changed, 35 insertions, 2 deletions
diff --git a/model/Relive.php b/model/Relive.php index 71a2e91..aa081a6 100644 --- a/model/Relive.php +++ b/model/Relive.php @@ -21,6 +21,8 @@ class Relive extends ModelBase $talks = file_get_contents($this->getJsonUrl()); $talks = (array)json_decode($talks, true); + $mapping = $this->getScheduleToRoomMapping(); + usort($talks, function($a, $b) { $sort = array('live', 'recorded', 'released'); return array_search($a['status'], $sort) > array_search($b['status'], $sort); @@ -34,6 +36,13 @@ class Relive extends ModelBase else $talk['url'] = 'relive/'.rawurlencode($talk['id']).'/'; + if(isset($mapping[$talk['room']])) + { + $room = $mapping[$talk['room']]; + $talk['room'] = $room->getDisplay(); + $talk['roomlink'] = $room->getLink(); + } + $talks_by_id[$talk['id']] = $talk; } @@ -86,4 +95,24 @@ class Relive extends ModelBase { return 'RELIVE.'.$this->getJsonUrl(); } + + private function getScheduleToRoomMapping() + { + $schedule = new Schedule(); + $mapping = array(); + + foreach($schedule->getScheduleToRoomSlugMapping() as $schedule => $slug) + { + try { + $mapping[$schedule] = new Room($slug); + } + catch(NotFoundException $e) + { + // + } + } + + return $mapping; + } + } diff --git a/model/Schedule.php b/model/Schedule.php index 42849d1..7ff66af 100644 --- a/model/Schedule.php +++ b/model/Schedule.php @@ -258,7 +258,7 @@ class Schedule extends ModelBase return 'SCHEDULE.'.$this->getScheduleUrl(); } - private function getScheduleToRoomSlugMapping() + public function getScheduleToRoomSlugMapping() { $mapping = array(); foreach($this->get('ROOMS') as $slug => $room) diff --git a/template/relive.phtml b/template/relive.phtml index e59f366..0ca33be 100644 --- a/template/relive.phtml +++ b/template/relive.phtml @@ -54,7 +54,11 @@ </li> <li> <span class="fa fa-sign-in"></span> - <?=h($talk['room'])?> + <? if(isset($talk['roomlink'])): ?> + <a href="<?=h($talk['roomlink'])?>"><?=h($talk['room'])?></a> + <? else: ?> + <?=h($talk['room'])?> + <? endif ?> </li> </ul> |