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

diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index 33fce80969832270c93af31632693c64c8aec864..e39e7bbfd46f8a35bb21f58c9e447d8b09b0b4f5 100644 (file)
--- a/mod/glossary/export.php
+++ b/mod/glossary/export.php
@@ -21,8 +21,8 @@
         print_error('invalidid', 'glossary');
     }
 
-    require_login($course->id, false, $cm);  
-    
+    require_login($course->id, false, $cm);
+
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:export', $context);
 
@@ -44,7 +44,7 @@
 
     echo $OUTPUT->heading($strexportentries);
 
-    print_box_start('glossarydisplay generalbox');
+    echo $OUTPUT->box_start('glossarydisplay generalbox');
     ?>
     <form action="exportfile.php" method="post">
     <table border="0" cellpadding="6" cellspacing="6" width="100%">
@@ -64,6 +64,6 @@
         $button->set_callback_options('glossary_csv_portfolio_caller', array('id' => $cm->id), '/mod/glossary/lib.php');
         $button->render();
     }
-    print_box_end();
+    echo $OUTPUT->box_end();
     echo $OUTPUT->footer();
 ?>

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index b2ff708da333944102c86e1fad4e59ef4e97248c..b47454e3dced57bd9bd0f9c4ff2708346686b5aa 100644 (file)
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -17,7 +17,7 @@
     if (! $cm = get_coursemodule_from_id('glossary', $id)) {
         print_error('invalidcoursemodule');
     }
-    
+
     if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
         print_error('coursemisconf');
     }
@@ -26,8 +26,8 @@
         print_error('invalidid', 'glossary');
     }
 
-    require_login($course->id, false, $cm);  
-    
+    require_login($course->id, false, $cm);
+
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/glossary:import', $context);
 
@@ -52,9 +52,9 @@
     echo $OUTPUT->heading($strimportentries);
 
     if ( !$step ) {
-        print_box_start('glossarydisplay generalbox');
+        echo $OUTPUT->box_start('glossarydisplay generalbox');
         include("import.html");
-        print_box_end();
+        echo $OUTPUT->box_end();
 
         echo $OUTPUT->footer();
         exit;
@@ -67,9 +67,9 @@
     $um = new upload_manager('file',false,false,$course,false,0);
 
     if (!$um->preprocess_files()) {
-        print_box_start('glossarydisplay generalbox');
+        echo $OUTPUT->box_start('glossarydisplay generalbox');
         print_continue('import.php?id='.$id);
-        print_box_end();
+        echo $OUTPUT->box_end();
 
         echo $OUTPUT->footer();
         die();
@@ -299,7 +299,7 @@
             }
         }
         // processed entries
-        print_box_start('glossarydisplay generalbox');
+        echo $OUTPUT->box_start('glossarydisplay generalbox');
         echo '<table class="glossaryimportexport">';
         echo '<tr>';
         echo '<td width="50%" align="right">';
@@ -345,7 +345,7 @@
         } else {
             print_continue('import.php?id='.$id);
         }
-        print_box_end();
+        echo $OUTPUT->box_end();
     } else {
         notice(get_string('errorparsingxml', 'glossary'));
     }

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 4429eb2a657aa6bbb9331eb29f71f32a2232fa8c..318263ec57ecad304581387c42a3a0c3db988896 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -323,7 +323,7 @@
 
 /// Info box
     if ($glossary->intro && $showcommonelements) {
-        print_box(format_module_intro('glossary', $glossary, $cm->id), 'generalbox', 'intro');
+        echo $OUTPUT->box(format_module_intro('glossary', $glossary, $cm->id), 'generalbox', 'intro');
     }
 
 /// Search box