Merge branch 'MDL-32124_21_wip' of git://github.com/grabs/moodle into…

… MOODLE_21_STABLE
moodle · Apr 10, 2012 · 365e69b · 365e69b
2 parents 5cd936c + 53dcf63
commit 365e69b
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
@@ -66,12 +66,33 @@
         print_error('invalidsesskey');
     }
 
+    $strfeedbacks = get_string("modulenameplural", "feedback");
+    $strfeedback  = get_string("modulename", "feedback");
+
     require_capability('mod/feedback:viewreports', $context);
 
     if($action == 'sendmessage' AND has_capability('moodle/course:bulkmessaging', $coursecontext)) {
-        // require_once($CFG->dirroot.'/message/lib.php');
+        $shortname = format_string($course->shortname,
+                                true,
+                                array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
+
+        $htmlmessage = "<body id=\"email\">";
+
+        $link1 = $CFG->wwwroot.'/course/view.php?id='.$course->id;
+        $link2 = $CFG->wwwroot.'/mod/feedback/index.php?id='.$course->id;
+        $link3 = $CFG->wwwroot.'/mod/feedback/view.php?id='.$cm->id;
+
+        $htmlmessage .= '<div class="navbar">'.
+        '<a target="_blank" href="'.$link1.'">'.$shortname.'</a> &raquo; '.
+        '<a target="_blank" href="'.$link2.'">'.$strfeedbacks.'</a> &raquo; '.
+        '<a target="_blank" href="'.$link3.'">'.format_string($feedback->name, true).'</a>'.
+        '</div>';
+
+        $htmlmessage .= $message;
+        $htmlmessage .= '</body>';
+
         $good = 1;
-        if(is_array($messageuser)) {
+        if (is_array($messageuser)) {
             foreach ($messageuser as $userid) {
                 $senduser = $DB->get_record('user', array('id'=>$userid));
                 $eventdata = new stdClass();
@@ -80,9 +101,9 @@
                 $eventdata->userfrom         = $USER;
                 $eventdata->userto           = $senduser;
                 $eventdata->subject          = $subject;
-                $eventdata->fullmessage      = $message;
+                $eventdata->fullmessage      = html_to_text($htmlmessage);
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
-                $eventdata->fullmessagehtml  = '';
+                $eventdata->fullmessagehtml  = $htmlmessage;
                 $eventdata->smallmessage     = '';
                 $good = $good && message_send($eventdata);
             }
@@ -101,9 +122,6 @@
     ////////////////////////////////////////////////////////
 
     /// Print the page header
-    $strfeedbacks = get_string("modulenameplural", "feedback");
-    $strfeedback  = get_string("modulename", "feedback");
-
     $PAGE->navbar->add(get_string('show_nonrespondents','feedback'));
     $PAGE->set_heading(format_string($course->fullname));
     $PAGE->set_title(format_string($feedback->name));