From 895b7fa70883b60ad7ee15fefed6f908020310b9 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 19:55:39 +0100
Subject: add linebreak to error message

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index ef3944c..6c62e34 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 
 if(!ini_get('short_open_tag'))
-	die('`short_open_tag = On` is required');
+	die("`short_open_tag = On` is required\n");
 
 require_once('config.php');
 require_once('lib/helper.php');
-- 
cgit v1.3.1


From 4e85b423354d8b715d12540fbd2ac79a66de3399 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 19:56:22 +0100
Subject: add download-command cli interface & config

---
 command/download.php | 28 ++++++++++++++++++++++++++++
 config.php           | 27 ++++++++++++++++++++++++++-
 index.php            | 16 ++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 command/download.php

(limited to 'index.php')

diff --git a/command/download.php b/command/download.php
new file mode 100644
index 0000000..8cc2f53
--- /dev/null
+++ b/command/download.php
@@ -0,0 +1,28 @@
+<?php
+
+$conf = $GLOBALS['CONFIG']['DOWNLOAD'];
+
+if(isset($conf['REQUIRE_USER']))
+{
+	if(get_current_user() != $conf['require-user'])
+	{
+		stderr(
+			'Not downloading files for user %s, run this script as user %s',
+			get_current_user(),
+			$conf['require-user']
+		);
+		exit(2);
+	}
+}
+
+foreach (Conferences::getConferences() as $conference)
+{
+	stdout('== %s ==', $conference->getSlug());
+
+	if(isset($conf['MAX_CONFERENCE_AGE']))
+	{
+		date_diff()
+		return time() >= $this->endsAt();
+	}
+
+}
diff --git a/config.php b/config.php
index 1dbea27..57be966 100644
--- a/config.php
+++ b/config.php
@@ -24,7 +24,7 @@ $GLOBALS['CONFIG']['PREVIEW_DOMAIN'] = 'xlocalhost';
  * Protokollfreie URLs (welche, die mit // beginnen), werden automatisch mit dem korrekten Protokoll ergänzt.
  * In diesem Fall wird auch ein SSL-Umschalt-Button im Header angezeigt
  */
-if($_SERVER['SERVER_NAME'] == 'localhost')
+if(@$_SERVER['SERVER_NAME'] == 'localhost')
 {
 	// keine Konfiguration -> BASEURL wird automatisch erraten
 }
@@ -38,3 +38,28 @@ else
 	// Set a safe Default
 	$GLOBALS['CONFIG']['BASEURL'] = '//streaming.media.ccc.de/';
 }
+
+
+/**
+ * Konfiguration für den Datei-Download Cronjob
+ */
+$GLOBALS['CONFIG']['DOWNLOAD'] = [
+	/**
+	 * Verweigeren Download, wenn der PHP-Prozess unter einem anderen Benutzer als diesem läuft
+	 * Auskommentieren um alle Benutzer zu erlauben
+	 */
+	//'REQUIRE_USER' => 'www-data',
+
+	/**
+	 * Wartende HTTP-Downloads nach dieser Anzahl von Sekunden abbrechen
+	 */
+	'HTTP_TIMEOUT' => 5 /* Sekunden */,
+
+	/**
+	 * Nur Dateien von Konferenzen herunterladen, die weniger als
+	 * diese Aanzahl von Tagen alt sind (gemessen am END_DATE)
+	 *
+	 * Auskommentieren, um alle Konferenzen zu beachten
+	 */
+	'MAX_CONFERENCE_AGE' => 30 /* Tage */,
+];
diff --git a/index.php b/index.php
index 6c62e34..9b4689c 100644
--- a/index.php
+++ b/index.php
@@ -27,6 +27,22 @@ require_once('model/Upcoming.php');
 
 
 ob_start();
+if(isset($argv) && isset($argv[1]))
+{
+	require('lib/command-helper.php');
+
+	switch($argv[1])
+	{
+		case 'download':
+			require('command/download.php');
+			exit(0);
+	}
+
+	stderr("Unknown Command: %s", $argv[1]);
+	exit(1);
+}
+
+
 try {
 	if(isset($_GET['htaccess']))
 	{
-- 
cgit v1.3.1


From 3384e963da66e9089b71c546750c8981be8c6ed8 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 17 Dec 2016 14:11:47 +0100
Subject: change storage paths according to issue description

---
 command/download.php | 13 +++++--------
 index.php            |  3 +++
 model/Relive.php     |  2 +-
 model/Schedule.php   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'index.php')

diff --git a/command/download.php b/command/download.php
index 8deb454..17ae7c9 100644
--- a/command/download.php
+++ b/command/download.php
@@ -77,13 +77,13 @@ foreach ($conferences as $conference)
 		);
 	}
 
-	foreach($conference->getExtraFiles() as $file)
+	foreach($conference->getExtraFiles() as $filename => $url)
 	{
 		download(
 			'extra-file',
 			$conference,
-			$file,
-			get_file_cache($conference, $file)
+			$url,
+			get_file_cache($conference, $filename)
 		);
 	}
 }
@@ -91,12 +91,9 @@ foreach ($conferences as $conference)
 
 
 
-function get_file_cache($conference, $url)
+function get_file_cache($conference, $filename)
 {
-	$info = parse_url($url);
-	$host = trim(preg_replace('/[^a-z0-9]/i', '_', $info['host']), '_');
-	$path = trim(preg_replace('/[^a-z0-9]/i', '_', $info['path']), '_');
-	return sprintf('/tmp/file-cache-%s_%s_%s-%s', $conference->getSlug(), $host, $path, md5($url));
+	return joinpath([$GLOBALS['BASEDIR'], 'configs/conferences', $conference->getSlug(), $filename]);
 }
 
 function download($what, $conference, $url, $cache)
diff --git a/index.php b/index.php
index 9b4689c..ca0a6d4 100644
--- a/index.php
+++ b/index.php
@@ -3,6 +3,9 @@
 if(!ini_get('short_open_tag'))
 	die("`short_open_tag = On` is required\n");
 
+$GLOBALS['BASEDIR'] = dirname(__FILE__);
+chdir($GLOBALS['BASEDIR']);
+
 require_once('config.php');
 require_once('lib/helper.php');
 
diff --git a/model/Relive.php b/model/Relive.php
index 5676b62..1e8266a 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -26,7 +26,7 @@ class Relive
 
 	public function getJsonCache()
 	{
-		return sprintf('/tmp/relive-cache-%s', $this->getConference()->getSlug());
+		return sprintf('/tmp/relive-cache-%s.json', $this->getConference()->getSlug());
 	}
 
 	public function getTalks()
diff --git a/model/Schedule.php b/model/Schedule.php
index 4032ecb..6536864 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -272,7 +272,7 @@ class Schedule
 
 	public function getScheduleCache()
 	{
-		return sprintf('/tmp/schedule-cache-%s', $this->getConference()->getSlug());
+		return sprintf('/tmp/schedule-cache-%s.xml', $this->getConference()->getSlug());
 	}
 
 	public function getScheduleToRoomSlugMapping()
-- 
cgit v1.3.1