From e630426b5fb3ccb4ecf68b919e592577f0402f5c Mon Sep 17 00:00:00 2001
From: Andreas Hubel
Date: Wed, 1 Jan 2020 12:25:48 +0100
Subject: relive player: improve handling of released talks

---
 template/relive-player.phtml | 2 +-
 view/relive-player.php       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/template/relive-player.phtml b/template/relive-player.phtml
index f82d4da..c8a0231 100644
--- a/template/relive-player.phtml
+++ b/template/relive-player.phtml
@@ -10,7 +10,7 @@
 			<div class="col-xs-12">
 				<div class="alert alert-success">
 					<h3>Released</h3>
-					<p>This talk is already released! Take a look at <a href="<?=h($talk['release_url'])?>"><?=h(parse_url($talk['release_url'], PHP_URL_HOST))?></a>.</p>
+					<p>Beware! This is an unprocessed streamdump, the final release was released at <a href="<?=h($talk['release_url'])?>"><?=h(parse_url($talk['release_url'], PHP_URL_HOST))?></a>.</p>
 				</div>
 			</div>
 		</div>
diff --git a/view/relive-player.php b/view/relive-player.php
index 6be5616..6afc8d9 100644
--- a/view/relive-player.php
+++ b/view/relive-player.php
@@ -6,6 +6,12 @@ if(!$relive->isEnabled())
 
 $talk = $relive->getTalk(intval($_GET['id']));
 
+if($talk['status'] == 'released' && empty($_GET['redirect'])) {
+	header("HTTP/1.1 301 Moved Permanently"); 
+	header('Location: ' . $talk['release_url']);
+	return;
+}
+
 echo $tpl->render(array(
 	'page' => 'relive-player',
 	'title' => 'Relive: ' . $talk['title'],
-- 
cgit v1.2.3