From bd3828c97c1e6d4864d76b822bfc8bfb4e5bc656 Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Fri, 16 Feb 2007 15:42:13 +0000
Subject: [PATCH] Fix for #2191 - n the packaged version, backups can neither
 be created nor restored.

---
 campcaster/src/modules/storageServer/var/Backup.php | 11 ++++++-----
 .../src/modules/storageServer/var/Restore.php       |  6 +++---
 campcaster/src/modules/storageServer/var/conf.php   |  1 +
 .../src/modules/storageServer/var/conf.php.template | 13 +++++++------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/campcaster/src/modules/storageServer/var/Backup.php b/campcaster/src/modules/storageServer/var/Backup.php
index 638b2754b..106b69b90 100755
--- a/campcaster/src/modules/storageServer/var/Backup.php
+++ b/campcaster/src/modules/storageServer/var/Backup.php
@@ -337,14 +337,15 @@ class Backup
      */
     private function doIt()
     {
+        global $CC_CONFIG;
         if ($this->loglevel=='debug') {
             $this->addLogItem("-I- ".date("Ymd-H:i:s")." doIt\n");
         }
-        $command = dirname(__FILE__).'/../bin/backup.sh'.
-            " {$this->tmpDir}".
-            " {$this->tmpFile}".
-            " {$this->statusFile}".
-            " >> {$this->logFile} &";
+        $command = $CC_CONFIG['storageBinDir']."/backup.sh"
+            ." {$this->tmpDir}"
+            ." {$this->tmpFile}"
+            ." {$this->statusFile}"
+            ." >> {$this->logFile} &";
         $res = system("$command");
         sleep(2);
         if ($this->loglevel=='debug') {
diff --git a/campcaster/src/modules/storageServer/var/Restore.php b/campcaster/src/modules/storageServer/var/Restore.php
index a9ca615a5..e901295b4 100644
--- a/campcaster/src/modules/storageServer/var/Restore.php
+++ b/campcaster/src/modules/storageServer/var/Restore.php
@@ -82,6 +82,7 @@ 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");
         }
@@ -95,7 +96,7 @@ class Restore {
         file_put_contents($this->statusFile, 'working');
 
         //call the restore script in background
-        $command = dirname(__FILE__).'/../bin/restore.php';
+        $command = $CC_CONFIG['storageBinDir'].'/restore.php';
         $runLog = "/dev/null";
         $params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &";
         $ret = system("$command $params", $st);
@@ -273,7 +274,7 @@ class Restore {
         if ($this->loglevel=='debug') {
             $this->addLogItem("-I- ".date("Ymd-H:i:s")." addFileToStorage - file:$file | type:$type | id:$gunid\n");
         }
-        require_once "XmlParser.php";
+        require_once("XmlParser.php");
         $tree = XmlParser::parse($file);
         $mediaFileLP = str_replace('.xml','',$file);
         $mediaFileLP = ($type=='audioClip' && is_file($mediaFileLP))?$mediaFileLP:'';
@@ -304,7 +305,6 @@ class Restore {
         } else {
             // add as new
             $parid = $this->gb->_getHomeDirIdFromSess($this->sessid);
-            #$this->addLogItem("Parid:$parid\n");
             $name = $tree->children[0]->children[0]->content;
             if (empty($name)) {
             	$name = $tree->attrs['title']->val;
diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php
index fab998de1..13c8e296f 100644
--- a/campcaster/src/modules/storageServer/var/conf.php
+++ b/campcaster/src/modules/storageServer/var/conf.php
@@ -58,6 +58,7 @@ $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,
diff --git a/campcaster/src/modules/storageServer/var/conf.php.template b/campcaster/src/modules/storageServer/var/conf.php.template
index 2c11bd83f..5ac8695bf 100644
--- a/campcaster/src/modules/storageServer/var/conf.php.template
+++ b/campcaster/src/modules/storageServer/var/conf.php.template
@@ -53,12 +53,13 @@ $CC_CONFIG = array(
     'StationPrefsGr'=> 'StationPrefs',
     'AllGr'         => 'All',
     'TrashName'     => 'trash_',
-    'storageDir'    =>  dirname(__FILE__).'/../../storageServer/var/stor',
-    'bufferDir'     =>  dirname(__FILE__).'/../../storageServer/var/stor/buffer',
-    'transDir'      =>  dirname(__FILE__).'/../../storageServer/var/trans',
-    'accessDir'     =>  dirname(__FILE__).'/../../storageServer/var/access',
-    'pearPath'      =>  'ls_lib_dir/pear',
-    'cronDir'       =>  dirname(__FILE__).'/../../storageServer/var/cron',
+    'storageDir'    => dirname(__FILE__).'/../../storageServer/var/stor',
+    'bufferDir'     => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
+    'transDir'      => dirname(__FILE__).'/../../storageServer/var/trans',
+    '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,