MDL-64290 backup imscc: Use correct tempdir for imscc restore

Use configured temp directory $CFG->tempdir instead of hard coded $CFG->dataroot . '/temp/backup/' Remove unused variable, $CFG
mpetrowi · Dec 5, 2018 · f1a22c4 · f1a22c4
1 parent df6d0b6
commit f1a22c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/backup/converter/imscc1/lib.php b/backup/converter/imscc1/lib.php
@@ -37,9 +37,10 @@ public function log($message, $level, $a = null, $depth = null, $display = false
      * @return null|string backup::FORMAT_IMSCC1 if the Common Cartridge 1.0 is detected, null otherwise
      */
     public static function detect_format($tempdir) {
-        global $CFG;
-
-        $filepath = $CFG->dataroot . '/temp/backup/' . $tempdir;
+        $filepath = make_backup_temp_directory($tempdir, false);
+        if (!is_dir($filepath)) {
+            throw new convert_helper_exception('tmp_backup_directory_not_found', $filepath);
+        }
         $manifest = cc2moodle::get_manifest($filepath);
         if (!empty($manifest)) {
             // Looks promising, lets load some information.

diff --git a/backup/converter/imscc11/lib.php b/backup/converter/imscc11/lib.php
@@ -38,9 +38,10 @@ public function log($message, $level, $a = null, $depth = null, $display = false
      * @return null|string backup::FORMAT_IMSCC11 if the Common Cartridge 1.1 is detected, null otherwise
      */
     public static function detect_format($tempdir) {
-        global $CFG;
-
-        $filepath = $CFG->dataroot . '/temp/backup/' . $tempdir;
+        $filepath = make_backup_temp_directory($tempdir, false);
+        if (!is_dir($filepath)) {
+            throw new convert_helper_exception('tmp_backup_directory_not_found', $filepath);
+        }
         $manifest = cc112moodle::get_manifest($filepath);
         if (file_exists($manifest)) {
             // Looks promising, lets load some information.