From f5b3525b17aab83ed2e8b826a854dea9ffd75773 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Tue, 27 Dec 2016 10:50:48 +0100
Subject: repiar embedding

---
 model/Stream.php | 14 ++++++++------
 view/embed.php   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/model/Stream.php b/model/Stream.php
index d2baa28..a51227e 100644
--- a/model/Stream.php
+++ b/model/Stream.php
@@ -105,12 +105,14 @@ class Stream
 
 	public function getEmbedUrl()
 	{
-		return
-			forceslash(baseurl()).
-			'embed/'.
-			rawurlencode($this->getRoom()->getSlug()).'/'.
-			rawurlencode($this->getSelection()).'/'.
-			rawurlencode($this->getLanguage()).'/';
+		return joinpath([
+			baseurl(),
+			$this->getRoom()->getConference()->getSlug(),
+			'embed',
+			rawurlencode($this->getRoom()->getSlug()),
+			rawurlencode($this->getSelection()),
+			rawurlencode($this->getLanguage()),
+		]);
 	}
 
 	public function getVideoUrl($proto)
diff --git a/view/embed.php b/view/embed.php
index ccd4b98..eb7caee 100644
--- a/view/embed.php
+++ b/view/embed.php
@@ -1,6 +1,6 @@
 <?php
 
-$room = new Room($_GET['room']);
+$room = $conference->getRoom($_GET['room']);
 if(!$room->hasEmbed())
 	throw new NotFoundException('Embedding is not enabled in this room');
 
-- 
cgit v1.2.3