MDL-19825 Converted all print_footer() calls

diff --git a/user/groupaddnote.php b/user/groupaddnote.php
index 823880e7634440440df9e962500a0d7484fbddc5..f3801f4592939bf3d8bb243b84f3a6dcd3733e07 100644 (file)
--- a/user/groupaddnote.php
+++ b/user/groupaddnote.php
@@ -53,7 +53,7 @@ print_header("$course->shortname: ".get_string('extendenrol'), $course->fullname
 
 // this will contain all available the based On select options, but we'll disable some on them on a per user basis
 
-echo $OUPTUT->heading($straddnote);
+echo $OUTPUT->heading($straddnote);
 echo '<form method="post" action="groupaddnote.php" >';
 echo '<div style="width:100%;text-align:center;">';
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
@@ -93,4 +93,4 @@ choose_from_menu($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $st
 echo '</p>';
 
 echo '<input type="submit" value="' . get_string('savechanges'). '" /></div></form>';
-print_footer($course);
+echo $OUTPUT->footer();

diff --git a/user/messageselect.php b/user/messageselect.php
index 386edb74ea5ef2cb16d7aca26d0db7b2b1655ae4..944c305fa53dae521dc1c80c6b8cfb4003d76d17 100644 (file)
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -82,7 +82,7 @@
         } else {
             $heading = get_string('addedrecips','moodle',$count);
         }
-        echo $OUPTUT->heading($heading);
+        echo $OUTPUT->heading($heading);
     }
 
     if (!empty($messagebody) && !$edit && !$deluser && ($preview || $send)) {
@@ -103,15 +103,15 @@
                     $good = $good && message_post_message($USER,$user,$messagebody,$format,'direct');
                 }
                 if (!empty($good)) {
-                    echo $OUPTUT->heading(get_string('messagedselectedusers'));
+                    echo $OUTPUT->heading(get_string('messagedselectedusers'));
                     unset($SESSION->emailto[$id]);
                     unset($SESSION->emailselect[$id]);
                 } else {
-                    echo $OUPTUT->heading(get_string('messagedselectedusersfailed'));
+                    echo $OUTPUT->heading(get_string('messagedselectedusersfailed'));
                 }
                 echo '<p align="center"><a href="index.php?id='.$id.'">'.get_string('backtoparticipants').'</a></p>';
             }
-            print_footer();
+            echo $OUTPUT->footer();
             exit;
         } else {
             notify(get_string('nousersyet'));
@@ -129,7 +129,7 @@
         require("message.html");
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 
 ?>

diff --git a/user/portfoliologs.php b/user/portfoliologs.php
index e3cfa2c785d4d4ea5ff9af34b94a141e208fed42..9d9023a39c642330f022b8659db2d54d333f7ea1 100644 (file)
--- a/user/portfoliologs.php
+++ b/user/portfoliologs.php
@@ -55,7 +55,7 @@ if (count($queued) > 0) {
         );
         unset($e); // this could potentially be quite big, so free it.
     }
-    echo $OUPTUT->heading(get_string('queuesummary', 'portfolio'));
+    echo $OUTPUT->heading(get_string('queuesummary', 'portfolio'));
     print_table($table);
 }
 $logcount = $DB->count_records('portfolio_log', array('userid' => $USER->id));
@@ -84,13 +84,13 @@ if ($logcount > 0) {
             userdate($log->time),
         );
     }
-    echo $OUPTUT->heading(get_string('logsummary', 'portfolio'));
+    echo $OUTPUT->heading(get_string('logsummary', 'portfolio'));
     print_paging_bar($logcount, $page, $perpage, $CFG->wwwroot . '/user/portfoliologs.php?');
     print_table($table);
     print_paging_bar($logcount, $page, $perpage, $CFG->wwwroot . '/user/portfoliologs.php?');
 
 }
 
-print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/user/profile/definelib.php b/user/profile/definelib.php
index 064de8dea689190c1ef57fb5a83ad2acc8cef6ca..d34177fed81ee982df47157c1b1cdd088804568b 100644 (file)
--- a/user/profile/definelib.php
+++ b/user/profile/definelib.php
@@ -438,9 +438,9 @@ function profile_edit_category($id, $redirect) {
 
         /// Print the page
         admin_externalpage_print_header();
-        echo $OUPTUT->heading($strheading);
+        echo $OUTPUT->heading($strheading);
         $categoryform->display();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -482,9 +482,9 @@ function profile_edit_field($id, $datatype, $redirect) {
 
         /// Print the page
         admin_externalpage_print_header();
-        echo $OUPTUT->heading($strheading);
+        echo $OUTPUT->heading($strheading);
         $fieldform->display();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 }

diff --git a/user/profile/index.php b/user/profile/index.php
index 72b04c80cfd9fc341605d9bd933952eeba2e31c7..b27670db62ba66b1a650f7a2c872415c5d35e450 100644 (file)
--- a/user/profile/index.php
+++ b/user/profile/index.php
@@ -52,9 +52,9 @@ switch ($action) {
         $fieldcount = $DB->count_records('user_info_field', array('categoryid'=>$id));
         $optionsyes = array ('id'=>$id, 'confirm'=>1, 'action'=>'deletecategory', 'sesskey'=>sesskey());
         admin_externalpage_print_header();
-        echo $OUPTUT->heading('profiledeletecategory', 'admin');
+        echo $OUTPUT->heading('profiledeletecategory', 'admin');
         notice_yesno(get_string('profileconfirmcategorydeletion', 'admin', $fieldcount), $redirect, $redirect, $optionsyes, null, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
         break;
     case 'deletefield':
@@ -70,9 +70,9 @@ switch ($action) {
         $datacount = $DB->count_records('user_info_data', array('fieldid'=>$id));
         $optionsyes = array ('id'=>$id, 'confirm'=>1, 'action'=>'deletefield', 'sesskey'=>sesskey());
         admin_externalpage_print_header();
-        echo $OUPTUT->heading('profiledeletefield', 'admin');
+        echo $OUTPUT->heading('profiledeletefield', 'admin');
         notice_yesno(get_string('profileconfirmfielddeletion', 'admin', $datacount), $redirect, $redirect, $optionsyes, null, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
         break;
     case 'editfield':
@@ -94,7 +94,7 @@ switch ($action) {
 
 /// Print the header
 admin_externalpage_print_header();
-echo $OUPTUT->heading(get_string('profilefields', 'admin'));
+echo $OUTPUT->heading(get_string('profilefields', 'admin'));
 
 /// Check that we have at least one category defined
 if ($DB->count_records('user_info_category') == 0) {
@@ -122,7 +122,7 @@ foreach ($categories as $category) {
         }
     }
 
-    echo $OUPTUT->heading(format_string($category->name) .' '.profile_category_icons($category));
+    echo $OUTPUT->heading(format_string($category->name) .' '.profile_category_icons($category));
     if (count($table->data)) {
         print_table($table);
     } else {
@@ -147,7 +147,7 @@ print_single_button('index.php', $options, get_string('profilecreatecategory', '
 
 echo '</div>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 die;
 
 

diff --git a/user/view.php b/user/view.php
index c3b0e35f83c7711fcb968bac28dd9daec6c04ef9..bd915d1e4551cb8b756cc682eac0c34d52419b89 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -92,7 +92,7 @@
 
                 print_header("$strpersonalprofile: ", "$strpersonalprofile: ", $navigation, "", "", true, " ", navmenu($course));
                 echo $OUTPUT->heading(get_string('usernotavailable', 'error'));
-                print_footer($course);
+                echo $OUTPUT->footer();
                 exit;
             }
         } else {   // Normal course
@@ -112,10 +112,10 @@
                     $navlinks[] = array('name' => $struser, 'link' => null, 'type' => 'misc');
                     $navigation = build_navigation($navlinks);
                     print_header("$strpersonalprofile: ", "$strpersonalprofile: ", $navigation, "", "", true, " ", navmenu($course));
-                    echo $OUPTUT->heading(get_string('notenrolledprofile'));
+                    echo $OUTPUT->heading(get_string('notenrolledprofile'));
                 }
                 print_continue($_SERVER['HTTP_REFERER']);
-                print_footer($course);
+                echo $OUTPUT->footer();
                 exit;
             }
         }
@@ -148,16 +148,16 @@
 
     if (($course->id != SITEID) and ! isguest() ) {   // Need to have access to a course to see that info
         if (!has_capability('moodle/course:view', $coursecontext, $user->id)) {
-            echo $OUPTUT->heading(get_string('notenrolled', '', $fullname));
-            print_footer($course);
+            echo $OUTPUT->heading(get_string('notenrolled', '', $fullname));
+            echo $OUTPUT->footer();
             die;
         }
     }
 
     if ($user->deleted) {
-        echo $OUPTUT->heading(get_string('userdeleted'));
+        echo $OUTPUT->heading(get_string('userdeleted'));
         if (!has_capability('moodle/user:update', $coursecontext)) {
-            print_footer($course);
+            echo $OUTPUT->footer();
             die;
         }
     }
@@ -540,11 +540,11 @@
 
     if ($CFG->debugdisplay && debugging('', DEBUG_DEVELOPER) && $USER->id == $user->id) {  // Show user object
         echo '<hr />';
-        echo $OUPTUT->heading('DEBUG MODE:  User session variables');
+        echo $OUTPUT->heading('DEBUG MODE:  User session variables');
         print_object($USER);
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 
 /// Functions ///////