From 43423317c2afac9974497329024c57269cfd0ca2 Mon Sep 17 00:00:00 2001 From: thomic Date: Fri, 2 Sep 2016 21:21:39 +0200 Subject: linkfix releases-webseite --- configs/conferences/mrmcd16/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/conferences/mrmcd16/config.php b/configs/conferences/mrmcd16/config.php index 76116c5..6065ddb 100644 --- a/configs/conferences/mrmcd16/config.php +++ b/configs/conferences/mrmcd16/config.php @@ -82,7 +82,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Link zu den Recordings * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - 'RELEASES' => 'https://media.ccc.de/c/mrmcd2016', + 'RELEASES' => 'https://media.ccc.de/c/mrmcd16', /** * Link zu einer (externen) ReLive-Übersichts-Seite -- cgit v1.2.3 From 6ee36da3d945b9b412eddf97aba90c65b5664afa Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sat, 3 Sep 2016 19:38:25 +0200 Subject: ignore get-parameters in url --- index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.php b/index.php index 38e5a0d..dd2c5d9 100644 --- a/index.php +++ b/index.php @@ -45,6 +45,9 @@ try { } else $route = ''; + + $pieces = parse_url($route); + $route = $pieces['path']; $route = rtrim($route, '/'); // generic template -- cgit v1.2.3 From 4e8fed0b773ad33e50017f498d40440592b7c4ef Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sat, 3 Sep 2016 19:50:34 +0200 Subject: accept ?forceopen=yes to force a conference open --- index.php | 2 ++ lib/helper.php | 8 ++++++++ model/Conference.php | 17 +++++++++++++++-- model/Room.php | 2 +- model/RoomTab.php | 4 ++-- template/assemblies/header.phtml | 4 ++-- template/page.phtml | 6 +++++- 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/index.php b/index.php index dd2c5d9..4deefcd 100644 --- a/index.php +++ b/index.php @@ -50,6 +50,8 @@ try { $route = $pieces['path']; $route = rtrim($route, '/'); + $GLOBALS['forceopen'] = isset($_GET['forceopen']); + // generic template $tpl = new PhpTemplate('template/page.phtml'); $tpl->set(array( diff --git a/lib/helper.php b/lib/helper.php index 170d224..4fce91e 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -100,3 +100,11 @@ function days_diff_readable($date) return "in $days days"; } + +function url_params() +{ + if($GLOBALS['forceopen']) + return '?forceopen=yess'; + + return ''; +} 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() diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml index b2d4215..c4d92e7 100644 --- a/template/assemblies/header.phtml +++ b/template/assemblies/header.phtml @@ -1,7 +1,7 @@