aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2014-12-13 01:21:00 +0100
committerMaZderMind2014-12-13 01:21:00 +0100
commitbf9f1735abd0d650b3210711760783bf3e61124a (patch)
tree57b2a031ccc08436664fbcf161591c9dbbd2966e
parent7cd0564c4336b578c78c55eb9a3d6fe7d4d12d02 (diff)
set 31C3 fahrplan url
and remove unneeded caching
-rw-r--r--lib/config.php12
-rw-r--r--lib/program.php7
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/config.php b/lib/config.php
index 6bed258..69bccaf 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -4,10 +4,9 @@ date_default_timezone_set('Europe/Berlin');
// guessed automatically
// $GLOBALS['CONFIG']['baseurl'] = 'http://foo.com/bar/';
-$GLOBALS['CONFIG']['SCHEDULE'] = 'http://fahrplan.mrmcd.net/schedule.xml';
-$GLOBALS['CONFIG']['SCHEDULE_CACHE_TTL'] = 5;
+$GLOBALS['CONFIG']['SCHEDULE'] = 'http://events.ccc.de/congress/2014/Fahrplan/schedule.xml';
$GLOBALS['CONFIG']['SCHEDULE_SCALE'] = 0.2; // float, px per second
-$GLOBALS['CONFIG']['SCHEDULE_OFFSET'] = strtotime('2014-11-09T17:00:00+01:00') - strtotime('2014-09-05T17:00:00+02:00');
+$GLOBALS['CONFIG']['SCHEDULE_OFFSET'] = 0;
$GLOBALS['CONFIG']['ROOMS'] = array(
@@ -43,7 +42,8 @@ $GLOBALS['CONFIG']['FORMAT_TEXT'] = array(
// various room-name nappings
$GLOBALS['CONFIG']['FAHRPLAN_ROOM_MAPPING'] = array(
- 'Grossbaustelle BER' => 'saal1',
- 'Tiefbaustelle S21' => 'saal2',
- 'Hochbaustelle Elbphilharmonie' => 'saal6',
+ 'Saal 1' => 'saal1',
+ 'Saal 2' => 'saal2',
+ 'Saal G' => 'saalg',
+ 'Saal 6' => 'saal6',
);
diff --git a/lib/program.php b/lib/program.php
index 0f038a8..5507442 100644
--- a/lib/program.php
+++ b/lib/program.php
@@ -2,10 +2,6 @@
function program()
{
- $cacheidx = __FILE__.':'.__FUNCTION__.':program:'.$GLOBALS['CONFIG']['SCHEDULE'];
- if(function_exists('apc_fetch') && $program = apc_fetch($cacheidx))
- return $program;
-
$program = array();
$schedule = simplexml_load_file($GLOBALS['CONFIG']['SCHEDULE']);
@@ -136,8 +132,5 @@ function program()
}
}
- if(function_exists('apc_store'))
- apc_store($cacheidx, $program, $GLOBALS['CONFIG']['SCHEDULE_CACHE_TTL']);
-
return $program;
}