]> git.mjollnir.org Git - moodle.git/commitdiff
Merging in changes for MDL-9947 and MDL-9923 from MOODLE_18_STABLE
authormark-nielsen <mark-nielsen>
Mon, 28 May 2007 18:55:15 +0000 (18:55 +0000)
committermark-nielsen <mark-nielsen>
Mon, 28 May 2007 18:55:15 +0000 (18:55 +0000)
mod/lesson/mediafile.php
mod/lesson/mod_form.php
mod/lesson/restorelib.php

index 4a9acd9dc6a19b4d1f75eaaa4ffa51cd7609e420..34e8491c04d7e255ae6572f01884ea56bd0a72ea 100644 (file)
         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 '<div class="lessonmediafilecontrol">
-            <form>
-            <div">
-            <input type="button" onclick="top.close();" value="'.get_string("closewindow").'" />
-            </div>
-            </form>
-            </div>';
+            print_header($course->shortname);
+            echo '<div class="lessonmediafilecontrol">
+                <form>
+                <div>
+                <input type="button" onclick="top.close();" value="'.get_string("closewindow").'" />
+                </div>
+                </form>
+                </div>';
+            print_footer();
         }
-        print_footer();
         exit();
     }
 
 
     } 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 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n";
         echo "<html dir=\"ltr\">\n";
         echo '<head>';
         echo '<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />';
         echo "<title>{$course->shortname}</title></head>\n";
-        */
         if ($lesson->mediaclose) {
             echo "<frameset rows=\"90%,*\">";
             echo "<frame src=\"$fullurl\" />";
             echo "<frame src=\"$fullurl\" />";
             echo "</frameset>";
         }
-        print_footer();
+        echo '</html>';
         exit();
 
     } else if (in_array($mimetype, array('image/gif','image/jpeg','image/png'))) {  // Image
index 5d07a3cf14056d22098345e7b718d7f46f7c600c..891bfa77592a6f1d41494e516a43c0a94e7d0966 100644 (file)
@@ -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);
index e611a50f0d3edc8feb606e1bf751275bd1a0516d..38e4363d7f22f3afb228b5e79d98ab63643aad62 100644 (file)
             }
         }
 
+        // 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;
     }