MDL-12330 - moving a question that uses an image in a subfolder of course files,...

diff --git a/question/contextmove.php b/question/contextmove.php
index 8d9ed31a6eb214ea9491ee2a112daa1119520e12..0b218561d9a6b5d83f70b244932ec4cb7875432b 100644 (file)
--- a/question/contextmove.php
+++ b/question/contextmove.php
@@ -99,6 +99,10 @@
                 $source = $CFG->dataroot."/$fromcoursefilesid/".$flipurls[$key];
                 $destination = $flipurls[$key];
                 if (($urlaction != QUESTION_FILEDONOTHING) && ($urlaction != QUESTION_FILEMOVELINKSONLY)){
+                    // Ensure the target folder exists.
+                    check_dir_exists(dirname($CFG->dataroot."/$tocoursefilesid/".$destination), true);
+
+                    // Then make sure the destination file name does not exist. If it does, change the name to be unique.
                     while (file_exists($CFG->dataroot."/$tocoursefilesid/".$destination)){
                         $matches = array();
                         //check for '_'. copyno after filename, before extension.

diff --git a/question/contextmoveq.php b/question/contextmoveq.php
index 3c1161e911e08ed5e9c640b1b952bc53ef87d819..53b1f63d73a660e9038bc86a99fab8b42bcfea7e 100644 (file)
--- a/question/contextmoveq.php
+++ b/question/contextmoveq.php
@@ -105,6 +105,10 @@ if ($contextmoveform->is_cancelled()){
             $source = $CFG->dataroot."/$fromcoursefilesid/".$flipurls[$key];
             $destination = $flipurls[$key];
             if (($urlaction != QUESTION_FILEDONOTHING) && ($urlaction != QUESTION_FILEMOVELINKSONLY)){
+                // Ensure the target folder exists.
+                check_dir_exists(dirname($CFG->dataroot."/$tocoursefilesid/".$destination), true);
+
+                // Then make sure the destination file name does not exist. If it does, change the name to be unique.
                 while (file_exists($CFG->dataroot."/$tocoursefilesid/".$destination)){
                     $matches = array();
                     //check for '_'. copyno after filename, before extension.
@@ -120,19 +124,19 @@ if ($contextmoveform->is_cancelled()){
             switch ($urlaction){
                 case QUESTION_FILECOPY :
                     if (!copy($source, $CFG->dataroot."/$tocoursefilesid/".$destination)){
-                        print_error('errorfilecannotbecopied', 'question', $onerrorurl, $source);
+                        print_error('errorfilecannotbecopied', 'question', $returnurl, $source);
                     }
                     break;
                 case QUESTION_FILEMOVE :
                     if (!rename($source, $CFG->dataroot."/$tocoursefilesid/".$destination)){
-                        print_error('errorfilecannotbemoved', 'question', $onerrorurl, $source);
+                        print_error('errorfilecannotbemoved', 'question', $returnurl, $source);
                     }
                     break;
                 case QUESTION_FILEMOVELINKSONLY :
                 case QUESTION_FILEDONOTHING :
                     break;
                 default :
-                    error('Invalid action selected!', $onerrorurl);
+                    error('Invalid action selected!', $returnurl);
             }
             //now search and replace urls in questions.
             switch ($urlaction){
@@ -148,7 +152,7 @@ if ($contextmoveform->is_cancelled()){
                 case  QUESTION_FILEDONOTHING :
                     break;
                 default :
-                    error('Invalid action selected!', $onerrorurl);
+                    error('Invalid action selected!', $returnurl);
                     break;
             }
 
@@ -157,7 +161,7 @@ if ($contextmoveform->is_cancelled()){
     }
     //now move questions
     if (!execute_sql("UPDATE {$CFG->prefix}question SET category = {$tocat->id} WHERE id IN ({$ids})", false)){
-        error("Could not move the questions {$ids} to category ".$tocat->name, $onerrorurl);
+        error("Could not move the questions {$ids} to category ".$tocat->name, $returnurl);
     }
     redirect($returnurl);
 }