MDL-19799 Migrated calls to print_heading

diff --git a/lib/adminlib.php b/lib/adminlib.php
index da97ff747a8f752fadcccc70851e3d494d529d09..3460aac64aa0e787dffc7ad8d98595d38c90c5fd 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1308,9 +1308,10 @@ class admin_setting_heading extends admin_setting {
      * @return string Returns an HTML string
      */
     public function output_html($data, $query='') {
+        global $OUTPUT;
         $return = '';
         if ($this->visiblename != '') {
-            $return .= print_heading('<a name="'.$this->name.'">'.highlightfast($query, $this->visiblename).'</a>', '', 3, 'main', true);
+            $return .= $OUTPUT->heading('<a name="'.$this->name.'">'.highlightfast($query, $this->visiblename).'</a>', 3, 'main', true);
         }
         if ($this->description != '') {
             $return .= print_box(highlight($query, $this->description), 'generalbox formsettingheading', '', true);
@@ -4546,7 +4547,7 @@ class admin_setting_manageauths extends admin_setting {
             }
         }
 
-        $return = print_heading(get_string('actauthhdr', 'auth'), '', 3, 'main', true);
+        $return = echo $OUTPUT->heading(get_string('actauthhdr', 'auth'), 3, 'main', true);
         $return .= print_box_start('generalbox authsui', '', true);
 
         $table = new object();
@@ -4723,7 +4724,7 @@ class admin_setting_manageeditors extends admin_setting {
             //$active_editors = array('textarea');
         }
         $editors_available = array_reverse($editors_available, true);
-        $return = print_heading(get_string('acteditorshhdr', 'editor'), '', 3, 'main', true);
+        $return = $OUTPUT->heading(get_string('acteditorshhdr', 'editor'), 3, 'main', true);
         $return .= print_box_start('generalbox editorsui', '', true);
 
         $table = new object();
@@ -5277,7 +5278,7 @@ function admin_find_write_settings($node, $data) {
  * @return string empty or XHTML
  */
 function admin_search_settings_html($query) {
-    global $CFG;
+    global $CFG, $OUTPUT;
 
     $textlib = textlib_get_instance();
     if ($textlib->strlen($query) < 2) {
@@ -5298,9 +5299,9 @@ function admin_search_settings_html($query) {
             continue;
         }
         if ($page instanceof admin_externalpage) {
-            $return .= print_heading(get_string('searchresults','admin').' - <a href="'.$page->url.'">'.highlight($query, $page->visiblename).'</a>', '', 2, 'main', true);
+            $return .= $OUTPUT->heading(get_string('searchresults','admin').' - <a href="'.$page->url.'">'.highlight($query, $page->visiblename).'</a>', 2, 'main');
         } else if ($page instanceof admin_settingpage) {
-            $return .= print_heading(get_string('searchresults','admin').' - <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$page->name.'">'.highlight($query, $page->visiblename).'</a>', '', 2, 'main', true);
+            $return .= $OUTPUT->heading(get_string('searchresults','admin').' - <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$page->name.'">'.highlight($query, $page->visiblename).'</a>', 2, 'main');
         } else {
             continue;
         }
@@ -5336,6 +5337,7 @@ function admin_search_settings_html($query) {
  * @return array
  */
 function admin_output_new_settings_by_page($node) {
+    global $OUTPUT;
     $return = array();
 
     if ($node instanceof admin_category) {
@@ -5353,7 +5355,7 @@ function admin_output_new_settings_by_page($node) {
         }
         if (count($newsettings) > 0) {
             $adminroot = admin_get_root();
-            $page = print_heading(get_string('upgradesettings','admin').' - '.$node->visiblename, '', 2, 'main', true);
+            $page = $OUTPUT->heading(get_string('upgradesettings','admin').' - '.$node->visiblename, 2, 'main');
             $page .= '<fieldset class="adminsettings">'."\n";
             foreach ($newsettings as $setting) {
                 $fullname = $setting->get_full_name();

diff --git a/lib/environmentlib.php b/lib/environmentlib.php
index 909d7a15d5b4346890c0c1d8c94ec1ea66bd81df..38bd06c5a52d1e228cc3788849cff761ba2f87b7 100644 (file)
--- a/lib/environmentlib.php
+++ b/lib/environmentlib.php
@@ -308,10 +308,10 @@ function print_moodle_environment($result, $environment_results) {
     $othertable->data = array_merge($otherdata['error'], $otherdata['warn'], $otherdata['ok']);
 
 /// Print table
-    print_heading(get_string('serverchecks', 'admin'));
+    echo $OUTPUT->heading(get_string('serverchecks', 'admin'));
     print_table($servertable);
     if (count($othertable->data)){
-        print_heading(get_string('customcheck', 'admin'));
+        echo $OUTPUT->heading(get_string('customcheck', 'admin'));
         print_table($othertable);
     }
 

diff --git a/lib/form/editorhelp.php b/lib/form/editorhelp.php
index a8fa02e141b3a184beb5eaf624ccdeb292011bcc..50d2a3d1a36939d7586c2ec91a326bd5316c55ec 100644 (file)
--- a/lib/form/editorhelp.php
+++ b/lib/form/editorhelp.php
@@ -56,7 +56,7 @@ for ($i=1; ; $i++){
 }
 print_header();
 print_simple_box_start('center', '96%');
-print_heading(get_string('editorhelptopics'));
+echo $OUTPUT->heading(get_string('editorhelptopics'));
 
 
 echo '<ul>';

diff --git a/lib/portfolio/exporter.php b/lib/portfolio/exporter.php
index 5ecac187295434ee9c7127d2233ac59d28a2c59d..9eef16e3d5f6dafad2c709e4f4942c741cda0644 100644 (file)
--- a/lib/portfolio/exporter.php
+++ b/lib/portfolio/exporter.php
@@ -365,7 +365,7 @@ class portfolio_exporter {
     * @return boolean whether or not to process the next stage. this is important as the control function is called recursively.
     */
     public function process_stage_confirm() {
-        global $CFG, $DB;
+        global $CFG, $DB, $OUTPUT;
 
         $previous = $DB->get_records(
             'portfolio_log',
@@ -383,7 +383,7 @@ class portfolio_exporter {
         $nourl  = $CFG->wwwroot . '/portfolio/add.php?cancel=1';
         $this->print_header('confirmexport');
         print_simple_box_start();
-        print_heading(get_string('confirmsummary', 'portfolio'), '', 4);
+        echo $OUTPUT->heading(get_string('confirmsummary', 'portfolio'), 4);
         $mainsummary = array();
         if (!$this->instance->get_export_config('hideformat')) {
             $mainsummary[get_string('selectedformat', 'portfolio')] = get_string('format_' . $this->instance->get_export_config('format'), 'portfolio');
@@ -571,6 +571,7 @@ class portfolio_exporter {
     * @param string $headerstring key for a portfolio language string
     */
     public function print_header($headingstr, $summary=true) {
+        global $OUTPUT;
         $titlestr = get_string('exporting', 'portfolio');
         $headerstr = get_string('exporting', 'portfolio');
 
@@ -579,7 +580,7 @@ class portfolio_exporter {
         if (strpos($hstr, '[[') === 0) {
             $hstr = $headingstr;
         }
-        print_heading($hstr);
+        echo $OUTPUT->heading($hstr);
 
         if (!$summary) {
             return;

diff --git a/lib/simpletest/getstringperformancetester.php b/lib/simpletest/getstringperformancetester.php
index 4d236729940c1e7ea9d31f889cc9b8be45066a35..b038f2173526876d7b60b64ad4d540b0b872df53 100644 (file)
--- a/lib/simpletest/getstringperformancetester.php
+++ b/lib/simpletest/getstringperformancetester.php
@@ -55,7 +55,7 @@ foreach ($requiredlangs as $lang) {
 }
 
 time_for_loop();
-print_heading('Timing calling functions');
+echo $OUTPUT->heading('Timing calling functions');
 time_function_call('dummy_function');
 time_function_call('simple_eval');
 time_function_call('simple_eval_with_interp');
@@ -76,7 +76,7 @@ if (isset($SESSION->lang)) {
 try {
 
     foreach ($TEST_LANGUAGES as $lang) {
-        print_heading("Language '$lang'");
+        echo $OUTPUT->heading("Language '$lang'");
         $SESSION->lang = $lang;
 
         time_log_file('admin_index.php_get_string.log.php');
@@ -109,8 +109,8 @@ print_footer();
  * @return unknown_type
  */
 function time_log_file($filename) {
-    global $CFG;
-    print_heading("Playing back calls from $filename", '', 3);
+    global $CFG, $OUTPUT;
+    echo $OUTPUT->heading("Playing back calls from $filename", '', 3);
     $fullpath = $CFG->libdir . '/simpletest/get_string_fixtures/pagelogs/' . $filename;
     for ($i = 0; $i < NUM_REPITITIONS; ++$i) {
         set_time_limit(60);
@@ -129,7 +129,8 @@ function time_log_file($filename) {
  * @param $a
  */
 function test_one_case($string, $module, $a) {
-    print_heading("get_string('$string', '$module', " . print_r($a, true) . ")", '', 3);
+    global $OUTPUT;
+    echo $OUTPUT->heading("get_string('$string', '$module', " . print_r($a, true) . ")", 3);
     echo '<p>Resulting string: ' . get_string($string, $module, $a) . "</p>\n";
     for ($i = 0; $i < NUM_REPITITIONS; ++$i) {
         set_time_limit(60);
@@ -143,7 +144,8 @@ function test_one_case($string, $module, $a) {
 }
 
 function time_for_loop() {
-    print_heading('Timing an empty for loop');
+    global $OUTPUT;
+    echo $OUTPUT->heading('Timing an empty for loop');
     $startime = microtime(true);
     for ($i = 0; $i < NUM_CALLS; $i++) {
     }
@@ -623,4 +625,4 @@ function get_string_from_file($identifier, $langfile, $destination) {
     return $destination .'= sprintf("'. $string[$identifier] .'");';
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/lib/tablelib.php b/lib/tablelib.php
index 2891b4f50bc4ae8aab777eefaf471b26519bdb14..0419a8917c82feed08a54d4c352f87d066d5ccff 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -868,9 +868,10 @@ class flexible_table {
      * This function is not part of the public api.
      */
     function print_nothing_to_display(){
+        global $OUTPUT;
         $this->print_initials_bar();
 
-        print_heading(get_string('nothingtodisplay'));
+        echo $OUTPUT->heading(get_string('nothingtodisplay'));
     }
 
     /**

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 778d9aa3481f0d9b88ec4a9e7316f9ab7293ae0e..fc4903c0afc58c9a589fd24a3c2a2001be95a431 100644 (file)
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -815,15 +815,16 @@ function print_upgrade_separator() {
  * @param bool $installation true if installation, false menas upgrade
  */
 function print_upgrade_part_start($plugin, $installation, $verbose) {
+    global $OUTPUT;
     if (empty($plugin) or $plugin == 'moodle') {
         upgrade_started($installation); // does not store upgrade running flag yet
         if ($verbose) {
-            print_heading(get_string('coresystem'));
+            echo $OUTPUT->heading(get_string('coresystem'));
         }
     } else {
         upgrade_started();
         if ($verbose) {
-            print_heading($plugin);
+            echo $OUTPUT->heading($plugin);
         }
     }
     if ($installation) {
@@ -883,7 +884,7 @@ function upgrade_get_javascript() {
  * @global object
  */
 function upgrade_language_pack($lang='') {
-    global $CFG;
+    global $CFG, $OUTPUT;
 
     if (empty($lang)) {
         $lang = current_language();
@@ -894,7 +895,7 @@ function upgrade_language_pack($lang='') {
     }
 
     upgrade_started(false);
-    print_heading(get_string('langimport', 'admin').': '.$lang);
+    echo $OUTPUT->heading(get_string('langimport', 'admin').': '.$lang);
 
     @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
     @mkdir ($CFG->dataroot.'/lang/');

diff --git a/lib/weblib.php b/lib/weblib.php
index 8ab83c042c04384f9c62b8151791c39198d33cb5..97f0608445d2036b93f38b19dd2e07b8a3cdff3a 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3271,12 +3271,12 @@ function rebuildnolinktag($text) {
  * @return void
  */
 function print_maintenance_message() {
-    global $CFG, $SITE, $PAGE;
+    global $CFG, $SITE, $PAGE, $OUTPUT;
 
     $PAGE->set_pagetype('maintenance-message');
     $PAGE->set_generaltype('maintenance');
     print_header(strip_tags($SITE->fullname), $SITE->fullname, 'home');
-    print_heading(get_string('sitemaintenance', 'admin'));
+    echo $OUTPUT->heading(get_string('sitemaintenance', 'admin'));
     if (isset($CFG->maintenance_message) and !html_is_blank($CFG->maintenance_message)) {
         print_box_start('maintenance_message generalbox boxwidthwide boxaligncenter');
         echo $CFG->maintenance_message;