diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/feedback-read.php | 5 | ||||
| -rw-r--r-- | view/streams-json-v2.php | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/view/feedback-read.php b/view/feedback-read.php index ba7a985..b0f3b33 100644 --- a/view/feedback-read.php +++ b/view/feedback-read.php @@ -7,9 +7,9 @@ if(!$feedback->isLoggedIn()) exit; } -$from = isset($_POST['from']) ? strtotime($_POST['from']) : strtotime('2000-01-01'); +$from = isset($_POST['from']) ? strtotime($_POST['from']) : time(); $to = isset($_POST['to']) ? strtotime($_POST['to']) : time() + 24*60*60; -$cols = isset($_POST['col']) ? $_POST['col'] : array('reported', 'stream', 'player', 'issuetext'); +$cols = isset($_POST['col']) ? $_POST['col'] : array('reported', 'stream', 'os', 'player', 'issues', 'issuetext'); $allcols = array('reported', 'datetime', 'net', 'os', 'stream', 'player', 'ipproto_v4', 'ipproto_v6', 'provider', 'issues', 'issuetext'); @@ -23,4 +23,5 @@ echo $tpl->render(array( 'columns' => array_intersect($allcols, $cols), 'allcolumns' => $allcols, + 'hostname' => shell_exec('hostname -f'), )); diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php index 5302e16..7f070dd 100644 --- a/view/streams-json-v2.php +++ b/view/streams-json-v2.php @@ -9,14 +9,17 @@ foreach (Conferences::getActiveConferences() as $conference) $now = $conference->getSchedule()->getScheduleDisplayTime($basetime); $overview = $conference->getOverview(); - $isInDayChange = false; + $isCurrentlyStreaming = false; foreach($conference->getRooms() as $room) { $currentTalk = $room->getCurrentTalk($now); - if($currentTalk && isset($currentTalk['special']) && $currentTalk['special'] == 'daychange') { - $isInDayChange = true; - break; + if ($currentTalk) { + $isCurrentlyStreaming = true; + if (isset($currentTalk['special']) && $currentTalk['special'] == 'daychange') { + $isCurrentlyStreaming = true; + break; + } } } @@ -126,7 +129,7 @@ foreach (Conferences::getActiveConferences() as $conference) 'schedule' => $conference->getSchedule()->getScheduleUrl(), 'startsAt' => $conference->startsAt() ? $conference->startsAt()->format(DateTime::ISO8601) : null, 'endsAt' => $conference->endsAt() ? $conference->endsAt()->format(DateTime::ISO8601) : null, - 'isCurrentlyStreaming' => !$isInDayChange, + 'isCurrentlyStreaming' => $isCurrentlyStreaming, 'groups' => $groupstruct, ); } |