MDL-19807 Migrated calls to print_heading

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index b94b1aa5586dfb133873e86498e53d999f3776d4..5e4d2d695ab93e651c72962d460ca5e22511881a 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -280,7 +280,7 @@
         ///////////////////////////////////////////////////////////////////////////
         ///////////////////////////////////////////////////////////////////////////
         ///////////////////////////////////////////////////////////////////////////
-        print_heading(format_text($feedback->name));
+        echo $OUTPUT->heading(format_text($feedback->name));
     
         if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
             if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 8afd260fe152ffd4c5ee42dad7ee7869c3a88a2c..cf68f1ea2beb79e8567fdd7780ebfd2d3a50d749 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -224,7 +224,7 @@
         ///////////////////////////////////////////////////////////////////////////
         ///////////////////////////////////////////////////////////////////////////
         ///////////////////////////////////////////////////////////////////////////
-        print_heading(format_text($feedback->name));
+        echo $OUTPUT->heading(format_text($feedback->name));
         
         if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
             echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';

diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index cfe9e44729d80589d03eab848d8771de866cb461..5057c71ae100c91c2438380de4cb3967aad6a157 100644 (file)
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -78,10 +78,10 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
     // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
     print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
-    print_heading(get_string('confirmdeleteentry', 'feedback'));
+    echo $OUTPUT->heading(get_string('confirmdeleteentry', 'feedback'));
     $mform->display();
     // print_simple_box_end();
     print_box_end();

diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index 60d44aa4afdc2cff74e1ccfab70938726485d10b..d1f22709b27fc15586f4297118b0d7d448e49e8a 100644 (file)
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -71,10 +71,10 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
     // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
     print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
-    print_heading(get_string('confirmdeleteitem', 'feedback'));
+    echo $OUTPUT->heading(get_string('confirmdeleteitem', 'feedback'));
     print_string('relateditemsdeleted','feedback');
     $mform->display();
     // print_simple_box_end();

diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index 8ede610a6bcdef66db236078bfc4260c3e598495..02fb849aee64b6f3e32ae59b5fd901487eb919a6 100644 (file)
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -88,12 +88,12 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(get_string('delete_template','feedback'));
+    echo $OUTPUT->heading(get_string('delete_template','feedback'));
     if($shoulddelete == 1) {
     
         // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
         print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
-        print_heading(get_string('confirmdeletetemplate', 'feedback'));
+        echo $OUTPUT->heading(get_string('confirmdeletetemplate', 'feedback'));
         $mform->display();
         // print_simple_box_end();
         print_box_end();

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 30a1f4d556b2ee0b61294c3e36262956026b1e7a..20481de909458ba750ce90d8ca68452266b9a59c 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -214,9 +214,9 @@
             
             $helpbutton = helpbutton('preview', get_string('preview','feedback'), 'feedback',true,false,'',true);
             
-            print_heading($helpbutton . get_string('preview', 'feedback'));
+            echo $OUTPUT->heading($helpbutton . get_string('preview', 'feedback'));
             if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
-                print_heading('<a href="'.htmlspecialchars($ME.'?id='.$id).'">'.get_string('cancel_moving', 'feedback').'</a>');
+                echo $OUTPUT->heading('<a href="'.htmlspecialchars($ME.'?id='.$id).'">'.get_string('cancel_moving', 'feedback').'</a>');
             }
             // print_simple_box_start('center', '80%');
             print_box_start('generalbox boxaligncenter boxwidthwide');

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 111e8b0e0861db87459925c6889d031f0c121a67..5d1a953efe375b726e98a4ee9108aaefeb81a0b1 100644 (file)
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -131,7 +131,7 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
   
           
     //print errormsg

diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 3d28e0ab1251177c3dd4e495730011e217deb14c..f7df282e71802db7028fd56d93cac15acbc22a09 100644 (file)
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -90,7 +90,7 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(get_string('import_questions','feedback'));
+    echo $OUTPUT->heading(get_string('import_questions','feedback'));
     
     if(isset($importerror->msg) AND is_array($importerror->msg)) {
         // print_simple_box_start('center', '', '#FFAAAA', 5, 'notifyproblem');

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 14aae76a6f3a5782b93c6a17dcc47ebca76f336a..71be32630271999f4a5bf3b74029af3480d6699f 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -2282,7 +2282,7 @@ function feedback_send_email_html($info, $course, $cm) {
  */
 function feedback_print_errors() {
 
-    global $SESSION;
+    global $SESSION, $OUTPUT;
 
     if(empty($SESSION->feedback->errors)) {
                return;
@@ -2290,7 +2290,7 @@ function feedback_print_errors() {
 
     // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
     print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
-    print_heading(get_string('handling_error', 'feedback'));
+    echo $OUTPUT->heading(get_string('handling_error', 'feedback'));
 
     echo '<p align="center"><b><font color="black"><pre>';
     print_r($SESSION->feedback->errors) . "\n";

diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index 046704443b92131b320415f6b1cb44ec4a0c4c37..265f1c2e46e8b9d714d00f70b0bcbbcf1f170703 100644 (file)
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -55,7 +55,7 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
 
     feedback_print_errors();
     

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index ff427c6985481d43e473d6b01ec5ff0df0f3ca54..94407e4b81c1663de7d0ea6dc28fbb7065ab9a4e 100644 (file)
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -207,7 +207,7 @@
     /// Print the responses of the given user
     ////////////////////////////////////////////////////////
     if($do_show == 'showoneentry') {
-        print_heading(format_text($feedback->name));
+        echo $OUTPUT->heading(format_text($feedback->name));
         
         //print the items
         if(is_array($feedbackitems)){

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 0837d964519b42daf01d67f1b740e43cc81f2133..b82b8aa8c7064febbf783bcca9d2f7c04505d127 100644 (file)
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -78,7 +78,7 @@
     ///////////////////////////////////////////////////////////////////////////
     include('tabs.php');
     
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
     
     print_continue(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries'));
     //print the list with anonymous completeds

diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index 2bd21e730008b1c8d762a58caa0058fe455d9d5b..2978376f1aab16f4858e02e785011aafb2b938d5 100644 (file)
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -77,11 +77,11 @@
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
     
     // print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
     print_box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal');
-    print_heading(get_string('confirmusetemplate', 'feedback'));
+    echo $OUTPUT->heading(get_string('confirmusetemplate', 'feedback'));
     
     $mform->display();
 

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 253ee0ea2ca6410525076a2d9b4351604f685aea..3b5fff68b7f8032af4dd91609d8562190906f71e 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -110,7 +110,7 @@
     /// print the tabs
     include('tabs.php');
 
-    print_heading(format_text($feedback->name));
+    echo $OUTPUT->heading(format_text($feedback->name));
 
     // print_simple_box_start('center', '80%');
     print_box_start('generalbox boxaligncenter boxwidthwide');
@@ -120,7 +120,7 @@
     print_box_end();
     
     if($capabilities->edititems) {
-        print_heading(get_string("page_after_submit", "feedback"), '', 4);
+        echo $OUTPUT->heading(get_string("page_after_submit", "feedback"), 4);
         // print_simple_box_start('center', '80%');
         print_box_start('generalbox boxaligncenter boxwidthwide');
         echo format_text($feedback->page_after_submit);