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

diff --git a/course/category.php b/course/category.php
index 1fabef65a4735d21d73c36dcb997caddc5a11cfd..60e934f16c5582a9a93508b4e9e7924c93bf86d2 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -179,9 +179,9 @@
 
 /// Print current category description
     if (!$editingon && $category->description) {
-        print_box_start();
+        echo $OUTPUT->box_start();
         echo format_text($category->description); // for multilang filter
-        print_box_end();
+        echo $OUTPUT->box_end();
     }
 
     if ($editingon && has_capability('moodle/category:manage', $context)) {
@@ -233,9 +233,9 @@
         }
 
     } else if ($numcourses <= COURSE_MAX_SUMMARIES_PER_PAGE and !$page and !$editingon) {
-        print_box_start('courseboxes');
+        echo $OUTPUT->box_start('courseboxes');
         print_courses($category);
-        print_box_end();
+        echo $OUTPUT->box_end();
 
     } else {
         echo $OUTPUT->paging_bar(moodle_paging_bar::make($totalcount, $page, $perpage, "category.php?id=$category->id&perpage=$perpage"));

diff --git a/course/format/social/format.php b/course/format/social/format.php
index 8492a0538331149727c110d4b9e5666c90153f65..b3ab1faf2a635c8fb5688c1080a7bd67ee040a75 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -12,9 +12,9 @@
         if (trim($forum->intro) != '') {
             $options = new stdclass;
             $options->para = false;
-            print_box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
+            echo $OUTPUT->box(format_text($forum->intro, FORMAT_MOODLE, $options), 'generalbox', 'intro');
         }
-        
+
         $cm = get_coursemodule_from_instance('forum', $forum->id);
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
         echo '<div class="subscribelink">', forum_get_subscribe_link($forum, $context), '</div>';

diff --git a/course/index.php b/course/index.php
index cb2c0ffde4631ddd7ac5d6521fc3960e4deb4ff2..a382017cb55bbed288bdc017030a8e8f6e101e04 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -61,9 +61,9 @@
             print_header("$site->shortname: $strcategories", $strcourses, $navigation, '', '', true, update_category_button());
             echo $OUTPUT->heading($strcategories);
             echo skip_main_destination();
-            print_box_start('categorybox');
+            echo $OUTPUT->box_start('categorybox');
             print_whole_category_list();
-            print_box_end();
+            echo $OUTPUT->box_end();
             print_course_search();
         } else {
             $strfulllistofcourses = get_string('fulllistofcourses');
@@ -71,9 +71,9 @@
                     build_navigation(array(array('name'=>$strfulllistofcourses, 'link'=>'','type'=>'misc'))),
                          '', '', true, update_category_button());
             echo skip_main_destination();
-            print_box_start('courseboxes');
+            echo $OUTPUT->box_start('courseboxes');
             print_courses(0);
-            print_box_end();
+            echo $OUTPUT->box_end();
         }
 
         echo '<div class="buttons">';
@@ -123,12 +123,12 @@
 
         if ($data->fulldelete) {
             $deletedcourses = category_delete_full($deletecat, true);
-            
+
             foreach($deletedcourses as $course) {
                 notify(get_string('coursedeleted', '', $course->shortname), 'notifysuccess');
             }
             notify(get_string('coursecategorydeleted', '', format_string($deletecat->name)), 'notifysuccess');
-            
+
         } else {
             category_delete_move($deletecat, $data->newparent, true);
         }

diff --git a/course/info.php b/course/info.php
index fc38200b4f4b720ce829eaba96c301942f7cab8f..abc74cd77bdeb39463b8c37471221241dc12146f 100644 (file)
--- a/course/info.php
+++ b/course/info.php
@@ -30,15 +30,15 @@
 
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
     if ((!course_parent_visible($course) || (! $course->visible)) && !has_capability('moodle/course:viewhiddencourses', $context)) {
-        print_error('coursehidden', '', $CFG->wwwroot .'/'); 
-    }  
-    
+        print_error('coursehidden', '', $CFG->wwwroot .'/');
+    }
+
     print_header(get_string("summaryof", "", $course->fullname));
 
     echo $OUTPUT->heading(format_string($course->fullname) . '<br />(' . format_string($course->shortname) . ')');
 
     if ($course->guest || $course->password) {
-        print_box_start('generalbox icons');
+        echo $OUTPUT->box_start('generalbox icons');
         if ($course->guest) {
             $strallowguests = get_string('allowguests');
             echo "<div><img alt=\"\" class=\"icon guest\" src=\"" . $OUTPUT->old_icon_url('i/guest') . "\" />&nbsp;$strallowguests</div>";
@@ -47,11 +47,11 @@
             $strrequireskey = get_string('requireskey');
             echo "<div><img alt=\"\" class=\"icon key\" src=\"" . $OUTPUT->old_icon_url('i/key') . "\" />&nbsp;$strrequireskey</div>";
         }
-        print_box_end();
+        echo $OUTPUT->box_end();
     }
 
 
-    print_box_start('generalbox info');
+    echo $OUTPUT->box_start('generalbox info');
 
     echo format_text($course->summary, FORMAT_MOODLE, NULL, $course->id);
 
@@ -63,13 +63,13 @@
             $roleid = (int) $roleid;
             if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', $canseehidden)) {
                 foreach ($users as $teacher) {
-                    $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
+                    $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context));
                     $namesarray[] = format_string(role_get_name($role, $context)).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
                                     $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';
                 }
-            }          
+            }
         }
-        
+
         if (!empty($namesarray)) {
             echo "<ul class=\"teachers\">\n<li>";
             echo implode('</li><li>', $namesarray);
@@ -81,7 +81,7 @@
     $enrol = enrolment_factory::factory($course->enrol);
     echo $enrol->get_access_icons($course);
 
-    print_box_end();
+    echo $OUTPUT->box_end();
 
     echo "<br />";