aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2016-12-17 14:11:47 +0100
committerMaZderMind2016-12-17 14:12:29 +0100
commit3384e963da66e9089b71c546750c8981be8c6ed8 (patch)
tree83a452dbcb3aa1716c6a0dd90f99c07f145f4829
parent9c7bccc3f2cc226cd5043752403e4c5d39c8b5b5 (diff)
change storage paths according to issue description
-rw-r--r--command/download.php13
-rw-r--r--index.php3
-rw-r--r--model/Relive.php2
-rw-r--r--model/Schedule.php2
4 files changed, 10 insertions, 10 deletions
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()