From 47c34aa3124672506aba111390fafc626054bcac Mon Sep 17 00:00:00 2001 From: fberckel Date: Fri, 23 May 2008 09:33:30 +0000 Subject: [PATCH] Reverting changes "$rp = file_exists" back to "$rp = realpath", because it does not function for hardy and effecting gutsy with errors as well. --- campcaster/src/modules/storageServer/var/conf.php | 2 +- campcaster/src/modules/storageServer/var/conf.php.template | 2 +- .../src/modules/storageServer/var/install/installStorage.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php index a40cfa266..ef845cceb 100644 --- a/campcaster/src/modules/storageServer/var/conf.php +++ b/campcaster/src/modules/storageServer/var/conf.php @@ -168,7 +168,7 @@ if (!is_null($this_file)) { // make dirpaths better (without "../") foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { - $rp = file_exists($CC_CONFIG[$d]); + $rp = realpath($CC_CONFIG[$d]); // workaround for missing dirs // if ( $rp === FALSE ) { // mkdir( $CC_CONFIG[$d] ); diff --git a/campcaster/src/modules/storageServer/var/conf.php.template b/campcaster/src/modules/storageServer/var/conf.php.template index 1356d7d62..2b5255a58 100644 --- a/campcaster/src/modules/storageServer/var/conf.php.template +++ b/campcaster/src/modules/storageServer/var/conf.php.template @@ -144,7 +144,7 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_i // make dirpaths better (without ../) foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { - $rp = file_exists($CC_CONFIG[$d]); + $rp = realpath($CC_CONFIG[$d]); // workaround for missing dirs if ( $rp === FALSE ) { mkdir( $CC_CONFIG[$d] ); diff --git a/campcaster/src/modules/storageServer/var/install/installStorage.php b/campcaster/src/modules/storageServer/var/install/installStorage.php index 2f719206c..b2fa0c1e3 100644 --- a/campcaster/src/modules/storageServer/var/install/installStorage.php +++ b/campcaster/src/modules/storageServer/var/install/installStorage.php @@ -45,14 +45,14 @@ if (!camp_db_table_exists($CC_CONFIG['prefTable'])) { // Install storage directories //------------------------------------------------------------------------ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { - $rp = file_exists($CC_CONFIG[$d]); + $rp = realpath($CC_CONFIG[$d]); if ( $rp === FALSE ) { echo " * Creating directory ".$CC_CONFIG[$d]."..."; mkdir($CC_CONFIG[$d], 02775); echo "done.\n"; $rp = realpath($CC_CONFIG[$d]); } else { - echo " * Skipping: directory already exists: ".$CC_CONFIG[$d]."\n"; + echo " * Skipping: directory already exists: $rp\n"; } $CC_CONFIG[$d] = $rp; }