MDL-18910 full support for module intro editor with embedded images

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 801c0d4dffd744f1e7cdd0ccdd202ef6e18e9d24..2c6e0d7bfce8b0dc626ef6cd9e0ca68817e25e83 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -457,15 +457,20 @@ function feedback_set_events($feedback) {
     // adding the feedback to the eventtable (I have seen this at quiz-module)
     $DB->delete_records('event', array('modulename'=>'feedback', 'instance'=>$feedback->id));
 
+    if (!isset($feedback->coursemodule)) {
+        $cm = get_coursemodule_from_id('feedback', $feedback->id);
+        $feedback->coursemodule = $cm->id;
+    }
+
     // the open-event
     if($feedback->timeopen > 0) {
         $event = NULL;
-        $event->name          = get_string('start', 'feedback').' '.$feedback->name;
-        $event->description = $feedback->intro;
+        $event->name         = get_string('start', 'feedback').' '.$feedback->name;
+        $event->description  = format_module_intro('feedback', $feedback, $feedback->coursemodule);
         $event->courseid     = $feedback->course;
         $event->groupid      = 0;
-        $event->userid        = 0;
-        $event->modulename  = 'feedback';
+        $event->userid       = 0;
+        $event->modulename   = 'feedback';
         $event->instance     = $feedback->id;
         $event->eventtype    = 'open';
         $event->timestart    = $feedback->timeopen;
@@ -482,12 +487,12 @@ function feedback_set_events($feedback) {
     // the close-event
     if($feedback->timeclose > 0) {
         $event = NULL;
-        $event->name          = get_string('stop', 'feedback').' '.$feedback->name;
-        $event->description = $feedback->intro;
+        $event->name         = get_string('stop', 'feedback').' '.$feedback->name;
+        $event->description  = format_module_intro('feedback', $feedback, $feedback->coursemodule);
         $event->courseid     = $feedback->course;
         $event->groupid      = 0;
-        $event->userid        = 0;
-        $event->modulename  = 'feedback';
+        $event->userid       = 0;
+        $event->modulename   = 'feedback';
         $event->instance     = $feedback->id;
         $event->eventtype    = 'close';
         $event->timestart    = $feedback->timeclose;

diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php
index 10f955534debe2c90fd338ae35162e5e5ead771f..da13615328636f3131e87f8f49000998cd66cb76 100644 (file)
--- a/mod/feedback/mod_form.php
+++ b/mod/feedback/mod_form.php
@@ -24,9 +24,7 @@ class mod_feedback_mod_form extends moodleform_mod {
         $mform->setType('name', PARAM_TEXT);
         $mform->addRule('name', null, 'required', null, 'client');
 
-        $mform->addElement('htmleditor', 'intro', get_string("description", "feedback"), array('rows' => 20));
-        $mform->setType('intro', PARAM_RAW);
-        $mform->addRule('intro', null, 'required', null, 'client');
+        $this->add_intro_editor(true, get_string('description', 'feedback'));
 
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'timinghdr', get_string('timing', 'form'));

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index c34a1849726d591c9c82a272ee8983f4798d18ed..253ee0ea2ca6410525076a2d9b4351604f685aea 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -16,18 +16,16 @@
     // $SESSION->feedback->current_tab = 'view';
     $current_tab = 'view';
 
-    if ($id) {
-        if (! $cm = get_coursemodule_from_id('feedback', $id)) {
-            print_error('invalidcoursemodule');
-        }
-     
-        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error('coursemisconf');
-        }
-     
-        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
-            print_error('invalidcoursemodule');
-        }
+    if (! $cm = get_coursemodule_from_id('feedback', $id)) {
+        print_error('invalidcoursemodule');
+    }
+ 
+    if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
+        print_error('coursemisconf');
+    }
+ 
+    if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
+        print_error('invalidcoursemodule');
     }
 
     $capabilities = feedback_load_capabilities($cm->id);
@@ -117,7 +115,7 @@
     // print_simple_box_start('center', '80%');
     print_box_start('generalbox boxaligncenter boxwidthwide');
     $options = (object)array('noclean'=>true);
-    echo format_text($feedback->intro, $feedback->introformat, $options);
+    echo format_module_intro('feedback', $feedback, $cm->id);
     // print_simple_box_end();
     print_box_end();