aboutsummaryrefslogtreecommitdiff
path: root/model
diff options
context:
space:
mode:
authorroot2016-09-03 19:57:40 +0200
committerroot2016-09-03 19:57:40 +0200
commite0dc97ff62bb77c7e943a28638c5da1b9d429577 (patch)
treee30650fe2d6b4b1884b889aa7812a17b1c4ab4d2 /model
parent7dd0823e93f9ddc25ccc59eff7ce6f5419962757 (diff)
parent4e8fed0b773ad33e50017f498d40440592b7c4ef (diff)
Merge branch 'master' of ssh://mng.ber.c3voc.de/streaming-website
Diffstat (limited to '')
-rw-r--r--model/Conference.php17
-rw-r--r--model/Room.php2
-rw-r--r--model/RoomTab.php4
3 files changed, 18 insertions, 5 deletions
diff --git a/model/Conference.php b/model/Conference.php
index 4d08791..9cb62d3 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -7,7 +7,13 @@ class Conference extends ModelBase
}
public function isPreviewEnabled() {
- return $this->has('PREVIEW_DOMAIN') && ($this->get('PREVIEW_DOMAIN') == $_SERVER['SERVER_NAME']);
+ if(isset($GLOBALS['forceopen']))
+ return true;
+
+ if($this->has('PREVIEW_DOMAIN') && ($this->get('PREVIEW_DOMAIN') == $_SERVER['SERVER_NAME']))
+ return true;
+
+ return false;
}
public function isClosed() {
@@ -94,12 +100,19 @@ class Conference extends ModelBase
return $this->get('CONFERENCE.RELEASES');
}
+ public function getLink() {
+ return url_params();
+ }
+ public function getAboutLink() {
+ return 'about/'.url_params();
+ }
+
public function hasRelive() {
return $this->has('CONFERENCE.RELIVE_JSON');
}
public function getReliveUrl() {
if($this->has('CONFERENCE.RELIVE_JSON'))
- return 'relive/';
+ return 'relive/'.url_params();
else
return null;
diff --git a/model/Room.php b/model/Room.php
index 7386c1d..df3d92c 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -47,7 +47,7 @@ class Room extends ModelBase
}
public function getLink() {
- return rawurlencode($this->getSlug()).'/';
+ return rawurlencode($this->getSlug()).'/'.url_params();
}
public function getStream() {
diff --git a/model/RoomTab.php b/model/RoomTab.php
index f0338d2..16a8359 100644
--- a/model/RoomTab.php
+++ b/model/RoomTab.php
@@ -22,9 +22,9 @@ class RoomTab
{
$tabs = $this->getRoom()->getTabNames();
if($tabs[0] == $this->getTab())
- return rawurlencode($this->getRoom()->getSlug()).'/';
+ return rawurlencode($this->getRoom()->getSlug()).'/'.url_params();
- return rawurlencode($this->getRoom()->getSlug()).'/'.rawurlencode($this->getTab()).'/';
+ return rawurlencode($this->getRoom()->getSlug()).'/'.rawurlencode($this->getTab()).'/'.url_params();
}
public function getDisplay()