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 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'command/download.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)
-- 
cgit v1.2.3