From 8beec6fda376b842a9ddb7a2425829690f0a8b48 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 20:27:35 +0100
Subject: use DateTime objects for ends/startsAt

---
 model/Conference.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'model/Conference.php')

diff --git a/model/Conference.php b/model/Conference.php
index 07d72dd..ae5ab41 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -33,11 +33,17 @@ class Conference extends ModelBase
 	}
 
 	public function startsAt() {
-		return $this->get('CONFERENCE.STARTS_AT');
+		if(!$this->has('CONFERENCE.STARTS_AT'))
+			return null;
+
+		return DateTime::createFromFormat('U', $this->get('CONFERENCE.STARTS_AT'));
 	}
 
 	public function endsAt() {
-		return $this->get('CONFERENCE.ENDS_AT');
+		if(!$this->has('CONFERENCE.ENDS_AT'))
+			return null;
+
+		return DateTime::createFromFormat('U', $this->get('CONFERENCE.ENDS_AT'));
 	}
 
 	public function hasBegun() {
@@ -62,7 +68,8 @@ class Conference extends ModelBase
 		}
 
 		if($this->has('CONFERENCE.STARTS_AT')) {
-			return time() >= $this->get('CONFERENCE.STARTS_AT');
+			$now = new DateTime('now');
+			return $now >= $this->startsAt();
 		} else {
 			return true;
 		}
@@ -84,7 +91,8 @@ class Conference extends ModelBase
 		}
 
 		if($this->has('CONFERENCE.ENDS_AT')) {
-			return time() >= $this->get('CONFERENCE.ENDS_AT');
+			$now = new DateTime('now');
+			return $now >= $this->endsAt();
 		} else {
 			return false;
 		}
-- 
cgit v1.2.3


From 6e0f7423769174b83d6b5618db7c33d54967099a Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 21:17:30 +0100
Subject: download files of forced-open conferences

---
 model/Conference.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'model/Conference.php')

diff --git a/model/Conference.php b/model/Conference.php
index ae5ab41..be62fdb 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -19,7 +19,7 @@ class Conference extends ModelBase
 	}
 
 	public function isPreviewEnabled() {
-		if($GLOBALS['forceopen'])
+		if(@$GLOBALS['forceopen'])
 			return true;
 
 		if($this->has('PREVIEW_DOMAIN') && ($this->get('PREVIEW_DOMAIN') == $_SERVER['SERVER_NAME']))
@@ -32,6 +32,10 @@ class Conference extends ModelBase
 		return !$this->hasBegun() || $this->hasEnded();
 	}
 
+	public function isOpen() {
+		return !$this->isClosed();
+	}
+
 	public function startsAt() {
 		if(!$this->has('CONFERENCE.STARTS_AT'))
 			return null;
-- 
cgit v1.2.3


From 284878f0f9917b55359cd464b86508cacc472653 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 21:46:01 +0100
Subject: add cache-file getters and download preparations

---
 model/Conference.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'model/Conference.php')

diff --git a/model/Conference.php b/model/Conference.php
index be62fdb..6c14746 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -221,4 +221,8 @@ class Conference extends ModelBase
 	public function getRelive() {
 		return new Relive($this);
 	}
+
+	public function getExtraFiles() {
+		return $this->get('EXTRA_FILES', []);
+	}
 }
-- 
cgit v1.2.3


From 9c7bccc3f2cc226cd5043752403e4c5d39c8b5b5 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 21:46:54 +0100
Subject: access relive config through relive-model

---
 model/Conference.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'model/Conference.php')

diff --git a/model/Conference.php b/model/Conference.php
index 6c14746..8d387a0 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -140,10 +140,10 @@ class Conference extends ModelBase
 	}
 
 	public function hasRelive() {
-		return $this->has('CONFERENCE.RELIVE_JSON');
+		return $this->getRelive()->isEnabled();
 	}
 	public function getReliveUrl() {
-		if($this->has('CONFERENCE.RELIVE_JSON'))
+		if($this->getRelive()->isEnabled())
 			return joinpath([$this->getSlug(), 'relive']).url_params();
 
 		else
-- 
cgit v1.2.3