From e72be0548e0b5712802e67823c52ea15dc9bd581 Mon Sep 17 00:00:00 2001 From: mark-nielsen Date: Mon, 28 May 2007 18:55:15 +0000 Subject: [PATCH] Merging in changes for MDL-9947 and MDL-9923 from MOODLE_18_STABLE --- mod/lesson/mediafile.php | 25 +++++++++++++------------ mod/lesson/mod_form.php | 2 +- mod/lesson/restorelib.php | 9 +++++++++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php index 4a9acd9dc6..34e8491c04 100644 --- a/mod/lesson/mediafile.php +++ b/mod/lesson/mediafile.php @@ -30,19 +30,22 @@ error('Course module is incorrect'); } - print_header($course->shortname); + if (!is_url($lesson->mediafile)) { + print_header($course->shortname); + } if ($printclose) { // this is for framesets if ($lesson->mediaclose) { - echo '
-
- - -
- - '; + print_header($course->shortname); + echo '
+
+
+ +
+
+
'; + print_footer(); } - print_footer(); exit(); } @@ -155,13 +158,11 @@ } else if (is_url($lesson->mediafile) or $mimetype == 'text/html' or $mimetype == 'text/plain') { // might be dangerous to handle all of these in the same fasion. It is being set by a teacher though. - /* echo "\n"; echo "\n"; echo ''; echo ''; echo "{$course->shortname}\n"; - */ if ($lesson->mediaclose) { echo ""; echo ""; @@ -172,7 +173,7 @@ echo ""; echo ""; } - print_footer(); + echo ''; exit(); } else if (in_array($mimetype, array('image/gif','image/jpeg','image/png'))) { // Image diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php index 5d07a3cf14..891bfa7759 100644 --- a/mod/lesson/mod_form.php +++ b/mod/lesson/mod_form.php @@ -215,7 +215,7 @@ class mod_lesson_mod_form extends moodleform_mod { $mform->addElement('choosecoursefile', 'mediafile', get_string('mediafile', 'lesson'), array('courseid'=>$COURSE->id)); $mform->setHelpButton('mediafile', array('mediafile', get_string('mediafile', 'lesson'), 'lesson')); $mform->setDefault('mediafile', ''); - $mform->setType('mediafile', PARAM_PATH); + $mform->setType('mediafile', PARAM_RAW); $mform->addElement('selectyesno', 'mediaclose', get_string('mediaclose', 'lesson')); $mform->setDefault('mediaclose', 0); diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php index e611a50f0d..38e4363d7f 100644 --- a/mod/lesson/restorelib.php +++ b/mod/lesson/restorelib.php @@ -812,6 +812,15 @@ } } + // Remap activity links + if ($lessons = get_records_select('lesson', "activitylink != 0 AND course = $restore->course_id", '', 'id, activitylink')) { + foreach ($lessons as $lesson) { + if ($newcmid = backup_getid($restore->backup_unique_code, 'course_modules', $lesson->activitylink)) { + $status = $status and set_field('lesson', 'activitylink', $newcmid->new_id, 'id', $lesson->id); + } + } + } + return $status; } -- 2.39.5