diff --git a/main/coursecopy/import_moodle.php b/main/coursecopy/import_moodle.php index a92632aec2..15a1432502 100644 --- a/main/coursecopy/import_moodle.php +++ b/main/coursecopy/import_moodle.php @@ -40,14 +40,21 @@ $form->addButtonImport(get_lang('Import')); if ($form->validate()) { $file = $_FILES['moodle_file']; $moodleImport = new MoodleImport(); - $responseImport = $moodleImport->readMoodleFile($file); + $responseImport = $moodleImport->import($file); Display::cleanFlashMessages(); if ($responseImport) { - Display::addFlash(Display::return_message(get_lang('MoodleFileImportedSuccessfully'), 'success')); + Display::addFlash( + Display::return_message( + get_lang('MoodleFileImportedSuccessfully'), + 'success' + ) + ); } else { - Display::addFlash(Display::return_message(get_lang('ErrorImportingFile'), 'error')); + Display::addFlash( + Display::return_message(get_lang('ErrorImportingFile'), 'error') + ); } } diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php index daafb17f5c..925aa8239e 100755 --- a/main/exercise/exercise.class.php +++ b/main/exercise/exercise.class.php @@ -3629,6 +3629,7 @@ class Exercise $listCorrectAnswers = FillBlanks::getAnswerInfo( $answer ); + $switchableAnswerSet = $listCorrectAnswers["switchable"]; $answerWeighting = $listCorrectAnswers["tabweighting"]; // user choices is an array $choice @@ -3657,19 +3658,15 @@ class Exercise // This value is the user input, not escaped while correct answer is escaped by fckeditor // Works with cyrillic alphabet and when using ">" chars see #7718 #7610 #7618 - if (!$from_database) { + /*if (!$from_database) { $studentAnswer = htmlentities( api_utf8_encode($studentAnswer) ); - } + }*/ $correctAnswer = $listCorrectAnswers['tabwords'][$i]; $isAnswerCorrect = 0; - if (FillBlanks::isGoodStudentAnswer( - $studentAnswer, - $correctAnswer - ) - ) { + if (FillBlanks::isGoodStudentAnswer($studentAnswer, $correctAnswer)) { // gives the related weighting to the student $questionScore += $answerWeighting[$i]; // increments total score diff --git a/main/inc/lib/MoodleImport.php b/main/inc/lib/MoodleImport.php index 6bf751f691..e889b86421 100644 --- a/main/inc/lib/MoodleImport.php +++ b/main/inc/lib/MoodleImport.php @@ -4,19 +4,21 @@ /** * Class MoodleImport * - * @author José Loguercio + * @author José Loguercio , + * @author Julio Montoya + * * @package chamilo.library */ class MoodleImport { /** - * Read and validate the moodleFile + * Import moodle file * * @param resource $uploadedFile *.* mbz file moodle course backup * @return bool */ - public function readMoodleFile($uploadedFile) + public function import($uploadedFile) { $file = $uploadedFile['tmp_name']; @@ -67,6 +69,49 @@ class MoodleImport $destinationDir ); + // This process will upload all question resource files + $filesXml = @file_get_contents($destinationDir.'/files.xml'); + $mainFileModuleValues = $this->getAllQuestionFiles($filesXml); + $currentResourceFilePath = $destinationDir.'/files/'; + + $importedFiles = []; + + foreach ($mainFileModuleValues as $fileInfo) { + $dirs = new RecursiveDirectoryIterator($currentResourceFilePath); + foreach (new RecursiveIteratorIterator($dirs) as $file) { + if (is_file($file) && strpos($file, $fileInfo['contenthash']) !== false) { + $files = []; + $files['file']['name'] = $fileInfo['filename']; + $files['file']['tmp_name'] = $file->getPathname(); + $files['file']['type'] = $fileInfo['mimetype']; + $files['file']['error'] = 0; + $files['file']['size'] = $fileInfo['filesize']; + $files['file']['from_file'] = true; + $files['file']['move_file'] = true; + $_POST['language'] = $courseInfo['language']; + $_POST['moodle_import'] = true; + + $data = DocumentManager::upload_document( + $files, + '/moodle', + isset($fileInfo['title']) ? $fileInfo['title'] : pathinfo($fileInfo['filename'], PATHINFO_FILENAME), + '', + null, + null, + true, + true, + 'file', + // This is to validate spaces as hyphens + false + ); + + if ($data) { + $importedFiles[$fileInfo['filename']] = basename($data['path']); + } + } + } + } + $xml = @file_get_contents($destinationDir.'/moodle_backup.xml'); $doc = new DOMDocument(); @@ -120,9 +165,9 @@ class MoodleImport // $moduleValues variable contains all the necesary info to the quiz import // var_dump($moduleValues); // <-- uncomment this to see the final array - // Lets do this ... $exercise = new Exercise($courseInfo['real_id']); - $exercise->updateTitle(Exercise::format_title_variable($moduleValues['name'])); + $title = Exercise::format_title_variable($moduleValues['name']); + $exercise->updateTitle($title); $exercise->updateDescription($moduleValues['intro']); $exercise->updateAttempts($moduleValues['attempts_number']); $exercise->updateFeedbackType(0); @@ -162,10 +207,22 @@ class MoodleImport $questionInstance = Question::getInstance($moduleValues['question_instances'][$index]['chamilo_qtype']); if ($questionInstance) { $questionInstance->updateTitle($moduleValues['question_instances'][$index]['name']); + $questionText = $moduleValues['question_instances'][$index]['questiontext']; // Replace the path from @@PLUGINFILE@@ to a correct chamilo path - $moduleValues['question_instances'][$index]['questiontext'] = str_replace('@@PLUGINFILE@@', '/courses/' . $coursePath . '/document/moodle', $moduleValues['question_instances'][$index]['questiontext']); - $questionInstance->updateDescription($moduleValues['question_instances'][$index]['questiontext']); + $questionText = str_replace( + '@@PLUGINFILE@@', + '/courses/'.$coursePath.'/document/moodle', + $questionText + ); + + if ($importedFiles) { + foreach ($importedFiles as $old => $new) { + $questionText = str_replace($old, $new, $questionText); + } + } + + $questionInstance->updateDescription($questionText); $questionInstance->updateLevel(1); $questionInstance->updateCategory(0); @@ -181,10 +238,15 @@ class MoodleImport $questionList = $moduleValues['question_instances'][$index]['plugin_qtype_'.$qType.'_question']; $currentQuestion = $moduleValues['question_instances'][$index]; - $this->processAnswers($questionList, $qType, $questionInstance, $currentQuestion); + $this->processAnswers( + $questionList, + $qType, + $questionInstance, + $currentQuestion, + $importedFiles + ); } } - break; case 'resource': // Read the current resource module xml. @@ -239,44 +301,6 @@ class MoodleImport } } } - - // This process will upload all question resource files - $filesXml = @file_get_contents($destinationDir.'/files.xml'); - $mainFileModuleValues = $this->getAllQuestionFiles($filesXml); - $currentResourceFilePath = $destinationDir.'/files/'; - - foreach ($mainFileModuleValues as $fileInfo) { - $dirs = new RecursiveDirectoryIterator($currentResourceFilePath); - foreach (new RecursiveIteratorIterator($dirs) as $file) { - if (is_file($file) && strpos($file, $fileInfo['contenthash']) !== false) { - $files = []; - $files['file']['name'] = $fileInfo['filename']; - $files['file']['tmp_name'] = $file->getPathname(); - $files['file']['type'] = $fileInfo['mimetype']; - $files['file']['error'] = 0; - $files['file']['size'] = $fileInfo['filesize']; - $files['file']['from_file'] = true; - $files['file']['move_file'] = true; - $_POST['language'] = $courseInfo['language']; - $_POST['moodle_import'] = true; - - DocumentManager::upload_document( - $files, - '/moodle', - isset($fileInfo['title']) ? $fileInfo['title'] : pathinfo($fileInfo['filename'], PATHINFO_FILENAME), - '', - null, - null, - true, - true, - 'file', - // This is to validate spaces as hyphens - false - ); - } - } - } - } else { removeDir($destinationDir); return false; @@ -589,10 +613,30 @@ class MoodleImport break; case 'truefalse': return UNIQUE_ANSWER_NO_OPTION; - break; + break; } } + /** + * Fix moodle files that contains spaces + * @param array $importedFiles + * @param string $text + * @return mixed + */ + public function fixPathInText($importedFiles, &$text) + { + if ($importedFiles) { + foreach ($importedFiles as $old => $new) { + $text = str_replace($old, $new, $text); + $old = str_replace(' ', '%20', $old); + $text = str_replace($old, $new, $text); + //$text = utf8_encode($text); + } + } + + return $text; + } + /** * Process Moodle Answers to Chamilo * @@ -600,16 +644,23 @@ class MoodleImport * @param string $questionType * @param object $questionInstance Question/Answer instance * @param array $currentQuestion + * @param array $importedFiles * @return integer db response */ - public function processAnswers($questionList, $questionType, $questionInstance, $currentQuestion) + public function processAnswers($questionList, $questionType, $questionInstance, $currentQuestion, $importedFiles) { switch ($questionType) { case 'multichoice': $objAnswer = new Answer($questionInstance->id); $questionWeighting = 0; foreach ($questionList as $slot => $answer) { - $this->processUniqueAnswer($objAnswer, $answer, $slot + 1, $questionWeighting); + $this->processUniqueAnswer( + $objAnswer, + $answer, + $slot + 1, + $questionWeighting, + $importedFiles + ); } // saves the answers into the data base @@ -623,11 +674,22 @@ class MoodleImport case 'multianswer': $objAnswer = new Answer($questionInstance->id); $coursePath = api_get_course_path(); - $placeholder = str_replace('@@PLUGINFILE@@', '/courses/' . $coursePath . '/document/moodle', $currentQuestion['questiontext']); + $placeholder = str_replace( + '@@PLUGINFILE@@', + '/courses/'.$coursePath.'/document/moodle', + $currentQuestion['questiontext'] + ); $optionsValues = []; foreach ($questionList as $slot => $subQuestion) { $qtype = $subQuestion['qtype']; - $optionsValues[] = $this->processFillBlanks($objAnswer, $qtype, $subQuestion['plugin_qtype_'.$qtype.'_question'], $placeholder, $slot + 1); + $optionsValues[] = $this->processFillBlanks( + $objAnswer, + $qtype, + $subQuestion['plugin_qtype_'.$qtype.'_question'], + $placeholder, + $slot + 1, + $importedFiles + ); } $answerOptionsWeight = '::'; @@ -649,6 +711,8 @@ class MoodleImport // sets the total weighting of the question $questionInstance->updateWeighting($questionWeighting); $questionInstance->save(); + $this->fixPathInText($importedFiles, $placeholder); + // saves the answers into the data base $objAnswer->createAnswer($placeholder, 0, '', 0, 1); $objAnswer->save(); @@ -658,7 +722,14 @@ class MoodleImport $objAnswer = new Answer($questionInstance->id); $placeholder = ''; - $optionsValues = $this->processFillBlanks($objAnswer, 'match', $questionList, $placeholder, 0); + $optionsValues = $this->processFillBlanks( + $objAnswer, + 'match', + $questionList, + $placeholder, + 0, + $importedFiles + ); $answerOptionsWeight = '::'; $answerOptionsSize = ''; @@ -678,6 +749,9 @@ class MoodleImport $questionInstance->updateWeighting($questionWeighting); $questionInstance->save(); // saves the answers into the data base + + $this->fixPathInText($importedFiles, $placeholder); + $objAnswer->createAnswer($placeholder, 0, '', 0, 1); $objAnswer->save(); @@ -701,7 +775,13 @@ class MoodleImport $objAnswer = new Answer($questionInstance->id); $questionWeighting = 0; foreach ($questionList as $slot => $answer) { - $this->processTrueFalse($objAnswer, $answer, $slot + 1, $questionWeighting); + $this->processTrueFalse( + $objAnswer, + $answer, + $slot + 1, + $questionWeighting, + $importedFiles + ); } // saves the answers into the data base @@ -724,9 +804,10 @@ class MoodleImport * @param array $answerValues * @param integer $position * @param integer $questionWeighting + * @param array $importedFiles * @return integer db response */ - public function processUniqueAnswer($objAnswer, $answerValues, $position, &$questionWeighting) + public function processUniqueAnswer($objAnswer, $answerValues, $position, &$questionWeighting, $importedFiles) { $correct = intval($answerValues['fraction']) ? intval($answerValues['fraction']) : 0; $answer = $answerValues['answertext']; @@ -738,6 +819,8 @@ class MoodleImport } $goodAnswer = $correct ? true : false; + $this->fixPathInText($importedFiles, $answer); + $objAnswer->createAnswer( $answer, $goodAnswer, @@ -757,9 +840,11 @@ class MoodleImport * @param array $answerValues * @param integer $position * @param integer $questionWeighting + * @param array $importedFiles + * * @return integer db response */ - public function processTrueFalse($objAnswer, $answerValues, $position, &$questionWeighting) + public function processTrueFalse($objAnswer, $answerValues, $position, &$questionWeighting, $importedFiles) { $correct = intval($answerValues['fraction']) ? intval($answerValues['fraction']) : 0; $answer = $answerValues['answertext']; @@ -771,6 +856,8 @@ class MoodleImport } $goodAnswer = $correct ? true : false; + $this->fixPathInText($importedFiles, $answer); + $objAnswer->createAnswer( $answer, $goodAnswer, @@ -791,9 +878,11 @@ class MoodleImport * @param array $answerValues * @param string $placeholder * @param integer $position + * @param array $importedFiles * @return integer db response + * */ - public function processFillBlanks($objAnswer, $questionType, $answerValues, &$placeholder, $position) + public function processFillBlanks($objAnswer, $questionType, $answerValues, &$placeholder, $position, $importedFiles) { $coursePath = api_get_course_path(); @@ -860,7 +949,11 @@ class MoodleImport $currentAnswers = $correctAnswer.$othersAnswers; $currentAnswers = '['.substr($currentAnswers, 0, -1).'] '; - $answer['questiontext'] = str_replace('@@PLUGINFILE@@', '/courses/' . $coursePath . '/document/moodle', $answer['questiontext']); + $answer['questiontext'] = str_replace( + '@@PLUGINFILE@@', + '/courses/'.$coursePath.'/document/moodle', + $answer['questiontext'] + ); $placeholder .= '

' . strip_tags($answer['questiontext']).' '.$currentAnswers . '

'; }