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

Reverting changes "$rp = file_exists" back to "$rp = realpath", because it does not function for hardy and effecting gutsy with errors as well.

Browse source
This commit is contained in:
fberckel 2008-05-23 09:33:30 +00:00
parent 4d786f8cdd
commit 47c34aa312
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
campcaster/src/modules/storageServer/var/conf.php
View file

@ -168,7 +168,7 @@ if (!is_null($this_file)) {
// make dirpaths better (without "../") // make dirpaths better (without "../")
foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { 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 // workaround for missing dirs
// if ( $rp === FALSE ) { // if ( $rp === FALSE ) {
// mkdir( $CC_CONFIG[$d] ); // mkdir( $CC_CONFIG[$d] );

2
campcaster/src/modules/storageServer/var/conf.php.template
View file

@ -144,7 +144,7 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_i
// make dirpaths better (without ../) // make dirpaths better (without ../)
foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { 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 // workaround for missing dirs
if ( $rp === FALSE ) { if ( $rp === FALSE ) {
mkdir( $CC_CONFIG[$d] ); mkdir( $CC_CONFIG[$d] );

4
campcaster/src/modules/storageServer/var/install/installStorage.php
View file

@ -45,14 +45,14 @@ if (!camp_db_table_exists($CC_CONFIG['prefTable'])) {
// Install storage directories // Install storage directories
//------------------------------------------------------------------------ //------------------------------------------------------------------------
foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) { foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', 'cronDir') as $d) {
$rp = file_exists($CC_CONFIG[$d]); $rp = realpath($CC_CONFIG[$d]);
if ( $rp === FALSE ) { if ( $rp === FALSE ) {
echo " * Creating directory ".$CC_CONFIG[$d]."..."; echo " * Creating directory ".$CC_CONFIG[$d]."...";
mkdir($CC_CONFIG[$d], 02775); mkdir($CC_CONFIG[$d], 02775);
echo "done.\n"; echo "done.\n";
$rp = realpath($CC_CONFIG[$d]); $rp = realpath($CC_CONFIG[$d]);
} else { } else {
echo " * Skipping: directory already exists: ".$CC_CONFIG[$d]."\n"; echo " * Skipping: directory already exists: $rp\n";
} }
$CC_CONFIG[$d] = $rp; $CC_CONFIG[$d] = $rp;
} }