MDL-19799 Converted print_box* to $OUTPUT->box*

diff --git a/lib/adminlib.php b/lib/adminlib.php
index e7e55330efdb1aa811d7a7481a2b7a94580cb303..181be2503f60d27a942a2e4c7c5f9e79a3f7fed4 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1314,7 +1314,7 @@ class admin_setting_heading extends admin_setting {
             $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);
+            $return .= $OUTPUT->box(highlight($query, $this->description), 'generalbox formsettingheading');
         }
         return $return;
     }
@@ -4548,7 +4548,7 @@ class admin_setting_manageauths extends admin_setting {
         }
 
         $return = $OUTPUT->heading(get_string('actauthhdr', 'auth'), 3, 'main');
-        $return .= print_box_start('generalbox authsui', '', true);
+        $return .= $OUTPUT->box_start('generalbox authsui');
 
         $table = new object();
         $table->head  = array($txt->name, $txt->enable, $txt->updown, $txt->settings);
@@ -4622,7 +4622,7 @@ class admin_setting_manageauths extends admin_setting {
         }
         $return .= print_table($table, true);
         $return .= get_string('configauthenticationplugins', 'admin').'<br />'.get_string('tablenosave', 'filters');
-        $return .= print_box_end(true);
+        $return .= $OUTPUT->box_end();
         return highlight($query, $return);
     }
 }
@@ -4725,7 +4725,7 @@ class admin_setting_manageeditors extends admin_setting {
         }
         $editors_available = array_reverse($editors_available, true);
         $return = $OUTPUT->heading(get_string('acteditorshhdr', 'editor'), 3, 'main', true);
-        $return .= print_box_start('generalbox editorsui', '', true);
+        $return .= $OUTPUT->box_start('generalbox editorsui');
 
         $table = new object();
         $table->head  = array($txt->name, $txt->enable, $txt->updown, $txt->settings);
@@ -4786,7 +4786,7 @@ class admin_setting_manageeditors extends admin_setting {
         }
         $return .= print_table($table, true);
         $return .= get_string('configeditorplugins', 'editor').'<br />'.get_string('tablenosave', 'filters');
-        $return .= print_box_end(true);
+        $return .= $OUTPUT->box_end();
         return highlight($query, $return);
     }
 }
@@ -4920,7 +4920,7 @@ class admin_setting_manageportfolio extends admin_setting {
     public function output_html($data, $query='') {
         global $CFG, $OUTPUT;
 
-        $output = print_box_start('generalbox','',true);
+        $output = $OUTPUT->box_start('generalbox');
 
         $namestr = get_string('name');
         $pluginstr = get_string('plugin', 'portfolio');
@@ -4978,7 +4978,7 @@ class admin_setting_manageportfolio extends admin_setting {
         if ($addable) {
             $output .= $instancehtml;
         }
-        $output .= print_box_end(true);
+        $output .= $OUTPUT->box_end();
 
         return highlight($query, $output);
     }
@@ -5779,7 +5779,7 @@ class admin_setting_managerepository extends admin_setting {
      */
     public function output_html($data, $query='') {
         global $CFG, $USER, $OUTPUT;
-        $output = print_box_start('generalbox','',true);
+        $output = $OUTPUT->box_start('generalbox');
         $namestr = get_string('name');
         $settingsstr = get_string('settings');
         $updownstr = get_string('updown', 'repository');
@@ -5881,7 +5881,7 @@ class admin_setting_managerepository extends admin_setting {
             $output .= $instancehtml;
         }
 
-        $output .= print_box_end(true);
+        $output .= $OUTPUT->box_end();
         return highlight($query, $output);
     }
 }

diff --git a/lib/weblib.php b/lib/weblib.php
index 8281eef61d102b1d4f6983dcfbc907da38fb41bb..80f9789acfe7d8e76179ea44b0245a9832541ffd 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -75,7 +75,7 @@ define('URL_MATCH_BASE', 0);
  */
 define('URL_MATCH_PARAMS', 1);
 /**
- * A moodle_url comparison using this flag will return true if the two URLs are identical, except for the order of the params 
+ * A moodle_url comparison using this flag will return true if the two URLs are identical, except for the order of the params
  */
 define('URL_MATCH_EXACT', 2);
 
@@ -3136,7 +3136,7 @@ function notice ($message, $link='', $course=NULL) {
         print_container_end_all(false, $THEME->open_header_containers);
     }
 
-    print_box($message, 'generalbox', 'notice');
+    echo $OUTPUT->box($message, 'generalbox', 'notice');
     print_continue($link);
 
     echo $OUTPUT->footer();
@@ -3331,9 +3331,9 @@ function print_maintenance_message() {
     print_header(strip_tags($SITE->fullname), $SITE->fullname, 'home');
     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 $OUTPUT->box_start('maintenance_message generalbox boxwidthwide boxaligncenter');
         echo $CFG->maintenance_message;
-        print_box_end();
+        echo $OUTPUT->box_end();
     }
     echo $OUTPUT->footer();
     die;