Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
martin 2011-02-28 13:27:26 -05:00
commit d47fc41082
2 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
application/configs/conf.php
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,11 @@ $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
'bufferDir' => __DIR__.'/../../files/stor/buffer',
// directory for incomplete transferred files
'transDir' => __DIR__.'/../../files/trans',
// directory for symlinks to accessed files
'accessDir' => __DIR__.'/../../files/access',
'cronDir' => __DIR__.'/../../files/cron',
"rootDir" => __DIR__."/../..", "rootDir" => __DIR__."/../..",
'pearPath' => dirname(__FILE__).'/../../library/pear', 'pearPath' => dirname(__FILE__).'/../../library/pear',

2
install/airtime-install.php
View file

@ -73,7 +73,7 @@ echo " *** Directory Setup ***\n";
foreach (array('baseFilesDir', 'storageDir') as $d) { foreach (array('baseFilesDir', 'storageDir') as $d) {
$test = file_exists($CC_CONFIG[$d]); $test = file_exists($CC_CONFIG[$d]);
if ( $test === FALSE ) { if ( $test === FALSE ) {
@mkdir($CC_CONFIG[$d], 02775); @mkdir($CC_CONFIG[$d], 02775, true);
if (file_exists($CC_CONFIG[$d])) { if (file_exists($CC_CONFIG[$d])) {
$rp = realpath($CC_CONFIG[$d]); $rp = realpath($CC_CONFIG[$d]);
echo " * Directory $rp created\n"; echo " * Directory $rp created\n";