From 72016072b4aa27da8b9ccf33a3e96da2e4f00487 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 19 Feb 2007 11:37:14 +0000
Subject: [PATCH] partial undo of [3002]

---
 campcaster/src/modules/storageServer/var/Backup.php        | 5 ++---
 campcaster/src/modules/storageServer/var/Restore.php       | 5 ++---
 campcaster/src/modules/storageServer/var/conf.php          | 3 +--
 campcaster/src/modules/storageServer/var/conf.php.template | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/Backup.php b/campcaster/src/modules/storageServer/var/Backup.php
index 106b69b90..a996d8e0a 100755
--- a/campcaster/src/modules/storageServer/var/Backup.php
+++ b/campcaster/src/modules/storageServer/var/Backup.php
@@ -337,11 +337,10 @@ class Backup
      */
     private function doIt()
     {
-        global $CC_CONFIG;
         if ($this->loglevel=='debug') {
             $this->addLogItem("-I- ".date("Ymd-H:i:s")." doIt\n");
         }
-        $command = $CC_CONFIG['storageBinDir']."/backup.sh"
+        $command = dirname(__FILe__)."/../bin/backup.sh"
             ." {$this->tmpDir}"
             ." {$this->tmpFile}"
             ." {$this->statusFile}"
@@ -489,4 +488,4 @@ class Backup
     }
 
 } // classs Backup
-?>
\ No newline at end of file
+?>
diff --git a/campcaster/src/modules/storageServer/var/Restore.php b/campcaster/src/modules/storageServer/var/Restore.php
index e901295b4..20cbd32cf 100644
--- a/campcaster/src/modules/storageServer/var/Restore.php
+++ b/campcaster/src/modules/storageServer/var/Restore.php
@@ -82,7 +82,6 @@ class Restore {
      */
     function openRestore($sessid, $backup_file)
     {
-        global $CC_CONFIG;
         if ($this->loglevel=='debug') {
             $this->addLogItem("-I-".date("Ymd-H:i:s")." doRestore - sessid:$sessid\n");
         }
@@ -96,7 +95,7 @@ class Restore {
         file_put_contents($this->statusFile, 'working');
 
         //call the restore script in background
-        $command = $CC_CONFIG['storageBinDir'].'/restore.php';
+        $command = dirname(__FILE__).'/../bin/restore.php';
         $runLog = "/dev/null";
         $params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &";
         $ret = system("$command $params", $st);
@@ -438,4 +437,4 @@ class Restore {
     }
 
 } // class Restore
-?>
\ No newline at end of file
+?>
diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php
index 13c8e296f..ef845cceb 100644
--- a/campcaster/src/modules/storageServer/var/conf.php
+++ b/campcaster/src/modules/storageServer/var/conf.php
@@ -58,7 +58,6 @@ $CC_CONFIG = array(
     'accessDir'     =>  dirname(__FILE__).'/../../storageServer/var/access',
     'pearPath'      =>  dirname(__FILE__).'/../../../../usr/lib/pear',
     'cronDir'       =>  dirname(__FILE__).'/../../storageServer/var/cron',
-    'storageBinDir' =>  dirname(__FILE__).'/../bin',
     'isArchive'     =>  FALSE,
     'validate'      =>  TRUE,
     'useTrash'      =>  TRUE,
@@ -180,4 +179,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/campcaster/src/modules/storageServer/var/conf.php.template b/campcaster/src/modules/storageServer/var/conf.php.template
index 5ac8695bf..2b5255a58 100644
--- a/campcaster/src/modules/storageServer/var/conf.php.template
+++ b/campcaster/src/modules/storageServer/var/conf.php.template
@@ -59,7 +59,6 @@ $CC_CONFIG = array(
     'accessDir'     => dirname(__FILE__).'/../../storageServer/var/access',
     'pearPath'      => 'ls_lib_dir/pear',
     'cronDir'       => dirname(__FILE__).'/../../storageServer/var/cron',
-    'storageBinDir' => dirname(__FILE__).'/../../../../bin',
     'isArchive'     =>  FALSE,
     'validate'      =>  TRUE,
     'useTrash'      =>  TRUE,
@@ -154,4 +153,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
     $CC_CONFIG[$d] = $rp;
 }
 
-?>
\ No newline at end of file
+?>