From 6864a246f3afbb4fe76e389b65cf6cd15bae9d08 Mon Sep 17 00:00:00 2001 From: mkonecny Date: Mon, 28 Feb 2011 00:39:55 -0500 Subject: [PATCH 1/2] -fixed so that baseFilesDir is set only once in conf.php --- application/configs/conf.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/application/configs/conf.php b/application/configs/conf.php index d15557bbc..ab540238a 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -6,6 +6,7 @@ define('CAMPCASTER_COPYRIGHT_DATE', '2010'); global $CC_CONFIG; $values = load_airtime_config(); +$baseFilesDir = __DIR__.'/../../files'; $CC_CONFIG = array( // Database config @@ -21,21 +22,21 @@ $CC_CONFIG = array( 'apiKey' => $values['api_key'], - 'apiPath' => "/api/", + 'apiPath' => '/api/', - 'baseFilesDir' => __DIR__."/../../files", + 'baseFilesDir' => $baseFilesDir, // main directory for storing binary media files - 'storageDir' => __DIR__.'/../../files/stor', + 'storageDir' => "$baseFilesDir/stor", // directory for temporary files - 'bufferDir' => __DIR__.'/../../files/stor/buffer', + 'bufferDir' => "$baseFilesDir/stor/buffer", // directory for incomplete transferred files - 'transDir' => __DIR__.'/../../files/trans', + 'transDir' => "$baseFilesDir/trans", // directory for symlinks to accessed files - 'accessDir' => __DIR__.'/../../files/access', - 'cronDir' => __DIR__.'/../../files/cron', + 'accessDir' => "$baseFilesDir/access", + 'cronDir' => "$baseFilesDir/cron", "rootDir" => __DIR__."/../..", 'pearPath' => dirname(__FILE__).'/../../library/pear', From ba330b94df8f5d40723ff981cc8c0899df7d8048 Mon Sep 17 00:00:00 2001 From: mkonecny Date: Mon, 28 Feb 2011 00:54:10 -0500 Subject: [PATCH 2/2] -cleanup + recursive directors can be specified for $baseFilesDir --- application/configs/conf.php | 10 ---------- install/airtime-install.php | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/application/configs/conf.php b/application/configs/conf.php index ab540238a..d85311f1f 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -28,16 +28,6 @@ $CC_CONFIG = array( // main directory for storing binary media files 'storageDir' => "$baseFilesDir/stor", - // directory for temporary files - 'bufferDir' => "$baseFilesDir/stor/buffer", - - // directory for incomplete transferred files - 'transDir' => "$baseFilesDir/trans", - - // directory for symlinks to accessed files - 'accessDir' => "$baseFilesDir/access", - 'cronDir' => "$baseFilesDir/cron", - "rootDir" => __DIR__."/../..", 'pearPath' => dirname(__FILE__).'/../../library/pear', 'zendPath' => dirname(__FILE__).'/../../library/Zend', diff --git a/install/airtime-install.php b/install/airtime-install.php index b89165a50..700b88d5d 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -73,7 +73,7 @@ echo " *** Directory Setup ***\n"; foreach (array('baseFilesDir', 'storageDir') as $d) { $test = file_exists($CC_CONFIG[$d]); if ( $test === FALSE ) { - @mkdir($CC_CONFIG[$d], 02775); + @mkdir($CC_CONFIG[$d], 02775, true); if (file_exists($CC_CONFIG[$d])) { $rp = realpath($CC_CONFIG[$d]); echo " * Directory $rp created\n";