-fixed so that baseFilesDir is set only once in conf.php

This commit is contained in:
mkonecny 2011-02-28 00:39:55 -05:00
parent 6f73e6303b
commit 6864a246f3
1 changed files with 8 additions and 7 deletions

View File

@ -6,6 +6,7 @@ define('CAMPCASTER_COPYRIGHT_DATE', '2010');
global $CC_CONFIG; global $CC_CONFIG;
$values = load_airtime_config(); $values = load_airtime_config();
$baseFilesDir = __DIR__.'/../../files';
$CC_CONFIG = array( $CC_CONFIG = array(
// Database config // Database config
@ -21,21 +22,21 @@ $CC_CONFIG = array(
'apiKey' => $values['api_key'], 'apiKey' => $values['api_key'],
'apiPath' => "/api/", 'apiPath' => '/api/',
'baseFilesDir' => __DIR__."/../../files", 'baseFilesDir' => $baseFilesDir,
// main directory for storing binary media files // main directory for storing binary media files
'storageDir' => __DIR__.'/../../files/stor', 'storageDir' => "$baseFilesDir/stor",
// directory for temporary files // directory for temporary files
'bufferDir' => __DIR__.'/../../files/stor/buffer', 'bufferDir' => "$baseFilesDir/stor/buffer",
// directory for incomplete transferred files // directory for incomplete transferred files
'transDir' => __DIR__.'/../../files/trans', 'transDir' => "$baseFilesDir/trans",
// directory for symlinks to accessed files // directory for symlinks to accessed files
'accessDir' => __DIR__.'/../../files/access', 'accessDir' => "$baseFilesDir/access",
'cronDir' => __DIR__.'/../../files/cron', 'cronDir' => "$baseFilesDir/cron",
"rootDir" => __DIR__."/../..", "rootDir" => __DIR__."/../..",
'pearPath' => dirname(__FILE__).'/../../library/pear', 'pearPath' => dirname(__FILE__).'/../../library/pear',