aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2015-12-28 11:21:51 +0100
committerMaZderMind2015-12-28 11:21:51 +0100
commitd1fdb6237750d0553b26b0726428d28507141aa6 (patch)
tree94067bab8402865dc0beb9b6bbf05e0256352c2c
parentc16e317e20377ac8084ba06f29174a925f75513c (diff)
force protocol on urls coming from relive
Diffstat (limited to '')
-rw-r--r--lib/helper.php8
-rw-r--r--template/assemblies/player/relive.phtml2
-rw-r--r--template/relive-player.phtml4
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 6635fb1..c23d211 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -37,6 +37,14 @@ function forceslash($url)
return $url;
}
+function forceproto($url)
+{
+ if(startswith('//', $url))
+ $url = proto().':'.$url;
+
+ return $url;
+}
+
function startswith($needle, $haystack)
{
return substr($haystack, 0, strlen($needle)) == $needle;
diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml
index 718b249..e9fe89c 100644
--- a/template/assemblies/player/relive.phtml
+++ b/template/assemblies/player/relive.phtml
@@ -8,7 +8,7 @@
class="relive"
>
<source
- src="<?=h($talk['playlist'])?>"
+ src="<?=h(forceproto($talk['playlist']))?>"
title="h.264 (HLS)"
type="application/x-mpegURL"
/>
diff --git a/template/relive-player.phtml b/template/relive-player.phtml
index 2ee9ace..0fdee88 100644
--- a/template/relive-player.phtml
+++ b/template/relive-player.phtml
@@ -21,7 +21,7 @@
<div class="col-xs-12">
<div class="alert alert-success">
<h3>Download</h3>
- <p>Click here to <a href="<?=h($talk['mp4'])?>">Download</a> this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.</p>
+ <p>Click here to <a href="<?=h(forceproto($talk['mp4']))?>">Download</a> this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.</p>
</div>
</div>
</div>
@@ -42,7 +42,7 @@
<h3>Sorry about the Flash</h3>
<p>
As there is no desktop player which supports time-shifting, we chose embed a Flash player here which does.
- If you still want to watch with a desktop player, use this URL: <a href="<?=h($talk['playlist'])?>"><?=h($talk['playlist'])?></a>
+ If you still want to watch with a desktop player, use this URL: <a href="<?=h(forceproto($talk['playlist']))?>"><?=h(forceproto($talk['playlist']))?></a>
</p>
<p>
Note: Downloading this file is useless because of the way HLS works. You need to play the URL from your player.