From 7336701ff107ee67743203e31db15ef182e2d7e7 Mon Sep 17 00:00:00 2001
From: Mark Nielsen <mark@moodlerooms.com>
Date: Wed, 9 Mar 2011 15:44:09 -0800
Subject: [PATCH] Minor fixes and added more methods

---
 backup/util/converter/base_converter.class.php |  4 ++--
 backup/util/plan/convert_plan.class.php        | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/backup/util/converter/base_converter.class.php b/backup/util/converter/base_converter.class.php
index 1c207cef6af..c3908cd071c 100644
--- a/backup/util/converter/base_converter.class.php
+++ b/backup/util/converter/base_converter.class.php
@@ -33,13 +33,13 @@ abstract class base_converter {
     public function get_convertdir() {
         global $CFG;
 
-        return "$CFG->dirroot/backup/temp/$this->convertdir";
+        return "$CFG->dataroot/temp/backup/$this->convertdir";
     }
 
     public function get_tempdir() {
         global $CFG;
 
-        return "$CFG->dirroot/backup/temp/$this->tempdir";
+        return "$CFG->dataroot/temp/backup/$this->tempdir";
     }
 
     public function delete_convertdir() {
diff --git a/backup/util/plan/convert_plan.class.php b/backup/util/plan/convert_plan.class.php
index 68a67d8f12f..55fc4ded767 100644
--- a/backup/util/plan/convert_plan.class.php
+++ b/backup/util/plan/convert_plan.class.php
@@ -3,14 +3,13 @@
  * Convert Plan
  */
 class convert_plan extends base_plan implements loggable {
-
+    /**
+     * @var plan_converter
+     */
     protected $converter;
 
     public function __construct(plan_converter $converter) {
-        global $CFG;
-
         $this->converter = $converter;
-        $this->basepath   = $CFG->dataroot . '/temp/backup/' . $converter->get_backupid();
         parent::__construct('convert_plan');
     }
 
@@ -23,6 +22,10 @@ class convert_plan extends base_plan implements loggable {
         // TODO: Implement log() method.
     }
 
+    public function get_basepath() {
+        return $this->converter->get_convertdir();
+    }
+
     public function get_converterid() {
         return $this->converter->get_id();
     }