From e92e7d75765551a912fc090a18de43406feae031 Mon Sep 17 00:00:00 2001
From: oliver <oliver@localhost>
Date: Sat, 30 Jan 2016 21:35:03 +0100
Subject: [PATCH] correct paths and autoplay for Station media (fixes #130)

---
 views/html/charactergroupsqueststations/edit.tpl    | 8 ++++----
 views/html/charactergroupsqueststations/station.tpl | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/html/charactergroupsqueststations/edit.tpl b/views/html/charactergroupsqueststations/edit.tpl
index e7466776..1f35432d 100644
--- a/views/html/charactergroupsqueststations/edit.tpl
+++ b/views/html/charactergroupsqueststations/edit.tpl
@@ -119,9 +119,9 @@
         </ul>
         <?php if(array_key_exists('rightav', $station)) : ?>
             <?php if(strpos($station['rightav']['mimetype'], 'audio') !== false) : ?>
-            <audio controls="controls" autoplay="false" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url'],'charactergroupsqueststation'))?>"></audio>
+            <audio controls="controls" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url']))?>"></audio>
             <?php else : ?>
-            <video controls="controls" autoplay="false" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url'],'charactergroupsqueststation'))?>"></video>
+            <video controls="controls" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url']))?>"></video>
             <?php endif ?>
         <?php else : ?>
             <i class="placeholder fa fa-film fa-4x"></i><br />
@@ -153,9 +153,9 @@
         </ul>
         <?php if(array_key_exists('wrongav', $station)) : ?>
             <?php if(strpos($station['wrongav']['mimetype'], 'audio') !== false) : ?>
-            <audio controls="controls" autoplay="false" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url'],'charactergroupsqueststation'))?>"></audio>
+            <audio controls="controls" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url']))?>"></audio>
             <?php else : ?>
-            <video controls="controls" autoplay="false" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url'],'charactergroupsqueststation'))?>"></video>
+            <video controls="controls" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url']))?>"></video>
             <?php endif ?>
         <?php else : ?>
             <i class="placeholder fa fa-film fa-4x"></i><br />
diff --git a/views/html/charactergroupsqueststations/station.tpl b/views/html/charactergroupsqueststations/station.tpl
index d22c5758..74320a54 100644
--- a/views/html/charactergroupsqueststations/station.tpl
+++ b/views/html/charactergroupsqueststations/station.tpl
@@ -129,9 +129,9 @@
         <?php endif ?>
         <?php if(array_key_exists('rightav', $station)) : ?>
             <?php if(strpos($station['rightav']['mimetype'], 'audio') !== false) : ?>
-            <audio controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url'],'charactergroupsqueststation'))?>"></audio>
+            <audio controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url']))?>"></audio>
             <?php else : ?>
-            <video controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url'],'charactergroupsqueststation'))?>"></video>
+            <video controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['rightav']['url']))?>"></video>
             <?php endif ?>
         <?php endif ?>
         <?=$t->t($station['righttext'])?>
@@ -145,9 +145,9 @@
         <?php endif ?>
         <?php if(array_key_exists('wrongav', $station)) : ?>
             <?php if(strpos($station['wrongav']['mimetype'], 'audio') !== false) : ?>
-            <audio controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url'],'charactergroupsqueststation'))?>"></audio>
+            <audio controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url']))?>"></audio>
             <?php else : ?>
-            <video controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url'],'charactergroupsqueststation'))?>"></video>
+            <video controls="controls" autoplay="autoplay" preload="metadata" src="<?=$linker->link(array('media','seminary',$seminary['url'],$station['wrongav']['url']))?>"></video>
             <?php endif ?>
         <?php endif ?>
         <?=$t->t($station['wrongtext'])?>